[98768] trunk/dports/python
ryandesign at macports.org
ryandesign at macports.org
Mon Oct 15 05:27:40 PDT 2012
Revision: 98768
http://trac.macports.org//changeset/98768
Author: ryandesign at macports.org
Date: 2012-10-15 05:27:40 -0700 (Mon, 15 Oct 2012)
Log Message:
-----------
py25-pynifti, py26-pynifti:
* update to 0.20100607.1
* rewrite master_sites to avoid redirects
* set distname instead of distfiles
* fix "ld: unknown option: --no-undefined" error (#35443)
* remove unneeded check for swig python capability
* fix livecheck
Modified Paths:
--------------
trunk/dports/python/py25-pynifti/Portfile
trunk/dports/python/py25-pynifti/files/patch-setup-py.diff
trunk/dports/python/py26-pynifti/Portfile
trunk/dports/python/py26-pynifti/files/patch-setup-py.diff
Modified: trunk/dports/python/py25-pynifti/Portfile
===================================================================
--- trunk/dports/python/py25-pynifti/Portfile 2012-10-15 11:34:55 UTC (rev 98767)
+++ trunk/dports/python/py25-pynifti/Portfile 2012-10-15 12:27:40 UTC (rev 98768)
@@ -5,8 +5,7 @@
PortGroup python25 1.0
name py25-pynifti
-version 0.20090303.1
-revision 1
+version 0.20100607.1
categories python
platforms darwin
maintainers jameskyle
@@ -14,11 +13,10 @@
long_description ${description}. It uses SWIG-generated wrappers for the NIfTI reference library and provides the NiftiImage class for Python-style access to the image data.
homepage http://sourceforge.net/projects/niftilib
-master_sites sourceforge:niftilib
+master_sites sourceforge:project/niftilib/pynifti/${version}
-checksums md5 6625c0db0ba4776c14327affa5c0098a \
- sha1 96072c1b79c882a7a14461c9b48366a34f211e05 \
- rmd160 b6e10b401f8e6585126426d207c9d6e9e393f382
+checksums rmd160 f9337ca40681b76432ac362d088034d79ba28556 \
+ sha256 d1607d330e94576d6b0f18690b5b94c75ed1a93722c573e9ea781580f555611a
depends_lib port:py25-numpy \
port:nifticlib \
@@ -26,23 +24,13 @@
build.env CCFLAGS="-I${prefix}/include -L${prefix}/lib -I${prefix}/include/nifti"
-distfiles pynifti_${version}${extract.suffix}
+distname pynifti_${version}
worksrcdir pynifti-${version}
patchfiles patch-setup-py.diff
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/setup.py
}
-pre-fetch {
- if {![llength [glob -nocomplain ${prefix}/share/swig/*/python/python.swg]]} {
- ui_error "The python variant of swig is not installed. Please run"
- ui_error "the following commands:"
- ui_error "$ sudo port uninstall swig"
- ui_error "$ sudo port install swig +python"
- error "python variant of swig required"
- }
-}
-
variant gcc43 conflicts gcc44 gcc45 description {build with gcc 4.3} {
depends_build-append port:gcc43
configure.compiler macports-gcc-4.3
@@ -62,5 +50,4 @@
default_variants +gcc45
}
-livecheck.url http://sourceforge.net/export/rss2_projfiles.php?project=niftilib
livecheck.regex {pynifti_([0-9.]+).tar.gz}
Modified: trunk/dports/python/py25-pynifti/files/patch-setup-py.diff
===================================================================
--- trunk/dports/python/py25-pynifti/files/patch-setup-py.diff 2012-10-15 11:34:55 UTC (rev 98767)
+++ trunk/dports/python/py25-pynifti/files/patch-setup-py.diff 2012-10-15 12:27:40 UTC (rev 98768)
@@ -1,5 +1,14 @@
---- setup.py.orig 2009-06-20 11:37:59.000000000 -0700
-+++ setup.py 2009-06-20 11:38:38.000000000 -0700
+--- setup.py.orig 2010-07-06 10:29:56.000000000 -0500
++++ setup.py 2012-10-15 07:13:51.000000000 -0500
+@@ -21,7 +21,7 @@
+ # Common configuration #
+ ########################
+
+-extra_link_args = ['--Wl,--no-undefined']
++extra_link_args = []
+ include_dirs = []
+ library_dirs = []
+ defines = []
@@ -45,11 +45,8 @@
else:
# try to look for nifticlibs in some place
@@ -14,3 +23,13 @@
else:
# no clue on windows
pass
+@@ -64,9 +61,6 @@
+ os.environ['SWIG_FEATURES'] = '-DWIN32 ' + os.environ['SWIG_FEATURES']
+ defines.append(('WIN32', None))
+
+-# apple stuff
+-if sys.platform == "darwin":
+- extra_link_args.append("-bundle")
+
+
+ ##############
Modified: trunk/dports/python/py26-pynifti/Portfile
===================================================================
--- trunk/dports/python/py26-pynifti/Portfile 2012-10-15 11:34:55 UTC (rev 98767)
+++ trunk/dports/python/py26-pynifti/Portfile 2012-10-15 12:27:40 UTC (rev 98768)
@@ -5,8 +5,7 @@
PortGroup python26 1.0
name py26-pynifti
-version 0.20090303.1
-revision 1
+version 0.20100607.1
categories python
platforms darwin
maintainers jameskyle
@@ -14,11 +13,10 @@
long_description ${description}. It uses SWIG-generated wrappers for the NIfTI reference library and provides the NiftiImage class for Python-style access to the image data.
homepage http://sourceforge.net/projects/niftilib
-master_sites sourceforge:niftilib
+master_sites sourceforge:project/niftilib/pynifti/${version}
-checksums md5 6625c0db0ba4776c14327affa5c0098a \
- sha1 96072c1b79c882a7a14461c9b48366a34f211e05 \
- rmd160 b6e10b401f8e6585126426d207c9d6e9e393f382
+checksums rmd160 f9337ca40681b76432ac362d088034d79ba28556 \
+ sha256 d1607d330e94576d6b0f18690b5b94c75ed1a93722c573e9ea781580f555611a
depends_lib port:py26-numpy \
port:nifticlib \
@@ -26,23 +24,13 @@
build.env CCFLAGS="-I${prefix}/include -L${prefix}/lib -I${prefix}/include/nifti"
-distfiles pynifti_${version}${extract.suffix}
+distname pynifti_${version}
worksrcdir pynifti-${version}
patchfiles patch-setup-py.diff
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/setup.py
}
-pre-fetch {
- if {![llength [glob -nocomplain ${prefix}/share/swig/*/python/python.swg]]} {
- ui_error "The python variant of swig is not installed. Please run"
- ui_error "the following commands:"
- ui_error "$ sudo port uninstall swig"
- ui_error "$ sudo port install swig +python"
- error "python variant of swig required"
- }
-}
-
variant gcc43 conflicts gcc44 gcc45 description {build with gcc 4.3} {
depends_build-append port:gcc43
configure.compiler macports-gcc-4.3
@@ -62,5 +50,4 @@
default_variants +gcc45
}
-livecheck.url http://sourceforge.net/export/rss2_projfiles.php?project=niftilib
livecheck.regex {pynifti_([0-9.]+).tar.gz}
Modified: trunk/dports/python/py26-pynifti/files/patch-setup-py.diff
===================================================================
--- trunk/dports/python/py26-pynifti/files/patch-setup-py.diff 2012-10-15 11:34:55 UTC (rev 98767)
+++ trunk/dports/python/py26-pynifti/files/patch-setup-py.diff 2012-10-15 12:27:40 UTC (rev 98768)
@@ -1,11 +1,11 @@
---- setup.py.orig 2009-03-04 03:13:23.000000000 +1100
-+++ setup.py 2012-06-25 12:54:38.000000000 +1000
+--- setup.py.orig 2010-07-06 10:29:56.000000000 -0500
++++ setup.py 2012-10-15 07:13:51.000000000 -0500
@@ -21,7 +21,7 @@
# Common configuration #
########################
-extra_link_args = ['--Wl,--no-undefined']
-+extra_link_args = ['-Wl,--no-undefined']
++extra_link_args = []
include_dirs = []
library_dirs = []
defines = []
@@ -23,3 +23,13 @@
else:
# no clue on windows
pass
+@@ -64,9 +61,6 @@
+ os.environ['SWIG_FEATURES'] = '-DWIN32 ' + os.environ['SWIG_FEATURES']
+ defines.append(('WIN32', None))
+
+-# apple stuff
+-if sys.platform == "darwin":
+- extra_link_args.append("-bundle")
+
+
+ ##############
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121015/c8d96550/attachment.html>
More information about the macports-changes
mailing list