[132956] trunk/dports/graphics

[devans at macports.org]

Revision: 132956
          https://trac.macports.org/changeset/132956
Author:   devans at macports.org
Date:     2015-02-15 16:11:27 -0800 (Sun, 15 Feb 2015)
Log Message:
-----------
gimp2-devel, gimp3-devel: patch to fix build with automake-1.15.

Modified Paths:
--------------
    trunk/dports/graphics/gimp2-devel/Portfile
    trunk/dports/graphics/gimp3-devel/Portfile

Added Paths:
-----------
    trunk/dports/graphics/gimp2-devel/files/patch-automake-1.15.diff
    trunk/dports/graphics/gimp3-devel/files/patch-automake-1.15.diff

Modified: trunk/dports/graphics/gimp2-devel/Portfile
===================================================================
--- trunk/dports/graphics/gimp2-devel/Portfile	2015-02-16 00:04:00 UTC (rev 132955)
+++ trunk/dports/graphics/gimp2-devel/Portfile	2015-02-16 00:11:27 UTC (rev 132956)
@@ -75,7 +75,8 @@
 
 use_parallel_build no
 
-patchfiles      patch-etc-gimprc.diff \
+patchfiles      patch-automake-1.15.diff \
+                patch-etc-gimprc.diff \
                 patch-plug-ins-twain-tw_mac.c.diff
 
 # gcc-4.2 5493 and 5666.3_13: gimpcpuaccel.c:180: error: can't find a register in class 'BREG' while reloading 'asm'

Added: trunk/dports/graphics/gimp2-devel/files/patch-automake-1.15.diff
===================================================================
--- trunk/dports/graphics/gimp2-devel/files/patch-automake-1.15.diff	                        (rev 0)
+++ trunk/dports/graphics/gimp2-devel/files/patch-automake-1.15.diff	2015-02-16 00:11:27 UTC (rev 132956)
@@ -0,0 +1,12 @@
+--- autogen.sh.orig	2015-02-15 08:56:17.000000000 -0800
++++ autogen.sh	2015-02-15 08:57:50.000000000 -0800
+@@ -157,6 +157,9 @@
+ if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=$AUTOMAKE
+    ACLOCAL=$ACLOCAL
++elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then
++   AUTOMAKE=automake-1.15
++   ACLOCAL=aclocal-1.15
+ elif (automake-1.14 --version) < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake-1.14
+    ACLOCAL=aclocal-1.14

Modified: trunk/dports/graphics/gimp3-devel/Portfile
===================================================================
--- trunk/dports/graphics/gimp3-devel/Portfile	2015-02-16 00:04:00 UTC (rev 132955)
+++ trunk/dports/graphics/gimp3-devel/Portfile	2015-02-16 00:11:27 UTC (rev 132956)
@@ -76,7 +76,8 @@
 
 use_parallel_build no
 
-patchfiles      patch-configure.ac.diff \
+patchfiles      patch-automake-1.15.diff \
+                patch-configure.ac.diff \
                 patch-etc-gimprc.diff \
                 patch-plug-ins-twain-tw_mac.c.diff
 

Added: trunk/dports/graphics/gimp3-devel/files/patch-automake-1.15.diff
===================================================================
--- trunk/dports/graphics/gimp3-devel/files/patch-automake-1.15.diff	                        (rev 0)
+++ trunk/dports/graphics/gimp3-devel/files/patch-automake-1.15.diff	2015-02-16 00:11:27 UTC (rev 132956)
@@ -0,0 +1,12 @@
+--- autogen.sh.orig	2015-02-15 09:28:06.000000000 -0800
++++ autogen.sh	2015-02-15 09:28:39.000000000 -0800
+@@ -157,6 +157,9 @@
+ if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=$AUTOMAKE
+    ACLOCAL=$ACLOCAL
++elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then
++   AUTOMAKE=automake-1.15
++   ACLOCAL=aclocal-1.15
+ elif (automake-1.14 --version) < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake-1.14
+    ACLOCAL=aclocal-1.14
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150215/47b54b65/attachment.html>