Thu Jul 4 12:05:27 2013 UTC ()
Support automake-1.14. Bump PKGREVISION.


(wiz)
diff -r1.16 -r1.17 pkgsrc/devel/gnome-common/Makefile
diff -r1.11 -r1.12 pkgsrc/devel/gnome-common/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/gnome-common/patches/patch-macros2_gnome-autogen.sh
cvs diff -r1.16 -r1.17 pkgsrc/devel/gnome-common/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gnome-common/Makefile 2013/01/22 22:12:04 1.16
+++ pkgsrc/devel/gnome-common/Makefile 2013/07/04 12:05:26 1.17
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.16 2013/01/22 22:12:04 wiz Exp $ 1# $NetBSD: Makefile,v 1.17 2013/07/04 12:05:26 wiz Exp $
2 2
3DISTNAME= gnome-common-3.6.0 3DISTNAME= gnome-common-3.6.0
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= devel gnome 5CATEGORIES= devel gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-common/3.6/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-common/3.6/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnome.org/ 10HOMEPAGE= http://www.gnome.org/
11COMMENT= Generic M4 macros for GNOME development 11COMMENT= Generic M4 macros for GNOME development
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14GNU_CONFIGURE= YES 14GNU_CONFIGURE= YES
15 15
16.include "../../mk/bsd.pkg.mk" 16.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/devel/gnome-common/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gnome-common/distinfo 2013/01/22 22:12:04 1.11
+++ pkgsrc/devel/gnome-common/distinfo 2013/07/04 12:05:26 1.12
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.11 2013/01/22 22:12:04 wiz Exp $ 1$NetBSD: distinfo,v 1.12 2013/07/04 12:05:26 wiz Exp $
2 2
3SHA1 (gnome-common-3.6.0.tar.xz) = 63a99fb27f8288595d516ee927929036312a86e1 3SHA1 (gnome-common-3.6.0.tar.xz) = 63a99fb27f8288595d516ee927929036312a86e1
4RMD160 (gnome-common-3.6.0.tar.xz) = 6c672c672f7e1ec437375b88f05acdda9c5ccf17 4RMD160 (gnome-common-3.6.0.tar.xz) = 6c672c672f7e1ec437375b88f05acdda9c5ccf17
5Size (gnome-common-3.6.0.tar.xz) = 143636 bytes 5Size (gnome-common-3.6.0.tar.xz) = 143636 bytes
6SHA1 (patch-macros2_gnome-autogen.sh) = 7dc95d33abad49c0d0805a6d5f1b2ffa63d56686 6SHA1 (patch-macros2_gnome-autogen.sh) = 73d54fa4c87527ea754edcc4d9de96d05ca66b63
cvs diff -r1.1 -r1.2 pkgsrc/devel/gnome-common/patches/Attic/patch-macros2_gnome-autogen.sh (expand / switch to unified diff)

--- pkgsrc/devel/gnome-common/patches/Attic/patch-macros2_gnome-autogen.sh 2013/01/22 22:12:04 1.1
+++ pkgsrc/devel/gnome-common/patches/Attic/patch-macros2_gnome-autogen.sh 2013/07/04 12:05:26 1.2
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1$NetBSD: patch-macros2_gnome-autogen.sh,v 1.1 2013/01/22 22:12:04 wiz Exp $ 1$NetBSD: patch-macros2_gnome-autogen.sh,v 1.2 2013/07/04 12:05:26 wiz Exp $
2 2
3Add automake-1.13 support. 3Add automake-1.13 support.
4 4
5--- macros2/gnome-autogen.sh.orig 2012-10-15 22:58:19.000000000 +0000 5--- macros2/gnome-autogen.sh.orig 2012-10-15 22:58:19.000000000 +0000
6+++ macros2/gnome-autogen.sh 6+++ macros2/gnome-autogen.sh
7@@ -346,14 +346,15 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoc 7@@ -346,14 +346,16 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoc
8  8
9 case $REQUIRED_AUTOMAKE_VERSION in 9 case $REQUIRED_AUTOMAKE_VERSION in
10 1.4*) automake_progs="automake-1.4" ;; 10 1.4*) automake_progs="automake-1.4" ;;
11- 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" ;; 11- 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" ;;
12- 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" ;; 12- 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" ;;
13- 1.7*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; 13- 1.7*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
14- 1.8*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; 14- 1.8*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
15- 1.9*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; 15- 1.9*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
16- 1.10*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;; 16- 1.10*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;;
17- 1.11*) automake_progs="automake-1.12 automake-1.11" ;; 17- 1.11*) automake_progs="automake-1.12 automake-1.11" ;;
18- 1.12*) automake_progs="automake-1.12" ;; 18- 1.12*) automake_progs="automake-1.12" ;;
19+ 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" ;; 19+ 1.5*) automake_progs="automake-1.14 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" ;;
20+ 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" ;; 20+ 1.6*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
21+ 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" ;; 21+ 1.7*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
22+ 1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; 22+ 1.8*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
23+ 1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; 23+ 1.9*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
24+ 1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;; 24+ 1.10*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
25+ 1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;; 25+ 1.11*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11" ;;
26+ 1.12*) automake_progs="automake-1.13 automake-1.12" ;; 26+ 1.12*) automake_progs="automake-1.14 automake-1.13 automake-1.12" ;;
27+ 1.13*) automake_progs="automake-1.13" ;; 27+ 1.13*) automake_progs="automake-1.14 automake-1.13" ;;
 28+ 1.14*) automake_progs="automake-1.14" ;;
28 esac 29 esac
29 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ 30 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
30 "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" 31 "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"