Revision: 74753 http://trac.macports.org/changeset/74753 Author: adfernandes@macports.org Date: 2011-01-01 08:04:56 -0800 (Sat, 01 Jan 2011) Log Message: ----------- pymol-devel : change build to python2.7; use gcc45 as default compiler; latest svn branch Modified Paths: -------------- trunk/dports/science/pymol-devel/Portfile trunk/dports/science/pymol-devel/files/pymol-build.patch Added Paths: ----------- trunk/dports/science/pymol-devel/ Modified: trunk/dports/science/pymol-devel/Portfile =================================================================== --- trunk/dports/science/pymol/Portfile 2010-12-31 18:29:38 UTC (rev 74741) +++ trunk/dports/science/pymol-devel/Portfile 2011-01-01 16:04:56 UTC (rev 74753) @@ -3,10 +3,12 @@ PortSystem 1.0 -name pymol -version 1.3 +name pymol-devel +svn.revision 3928 +version 1.3.${svn.revision} +conflicts pymol categories science -maintainers bromo.med.uc.edu:howarth +maintainers adfernandes openmaintainer description Molecular graphics system long_description PyMOL is a molecular graphics system with an embedded Python interpreter \ designed for real-time visualization and rapid generation of high-quality \ @@ -19,10 +21,9 @@ master_sites sourceforge fetch.type svn svn.url https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol -svn.revision 3911 worksrcdir pymol -depends_lib port:glut port:freetype port:libpng port:python26 port:py26-pmw port:py26-numeric port:mesa +depends_lib port:glut port:freetype port:libpng port:python27 port:py27-pmw port:py27-numeric port:mesa depends_run port:xdpyinfo patchfiles pymol-build.patch pymol-build.patch2 @@ -51,6 +52,8 @@ CC="${configure.cc}" CXX="${configure.cxx}" } +default_variants +gcc45 + variant gcc43 description conflicts gcc44 gcc45 description {build using macports-gcc-4.3} { depends_lib-append port:gcc43 # the current pymol makefile does not honour CC and CXX environment variables @@ -85,5 +88,5 @@ } post-destroot { - system "${prefix}/bin/python2.6 -O ${prefix}/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/compileall.py -d ${prefix}/lib/pymol/modules ${destroot}${prefix}/lib/pymol/modules" + system "${prefix}/bin/python2.7 -O ${prefix}/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/compileall.py -d ${prefix}/lib/pymol/modules ${destroot}${prefix}/lib/pymol/modules" } Modified: trunk/dports/science/pymol-devel/files/pymol-build.patch =================================================================== --- trunk/dports/science/pymol/files/pymol-build.patch 2010-12-31 18:29:38 UTC (rev 74741) +++ trunk/dports/science/pymol-devel/files/pymol-build.patch 2011-01-01 16:04:56 UTC (rev 74753) @@ -5,11 +5,11 @@ # (Static) build target -TARGET= python -+TARGET= python2.6 ++TARGET= python2.7 # Installed python binary (used only by boot target) -#PYTHON= -+PYTHON= python2.6 ++PYTHON= python2.7 # Add more -I and -D options here CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS) @@ -53,12 +53,12 @@ XINC_DIR = -I/usr/X11R6/include #--- Python -PYTHON_EXE = /sw/bin/python2.3 -+PYTHON_EXE = @PREFIX@/bin/python2.6 ++PYTHON_EXE = @PREFIX@/bin/python2.7 PYTHON_LIB = PYTHON_LIB_DIR = -PYTHON_INC_DIR = -I/sw/include/python2.3 \ - -I/sw/include/python2.3/Numeric -+PYTHON_INC_DIR = `python2.6-config --include`/Numeric ++PYTHON_INC_DIR = `python2.7-config --include`/Numeric #--- Other external dependencies -EXT_INC_DIR = -I/sw/include -EXT_LIB_DIR = -L/sw/lib @@ -72,7 +72,7 @@ DEFS = -D_PYMOL_MODULE -D_PYMOL_NUMPY -D_PYMOL_FINK #--- How we build shared libraries -BUILD = -bundle -bundle_loader /sw/bin/python2.3 -flat_namespace -undefined suppress -+BUILD = -bundle -bundle_loader @PREFIX@/bin/python2.6 -flat_namespace -undefined suppress ++BUILD = -bundle -bundle_loader @PREFIX@/bin/python2.7 -flat_namespace -undefined suppress #--- What are we trying to build? DEST = -o modules/pymol/_cmd.so #--- Gcc Options for Linux @@ -95,4 +95,4 @@ +APBS_PSIZE=@PREFIX@/bin/apbs-psize.py +export APBS_PSIZE +# -+exec @PREFIX@/bin/python2.6 $PYMOL_PATH/modules/pymol/__init__.py -d "_ set stereo_double_pump_mono,quiet=1" "$@" ++exec @PREFIX@/bin/python2.7 $PYMOL_PATH/modules/pymol/__init__.py -d "_ set stereo_double_pump_mono,quiet=1" "$@"