Changes 0.14.6:

* Updated the meaning of 'gcc-internal-format' to match GCC 4.1.

6 files changed, 41 insertions, 42 deletions

diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile
index e7a898bef65..bd5da8d6fdf 100644
--- a/devel/gettext-tools/Makefile
+++ b/devel/gettext-tools/Makefile
@@ -1,32 +1,32 @@
-# $NetBSD: Makefile,v 1.6 2006/07/07 15:49:31 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/07/26 06:53:02 adam Exp $
 
-DISTNAME=		gettext-0.14.5
-PKGNAME=		gettext-tools-0.14.5
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNU:=gettext/}
+DISTNAME=	gettext-0.14.6
+PKGNAME=	gettext-tools-0.14.6
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNU:=gettext/}
 
-MAINTAINER=		joerg@NetBSD.org
-HOMEPAGE=		http://www.gnu.org/software/gettext/gettext.html
-COMMENT=		Tools for providing messages in different languages
+MAINTAINER=	joerg@NetBSD.org
+HOMEPAGE=	http://www.gnu.org/software/gettext/gettext.html
+COMMENT=	Tools for providing messages in different languages
 
 BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.14.5
 CONFLICTS=		gettext<0.14.5
 
+USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
-SHLIBTOOL_OVERRIDE=	# empty
 CONFIGURE_ARGS+=	--without-included-gettext
-INFO_FILES=		# PLIST
-
-BROKEN_GETTEXT_DETECTION=	yes
-USE_BUILTIN.gettext=	no # force use of pkgsrc gettext-lib
-
 CONFIGURE_ENV+=		GCJ= ac_cv_prog_GCJ= ac_cv_prog_JAR=
 CONFIGURE_ENV+=		HAVE_GCJ_IN_PATH=
 CONFIGURE_ENV+=		HAVE_JAVAC_IN_PATH=
 CONFIGURE_ENV+=		HAVE_JIKES_IN_PATH=
 CONFIGURE_ENV+=		ac_cv_libexpat=no
 
+SHLIBTOOL_OVERRIDE=	# empty
+INFO_FILES=		yes
+
+BROKEN_GETTEXT_DETECTION=	yes
+USE_BUILTIN.gettext=	no # force use of pkgsrc gettext-lib
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gettext-tools/PLIST b/devel/gettext-tools/PLIST
index 87cfec9db0a..ecc0fae000e 100644
--- a/devel/gettext-tools/PLIST
+++ b/devel/gettext-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/07/26 06:53:02 adam Exp $
 bin/envsubst
 bin/gettext
 bin/gettext.sh
@@ -134,7 +134,6 @@ share/locale/it/LC_MESSAGES/gettext-runtime.mo
 share/locale/it/LC_MESSAGES/gettext-tools.mo
 share/locale/ja/LC_MESSAGES/gettext-runtime.mo
 share/locale/ja/LC_MESSAGES/gettext-tools.mo
-share/locale/ga/LC_MESSAGES/gettext-runtime.mo
 share/locale/ko/LC_MESSAGES/gettext-runtime.mo
 share/locale/ko/LC_MESSAGES/gettext-tools.mo
 share/locale/nl/LC_MESSAGES/gettext-runtime.mo
@@ -165,8 +164,8 @@ share/locale/tr/LC_MESSAGES/gettext-runtime.mo
 share/locale/tr/LC_MESSAGES/gettext-tools.mo
 share/locale/uk/LC_MESSAGES/gettext-runtime.mo
 share/locale/uk/LC_MESSAGES/gettext-tools.mo
-share/locale/vi/LC_MESSAGES/gettext-tools.mo
 share/locale/vi/LC_MESSAGES/gettext-runtime.mo
+share/locale/vi/LC_MESSAGES/gettext-tools.mo
 share/locale/zh_CN/LC_MESSAGES/gettext-runtime.mo
 share/locale/zh_CN/LC_MESSAGES/gettext-tools.mo
 share/locale/zh_TW/LC_MESSAGES/gettext-runtime.mo
