[99765] trunk/dports/science/pymol-devel
adfernandes at macports.org
adfernandes at macports.org
Fri Nov 16 17:01:16 PST 2012
Revision: 99765
https://trac.macports.org/changeset/99765
Author: adfernandes at macports.org
Date: 2012-11-16 17:01:16 -0800 (Fri, 16 Nov 2012)
Log Message:
-----------
science/pymol-devel: update to post 1.5.0.3 (r4007) and ensure tcl does not use corefoundation
Revision Links:
--------------
https://trac.macports.org/changeset/4007
Modified Paths:
--------------
trunk/dports/science/pymol-devel/Portfile
trunk/dports/science/pymol-devel/files/pymol_shell.diff
Added Paths:
-----------
trunk/dports/science/pymol-devel/files/apbs-psize.patch
trunk/dports/science/pymol-devel/files/pmg_tk_platform.patch
Modified: trunk/dports/science/pymol-devel/Portfile
===================================================================
--- trunk/dports/science/pymol-devel/Portfile 2012-11-16 23:26:51 UTC (rev 99764)
+++ trunk/dports/science/pymol-devel/Portfile 2012-11-17 01:01:16 UTC (rev 99765)
@@ -6,9 +6,11 @@
name pymol-devel
conflicts pymol
-svn.revision 3964
-version 1.4.1.${svn.revision}
-revision 5
+svn.revision 4007
+version 1.5.0.3.r${svn.revision}
+# license is equivalent to the 3-clause BSD (http://pymol.svn.sourceforge.net/viewvc/pymol/trunk/pymol/LICENSE)
+license BSD
+#revision 1
categories science
maintainers adfernandes openmaintainer
description Molecular graphics system
@@ -28,10 +30,20 @@
depends_lib port:freetype port:libpng port:python27 port:py27-pmw port:py27-numpy port:py27-scipy port:mesa port:glew port:py27-tkinter port:freeglut
depends_run port:xdpyinfo
+pre-fetch {
+ set i [lindex [registry_active "tcl"] 0]
+ set regref [registry_open [lindex $i 0] [lindex $i 1] [lindex $i 2] [lindex $i 3] [lindex $i 5]]
+ set variants [registry_prop_retr $regref variants]
+ if {[regexp "\\+corefoundation(\\+|-|$)" ${variants}]} {
+ ui_debug "Port '${name}' is incompatible with the 'corefoundation' variant of the 'tcl' port."
+ return -code error "incompatible variant in dependent port"
+ }
+}
+
# py27-scipy is not universal
universal_variant no
-patchfiles setup_py.diff pymol_shell.diff
+patchfiles pymol_shell.diff pmg_tk_platform.patch apbs-psize.patch
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py
@@ -41,35 +53,43 @@
use_parallel_build yes
-platform darwin 11 {
- python.add_archflags no
- build.env CC="/usr/bin/clang" CXX="/usr/bin/clang++"
-}
-
-variant gcc43 description conflicts gcc44 gcc45 gcc46 description {build using macports-gcc-4.3} {
+variant gcc43 description conflicts gcc44 gcc45 gcc46 gcc47 description {build using macports-gcc-4.3} {
depends_lib-append port:gcc43
python.add_archflags no
- build.env CC="${prefix}/bin/gcc-mp-4.3" CXX="${prefix}/bin/g++-mp-4.3"
+ configure.compiler macports-gcc-4.3
}
-variant gcc44 description conflicts gcc43 gcc45 gcc46 description {build using macports-gcc-4.4} {
+variant gcc44 description conflicts gcc43 gcc45 gcc46 gcc47 description {build using macports-gcc-4.4} {
depends_lib-append port:gcc44
python.add_archflags no
- build.env CC="${prefix}/bin/gcc-mp-4.4" CXX="${prefix}/bin/g++-mp-4.4"
+ configure.compiler macports-gcc-4.4
}
-variant gcc45 description conflicts gcc43 gcc44 gcc46 description {build using macports-gcc-4.5} {
+variant gcc45 description conflicts gcc43 gcc44 gcc46 gcc47 description {build using macports-gcc-4.5} {
depends_lib-append port:gcc45
python.add_archflags no
- build.env CC="${prefix}/bin/gcc-mp-4.5" CXX="${prefix}/bin/g++-mp-4.5"
+ configure.compiler macports-gcc-4.5
}
-variant gcc46 description conflicts gcc43 gcc44 gcc45 description {build using macports-gcc-4.6} {
+variant gcc46 description conflicts gcc43 gcc44 gcc45 gcc47 description {build using macports-gcc-4.6} {
depends_lib-append port:gcc46
python.add_archflags no
- build.env CC="${prefix}/bin/gcc-mp-4.6" CXX="${prefix}/bin/g++-mp-4.6"
+ configure.compiler macports-gcc-4.6
}
+variant gcc47 description conflicts gcc43 gcc44 gcc45 gcc46 description {build using macports-gcc-4.7} {
+ depends_lib-append port:gcc47
+ python.add_archflags no
+ configure.compiler macports-gcc-4.7
+}
+
+build {
+}
+
+pre-destroot {
+ destroot.env CC="${configure.cc}" CXX="${configure.cxx}"
+}
+
post-destroot {
file copy ${worksrcpath}/setup/pymol_macports ${destroot}${prefix}/bin/pymol
file attributes ${destroot}${prefix}/bin/pymol -permissions a+x
Copied: trunk/dports/science/pymol-devel/files/apbs-psize.patch (from rev 99744, trunk/dports/science/pymol/files/apbs-psize.patch)
===================================================================
--- trunk/dports/science/pymol-devel/files/apbs-psize.patch (rev 0)
+++ trunk/dports/science/pymol-devel/files/apbs-psize.patch 2012-11-17 01:01:16 UTC (rev 99765)
@@ -0,0 +1,11 @@
+--- modules/pmg_tk/startup/apbs_tools.py.orig 2012-02-18 17:28:11.000000000 -0500
++++ modules/pmg_tk/startup/apbs_tools.py 2012-02-18 17:38:31.000000000 -0500
+@@ -832,7 +832,7 @@
+ label_pyclass = FileDialogButtonClassFactory.get(self.setPsizeLocation),
+ validate = {'validator':quickFileValidation,},
+ #value = '/usr/local/apbs-0.3.1/tools/manip/psize.py',
+- value = get_default_location('psize.py'),
++ value = get_default_location('apbs-psize.py'),
+ label_text = 'APBS psize.py location:',
+ )
+ self.psize.pack(fill = 'x', padx = 20, pady = 10)
Copied: trunk/dports/science/pymol-devel/files/pmg_tk_platform.patch (from rev 99744, trunk/dports/science/pymol/files/pmg_tk_platform.patch)
===================================================================
--- trunk/dports/science/pymol-devel/files/pmg_tk_platform.patch (rev 0)
+++ trunk/dports/science/pymol-devel/files/pmg_tk_platform.patch 2012-11-17 01:01:16 UTC (rev 99765)
@@ -0,0 +1,56 @@
+--- modules/pmg_tk/skins/normal/__init__.py.orig 2012-02-18 12:31:32.000000000 -0500
++++ modules/pmg_tk/skins/normal/__init__.py 2012-02-18 12:32:53.000000000 -0500
+@@ -250,7 +250,7 @@
+ self.buttonArea.destroy()
+
+ def my_show(self,win,center=1):
+- if sys.platform!='linux2':
++ if (sys.platform!='linux2') and (sys.platform!='darwin'):
+ win.show()
+ else: # autocenter, deiconify, and run mainloop
+ # this is a workaround for a bug in the
+@@ -269,13 +269,13 @@
+ # win.show()
+
+ def my_withdraw(self,win):
+- if sys.platform!='linux2':
++ if (sys.platform!='linux2') or (sys.platform!='darwin'):
+ win.withdraw()
+ else:
+ win.destroy()
+
+ def my_activate(self,win,center=1,focus=None):
+- if sys.platform!='linux2':
++ if (sys.platform!='linux2') and (sys.platform!='darwin'):
+ win.activate()
+ else: # autocenter, deiconify, and run mainloop
+ # this is a workaround for a bug in the
+@@ -296,7 +296,7 @@
+ win.mainloop()
+
+ def my_deactivate(self,win):
+- if sys.platform!='linux2':
++ if (sys.platform!='linux2') or (sys.platform!='darwin'):
+ win.deactivate()
+ else: # autocenter, deiconify, and run mainloop
+ win.destroy()
+--- modules/pmg_tk/PMGApp.py.orig 2012-02-18 12:35:29.000000000 -0500
++++ modules/pmg_tk/PMGApp.py 2012-02-18 12:36:46.000000000 -0500
+@@ -219,7 +219,7 @@
+
+
+ def my_show(self,win,center=1):
+- if sys.platform!='linux2':
++ if (sys.platform!='linux2') and (sys.platform!='darwin'):
+ win.show()
+ else: # autocenter, deiconify, and run mainloop
+ # this is a workaround for a bug in the
+@@ -237,7 +237,7 @@
+ win.deiconify()
+
+ def my_withdraw(self,win):
+- if sys.platform!='linux2':
++ if (sys.platform!='linux2') or (sys.platform!='darwin'):
+ win.withdraw()
+ else:
+ win.destroy()
Modified: trunk/dports/science/pymol-devel/files/pymol_shell.diff
===================================================================
--- trunk/dports/science/pymol-devel/files/pymol_shell.diff 2012-11-16 23:26:51 UTC (rev 99764)
+++ trunk/dports/science/pymol-devel/files/pymol_shell.diff 2012-11-17 01:01:16 UTC (rev 99765)
@@ -1,6 +1,6 @@
--- /dev/null 2011-04-22 23:16:48.000000000 -0400
+++ setup/pymol_macports 2011-04-22 23:19:48.000000000 -0400
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# PyMOL startup script
@@ -16,7 +16,4 @@
+#
+# python modules
+#
-+APBS_PSIZE=@PREFIX@/bin/apbs-psize.py
-+export APBS_PSIZE
-+#
+exec @@PYTHON_BINARY@@ @@PYTHON_PKGDIR@@/pymol/__init__.py -d "_ set stereo_double_pump_mono,quiet=1" "$@"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121116/dbad13e0/attachment.html>
More information about the macports-changes
mailing list