Changes 0.14.6:

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

6 files changed, 48 insertions, 50 deletions

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 61f98dbefe2..f3fcb94efa5 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,29 +1,29 @@
-# $NetBSD: Makefile,v 1.73 2006/07/07 15:49:31 jlam Exp $
+# $NetBSD: Makefile,v 1.74 2006/07/26 06:53:02 adam Exp $
 
-DISTNAME=		gettext-0.14.5
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNU:=gettext/}
+DISTNAME=	gettext-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
 
-DEPENDS+=			gettext-m4-0.14.5:../../devel/gettext-m4
-DEPENDS+=			gettext-tools-0.14.5:../../devel/gettext-tools
+DEPENDS+=		gettext-m4-0.14.6:../../devel/gettext-m4
+DEPENDS+=		gettext-tools-0.14.6:../../devel/gettext-tools
 BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.14.5
 
+USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	# empty
 CONFIGURE_ARGS+=	--without-included-gettext
-
 CONFIGURE_ENV+=		GCJ= ac_cv_prog_GCJ=
 CONFIGURE_ENV+=		HAVE_GCJ_IN_PATH=
 CONFIGURE_ENV+=		HAVE_JAVAC_IN_PATH=
 CONFIGURE_ENV+=		HAVE_JIKES_IN_PATH=
 CONFIGURE_ENV+=		ac_cv_libexpat=no
 
+INSTALLATION_DIRS+=	lib/gettext ${PKGMANDIR}/man1
 TEST_TARGET=		check
 
 BROKEN_GETTEXT_DETECTION=	yes
@@ -31,7 +31,6 @@ USE_BUILTIN.gettext=	no # force use of pkgsrc gettext-lib
 
 do-install:
 	cd ${WRKSRC}/gettext-tools && ${MAKE} install-gettextsrcSCRIPTS
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/gettext
 	cd ${WRKSRC}/gettext-tools/lib && ${MAKE} install-gettextsrcDATA
 	cd ${WRKSRC}/gettext-tools/projects && ${MAKE} install
 	cd ${WRKSRC}/gettext-tools/misc && ${MAKE} install
@@ -39,7 +38,6 @@ do-install:
 	cd ${WRKSRC}/gettext-runtime && ${MAKE} install-gettextsrcDATA
 	cd ${WRKSRC}/gettext-tools/intl && ${MAKE} install-exec install-data
 	cd ${WRKSRC}/gettext-tools/po && ${MAKE} installdirs-data install-data
-	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/gettext-tools/man/autopoint.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/gettext-tools/man/gettextize.1 ${PREFIX}/${PKGMANDIR}/man1
 
diff --git a/devel/gettext/PLIST b/devel/gettext/PLIST
index 15902cf2a06..0583e09b63d 100644
--- a/devel/gettext/PLIST
+++ b/devel/gettext/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/02/05 22:45:53 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/07/26 06:53:02 adam Exp $
 bin/autopoint
 bin/gettextize
 lib/gettext/hostname
@@ -32,8 +32,8 @@ share/gettext/intl/gmo.h
 share/gettext/intl/hash-string.h
 share/gettext/intl/intl-compat.c
 share/gettext/intl/l10nflist.c
-share/gettext/intl/libgnuintl.h.in
 share/gettext/intl/langprefs.c
+share/gettext/intl/libgnuintl.h.in
 share/gettext/intl/loadinfo.h
 share/gettext/intl/loadmsgcat.c
 share/gettext/intl/localcharset.c
@@ -55,10 +55,10 @@ share/gettext/intl/printf-args.h
 share/gettext/intl/printf-parse.c
 share/gettext/intl/printf-parse.h
 share/gettext/intl/printf.c
-share/gettext/intl/relocatable.c
-share/gettext/intl/relocatable.h
 share/gettext/intl/ref-add.sin
 share/gettext/intl/ref-del.sin
+share/gettext/intl/relocatable.c
+share/gettext/intl/relocatable.h
 share/gettext/intl/textdomain.c
 share/gettext/intl/vasnprintf.c
 share/gettext/intl/vasnprintf.h
@@ -67,6 +67,15 @@ share/gettext/intl/wprintf-parse.h
 share/gettext/intl/xsize.h
 share/gettext/mkinstalldirs
 share/gettext/msgunfmt.tcl
+share/gettext/po/Makefile.in.in
+share/gettext/po/Makevars.template
+share/gettext/po/Rules-quot
+share/gettext/po/boldquot.sed
+share/gettext/po/en@boldquot.header
+share/gettext/po/en@quot.header
+share/gettext/po/insert-header.sin
+share/gettext/po/quot.sed
+share/gettext/po/remove-potcdate.sin
 share/gettext/projects/GNOME/team-address
 share/gettext/projects/GNOME/teams.html
 share/gettext/projects/GNOME/teams.url
@@ -81,15 +90,6 @@ share/gettext/projects/TP/teams.url
 share/gettext/projects/TP/trigger
 share/gettext/projects/index
 share/gettext/projects/team-address
-share/gettext/po/Makefile.in.in
-share/gettext/po/Makevars.template
-share/gettext/po/Rules-quot
-share/gettext/po/boldquot.sed
-share/gettext/po/en@boldquot.header
-share/gettext/po/en@quot.header
-share/gettext/po/insert-header.sin
-share/gettext/po/quot.sed
-share/gettext/po/remove-potcdate.sin
 @dirrm share/gettext/po
 @dirrm share/gettext/intl
 @dirrm share/gettext/projects/GNOME
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index 63566a97235..e18616d552b 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.17 2006/02/21 20:04:03 jschauma Exp $
+$NetBSD: distinfo,v 1.18 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) = 2ed0cbf8e2e9a03ac3f8aaff447a07f578010472
diff --git a/devel/gettext/patches/patch-ab b/devel/gettext/patches/patch-ab
index 5e613a2639e..8d81c50c6eb 100644
--- a/devel/gettext/patches/patch-ab
+++ b/devel/gettext/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2006/02/05 22:45:53 joerg Exp $
+$NetBSD: patch-ab,v 1.7 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/patches/patch-ag b/devel/gettext/patches/patch-ag
index 4c42aa382cf..b05d8296e1e 100644
--- a/devel/gettext/patches/patch-ag
+++ b/devel/gettext/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.6 2006/02/05 22:45:54 joerg Exp $
+$NetBSD: patch-ag,v 1.7 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.6 2006/02/05 22:45:54 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.6 2006/02/05 22:45:54 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.6 2006/02/05 22:45:54 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/patches/patch-ah b/devel/gettext/patches/patch-ah
index 89c56227c4d..4d99992ee17 100644
--- a/devel/gettext/patches/patch-ah
+++ b/devel/gettext/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.6 2006/02/11 17:44:39 joerg Exp $
+$NetBSD: patch-ah,v 1.7 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.6 2006/02/11 17:44:39 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.6 2006/02/11 17:44:39 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.6 2006/02/11 17:44:39 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.6 2006/02/11 17:44:39 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.6 2006/02/11 17:44:39 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: