[135488] trunk/dports/graphics/gimp-jp2

[devans at macports.org]

Revision: 135488
          https://trac.macports.org/changeset/135488
Author:   devans at macports.org
Date:     2015-04-24 12:42:26 -0700 (Fri, 24 Apr 2015)
Log Message:
-----------
gimp-jp2: reconfigure using upstream autogen.sh for intltool 0.51 compatibility.

Modified Paths:
--------------
    trunk/dports/graphics/gimp-jp2/Portfile

Added Paths:
-----------
    trunk/dports/graphics/gimp-jp2/files/patch-autogen.sh.diff

Modified: trunk/dports/graphics/gimp-jp2/Portfile
===================================================================
--- trunk/dports/graphics/gimp-jp2/Portfile	2015-04-24 19:42:25 UTC (rev 135487)
+++ trunk/dports/graphics/gimp-jp2/Portfile	2015-04-24 19:42:26 UTC (rev 135488)
@@ -28,12 +28,17 @@
 
 depends_build   port:pkgconfig \
                 port:intltool \
-                port:gnome-doc-utils
+                port:gnome-doc-utils \
+                port:autoconf \
+                port:automake \
+                port:libtool
 
 depends_lib     path:lib/pkgconfig/gimp-2.0.pc:gimp2 \
                 port:openjpeg15
 
-patchfiles INIT_Il8N-return.patch stdbool.patch
+patchfiles      patch-autogen.sh.diff \
+                INIT_Il8N-return.patch \
+                stdbool.patch
 
 post-patch {
     reinplace "s|#include <malloc.h>||" ${worksrcpath}/src/main.c
@@ -46,11 +51,9 @@
     file delete ${worksrcpath}/src/openjpeg.h
 }
 
-# autoreconf using MacPorts intltool.m4
+# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
-use_autoreconf  yes
-autoreconf.args -fvi
-
+configure.cmd   ./autogen.sh
 configure.cppflags-append -I${prefix}/include/openjpeg-1.5
 
 post-destroot {

Added: trunk/dports/graphics/gimp-jp2/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/graphics/gimp-jp2/files/patch-autogen.sh.diff	                        (rev 0)
+++ trunk/dports/graphics/gimp-jp2/files/patch-autogen.sh.diff	2015-04-24 19:42:26 UTC (rev 135488)
@@ -0,0 +1,21 @@
+--- autogen.sh.orig	2006-11-23 12:08:22.000000000 -0800
++++ autogen.sh	2015-04-24 07:41:21.000000000 -0700
+@@ -13,7 +13,7 @@
+ FILE=src/render.c
+ 
+ AUTOCONF_REQUIRED_VERSION=2.54
+-AUTOMAKE_REQUIRED_VERSION=1.6
++AUTOMAKE_REQUIRED_VERSION=1.15
+ GLIB_REQUIRED_VERSION=2.0.0
+ INTLTOOL_REQUIRED_VERSION=0.17
+ 
+@@ -62,6 +62,9 @@
+ elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake-1.9
+    ACLOCAL=aclocal-1.9
++elif (automake-1.15 --version) < /dev/null > /dev/null 2>&1; then
++   AUTOMAKE=automake-1.15
++   ACLOCAL=aclocal-1.15
+ elif (automake-1.6 --version) < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake-1.6
+    ACLOCAL=aclocal-1.6
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150424/9d169481/attachment.html>