[83781] trunk/dports/graphics/inkscape

devans at macports.org devans at macports.org
Sat Sep 10 18:36:10 PDT 2011


Revision: 83781
          http://trac.macports.org/changeset/83781
Author:   devans at macports.org
Date:     2011-09-10 18:36:05 -0700 (Sat, 10 Sep 2011)
Log Message:
-----------
inkscape: 
    * update to version 0.48.2 (#30323)
    * add variants +python26, +python27 (#29987)
    * now builds universal

Modified Paths:
--------------
    trunk/dports/graphics/inkscape/Portfile

Added Paths:
-----------
    trunk/dports/graphics/inkscape/files/patch-configure-python26.diff
    trunk/dports/graphics/inkscape/files/patch-configure-python27.diff

Removed Paths:
-------------
    trunk/dports/graphics/inkscape/files/patch-configure.diff

Modified: trunk/dports/graphics/inkscape/Portfile
===================================================================
--- trunk/dports/graphics/inkscape/Portfile	2011-09-11 00:06:24 UTC (rev 83780)
+++ trunk/dports/graphics/inkscape/Portfile	2011-09-11 01:36:05 UTC (rev 83781)
@@ -5,8 +5,7 @@
 
 name            inkscape
 conflicts       inkscape-devel
-version         0.48.1
-revision        1
+version         0.48.2
 license         GPL-2 LGPL-2.1
 maintainers     devans
 categories      graphics gnome
@@ -23,13 +22,11 @@
                 gradients, node editing, svg-to-png export, \
                 grouping, and more.
 
-universal_variant no
-
 use_bzip2       yes
 master_sites    sourceforge
 
-checksums       sha1    9727ed11cef31c2790bf2affbddf6a6ef352753f \
-                rmd160  9e25e02258d1b1e4cce24474523e1b37e58aded6
+checksums       sha1    be30ab2d2714d04ddd69b400bd6ad30b09e83067 \
+                rmd160  3f658d373f976a41191d48d8248b33dfb3d65238
 
 depends_build   port:pkgconfig \
                 port:intltool \
@@ -50,13 +47,42 @@
 # external dependencies for included Python extensions
 #
 
-depends_lib-append \
-                port:py26-lxml \
-                port:py26-numpy \
-                port:py26-xml
+variant python26 conflicts python27 description {Configure to use Python version 2.6} {
+    depends_lib-append \
+        port:py26-lxml \
+        port:py26-numpy \
+        port:py26-xml
 
-patchfiles      patch-configure.diff
+    patchfiles-append  patch-configure-python26.diff
 
+    post-patch {
+        reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.6\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
+        reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
+        reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
+    }
+
+    configure.python \
+        ${prefix}/bin/python2.6
+}
+
+variant python27 conflicts python26 description {Configure to use Python version 2.7} {
+    depends_lib-append \
+        port:py27-lxml \
+        port:py27-numpy \
+        port:py27-xml
+
+    patchfiles-append  patch-configure.diff
+
+    post-patch {
+        reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.7\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
+        reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
+        reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
+    }
+
+    configure.python \
+        ${prefix}/bin/python2.7
+}
+
 configure.args  \
         --mandir=${prefix}/share/man \
         --with-xft \
@@ -65,15 +91,15 @@
         --enable-lcms \
         --enable-poppler-cairo
 
-configure.python \
-        ${prefix}/bin/python2.6
-
 configure.cppflags-append \
         -I${worksrcpath}/src/extension/script
 
-default_variants \
-        disable_debugging
+default_variants +disable_debugging
 
+if {![variant_isset python26] && ![variant_isset python27]} {
+    default_variants +python26
+}
+
 variant disable_debugging conflicts enable_debugging description {Disable debugging. Strip executables to save disk space} {
         # this variant strips the executables saving @200MB of disk space
         # at the cost of not being able to get meaningful debugging information
@@ -88,12 +114,6 @@
         # does nothing but offer a counter-point to disable_debugging
 }
 
-post-patch {
-        reinplace "s|\"python-interpreter\", \"python\"|\"python-interpreter\", \"python2.6\"|g" ${worksrcpath}/src/extension/implementation/script.cpp
-        reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.h
-        reinplace "s|^#include \"Object.h\"|#include \"${prefix}/include/poppler/Object.h\"|" ${worksrcpath}/src/extension/internal/pdfinput/pdf-parser.cpp
-}
-
 post-activate {
         system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
 }

Added: trunk/dports/graphics/inkscape/files/patch-configure-python26.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-configure-python26.diff	                        (rev 0)
+++ trunk/dports/graphics/inkscape/files/patch-configure-python26.diff	2011-09-11 01:36:05 UTC (rev 83781)
@@ -0,0 +1,16 @@
+--- configure.orig	2011-07-08 12:25:02.000000000 -0700
++++ configure	2011-09-10 10:56:33.000000000 -0700
+@@ -9739,11 +9739,11 @@
+ 
+ 
+ if test "x$with_python" = "xyes"; then
+-    checkPYTHON_CFLAGS=`python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
++    checkPYTHON_CFLAGS=`${prefix}/bin/python2.6 -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
+     if test "$?" -gt "0"; then
+         with_python="no"
+     else
+-        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
++        checkPYTHON_LIBS=-lpython2.6
+         if test "$?" -gt "0"; then
+             with_python="no"
+         else

Added: trunk/dports/graphics/inkscape/files/patch-configure-python27.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-configure-python27.diff	                        (rev 0)
+++ trunk/dports/graphics/inkscape/files/patch-configure-python27.diff	2011-09-11 01:36:05 UTC (rev 83781)
@@ -0,0 +1,16 @@
+--- configure.orig	2011-07-08 12:25:02.000000000 -0700
++++ configure	2011-09-10 10:56:33.000000000 -0700
+@@ -9739,11 +9739,11 @@
+ 
+ 
+ if test "x$with_python" = "xyes"; then
+-    checkPYTHON_CFLAGS=`python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
++    checkPYTHON_CFLAGS=`${prefix}/bin/python2.7 -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
+     if test "$?" -gt "0"; then
+         with_python="no"
+     else
+-        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
++        checkPYTHON_LIBS=-lpython2.7
+         if test "$?" -gt "0"; then
+             with_python="no"
+         else

Deleted: trunk/dports/graphics/inkscape/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-configure.diff	2011-09-11 00:06:24 UTC (rev 83780)
+++ trunk/dports/graphics/inkscape/files/patch-configure.diff	2011-09-11 01:36:05 UTC (rev 83781)
@@ -1,16 +0,0 @@
---- configure.orig	2011-02-01 12:13:19.000000000 -0500
-+++ configure	2011-02-01 12:13:24.000000000 -0500
-@@ -9687,11 +9687,11 @@
- 
- 
- if test "x$with_python" = "xyes"; then
--    checkPYTHON_CFLAGS=`python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
-+    checkPYTHON_CFLAGS=`${prefix}/bin/python2.6 -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null`
-     if test "$?" -gt "0"; then
-         with_python="no"
-     else
--        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
-+        checkPYTHON_LIBS=-lpython2.6
-         if test "$?" -gt "0"; then
-             with_python="no"
-         else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110910/8f0f961a/attachment.html>


More information about the macports-changes mailing list