[84189] trunk/dports/science/bkchem

[blb at macports.org]

Revision: 84189
          http://trac.macports.org/changeset/84189
Author:   blb at macports.org
Date:     2011-09-19 23:09:59 -0700 (Mon, 19 Sep 2011)
Log Message:
-----------
science/bkchem - update to use python 2.7, install share/ into ${prefix}
instead of module location since this is not a module, and properly install
the bkchem script (ticket #29809)

The update to files/patch-setup.py.diff gets the install stuff in setup.py
to run properly since MacPorts adds --no-user-cfg between 'setup.py' and
'install' during destroot

Modified Paths:
--------------
    trunk/dports/science/bkchem/Portfile
    trunk/dports/science/bkchem/files/patch-setup.py.diff

Modified: trunk/dports/science/bkchem/Portfile
===================================================================
--- trunk/dports/science/bkchem/Portfile	2011-09-20 06:08:49 UTC (rev 84188)
+++ trunk/dports/science/bkchem/Portfile	2011-09-20 06:09:59 UTC (rev 84189)
@@ -1,10 +1,11 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           python25 1.0
+PortGroup           python27 1.0
 
 name                bkchem
 version             0.13.0
+revision            1
 categories          science python
 platforms           darwin
 maintainers         nomaintainer
@@ -21,15 +22,23 @@
 checksums           sha1    ab38ba090682f36b1f34c7805f888c5c92e75186 \
                     rmd160  d6fba65d2c4cb58f9d9c3f6a4e8e850e2338ec8e
 
-depends_lib-append  port:py25-tkinter
+depends_lib-append  port:py27-tkinter
 patchfiles          patch-setup.py.diff
 
+# Not a module port so don't keep a python version in the link
+python.link_binaries_suffix
+
 post-patch {
     reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/setup.py
     reinplace "s|__PYTHON__|${python.bin}|g" ${worksrcpath}/setup.py
     reinplace "s|__PYTHON_PKGD__|${python.pkgd}|g" ${worksrcpath}/setup.py
 }
 
+post-destroot {
+    file delete -force "${destroot}${prefix}/share"
+    move ${destroot}${python.prefix}/share ${destroot}${prefix}
+}
+
 livecheck.type      regex
 livecheck.url       ${homepage}download_en.html
 livecheck.regex     ${name}-(\[0-9.\]+)${extract.suffix}

Modified: trunk/dports/science/bkchem/files/patch-setup.py.diff
===================================================================
--- trunk/dports/science/bkchem/files/patch-setup.py.diff	2011-09-20 06:08:49 UTC (rev 84188)
+++ trunk/dports/science/bkchem/files/patch-setup.py.diff	2011-09-20 06:09:59 UTC (rev 84189)
@@ -2,6 +2,15 @@
 ===================================================================
 --- setup.py.orig	2008-05-30 09:34:24.000000000 +0200
 +++ setup.py	2008-10-11 00:44:38.000000000 +0200
+@@ -79,7 +79,7 @@
+ 
+ 
+ 
+-if len( sys.argv) > 1 and sys.argv[1] == 'install' and '--help' not in sys.argv:
++if len( sys.argv) > 1 and 'install' in sys.argv and '--help' not in sys.argv:
+   data_dir = set.command_obj['install'].install_data
+   py_dir = set.command_obj['install'].install_lib
+   bin_dir = set.command_obj['install'].install_scripts
 @@ -92,11 +92,11 @@
      print "ERROR: couldn't open the file %s for write" %  config_name
      sys.exit()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110919/9afeada9/attachment.html>