[44344] trunk/dports/python/py25-cairo/Portfile

[mcalhoun at macports.org]

Revision: 44344
          http://trac.macports.org/changeset/44344
Author:   mcalhoun at macports.org
Date:     2008-12-26 15:32:25 -0800 (Fri, 26 Dec 2008)
Log Message:
-----------
py25-cairo: Update version 1.6.4 -> 1.8.0.
Avoid conflict with py-cairo.
Fixes #17656.
Partially fixes #17778.

Modified Paths:
--------------
    trunk/dports/python/py25-cairo/Portfile

Modified: trunk/dports/python/py25-cairo/Portfile
===================================================================
--- trunk/dports/python/py25-cairo/Portfile	2008-12-26 22:52:44 UTC (rev 44343)
+++ trunk/dports/python/py25-cairo/Portfile	2008-12-26 23:32:25 UTC (rev 44344)
@@ -5,7 +5,7 @@
 
 name            py25-cairo
 set my_name     pycairo
-version         1.6.4
+version         1.8.0
 categories      python x11
 platforms       darwin
 maintainers     mcalhoun
@@ -18,9 +18,10 @@
 master_sites    http://cairographics.org/releases/
 distname        ${my_name}-${version}
 
-checksums       md5     2c3aa21e6e610321498f9f81f7b625df \
-                sha1    d3b3ecb6e999cc7b4a6ebcad00ae8d82c253c21c \
-                rmd160  6197427df3d10b708847503f975670e3d02d57e5
+checksums       \
+    md5     847f5377c32228a656819f5bd18eb6b4 \
+    sha1    b9b50f4202b022365f30824459c2b39fb33e891f \
+    rmd160  0435c394cc343de21b7a0f00dab0f9f943912612
 
 depends_build   port:pkgconfig
 depends_lib     port:python25 \
@@ -29,6 +30,10 @@
 
 configure.python    ${prefix}/bin/python2.5
 
+set python_prefix  ${frameworks_dir}/Python.framework/Versions/2.5
+# change default includedir to avoid conflict with py-cairo
+configure.args-append      --includedir=${prefix}/include/python2.5
+
 platform darwin 9 {
     post-patch {
         reinplace "s| -export-symbols-regex.*||g" ${worksrcpath}/cairo/Makefile.am
@@ -38,9 +43,14 @@
 
 post-destroot {
     set docdir ${prefix}/share/doc/${name}-${version}
-    xinstall -d ${destroot}${docdir}
-    xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING NEWS doc/NOTES doc/FAQ README \
+    xinstall -d -m 0755 ${destroot}${docdir}
+    xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING NEWS README \
         ${destroot}${docdir}
+
+    # avoid conflict with py-cairo
+    # pkg-config based ports will have to set configure.pkg_config_path to find this package
+    xinstall -d -m 0755 ${destroot}${python_prefix}/lib
+    move ${destroot}${prefix}/lib/pkgconfig ${destroot}${python_prefix}/lib
 }
 
 livecheck.check  regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081226/2c534821/attachment.html>