Changeset 98768

Timestamp:

Oct 15, 2012, 12:27:40 PM (12 years ago)

Author:

ryandesign@…

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

Location:

trunk/dports/python

Files:

• py25-pynifti/Portfile (modified) (4 diffs)
• py25-pynifti/files/patch-setup-py.diff (modified) (2 diffs)
• py26-pynifti/Portfile (modified) (4 diffs)
• py26-pynifti/files/patch-setup-py.diff (modified) (3 diffs)

trunk/dports/python/py25-pynifti/Portfile

@@ -6 +6 @@
 
 name                    py25-pynifti
-version                 0.20090303.1
-revision                1
+version                 0.20100607.1
 categories              python
 platforms               darwin
@@ -15 +14 @@
 
 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 \
@@ -27 +25 @@
 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"
-  }
 }
 
@@ -63 +51 @@
 }
 
-livecheck.url http://sourceforge.net/export/rss2_projfiles.php?project=niftilib
 livecheck.regex {pynifti_([0-9.]+).tar.gz}

trunk/dports/python/py25-pynifti/files/patch-setup-py.diff

@@ -1 @@
---- 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:
@@ -15 +24 @@
          # 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")
+ 
+ 
+ ##############

trunk/dports/python/py26-pynifti/Portfile

@@ -6 +6 @@
 
 name                    py26-pynifti
-version                 0.20090303.1
-revision                1
+version                 0.20100607.1
 categories              python
 platforms               darwin
@@ -15 +14 @@
 
 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 \
@@ -27 +25 @@
 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"
-  }
 }
 
@@ -63 +51 @@
 }
 
-livecheck.url http://sourceforge.net/export/rss2_projfiles.php?project=niftilib
 livecheck.regex {pynifti_([0-9.]+).tar.gz}

trunk/dports/python/py26-pynifti/files/patch-setup-py.diff

@@ -1 @@
---- 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 #
@@ -6 +6 @@
  
 -extra_link_args = ['--Wl,--no-undefined']
-+extra_link_args = ['-Wl,--no-undefined']
++extra_link_args = []
  include_dirs = []
  library_dirs = []
@@ -24 +24 @@
          # 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")
+ 
+ 
+ ##############