Add automake-1.13 support. Bump PKGREVISION.

3 files changed, 34 insertions, 2 deletions

diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 30210d259c8..c2bf73c0748 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2012/10/31 11:17:02 asau Exp $
+# $NetBSD: Makefile,v 1.16 2013/01/22 22:12:04 wiz Exp $
 
 DISTNAME=	gnome-common-3.6.0
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-common/3.6/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo
index 336773f18a7..c04e2343e2f 100644
--- a/devel/gnome-common/distinfo
+++ b/devel/gnome-common/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10 2012/10/28 08:23:16 wiz Exp $
+$NetBSD: distinfo,v 1.11 2013/01/22 22:12:04 wiz Exp $
 
 SHA1 (gnome-common-3.6.0.tar.xz) = 63a99fb27f8288595d516ee927929036312a86e1
 RMD160 (gnome-common-3.6.0.tar.xz) = 6c672c672f7e1ec437375b88f05acdda9c5ccf17
 Size (gnome-common-3.6.0.tar.xz) = 143636 bytes
+SHA1 (patch-macros2_gnome-autogen.sh) = 7dc95d33abad49c0d0805a6d5f1b2ffa63d56686
diff --git a/devel/gnome-common/patches/patch-macros2_gnome-autogen.sh b/devel/gnome-common/patches/patch-macros2_gnome-autogen.sh
new file mode 100644
index 00000000000..230d3d2312f
--- /dev/null
+++ b/devel/gnome-common/patches/patch-macros2_gnome-autogen.sh
@@ -0,0 +1,30 @@
+$NetBSD: patch-macros2_gnome-autogen.sh,v 1.1 2013/01/22 22:12:04 wiz Exp $
+
+Add automake-1.13 support.
+
+--- macros2/gnome-autogen.sh.orig	2012-10-15 22:58:19.000000000 +0000
++++ macros2/gnome-autogen.sh
+@@ -346,14 +346,15 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoc
+ 
+ case $REQUIRED_AUTOMAKE_VERSION in
+     1.4*) automake_progs="automake-1.4" ;;
+-    1.5*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+-    1.6*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+-    1.7*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+-    1.8*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+-    1.9*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
+-    1.10*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;;
+-    1.11*) automake_progs="automake-1.12 automake-1.11" ;;
+-    1.12*) automake_progs="automake-1.12" ;;
++    1.5*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
++    1.6*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
++    1.7*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
++    1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
++    1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
++    1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
++    1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;;
++    1.12*) automake_progs="automake-1.13 automake-1.12" ;;
++    1.13*) automake_progs="automake-1.13" ;;
+ esac
+ version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
+     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"