diff --git a/devel/gettext-tools/distinfo b/devel/gettext-tools/distinfo
index 96c0a55c01d..1925db21a3e 100644
--- a/devel/gettext-tools/distinfo
+++ b/devel/gettext-tools/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.3 2006/07/06 13:10:27 markd Exp $
+$NetBSD: distinfo,v 1.4 2006/07/26 06:53:02 adam Exp $
 
-SHA1 (gettext-0.14.5.tar.gz) = 68737eee1a6427044eef901dc88e4144d371fb6b
-RMD160 (gettext-0.14.5.tar.gz) = d31c8e49671f00623ce1e6f73716a5abcd1c7ec2
-Size (gettext-0.14.5.tar.gz) = 7105715 bytes
+SHA1 (gettext-0.14.6.tar.gz) = 0d8ce8d9a09a719065a1530399c4f45c15a002c5
+RMD160 (gettext-0.14.6.tar.gz) = 02138d12fd4d9ce0b3bda2d132f1569b30d16726
+Size (gettext-0.14.6.tar.gz) = 7102365 bytes
 SHA1 (patch-aa) = da7ff06b28645b7c63ae9e49a29a8014f07dcec1
-SHA1 (patch-ab) = 91eb4e65d63747a19315a21c9274f6c44dddf38e
+SHA1 (patch-ab) = d13af25a5fbe3e4141b67bbeaeaf637482e78442
 SHA1 (patch-ad) = 53bf06d6073cd2ff4a09a688b1df3d294ef7ddb4
 SHA1 (patch-ae) = f2efed6024ef1aa3fb972c043e0900676659c766
-SHA1 (patch-ag) = 1979c71e9a65e85ca9bad63bb905b46d4e2a4046
-SHA1 (patch-ah) = 93532219a032e55fd740fd8c223b062fd66f3aa9
+SHA1 (patch-ag) = 9a39ea58e8e8c10c747ab34fe198072c8663d6b0
+SHA1 (patch-ah) = b33e4c81a8046e4f45b927613af59a0d99a4d0bb
 SHA1 (patch-aj) = 5a28ee9299b5c0e7ba10621bf73b638cafdcfa7e
 SHA1 (patch-ak) = 3f2aa72291aae5e024a3bb833b46973221be3b95
 SHA1 (patch-al) = 0a41f77406acf3959a64819a333b369ab2141610
diff --git a/devel/gettext-tools/patches/patch-ab b/devel/gettext-tools/patches/patch-ab
index 0bc30cc7d45..c405da3c55d 100644
--- a/devel/gettext-tools/patches/patch-ab
+++ b/devel/gettext-tools/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2006/07/26 06:53:02 adam Exp $
 
---- gettext-tools/misc/Makefile.in.orig	2005-05-23 11:24:28.000000000 +0000
+--- gettext-tools/misc/Makefile.in.orig	2006-06-21 14:30:05.000000000 +0200
 +++ gettext-tools/misc/Makefile.in
-@@ -569,7 +569,7 @@ info: info-am
+@@ -576,7 +576,7 @@ info: info-am
  
  info-am:
  
diff --git a/devel/gettext-tools/patches/patch-ag b/devel/gettext-tools/patches/patch-ag
index 86f169dcf12..e04cc05100e 100644
--- a/devel/gettext-tools/patches/patch-ag
+++ b/devel/gettext-tools/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2006/07/26 06:53:02 adam Exp $
 
---- gettext-tools/lib/Makefile.in.orig	2005-05-23 11:24:27.000000000 +0000
+--- gettext-tools/lib/Makefile.in.orig	2006-06-21 14:30:05.000000000 +0200
 +++ gettext-tools/lib/Makefile.in
-@@ -455,7 +455,7 @@ libgettextlib_la_LIBADD = @LTLIBOBJS@
+@@ -453,7 +453,7 @@ libgettextlib_la_LIBADD = @LTLIBOBJS@
  # Need @LTLIBICONV@ because linebreak.c uses iconv().
  libgettextlib_la_LDFLAGS = \
    -release @VERSION@ \
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
  
  
  # Extra files to be installed.
