Ticket #38516: Portfile.diff

Portfile

@@ -6 +6 @@
 PortGroup           active_variants 1.1
 
 name                pymol
-version             1.5
-revision            8
+version             1.6.0
 categories          science
+license             GPL
 maintainers         bromo.med.uc.edu:howarth
 description         Molecular graphics system
 long_description    PyMOL is a molecular graphics system with an embedded Python interpreter \
@@ -21 +21 @@
 
 master_sites        sourceforge
 fetch.type          svn
-svn.url             https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol
-svn.revision        4013
+svn.url             https://svn.code.sf.net/p/pymol/code/trunk/pymol
+svn.revision        4039
 worksrcdir          pymol
 
 depends_lib         port:freetype port:libpng port:python26 port:py26-pmw port:py26-numpy port:py26-scipy port:mesa port:glew port:py26-tkinter port:freeglut
@@ -31 +31 @@
 # py27-scipy is not universal
 universal_variant   no
 
-patchfiles          setup_py.diff pymol_shell.diff pmg_tk_platform.patch apbs-psize.patch
+patchfiles          setup_py.diff pymol_shell.diff pmg_tk_platform.patch apbs-psize.patch apbs_tkinter.patch pymol-clang.diff 
 
 require_active_variants tcl "" corefoundation
 require_active_variants tk "" quartz
@@ -44 +44 @@
 
 use_parallel_build yes
 
-variant gcc43 description conflicts gcc44 gcc45 gcc46 gcc47 description {build using macports-gcc-4.3} {
+variant gcc43 description conflicts gcc44 gcc45 gcc46 gcc47 gcc48 description {build using macports-gcc-4.3} {
     depends_lib-append  port:gcc43
     python.add_archflags   no
     configure.compiler  macports-gcc-4.3
 }
 
-variant gcc44 description conflicts gcc43 gcc45 gcc46 gcc47 description {build using macports-gcc-4.4} {
+variant gcc44 description conflicts gcc43 gcc45 gcc46 gcc47 gcc48 description {build using macports-gcc-4.4} {
     depends_lib-append  port:gcc44
     python.add_archflags   no
     configure.compiler  macports-gcc-4.4
 }
 
-variant gcc45 description conflicts gcc43 gcc44 gcc46 gcc47 description {build using macports-gcc-4.5} {
+variant gcc45 description conflicts gcc43 gcc44 gcc46 gcc47 gcc48 description {build using macports-gcc-4.5} {
     depends_lib-append  port:gcc45
     python.add_archflags   no
     configure.compiler  macports-gcc-4.5
 }
 
-variant gcc46 description conflicts gcc43 gcc44 gcc45 gcc47 description {build using macports-gcc-4.6} {
+variant gcc46 description conflicts gcc43 gcc44 gcc45 gcc47 gcc48 description {build using macports-gcc-4.6} {
     depends_lib-append  port:gcc46
     python.add_archflags   no
     configure.compiler  macports-gcc-4.6
 }
 
-variant gcc47 description conflicts gcc43 gcc44 gcc45 gcc46 description {build using macports-gcc-4.7} {
+variant gcc47 description conflicts gcc43 gcc44 gcc45 gcc46 gcc48 description {build using macports-gcc-4.7} {
     depends_lib-append  port:gcc47
     python.add_archflags   no
     configure.compiler  macports-gcc-4.7
 }
 
+variant gcc48 description conflicts gcc43 gcc44 gcc45 gcc46 gcc47 description {build using macports-gcc-4.8} {
+    depends_lib-append  port:gcc48
+    python.add_archflags   no
+    configure.compiler  macports-gcc-4.8
+}
+
 build {
 }
 
@@ -84 +90 @@
 post-destroot {
      file copy ${worksrcpath}/setup/pymol_macports ${destroot}${prefix}/bin/pymol
      file attributes ${destroot}${prefix}/bin/pymol -permissions a+x
-     ln -s ${python.pkgd}/pymol ${destroot}${python.pkgd}/pymol/pymol_path
      foreach d {data modules examples test scripts} {
         copy ${worksrcpath}/${d} ${destroot}${python.pkgd}/pymol
     }