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

[devans at macports.org]

Revision: 52678
          http://trac.macports.org/changeset/52678
Author:   devans at macports.org
Date:     2009-06-20 22:39:08 -0700 (Sat, 20 Jun 2009)
Log Message:
-----------
inkscape-devel: patch autogen.sh to check for automake 1.11 first. Closes #19880.

Modified Paths:
--------------
    trunk/dports/graphics/inkscape-devel/Portfile
    trunk/dports/graphics/inkscape-devel/files/patch-configure.ac.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	2009-06-21 04:53:19 UTC (rev 52677)
+++ trunk/dports/graphics/inkscape-devel/Portfile	2009-06-21 05:39:08 UTC (rev 52678)
@@ -50,7 +50,8 @@
 
 depends_run     port:ghostscript
 
-patchfiles      patch-configure.ac.diff
+patchfiles      patch-autogen.sh.diff \
+                patch-configure.ac.diff
 
 configure.cmd   {./autogen.sh && ./configure}
 

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	2009-06-21 05:39:08 UTC (rev 52678)
@@ -0,0 +1,14 @@
+--- autogen.sh.orig	2009-06-20 21:56:52.000000000 -0700
++++ autogen.sh	2009-06-20 21:58:39.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.10 --version) < /dev/null > /dev/null 2>&1; then
++if (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
+    AUTOMAKE=automake-1.10
+    ACLOCAL=aclocal-1.10
+ elif (automake --version) < /dev/null > /dev/null 2>&1; then

Modified: trunk/dports/graphics/inkscape-devel/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-configure.ac.diff	2009-06-21 04:53:19 UTC (rev 52677)
+++ trunk/dports/graphics/inkscape-devel/files/patch-configure.ac.diff	2009-06-21 05:39:08 UTC (rev 52678)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2008-12-30 14:16:22.000000000 -0800
-+++ configure.ac	2008-12-30 14:18:29.000000000 -0800
-@@ -452,11 +452,11 @@
+--- configure.ac.orig	2009-06-20 22:20:09.000000000 -0700
++++ configure.ac	2009-06-20 22:21:41.000000000 -0700
+@@ -449,11 +449,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/20090620/9ca913b7/attachment.html>