[92416] trunk/dports/science/ccpnmr
ryandesign at macports.org
ryandesign at macports.org
Fri Apr 27 21:48:29 PDT 2012
Revision: 92416
https://trac.macports.org/changeset/92416
Author: ryandesign at macports.org
Date: 2012-04-27 21:48:28 -0700 (Fri, 27 Apr 2012)
Log Message:
-----------
ccpnmr: maintainer update to 2.2.2; use python27 instead of python26; use MacPorts gcc45 compiler; see #33964
Modified Paths:
--------------
trunk/dports/science/ccpnmr/Portfile
trunk/dports/science/ccpnmr/files/ccpnmr.patch
Modified: trunk/dports/science/ccpnmr/Portfile
===================================================================
--- trunk/dports/science/ccpnmr/Portfile 2012-04-28 04:47:58 UTC (rev 92415)
+++ trunk/dports/science/ccpnmr/Portfile 2012-04-28 04:48:28 UTC (rev 92416)
@@ -4,7 +4,7 @@
PortSystem 1.0
name ccpnmr
-version 2.1.5
+version 2.2.2
set branch [join [lrange [split $version .] 0 1] .]
categories science python
maintainers bromo.med.uc.edu:howarth
@@ -17,16 +17,16 @@
experimental data to the final validation.
platforms darwin
homepage http://www.ccpn.ac.uk/ccpn/software/ccpnmr-suite
-master_sites http://www.bio.cam.ac.uk/ccpn/download/ccpnmr/
+master_sites http://www2.ccpn.ac.uk/download/ccpnmr/
distname analysis${version}
-checksums md5 e1e93cac7516c6f8fbe4b503a223cdd4 \
- sha1 70dc5e6b2752d6b7d5c8673fc992ebd0a88e6ad0
+checksums md5 a3ede39ed484d261eb82137055dc66a1 \
+ sha1 825ad7487ef6191baac0e5aa3d0ec6a6ed94a04f
worksrcdir ${name}
-depends_lib port:py26-scipy port:mesa port:freeglut port:tk port:py26-tkinter
+depends_lib port:py27-scipy port:mesa port:freeglut port:tk port:py27-tkinter port:gcc45
patchfiles ccpnmr.patch
use_configure no
-set python.branch 2.6
+set python.branch 2.7
set python.prefix ${frameworks_dir}/Python.framework/Versions/${python.branch}
set python.bin ${python.prefix}/bin/python${python.branch}
set python.pkgd ${python.prefix}/lib/python${python.branch}/site-packages
@@ -54,6 +54,8 @@
pre-build {
copy ${worksrcpath}/ccpnmr${branch}/c/environment-opengl.txt ${worksrcpath}/ccpnmr${branch}/c/environment.txt
}
+
+configure.compiler macports-gcc-4.5
build.args CC=${configure.cc} ARCHFLAGS="${configure.cc_archflags}"
build.dir ${worksrcpath}/ccpnmr${branch}/c
build.target all links
Modified: trunk/dports/science/ccpnmr/files/ccpnmr.patch
===================================================================
--- trunk/dports/science/ccpnmr/files/ccpnmr.patch 2012-04-28 04:47:58 UTC (rev 92415)
+++ trunk/dports/science/ccpnmr/files/ccpnmr.patch 2012-04-28 04:48:28 UTC (rev 92416)
@@ -9,7 +9,7 @@
+ export LIBGL_ALWAYS_INDIRECT=1
+fi
+
-+ at PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/analysis/AnalysisGui.py $1 $2 $3 $4 $5
++ at PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.2/python/ccpnmr/analysis/AnalysisGui.py $1 $2 $3 $4 $5
--- bin/formatConverter.orig 1970-01-01 01:00:00.000000000 +0100
+++ bin/formatConverter 2005-12-23 20:44:06.000000000 +0000
@@ -0,0 +1,9 @@
@@ -21,7 +21,7 @@
+ export LIBGL_ALWAYS_INDIRECT=1
+fi
+
-+ at PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/format/gui/FormatConverter.py $1 $2
++ at PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.2/python/ccpnmr/format/gui/FormatConverter.py $1 $2
--- bin/pipe2azara.orig 1970-01-01 01:00:00.000000000 +0100
+++ bin/pipe2azara 2005-12-23 20:44:06.000000000 +0000
@@ -0,0 +1,9 @@
@@ -33,13 +33,101 @@
+ export LIBGL_ALWAYS_INDIRECT=1
+fi
+
-+ at PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/analysis/NmrPipeData.py $1 $2 $3
---- ccpnmr2.1/c/environment-opengl.txt.orig 1970-01-01 01:00:00.000000000 +0100
-+++ ccpnmr2.1/c/environment-opengl.txt 2005-12-23 21:37:59.000000000 +0000
++ at PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.2/python/ccpnmr/analysis/NmrPipeData.py $1 $2 $3
+--- bin/dataShifter.orig 1970-01-01 01:00:00.000000000 +0100
++++ bin/dataShifter 2008-03-24 19:03:07.000000000 +0000
+@@ -0,0 +1,9 @@
++#!/bin/sh
++
++export MallocLogFile=/dev/null
++
++if [ ${SSH_TTY} ]; then
++ export LIBGL_ALWAYS_INDIRECT=1
++fi
++
++ at PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.2/python/ccpnmr/format/gui/DataShifter.py
+--- bin/updateAll.orig 1970-01-01 01:00:00.000000000 +0100
++++ bin/updateAll 2008-03-24 19:04:31.000000000 +0000
+@@ -0,0 +1,9 @@
++#!/bin/sh
++
++export MallocLogFile=/dev/null
++
++if [ ${SSH_TTY} ]; then
++ export LIBGL_ALWAYS_INDIRECT=1
++fi
++
++ at PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.2/python/ccpnmr/update/UpdateAuto.py
+--- bin/updateCheck.orig 1970-01-01 01:00:00.000000000 +0100
++++ bin/updateCheck 2008-03-24 19:06:16.000000000 +0000
+@@ -0,0 +1,9 @@
++#!/bin/sh
++
++export MallocLogFile=/dev/null
++
++if [ ${SSH_TTY} ]; then
++ export LIBGL_ALWAYS_INDIRECT=1
++fi
++
++ at PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.2/python/ccpnmr/update/UpdatePopup.py
+--- ccpnmr2.2/c/ccp/structure/Makefile.orig 2012-03-13 12:30:17.000000000 -0400
++++ ccpnmr2.2/c/ccp/structure/Makefile 2012-04-08 17:19:22.000000000 -0400
+@@ -40,11 +40,11 @@
+ $(GLOBAL_DIR)/py_tk_handler.$(OBJ_SUFFIX) \
+ $(GLOBAL_DIR)/py_tk_util.$(OBJ_SUFFIX)
+
+-ALL_INCLUDE_FLAGS = $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \
+- $(X11_INCLUDE_FLAGS) \
+- $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
++ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(GLOBAL_INCLUDE_FLAGS) \
++ $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
++ $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
+
+-ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS)
++ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TK_LIB_FLAGS)
+
+ ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
+
+--- ccpnmr2.2/c/ccpnmr/analysis/Makefile.orig 2012-03-13 12:30:17.000000000 -0400
++++ ccpnmr2.2/c/ccpnmr/analysis/Makefile 2012-04-08 17:18:17.000000000 -0400
+@@ -55,11 +55,11 @@
+ $(GLOBAL_DIR)/py_tk_handler.$(OBJ_SUFFIX) \
+ $(GLOBAL_DIR)/py_tk_util.$(OBJ_SUFFIX)
+
+-ALL_INCLUDE_FLAGS = $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \
+- $(X11_INCLUDE_FLAGS) \
+- $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
++ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(GLOBAL_INCLUDE_FLAGS) \
++ $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
++ $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
+
+-ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS)
++ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TK_LIB_FLAGS)
+
+ ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
+
+--- ccpnmr2.2/c/memops/global/Makefile.orig 2012-03-13 12:30:17.000000000 -0400
++++ ccpnmr2.2/c/memops/global/Makefile 2012-04-08 17:11:36.000000000 -0400
+@@ -137,10 +137,10 @@
+
+ TCLTK_LIB = $(TK_LIB) $(X11_LIB) $(MATH_LIB)
+
+-ALL_INCLUDE_FLAGS = $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
+- $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
++ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
++ $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
+
+-ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS)
++ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS)
+
+ ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
+
+--- ccpnmr2.2/c/environment-opengl.txt.orig 2012-04-08 17:31:08.000000000 -0400
++++ ccpnmr2.2/c/environment-opengl.txt 2012-04-08 17:33:55.000000000 -0400
@@ -0,0 +1,56 @@
+#Environment file for use with fink to build ccpnmr suite - environment.txt
+
-+CC = gcc
++CC = gcc-mp-4.5
+LINK = $(CC)
+MAKE = make
+CO_NAME = -c $<
@@ -57,12 +145,12 @@
+LINK_LIBRARIES = sh linkSharedObjs
+COPY_LIBRARIES = sh copySharedObjs
+
++OPENMP_FLAGS = -fopenmp
++OPENMP_LIB = -L at PREFIX@/lib/gcc45 -lgomp
++
+GL_FLAG = -DUSE_GL_TRUE
-+#GL_FLAG = -DUSE_GL_FALSE
+
-+#GLUT_NEED_INIT =
+GLUT_NEED_INIT = -DNEED_GLUT_INIT
-+#GLUT_NOT_IN_GL = -DGLUT_IN_OWN_DIR
+GLUT_FLAG = $(GLUT_NEED_INIT) $(GLUT_NOT_IN_GL)
+
+SHARED_FLAGS = -L at PREFIX@/lib -bundle -bundle_loader @PYTHON_BIN@ "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
@@ -87,95 +175,9 @@
+PYTHON_DIR = @PREFIX@
+PYTHON_LIB =
+PYTHON_INCLUDE_FLAGS = -I at PYTHON_INCL@
-+PYTHON_LIB_FLAGS = -L at PREFIX@ -lpython2.6
++PYTHON_LIB_FLAGS = -L at PREFIX@ -lpython2.7
+
+GL_DIR = /usr/X11R6
+GL_LIB = -lglut -lGLU -lGL
+GL_INCLUDE_FLAGS = -I$(GL_DIR)/include -I at PREFIX@/include
+GL_LIB_FLAGS = -L$(GL_DIR)/lib -L at PREFIX@/lib
---- ccpnmr2.1/c/ccp/structure/Makefile.orig 2006-01-13 21:52:17.000000000 +0000
-+++ ccpnmr2.1/c/ccp/structure/Makefile 2006-01-13 21:56:46.000000000 +0000
-@@ -35,11 +35,11 @@
- $(GLOBAL_DIR)/py_ps_handler.o \
- $(GLOBAL_DIR)/py_tk_handler.o
-
--ALL_INCLUDE_FLAGS = $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \
-+ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \
- $(X11_INCLUDE_FLAGS) \
-- $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
-+ $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
-
--ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS)
-+ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS)
-
- ALL_LIB = $(GL_LIB) $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
-
---- ccpnmr2.1/c/ccpnmr/analysis/Makefile.orig 2006-01-13 21:52:45.000000000 +0000
-+++ ccpnmr2.1/c/ccpnmr/analysis/Makefile 2006-01-13 21:57:29.000000000 +0000
-@@ -40,11 +40,11 @@
- $(GLOBAL_DIR)/py_ps_handler.o \
- $(GLOBAL_DIR)/py_tk_handler.o
-
--ALL_INCLUDE_FLAGS = $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \
-+ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \
- $(X11_INCLUDE_FLAGS) \
-- $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
-+ $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
-
--ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS)
-+ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS)
-
- ALL_LIB = $(GL_LIB) $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
-
---- ccpnmr2.1/c/memops/global/Makefile.orig 2006-01-13 20:57:07.000000000 +0000
-+++ ccpnmr2.1/c/memops/global/Makefile 2006-01-13 20:59:57.000000000 +0000
-@@ -99,10 +99,10 @@
-
- TCLTK_LIB = $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
-
--ALL_INCLUDE_FLAGS = $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
-- $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
-+ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
-+ $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
-
--ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS)
-+ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS)
-
- ALL_LIB = $(GL_LIB) $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
-
---- bin/dataShifter.orig 1970-01-01 01:00:00.000000000 +0100
-+++ bin/dataShifter 2008-03-24 19:03:07.000000000 +0000
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+export MallocLogFile=/dev/null
-+
-+if [ ${SSH_TTY} ]; then
-+ export LIBGL_ALWAYS_INDIRECT=1
-+fi
-+
-+ at PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/format/gui/DataShifter.py
---- bin/updateAll.orig 1970-01-01 01:00:00.000000000 +0100
-+++ bin/updateAll 2008-03-24 19:04:31.000000000 +0000
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+export MallocLogFile=/dev/null
-+
-+if [ ${SSH_TTY} ]; then
-+ export LIBGL_ALWAYS_INDIRECT=1
-+fi
-+
-+ at PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/update/UpdateAuto.py
---- bin/updateCheck.orig 1970-01-01 01:00:00.000000000 +0100
-+++ bin/updateCheck 2008-03-24 19:06:16.000000000 +0000
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+export MallocLogFile=/dev/null
-+
-+if [ ${SSH_TTY} ]; then
-+ export LIBGL_ALWAYS_INDIRECT=1
-+fi
-+
-+ at PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.1/python/ccpnmr/update/UpdatePopup.py
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120427/57f1e787/attachment.html>
More information about the macports-changes
mailing list