-@@ -683,7 +683,7 @@ check: $(BUILT_SOURCES)
+@@ -681,7 +681,7 @@ check: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) check-am
  all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
  installdirs:
@@ -20,7 +20,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
  	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
  	done
  install: $(BUILT_SOURCES)
-@@ -735,7 +735,7 @@ info: info-am
+@@ -733,7 +733,7 @@ info: info-am
  
  info-am:
  
@@ -29,7 +29,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
  
  install-exec-am: install-exec-local install-libLTLIBRARIES
  
-@@ -781,15 +781,6 @@ uninstall-am: uninstall-examplesbuildaux
+@@ -779,15 +779,6 @@ uninstall-am: uninstall-examplesbuildaux
  	uninstall-gettextsrcDATA uninstall-info-am \
  	uninstall-libLTLIBRARIES uninstall-local
  
diff --git a/devel/gettext-tools/patches/patch-ah b/devel/gettext-tools/patches/patch-ah
index 85c889a3da6..35b626133a8 100644
--- a/devel/gettext-tools/patches/patch-ah
+++ b/devel/gettext-tools/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2006/07/26 06:53:02 adam Exp $
 
---- gettext-tools/src/Makefile.in.orig	2006-02-03 14:37:39.000000000 +0000
+--- gettext-tools/src/Makefile.in.orig	2006-06-21 18:53:45.000000000 +0200
 +++ gettext-tools/src/Makefile.in
-@@ -185,9 +185,7 @@ msggrep_DEPENDENCIES = $(am__DEPENDENCIE
+@@ -183,9 +183,7 @@ msggrep_DEPENDENCIES = $(am__DEPENDENCIE
  am_msginit_OBJECTS = msginit-msginit.$(OBJEXT) \
  	msginit-plural-count.$(OBJEXT) msginit-localealias.$(OBJEXT)
  msginit_OBJECTS = $(am_msginit_OBJECTS)
@@ -13,7 +13,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
  am_msgmerge_OBJECTS = msgmerge-msgmerge.$(OBJEXT) \
  	msgmerge-plural-count.$(OBJEXT)
  msgmerge_OBJECTS = $(am_msgmerge_OBJECTS)
-@@ -592,7 +590,7 @@ urlget_SOURCES = urlget.c
+@@ -591,7 +589,7 @@ urlget_SOURCES = urlget.c
  # use iconv().
  libgettextsrc_la_LDFLAGS = \
    -release @VERSION@ \
@@ -22,7 +22,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
  
  
  # How to build libgettextpo.la.
-@@ -623,8 +621,7 @@ msgen_LDADD = libgettextsrc.la @INTL_MAC
+@@ -622,8 +620,7 @@ msgen_LDADD = libgettextsrc.la @INTL_MAC
  msgexec_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@
  msgfilter_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@
  msggrep_LDADD = $(LIBGREP) libgettextsrc.la @INTL_MACOSX_LIBS@
@@ -32,7 +32,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
  
  msguniq_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@
  
-@@ -1349,7 +1346,7 @@ info-am:
+@@ -1348,7 +1345,7 @@ info-am:
  
  install-data-am: install-data-local install-includeHEADERS
  
@@ -41,7 +41,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
  	install-libLTLIBRARIES
  
  install-info: install-info-am
-@@ -1396,14 +1393,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -1395,14 +1392,6 @@ uninstall-am: uninstall-binPROGRAMS unin
  	uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
  
  
@@ -56,7 +56,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
  po-lex.o po-lex.lo: po-gram-gen2.h
  po-gram-gen2.h: po-gram-gen.h
  	$(SED) -e 's/yy/po_gram_/g' -e 's/extern /extern DLL_VARIABLE /' $(srcdir)/po-gram-gen.h > $@-tmp
-@@ -1507,12 +1496,12 @@ uninstall-csharp-yes: all-csharp-yes
+@@ -1506,12 +1495,12 @@ uninstall-csharp-yes: all-csharp-yes
  	$(RM) $(DESTDIR)$(pkglibdir)/msgunfmt.net.exe
  uninstall-csharp-no: