[97787] trunk/dports/graphics/inkscape-devel

[devans at macports.org]

Revision: 97787
          http://trac.macports.org//changeset/97787
Author:   devans at macports.org
Date:     2012-09-15 09:25:07 -0700 (Sat, 15 Sep 2012)
Log Message:
-----------
inkscape-devel: update to latest bzr revision, patch autogen.sh to recognize automake 1.12 (#34380), use compiler.blacklist, configuration.

Modified Paths:
--------------
    trunk/dports/graphics/inkscape-devel/Portfile
    trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff
    trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff

Added Paths:
-----------
    trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff

Modified: trunk/dports/graphics/inkscape-devel/Portfile
===================================================================
--- trunk/dports/graphics/inkscape-devel/Portfile	2012-09-15 11:09:46 UTC (rev 97786)
+++ trunk/dports/graphics/inkscape-devel/Portfile	2012-09-15 16:25:07 UTC (rev 97787)
@@ -5,7 +5,7 @@
 
 name            inkscape-devel
 conflicts       inkscape
-set bzr_rev     11604
+set bzr_rev     11668
 version         0.48.99.${bzr_rev}
 epoch           1
 license         GPL-2 LGPL-2.1
@@ -57,6 +57,8 @@
     ui_msg "--->  Fetching source from bzr repository: this may take a while"
 }
 
+patchfiles      patch-autogen.sh.diff
+
 variant python26 conflicts python27 description {Configure to use Python version 2.6} {
     depends_lib-append \
         port:py26-lxml \
@@ -91,14 +93,11 @@
         ${prefix}/bin/python2.7
 }
 
-if {${configure.compiler} == "clang"}  {
-    configure.compiler llvm-gcc-4.2
-}
+compiler.blacklist clang
 
 configure.cmd   {./autogen.sh && ./configure}
 
-configure.args  --with-xft \
-                --with-gnome-vfs \
+configure.args  --with-gnome-vfs \
                 --with-python \
                 --enable-lcms \
                 --enable-poppler-cairo \

Added: trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff	                        (rev 0)
+++ trunk/dports/graphics/inkscape-devel/files/patch-autogen.sh.diff	2012-09-15 16:25:07 UTC (rev 97787)
@@ -0,0 +1,14 @@
+--- autogen.sh.orig	2012-09-15 02:31:08.000000000 -0700
++++ autogen.sh	2012-09-15 02:32:37.000000000 -0700
+@@ -86,7 +86,10 @@
+ 
+ echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
+ # Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
+-if (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
++if (automake-1.12 --version) < /dev/null > /dev/null 2>&1; then
++   AUTOMAKE=automake-1.12
++   ACLOCAL=aclocal-1.12
++elif (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake-1.11
+    ACLOCAL=aclocal-1.11
+ elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then

Modified: trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff	2012-09-15 11:09:46 UTC (rev 97786)
+++ trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python26.diff	2012-09-15 16:25:07 UTC (rev 97787)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2011-10-08 15:47:21.000000000 -0700
-+++ configure.ac	2011-10-08 15:56:38.000000000 -0700
-@@ -451,11 +451,11 @@
+--- configure.ac.orig	2012-09-15 02:57:23.000000000 -0700
++++ configure.ac	2012-09-15 03:04:48.000000000 -0700
+@@ -472,11 +472,11 @@
              [with_python=$withval], [with_python=skipped])
  
  if test "x$with_python" = "xyes"; then

Modified: trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff	2012-09-15 11:09:46 UTC (rev 97786)
+++ trunk/dports/graphics/inkscape-devel/files/patch-configure.ac-python27.diff	2012-09-15 16:25:07 UTC (rev 97787)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2011-10-08 15:47:21.000000000 -0700
-+++ configure.ac	2011-10-08 15:56:38.000000000 -0700
-@@ -451,11 +451,11 @@
+--- configure.ac.orig	2012-09-15 02:57:23.000000000 -0700
++++ configure.ac	2012-09-15 03:04:48.000000000 -0700
+@@ -472,11 +472,11 @@
              [with_python=$withval], [with_python=skipped])
  
  if test "x$with_python" = "xyes"; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120915/abb78592/attachment.html>