[56936] trunk/dports/python

[mmoll at macports.org]

Revision: 56936
          http://trac.macports.org/changeset/56936
Author:   mmoll at macports.org
Date:     2009-09-03 10:19:45 -0700 (Thu, 03 Sep 2009)
Log Message:
-----------
py2[56]-MMTK: disable netcdf detection

Modified Paths:
--------------
    trunk/dports/python/py25-MMTK/Portfile
    trunk/dports/python/py26-MMTK/Portfile

Added Paths:
-----------
    trunk/dports/python/py25-MMTK/files/
    trunk/dports/python/py25-MMTK/files/patch-setup.py.diff
    trunk/dports/python/py26-MMTK/files/
    trunk/dports/python/py26-MMTK/files/patch-setup.py.diff

Modified: trunk/dports/python/py25-MMTK/Portfile
===================================================================
--- trunk/dports/python/py25-MMTK/Portfile	2009-09-03 17:17:22 UTC (rev 56935)
+++ trunk/dports/python/py25-MMTK/Portfile	2009-09-03 17:19:45 UTC (rev 56936)
@@ -6,6 +6,7 @@
 set realname        MMTK
 name                py25-${realname}
 version             2.6.0
+revision            1
 categories          python science
 maintainers         mmoll openmaintainer
 description         The Molecular Modelling Toolkit is a library for molecular \
@@ -18,9 +19,10 @@
                     sha1    49a20959fd373ce34d1fa652d2d1247fb7ca9b6c \
                     rmd160  c8bb0c6b02039b43f65809df12885fe8c12beeb7
 distname            ${realname}-${version}
+patchfiles          patch-setup.py.diff
 depends_build		port:py25-setuptools
 depends_lib         port:py25-scientific
-build.env           CPPFLAGS=-I${prefix}/include
+build.env           CPPFLAGS="-I${prefix}/include -I${prefix}/include/python2.5"
 
 livecheck.check     regex
 livecheck.url       ${homepage}

Added: trunk/dports/python/py25-MMTK/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py25-MMTK/files/patch-setup.py.diff	                        (rev 0)
+++ trunk/dports/python/py25-MMTK/files/patch-setup.py.diff	2009-09-03 17:19:45 UTC (rev 56936)
@@ -0,0 +1,18 @@
+--- setup.py.orig	2009-09-03 08:38:43.000000000 -0500
++++ setup.py	2009-09-03 11:48:25.000000000 -0500
+@@ -36,15 +36,6 @@
+ compile_args = []
+ include_dirs = ['Include']
+ 
+-if int(scientific_version[1]) >= 8 or \
+-       (int(scientific_version[1]) == 7 and int(scientific_version[2]) >= 8):
+-    compile_args.append("-DUSE_NETCDF_H_FROM_SCIENTIFIC=1")
+-else:
+-    # Take care of the common problem that netcdf is in /usr/local but
+-    # /usr/local/include is not on $CPATH.
+-    if os.path.exists('/usr/local/include/netcdf.h'):
+-        include_dirs.append('/usr/local/include')
+-
+ from Scientific import N
+ try:
+     num_package = N.package

Modified: trunk/dports/python/py26-MMTK/Portfile
===================================================================
--- trunk/dports/python/py26-MMTK/Portfile	2009-09-03 17:17:22 UTC (rev 56935)
+++ trunk/dports/python/py26-MMTK/Portfile	2009-09-03 17:19:45 UTC (rev 56936)
@@ -6,6 +6,7 @@
 set realname        MMTK
 name                py26-${realname}
 version             2.6.0
+revision            1
 categories          python science
 maintainers         mmoll openmaintainer
 description         The Molecular Modelling Toolkit is a library for molecular \
@@ -18,9 +19,10 @@
                     sha1    49a20959fd373ce34d1fa652d2d1247fb7ca9b6c \
                     rmd160  c8bb0c6b02039b43f65809df12885fe8c12beeb7
 distname            ${realname}-${version}
+patchfiles          patch-setup.py.diff
 depends_build		port:py26-setuptools
 depends_lib         port:py26-scientific
-build.env           CPPFLAGS=-I${prefix}/include
+build.env           CPPFLAGS="-I${prefix}/include -I${prefix}/include/python2.6"
 
 livecheck.check     regex
 livecheck.url       ${homepage}

Added: trunk/dports/python/py26-MMTK/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py26-MMTK/files/patch-setup.py.diff	                        (rev 0)
+++ trunk/dports/python/py26-MMTK/files/patch-setup.py.diff	2009-09-03 17:19:45 UTC (rev 56936)
@@ -0,0 +1,18 @@
+--- setup.py.orig	2009-09-03 08:38:43.000000000 -0500
++++ setup.py	2009-09-03 11:48:25.000000000 -0500
+@@ -36,15 +36,6 @@
+ compile_args = []
+ include_dirs = ['Include']
+ 
+-if int(scientific_version[1]) >= 8 or \
+-       (int(scientific_version[1]) == 7 and int(scientific_version[2]) >= 8):
+-    compile_args.append("-DUSE_NETCDF_H_FROM_SCIENTIFIC=1")
+-else:
+-    # Take care of the common problem that netcdf is in /usr/local but
+-    # /usr/local/include is not on $CPATH.
+-    if os.path.exists('/usr/local/include/netcdf.h'):
+-        include_dirs.append('/usr/local/include')
+-
+ from Scientific import N
+ try:
+     num_package = N.package
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090903/e8273c94/attachment.html>