[127664] trunk/dports/graphics/inkscape/Portfile

[devans at macports.org]

Revision: 127664
          https://trac.macports.org/changeset/127664
Author:   devans at macports.org
Date:     2014-10-31 14:42:48 -0700 (Fri, 31 Oct 2014)
Log Message:
-----------
inkscape: drop +python26 variant, +python27 is optional default.

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

Modified: trunk/dports/graphics/inkscape/Portfile
===================================================================
--- trunk/dports/graphics/inkscape/Portfile	2014-10-31 21:12:58 UTC (rev 127663)
+++ trunk/dports/graphics/inkscape/Portfile	2014-10-31 21:42:48 UTC (rev 127664)
@@ -6,7 +6,7 @@
 name            inkscape
 conflicts       inkscape-devel
 version         0.48.5
-revision        3
+revision        4
 license         GPL-2 LGPL-2.1
 maintainers     devans
 categories      graphics gnome
@@ -50,23 +50,22 @@
 patchfiles      patch-python-configure.ac.diff \
                 patch-r10041-thru-r10042.diff
 
-variant python26 conflicts python27 description {Configure to use Python version 2.6} {
-    depends_lib-append \
-        port:py26-lxml \
-        port:py26-numpy
+use_autoreconf  yes
+autoreconf.args -fvi
 
-    post-patch {
-        reinplace "s|@@MP_PYTHON_VERSION@@|2.6|" configure.ac
-        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.args  --without-gnome-vfs \
+                --without-python \
+                --enable-lcms \
+                --enable-poppler-cairo
 
-    configure.python \
-        ${prefix}/bin/python2.6
+configure.cppflags-append \
+        -I${worksrcpath}/src/extension/script
+
+if {[string match "*clang*" ${configure.compiler}]} {
+    configure.cxxflags-append -std=c++11
 }
 
-variant python27 conflicts python26 description {Configure to use Python version 2.7} {
+variant python27 description {Configure to use Python version 2.7} {
     depends_lib-append \
         port:py27-lxml \
         port:py27-numpy
@@ -80,27 +79,15 @@
 
     configure.python \
         ${prefix}/bin/python2.7
+    
+    configure.args-replace \
+        --without-python --with-python
 }
 
-use_autoreconf  yes
-autoreconf.args -fvi
+# enable optional python support by default
 
-configure.args  --without-gnome-vfs \
-                --with-python \
-                --enable-lcms \
-                --enable-poppler-cairo
+default_variants +python27
 
-configure.cppflags-append \
-        -I${worksrcpath}/src/extension/script
-
-if {[string match "*clang*" ${configure.compiler}]} {
-    configure.cxxflags-append -std=c++11
-}
-
-if {![variant_isset python26] && ![variant_isset python27]} {
-    default_variants +python27
-}
-
 #
 # the following dummy variants are used
 # to identify this port's binary dependencies
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141031/6b7aedda/attachment-0001.html>