Revision: 100858 https://trac.macports.org/changeset/100858 Author: devans@macports.org Date: 2012-12-30 00:52:44 -0800 (Sun, 30 Dec 2012) Log Message: ----------- gimp-gap-devel: update to latest git master, patch to build with automake 1.13. Modified Paths: -------------- trunk/dports/graphics/gimp-gap-devel/Portfile trunk/dports/graphics/gimp-gap-devel/files/patch-autogen.sh.diff Added Paths: ----------- trunk/dports/graphics/gimp-gap-devel/files/patch-automake-1.13.diff Modified: trunk/dports/graphics/gimp-gap-devel/Portfile =================================================================== --- trunk/dports/graphics/gimp-gap-devel/Portfile 2012-12-30 08:40:52 UTC (rev 100857) +++ trunk/dports/graphics/gimp-gap-devel/Portfile 2012-12-30 08:52:44 UTC (rev 100858) @@ -7,7 +7,7 @@ conflicts gimp-gap set git_name gimp-gap version 2.7.0 -revision 10 +revision 11 license GPL-2+ categories graphics maintainers devans @@ -29,14 +29,15 @@ fetch.type git git.url git://git.gnome.org/${git_name} -git.branch 929e15764d0add257ee00d4e94dadbb8e2a265a3 +git.branch ee519be69dc98f871e4acc93eb1074ba78c0644d pre-patch { system "cd ${worksrcpath}/extern_libs && gzip -dc ffmpeg.tar.gz | gnutar -xf -" } patchfiles patch-extern_libs-configure_options_ffmpeg.txt.diff \ - patch-autogen.sh.diff + patch-autogen.sh.diff \ + patch-automake-1.13.diff post-patch { set ffmpeg_extras "--cc=${configure.cc} --arch=${build_arch}" Modified: trunk/dports/graphics/gimp-gap-devel/files/patch-autogen.sh.diff =================================================================== --- trunk/dports/graphics/gimp-gap-devel/files/patch-autogen.sh.diff 2012-12-30 08:40:52 UTC (rev 100857) +++ trunk/dports/graphics/gimp-gap-devel/files/patch-autogen.sh.diff 2012-12-30 08:52:44 UTC (rev 100858) @@ -1,11 +1,14 @@ ---- autogen.sh.orig 2012-08-06 14:07:21.000000000 -0700 -+++ autogen.sh 2012-08-06 14:07:56.000000000 -0700 -@@ -88,7 +88,10 @@ +--- autogen.sh.orig 2012-12-29 23:28:55.000000000 -0800 ++++ autogen.sh 2012-12-29 23:30:30.000000000 -0800 +@@ -88,7 +88,13 @@ echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... " -if (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then -+if (automake-1.12 --version) < /dev/null > /dev/null 2>&1; then ++if (automake-1.13 --version) < /dev/null > /dev/null 2>&1; then ++ AUTOMAKE=automake-1.13 ++ ACLOCAL=aclocal-1.13 ++elif (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 Added: trunk/dports/graphics/gimp-gap-devel/files/patch-automake-1.13.diff =================================================================== --- trunk/dports/graphics/gimp-gap-devel/files/patch-automake-1.13.diff (rev 0) +++ trunk/dports/graphics/gimp-gap-devel/files/patch-automake-1.13.diff 2012-12-30 08:52:44 UTC (rev 100858) @@ -0,0 +1,19 @@ +--- configure.in.orig 2012-12-30 00:20:46.000000000 -0800 ++++ configure.in 2012-12-30 00:25:00.000000000 -0800 +@@ -2,7 +2,7 @@ + + AC_PREREQ(2.52) + AC_INIT(configure.in) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + GAP_MAJOR_VERSION=2 + GAP_MINOR_VERSION=7 +@@ -35,7 +35,6 @@ + + AC_PROG_CC + AC_ISC_POSIX +-AM_PROG_CC_STDC + AC_HEADER_STDC + + AC_PROG_RANLIB