Ticket #56139: Portfile.diff

Portfile

@@ -6 +6 @@
 PortGroup           compilers 1.0
 
 name                pymol
-version             1.8.7.0
+version             2.1.0
 categories          science chemistry
 license             PSF
 maintainers         {gmail.com:howarth.at.macports @jwhowarth} openmaintainer
@@ -22 +22 @@
 master_sites        sourceforge
 fetch.type          svn
 svn.url             http://svn.code.sf.net/p/pymol/code/trunk/pymol
-svn.revision        4176
+svn.revision        4187
 worksrcdir          pymol
 
 compilers.choose    cc cxx
 compilers.setup
 
-variant python27 conflicts python34 python35 description {Use Python 2.7} {}
-variant python34 conflicts python27 python35 description {Use Python 3.4} {}
-variant python35 conflicts python27 python34 description {Use Python 3.5} {}
+variant python27 conflicts python34 python35 python36 description {Use Python 2.7} {}
+variant python34 conflicts python27 python35 python36 description {Use Python 3.4} {}
+variant python35 conflicts python27 python34 python36 description {Use Python 3.5} {}
+variant python36 conflicts python27 python34 python35 description {Use Python 3.5} {}
+
 if {[variant_isset python34]} {
     python.default_version 34
 } elseif {[variant_isset python35]} {
     python.default_version 35
+} elseif {[variant_isset python36]} {
+    python.default_version 36
 } else {
     default_variants +python27
     python.default_version 27
@@ -50 +54 @@
                     port:msgpack1 \
                     port:py${python.version}-numpy \
                     port:py${python.version}-pmw \
+                    port:py${python.version}-pyqt5 \
                     port:py${python.version}-scipy \
                     port:py${python.version}-tkinter \
                     port:tcl \
@@ -61 +66 @@
 
 patchfiles          pymol_shell.diff \
                     pmg_tk_platform.patch \
-                    apbs-psize.patch 
-
-if {${os.platform} eq "darwin" && ${os.major} >= 12} {
-    patchfiles-append pymol-use-glkit.diff
-}
+                    apbs-psize.patch  \
+                    pdb2pqr.patch
 
 require_active_variants tcl "" corefoundation
 require_active_variants tk "" quartz
 
 post-patch {
-    reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py
+    reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py ${worksrcpath}/modules/pmg_tk/startup/apbs_tools.py
     reinplace  "s|@@PYTHON_PKGDIR@@|${python.pkgd}|g" ${worksrcpath}/setup/pymol_macports
     reinplace  "s|@@PYTHON_BINARY@@|${python.bin}|g" ${worksrcpath}/setup/pymol_macports
     reinplace  "s|\"-O3\",|\"-O3\", \"-g\",|g" ${worksrcpath}/setup.py
@@ -82 +84 @@
 
 build {}
 
+destroot.cmd ${python.bin} setup.py --no-user-cfg --osx-frameworks
+
 pre-destroot {
     destroot.env CC="${configure.cc}" CXX="${configure.cxx}" PREFIX_PATH="${prefix}"
 }
@@ -89 +93 @@
 post-destroot {
      file copy ${worksrcpath}/setup/pymol_macports ${destroot}${prefix}/bin/pymol
      file attributes ${destroot}${prefix}/bin/pymol -permissions a+x
-     foreach d {data modules examples test scripts} {
-        copy ${worksrcpath}/${d} ${destroot}${python.pkgd}/pymol
-    }
 }
+
+test.run            yes
+test.cmd            cd test && ${python.bin}
+test.target         run
+
+notes "Pymol can be started with the classic Tk GUI by appending the '-N pmg_tk' runtime option."
+
+livecheck.type  regex
+livecheck.url   ${svn.url}
+livecheck.version  ${svn.revision}
+livecheck.regex {Revision (\d+):}