[55060] trunk/dports/python

[mnick at macports.org]

Revision: 55060
          http://trac.macports.org/changeset/55060
Author:   mnick at macports.org
Date:     2009-08-06 06:20:08 -0700 (Thu, 06 Aug 2009)
Log Message:
-----------
common fix for py26-scikits-{ann|audiolab}:
* depend on py26-scikits-module to resolve implicit dependencies
* bump revision

Modified Paths:
--------------
    trunk/dports/python/py26-scikits-ann/Portfile
    trunk/dports/python/py26-scikits-audiolab/Portfile

Modified: trunk/dports/python/py26-scikits-ann/Portfile
===================================================================
--- trunk/dports/python/py26-scikits-ann/Portfile	2009-08-06 12:53:38 UTC (rev 55059)
+++ trunk/dports/python/py26-scikits-ann/Portfile	2009-08-06 13:20:08 UTC (rev 55060)
@@ -5,6 +5,7 @@
 
 name                py26-scikits-ann
 version             0.2
+revision 			1
 maintainers         mnick
 
 categories-append   science
@@ -26,6 +27,7 @@
 patchfiles          patch-ann_init.diff
 
 depends_lib         port:py26-numpy \
+                    port:py26-scikits-module \
                     port:swig \
                     port:libANN
 
@@ -36,9 +38,6 @@
 livecheck.regex     <i>version (\[\.\\d\]+\\d)
 
 post-destroot {
-    # Every scikit installs identical scikits/__init__.py. To avoid conflicts
-    # install only if not already present
-    if {[file exists ${python.pkgd}/scikits/__init__.py]} {
-        file delete ${destroot}${python.pkgd}/scikits/__init__.py
-    }
+    # scikits/__init__.py is provided by scikits-module
+    file delete ${destroot}${python.pkgd}/scikits/__init__.py
 }

Modified: trunk/dports/python/py26-scikits-audiolab/Portfile
===================================================================
--- trunk/dports/python/py26-scikits-audiolab/Portfile	2009-08-06 12:53:38 UTC (rev 55059)
+++ trunk/dports/python/py26-scikits-audiolab/Portfile	2009-08-06 13:20:08 UTC (rev 55060)
@@ -6,6 +6,7 @@
 
 name                py26-scikits-audiolab
 version             0.10.2
+revision            1
 maintainers         mnick
 
 categories-append   science audio
@@ -26,12 +27,10 @@
                     rmd160  84c7c02601dd4e5f0bfc0930b077c1bd03a28fe1
 
 depends_lib-append  port:libsndfile \
-                    port:py26-numpy
+                    port:py26-numpy \
+                    port:py26-scikits-module
 
 post-destroot {
-    # Every scikit installs identical scikits/__init__.py. To avoid conflicts
-    # install only if not already present
-    if {[file exists ${python.pkgd}/scikits/__init__.py]} {
-        file delete ${destroot}${python.pkgd}/scikits/__init__.py
-    }
+    # scikits/__init__.py is provided by scikits-module
+    file delete ${destroot}${python.pkgd}/scikits/__init__.py
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090806/aa34f1d4/attachment-0001.html>