[52422] trunk/dports/python/py25-igraph

[snc at macports.org]

Revision: 52422
          http://trac.macports.org/changeset/52422
Author:   snc at macports.org
Date:     2009-06-15 22:27:00 -0700 (Mon, 15 Jun 2009)
Log Message:
-----------
updated version, needed new patches

Modified Paths:
--------------
    trunk/dports/python/py25-igraph/Portfile
    trunk/dports/python/py25-igraph/files/patch-setup.py.diff

Added Paths:
-----------
    trunk/dports/python/py25-igraph/files/patch-setup.cfg.diff

Modified: trunk/dports/python/py25-igraph/Portfile
===================================================================
--- trunk/dports/python/py25-igraph/Portfile	2009-06-16 05:04:20 UTC (rev 52421)
+++ trunk/dports/python/py25-igraph/Portfile	2009-06-16 05:27:00 UTC (rev 52422)
@@ -5,7 +5,7 @@
 PortGroup           python25 1.0
 
 name                py25-igraph
-version             0.5.1
+version             0.5.2
 categories-append   math
 maintainers         snc openmaintainer
 description         Python interface to the igraph library
@@ -18,18 +18,20 @@
 
 distname            python-igraph-${version}
 
-checksums           md5     9cc4364d656db67add07dd474c8b0f11 \
-                    sha1    406c70c4dc09176782c8234d1161b62625a3acd7 \
-                    rmd160  356964caa38c312bbd01c0c528a815d0ec7ee62b
+checksums           md5     d7c94b8823407a95d8113cbf907c5c56 \
+                    sha1    bbd0f40e81f1a52ba12466491c89a225b947b00e \
+                    rmd160  f7fbbe70131c7f38c3a3e6412d83321b5775c800
 
 platforms           darwin
 
 depends_lib         port:igraph \
                     port:py25-setuptools
 
-patchfiles          patch-setup.py.diff
+patchfiles          patch-setup.cfg.diff \
+                    patch-setup.py.diff
 
 post-patch {
+	reinplace s|@PREFIX@|${prefix}|g ${worksrcpath}/setup.cfg
 	reinplace s|@PREFIX@|${prefix}|g ${worksrcpath}/setup.py
 }
 

Added: trunk/dports/python/py25-igraph/files/patch-setup.cfg.diff
===================================================================
--- trunk/dports/python/py25-igraph/files/patch-setup.cfg.diff	                        (rev 0)
+++ trunk/dports/python/py25-igraph/files/patch-setup.cfg.diff	2009-06-16 05:27:00 UTC (rev 52422)
@@ -0,0 +1,11 @@
+--- setup.cfg.orig	2009-06-16 00:59:25.000000000 -0400
++++ setup.cfg	2009-06-16 01:01:02.000000000 -0400
+@@ -4,6 +4,6 @@
+ tag_svn_revision = 0
+ 
+ [build_ext]
+-library_dirs = /usr/local/lib:/usr/lib:../../src/.libs
+-include_dirs = /usr/local/include:/usr/include:../../include
++library_dirs = @PREFIX@/lib
++include_dirs = @PREFIX@/include
+ 

Modified: trunk/dports/python/py25-igraph/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py25-igraph/files/patch-setup.py.diff	2009-06-16 05:04:20 UTC (rev 52421)
+++ trunk/dports/python/py25-igraph/files/patch-setup.py.diff	2009-06-16 05:27:00 UTC (rev 52422)
@@ -1,26 +1,27 @@
---- setup.py.orig	2008-10-11 01:19:58.000000000 +0400
-+++ setup.py	2008-10-11 01:20:55.000000000 +0400
-@@ -12,7 +12,7 @@
- from os import popen3, mkdir
+--- setup.py.orig	2009-06-16 01:21:26.000000000 -0400
++++ setup.py	2009-06-16 01:21:50.000000000 -0400
+@@ -13,7 +13,7 @@
  from shutil import copy2
+ from subprocess import Popen, PIPE
  
--LIBIGRAPH_FALLBACK_INCLUDE_DIRS = ['/usr/include/igraph', '/usr/local/include/igraph']
-+LIBIGRAPH_FALLBACK_INCLUDE_DIRS = ['@PREFIX@/include/igraph']
+-LIBIGRAPH_FALLBACK_INCLUDE_DIRS = ['/usr/include', '/usr/local/include']
++LIBIGRAPH_FALLBACK_INCLUDE_DIRS = ['@PREFIX@/include']
  LIBIGRAPH_FALLBACK_LIBRARIES = ['igraph']
  LIBIGRAPH_FALLBACK_LIBRARY_DIRS = []
  
-@@ -94,10 +94,10 @@
+@@ -130,10 +130,10 @@
+     ]
+ )
  
- plat = get_platform()
- data_files = []
 -if "macosx" in plat:
--    data_files = [('/usr/lib', ['/usr/local/lib/libigraph.dylib', \
--                                '/usr/local/lib/libigraph.0.dylib', \
--                                '/usr/local/lib/libigraph.0.0.0.dylib'])]
+-    # OS X specific stuff to build the .mpkg installer
+-    options["data_files"] = [ \
+-            ('/usr/local/lib', [os.path.expanduser('~/lib/libigraph.0.dylib')])
+-    ]
 +#if "macosx" in plat:
-+#    data_files = [('/opt/local/lib', ['/opt/local/lib/libigraph.dylib', \
-+#                                '/opt/local/lib/libigraph.0.dylib', \
-+#                                '/opt/local/lib/libigraph.0.0.0.dylib'])]
++#    # OS X specific stuff to build the .mpkg installer
++#    options["data_files"] = [ \
++#            ('/usr/local/lib', [os.path.expanduser('~/lib/libigraph.0.dylib')])
++#    ]
  
- setup(name = 'python-igraph',
-       version = '0.5.1',
+ setup(**options)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090615/1e90bd2e/attachment.html>