Update gettext to 0.14.5. Many bugfixes and improvements,

including support for relocable programs, Qt support,
separation of the PO processing functions into a separate
library and more.

Reorganise the gettext infrastructure by splitting of the
tools into devel/gettext-tools, which will be used by the tools
framework. The remaining devel/gettext package contains
gettextize and autopoint aka the infrastructure to embbed gettext
into a package.

Due to the ABI and API changes, a recursive revision bump will
follow.

Take blaim by receiving the maintainer hat.

With input from jlam@, reed@ and wiz@.

17 files changed, 279 insertions, 320 deletions

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 0be4ca0335c..87c9995207e 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.65 2006/01/06 13:02:00 joerg Exp $
+# $NetBSD: Makefile,v 1.66 2006/02/05 22:45:53 joerg Exp $
 
-DISTNAME=		gettext-0.11.5
-PKGREVISION=		5
+DISTNAME=		gettext-0.14.5
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=gettext/}
 
-MAINTAINER=		tech-pkg@NetBSD.org
+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.11.5:../../devel/gettext-m4
-BUILDLINK_DEPENDS.gettext+=	gettext-lib>=0.11.5
+DEPENDS+=			gettext-m4-0.14.5:../../devel/gettext-m4
+DEPENDS+=			gettext-tools-0.14.5:../../devel/gettext-tools
+BUILDLINK_DEPENDS.gettext+=	gettext-lib>=0.14.5
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
@@ -18,22 +18,30 @@ USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	libtool
 CONFIGURE_ARGS+=	--without-included-gettext
 
-INFO_FILES=		gettext.info
-
 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=
 
-MAKE_ENV+=  		OPSYS=${OPSYS:Q}
-
 TEST_TARGET=		check
 
-USE_BUILTIN.gettext=	no # force use of pkgsrc gettext-lib
 BROKEN_GETTEXT_DETECTION=	yes
+USE_BUILTIN.gettext=	no # force use of pkgsrc gettext-lib
 
-post-install:
-	cd ${WRKSRC}/intl; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install-data
+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
+	cd ${WRKSRC}/gettext-tools/src && ${MAKE} install-tcl install-exec-local
+	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_DATA_DIR} ${MANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/gettext-tools/man/autopoint.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/gettext-tools/man/gettextize.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-asprintf/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gettext/PLIST b/devel/gettext/PLIST
index 4ce82f65773..15902cf2a06 100644
--- a/devel/gettext/PLIST
+++ b/devel/gettext/PLIST
@@ -1,105 +1,12 @@
-@comment $NetBSD: PLIST,v 1.9 2004/09/22 08:09:25 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/02/05 22:45:53 joerg Exp $
 bin/autopoint
-bin/gettext
 bin/gettextize
-bin/msgattrib
-bin/msgcat
-bin/msgcmp
-bin/msgcomm
-bin/msgconv
-bin/msgen
-bin/msgexec
-bin/msgfilter
-bin/msgfmt
-bin/msggrep
-bin/msginit
-bin/msgmerge
-bin/msgunfmt
-bin/msguniq
-bin/ngettext
-bin/xgettext
 lib/gettext/hostname
 lib/gettext/project-id
 lib/gettext/urlget
 lib/gettext/user-email
-lib/libgettextlib.la
-lib/libgettextsrc.la
 man/man1/autopoint.1
-man/man1/gettext.1
 man/man1/gettextize.1
-man/man1/msgattrib.1
-man/man1/msgcat.1
-man/man1/msgcmp.1
-man/man1/msgcomm.1
-man/man1/msgconv.1
-man/man1/msgen.1
-man/man1/msgexec.1
-man/man1/msgfilter.1
-man/man1/msgfmt.1
-man/man1/msggrep.1
-man/man1/msginit.1
-man/man1/msgmerge.1
-man/man1/msgunfmt.1
-man/man1/msguniq.1
-man/man1/ngettext.1
-man/man1/xgettext.1
-man/man3/bind_textdomain_codeset.3
-man/man3/bindtextdomain.3
-man/man3/dcgettext.3
-man/man3/dcngettext.3
-man/man3/dgettext.3
-man/man3/dngettext.3
-man/man3/gettext.3
-man/man3/ngettext.3
-man/man3/textdomain.3
-share/doc/gettext/autopoint.1.html
-share/doc/gettext/bind_textdomain_codeset.3.html
-share/doc/gettext/bindtextdomain.3.html
-share/doc/gettext/gettext.1.html
-share/doc/gettext/gettext.3.html
-share/doc/gettext/gettext_1.html
-share/doc/gettext/gettext_10.html
-share/doc/gettext/gettext_11.html
-share/doc/gettext/gettext_12.html
-share/doc/gettext/gettext_13.html
-share/doc/gettext/gettext_14.html
-share/doc/gettext/gettext_15.html
-share/doc/gettext/gettext_16.html
-share/doc/gettext/gettext_17.html
-share/doc/gettext/gettext_18.html
-share/doc/gettext/gettext_19.html
-share/doc/gettext/gettext_2.html
-share/doc/gettext/gettext_20.html
-share/doc/gettext/gettext_21.html
-share/doc/gettext/gettext_22.html
-share/doc/gettext/gettext_3.html
-share/doc/gettext/gettext_4.html
-share/doc/gettext/gettext_5.html
-share/doc/gettext/gettext_6.html
-share/doc/gettext/gettext_7.html
-share/doc/gettext/gettext_8.html
-share/doc/gettext/gettext_9.html
-share/doc/gettext/gettext_foot.html
-share/doc/gettext/gettext_toc.html
-share/doc/gettext/gettextize.1.html
-share/doc/gettext/msgattrib.1.html
-share/doc/gettext/msgcat.1.html
-share/doc/gettext/msgcmp.1.html
-share/doc/gettext/msgcomm.1.html
-share/doc/gettext/msgconv.1.html
-share/doc/gettext/msgen.1.html
-share/doc/gettext/msgexec.1.html
-share/doc/gettext/msgfilter.1.html
-share/doc/gettext/msgfmt.1.html
-share/doc/gettext/msggrep.1.html
-share/doc/gettext/msginit.1.html
-share/doc/gettext/msgmerge.1.html
-share/doc/gettext/msgunfmt.1.html
-share/doc/gettext/msguniq.1.html
-share/doc/gettext/ngettext.1.html
-share/doc/gettext/ngettext.3.html
-share/doc/gettext/textdomain.3.html
-share/doc/gettext/xgettext.1.html
 share/gettext/ABOUT-NLS
 share/gettext/archive.tar.gz
 share/gettext/config.rpath
@@ -125,13 +32,16 @@ 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
+share/gettext/intl/libgnuintl.h.in
+share/gettext/intl/langprefs.c
 share/gettext/intl/loadinfo.h
 share/gettext/intl/loadmsgcat.c
 share/gettext/intl/localcharset.c
+share/gettext/intl/localcharset.h
 share/gettext/intl/locale.alias
 share/gettext/intl/localealias.c
 share/gettext/intl/localename.c
+share/gettext/intl/log.c
 share/gettext/intl/ngettext.c
 share/gettext/intl/os2compat.c
 share/gettext/intl/os2compat.h
@@ -140,13 +50,39 @@ share/gettext/intl/plural-exp.c
 share/gettext/intl/plural-exp.h
 share/gettext/intl/plural.c
 share/gettext/intl/plural.y
+share/gettext/intl/printf-args.c
+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/textdomain.c
+share/gettext/intl/vasnprintf.c
+share/gettext/intl/vasnprintf.h
+share/gettext/intl/vasnwprintf.h
+share/gettext/intl/wprintf-parse.h
+share/gettext/intl/xsize.h
 share/gettext/mkinstalldirs
 share/gettext/msgunfmt.tcl
+share/gettext/projects/GNOME/team-address
+share/gettext/projects/GNOME/teams.html
+share/gettext/projects/GNOME/teams.url
+share/gettext/projects/GNOME/trigger
+share/gettext/projects/KDE/team-address
+share/gettext/projects/KDE/teams.html
+share/gettext/projects/KDE/teams.url
+share/gettext/projects/KDE/trigger
+share/gettext/projects/TP/team-address
+share/gettext/projects/TP/teams.html
+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
+share/gettext/po/Makevars.template
 share/gettext/po/Rules-quot
 share/gettext/po/boldquot.sed
 share/gettext/po/en@boldquot.header
@@ -154,37 +90,11 @@ share/gettext/po/en@quot.header
 share/gettext/po/insert-header.sin
 share/gettext/po/quot.sed
 share/gettext/po/remove-potcdate.sin
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/en@boldquot/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/en@quot/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gettext.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gettext.mo
 @dirrm share/gettext/po
 @dirrm share/gettext/intl
-@unexec ${RMDIR} %D/share/gettext 2>/dev/null || ${TRUE}
-@dirrm share/doc/gettext
+@dirrm share/gettext/projects/GNOME
+@dirrm share/gettext/projects/KDE
+@dirrm share/gettext/projects/TP
+@dirrm share/gettext/projects
+@dirrm share/gettext
 @dirrm lib/gettext
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index 3e0db009730..beb136c7930 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,17 +1,15 @@
-$NetBSD: distinfo,v 1.12 2005/02/23 22:24:14 agc Exp $
+$NetBSD: distinfo,v 1.13 2006/02/05 22:45:53 joerg Exp $
 
-SHA1 (gettext-0.11.5.tar.gz) = 4d17534afac106bc0f2310a9fd77a291d433234b
-RMD160 (gettext-0.11.5.tar.gz) = 1de10790d1b8257717bc9c8a2a6fb451de5136c8
-Size (gettext-0.11.5.tar.gz) = 3724099 bytes
-SHA1 (patch-aa) = faa6d71599703d20ac7652637c83a0c713467a32
-SHA1 (patch-ab) = 6e9eec0ff3bbab05df5a6b513ee9f8d3b39ad385
-SHA1 (patch-ac) = 1703e08d31fb31b99f6496ef56f4c405f1baefab
-SHA1 (patch-ag) = ec7477b6d66dbbb6bc3169f700ced6b117a6db27
-SHA1 (patch-ah) = 3de0f7bdffb57352cbfc361729d463ed53b53886
-SHA1 (patch-aj) = 8c8cf6fcc6f23a54b5e20e1ab741d4a7d92a11a7
-SHA1 (patch-ak) = 6ba1e5c4180cfc76b3545551f18c16f2c1bdbb15
-SHA1 (patch-al) = de803407110c28b044aad8c122ff42181510a0e3
-SHA1 (patch-am) = 572a97eb3f0d805e27a3654eb4a4294433a51674
-SHA1 (patch-an) = 5bda0ba8f1e8a9c5d2c073b80caa253993111f1d
-SHA1 (patch-ao) = 9d2aea0904acc72951b1f449b65948ec0ecca1e7
-SHA1 (patch-ap) = 99153dcd56d937b15caf25d3f12aa958ea096825
+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 (patch-aa) = da7ff06b28645b7c63ae9e49a29a8014f07dcec1
+SHA1 (patch-ab) = 91eb4e65d63747a19315a21c9274f6c44dddf38e
+SHA1 (patch-ad) = 53bf06d6073cd2ff4a09a688b1df3d294ef7ddb4
+SHA1 (patch-ae) = f2efed6024ef1aa3fb972c043e0900676659c766
+SHA1 (patch-ag) = 1979c71e9a65e85ca9bad63bb905b46d4e2a4046
+SHA1 (patch-ah) = a3a46efae0cb2b61344bcff7788765928a43c285
+SHA1 (patch-aj) = 5a28ee9299b5c0e7ba10621bf73b638cafdcfa7e
+SHA1 (patch-ak) = 3f2aa72291aae5e024a3bb833b46973221be3b95
+SHA1 (patch-al) = 2ed0cbf8e2e9a03ac3f8aaff447a07f578010472
+SHA1 (patch-an) = f99f345f9b23f72e4a462445bcce8281dd1e5308
diff --git a/devel/gettext/patches/patch-aa b/devel/gettext/patches/patch-aa
index 264150d4721..843f7ed9352 100644
--- a/devel/gettext/patches/patch-aa
+++ b/devel/gettext/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.10 2002/11/30 23:21:35 salo Exp $
+$NetBSD: patch-aa,v 1.11 2006/02/05 22:45:53 joerg Exp $
 
---- configure.orig	Tue Aug  6 15:57:16 2002
-+++ configure	Sun Sep  1 16:06:20 2002
-@@ -14293,10 +14293,6 @@
+--- gettext-runtime/configure.orig	2006-02-03 14:56:53.000000000 +0000
++++ gettext-runtime/configure
+@@ -31906,10 +31906,6 @@ echo "${ECHO_T}$gt_cv_func_gnugettext2_l
+ 
        if test "$nls_cv_use_gnu_gettext" = "yes"; then
-                 INTLOBJS="\$(GETTOBJS)"
-         BUILD_INCLUDED_LIBINTL=yes
+                 BUILD_INCLUDED_LIBINTL=yes
 -        USE_INCLUDED_LIBINTL=yes
 -        LIBINTL="\${top_builddir}/intl/libintl.la $LIBICONV"
 -        LTLIBINTL="\${top_builddir}/intl/libintl.la $LTLIBICONV"
 -        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
        fi
  
-       if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       CATOBJEXT=
diff --git a/devel/gettext/patches/patch-ab b/devel/gettext/patches/patch-ab
index eedd52a4d49..5e613a2639e 100644
--- a/devel/gettext/patches/patch-ab
+++ b/devel/gettext/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2002/11/27 17:41:06 drochner Exp $
+$NetBSD: patch-ab,v 1.6 2006/02/05 22:45:53 joerg Exp $
 
---- misc/Makefile.in.orig	Tue Aug  6 16:00:33 2002
-+++ misc/Makefile.in	Sun Sep  1 14:12:13 2002
-@@ -342,7 +342,7 @@
+--- gettext-tools/misc/Makefile.in.orig	2005-05-23 11:24:28.000000000 +0000
++++ gettext-tools/misc/Makefile.in
+@@ -569,7 +569,7 @@ info: info-am
  
  info-am:
  
diff --git a/devel/gettext/patches/patch-ac b/devel/gettext/patches/patch-ac
deleted file mode 100644
index 4174a7f8dc6..00000000000
--- a/devel/gettext/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2002/11/27 17:41:06 drochner Exp $
-
---- intl/Makefile.in.orig	Thu Jul 25 14:49:57 2002
-+++ intl/Makefile.in	Sun Sep  1 14:13:47 2002
-@@ -181,7 +181,7 @@
- 	else \
- 	  : ; \
- 	fi
--install-data: all
-+install-data:
- 	if test "$(PACKAGE)" = "gettext"; then \
- 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
- 	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
diff --git a/devel/gettext/patches/patch-ad b/devel/gettext/patches/patch-ad
new file mode 100644
index 00000000000..9926fc7b453
--- /dev/null
+++ b/devel/gettext/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.3 2006/02/05 22:45:53 joerg Exp $
+
+--- gettext-tools/Makefile.in.orig	2006-02-03 15:55:59.000000000 +0000
++++ gettext-tools/Makefile.in
+@@ -348,7 +348,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4
+-SUBDIRS = doc intl lib libgrep libuniname src po projects misc man m4 tests examples
++SUBDIRS = doc intl lib libgrep libuniname src po man tests
+ # vms_jackets.h is a header that comes with Compaq's "porting library".
+ # KEEP_CRTL_SETLOCALE tells it to not override the native locale support.
+ EXTRA_DIST = misc/DISCLAIM Makefile.vms config.h_vms README.woe32 \
+@@ -774,7 +774,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-gettextsrcSCRIPTS
++install-data-am:
+ 
+ install-exec-am:
+ 
diff --git a/devel/gettext/patches/patch-ae b/devel/gettext/patches/patch-ae
new file mode 100644
index 00000000000..71bac2c941c
--- /dev/null
+++ b/devel/gettext/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.3 2006/02/05 22:45:53 joerg Exp $
+
+--- gettext-tools/configure.orig	2006-02-03 17:13:33.000000000 +0000
++++ gettext-tools/configure
+@@ -39057,10 +39057,6 @@ echo "${ECHO_T}$gt_cv_func_gnugettext2_l
+ 
+       if test "$nls_cv_use_gnu_gettext" = "yes"; then
+                 BUILD_INCLUDED_LIBINTL=yes
+-        USE_INCLUDED_LIBINTL=yes
+-        LIBINTL="\${top_builddir}/intl/libintl.la $LIBICONV"
+-        LTLIBINTL="\${top_builddir}/intl/libintl.la $LTLIBICONV"
+-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+       fi
+ 
+       CATOBJEXT=
diff --git a/devel/gettext/patches/patch-ag b/devel/gettext/patches/patch-ag
index 1c1204847bd..4c42aa382cf 100644
--- a/devel/gettext/patches/patch-ag
+++ b/devel/gettext/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.5 2003/12/05 18:15:49 erh Exp $
+$NetBSD: patch-ag,v 1.6 2006/02/05 22:45:54 joerg Exp $
 
---- lib/Makefile.in.orig	2002-08-06 08:58:14.000000000 -0500
-+++ lib/Makefile.in	2003-12-04 17:16:55.000000000 -0600
-@@ -227,7 +227,7 @@
+--- gettext-tools/lib/Makefile.in.orig	2005-05-23 11:24:27.000000000 +0000
++++ gettext-tools/lib/Makefile.in
+@@ -455,7 +455,7 @@ libgettextlib_la_LIBADD = @LTLIBOBJS@
  # Need @LTLIBICONV@ because linebreak.c uses iconv().
  libgettextlib_la_LDFLAGS = \
    -release @VERSION@ \
@@ -10,17 +10,38 @@ $NetBSD: patch-ag,v 1.5 2003/12/05 18:15:49 erh Exp $
 +  @LTLIBINTL@ @LTLIBICONV@ -lc
  
  
+ # Extra files to be installed.
+@@ -683,7 +683,7 @@ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(examplesbuildauxdir)" "$(DESTDIR)$(gettextsrcdir)"; do \
++	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gettextsrcdir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+ install: $(BUILT_SOURCES)
+@@ -735,7 +735,7 @@ info: info-am
  
-@@ -517,9 +517,12 @@
+ info-am:
  
+-install-data-am: install-examplesbuildauxDATA install-gettextsrcDATA
++install-data-am:
  
- # No need to install libgettextlib.a.
-+# Unless we're on AIX, where .a's are shared libraries.
- install-exec-am: install-exec-clean
- install-exec-clean:
-+.if ${OPSYS} != "AIX"
- 	$(RM) $(DESTDIR)$(libdir)/libgettextlib.a
-+.endif
+ install-exec-am: install-exec-local install-libLTLIBRARIES
  
- all-local c-ctype.lo execute.lo javacomp.lo javaexec.lo pipe-bidi.lo pipe-in.lo pipe-out.lo progname.lo tmpdir.lo wait-process.lo xerror.lo: @STDBOOL_H@
- stdbool.h: stdbool.h.in
+@@ -781,15 +781,6 @@ uninstall-am: uninstall-examplesbuildaux
+ 	uninstall-gettextsrcDATA uninstall-info-am \
+ 	uninstall-libLTLIBRARIES uninstall-local
+ 
+-
+-# No need to install libgettextlib.a, except on AIX.
+-install-exec-local: install-libLTLIBRARIES install-exec-clean
+-install-exec-clean:
+-	case "@host_os@" in \
+-	  aix*) ;; \
+-	  *) $(RM) $(DESTDIR)$(libdir)/libgettextlib.a ;; \
+-	esac
+-
+ # The following is needed in order to create an <stdbool.h> when the system
+ # doesn't have one that works.
+ all-local $(libgettextlib_la_OBJECTS): @STDBOOL_H@
diff --git a/devel/gettext/patches/patch-ah b/devel/gettext/patches/patch-ah
index 2982d8bd7fc..1721c600a06 100644
--- a/devel/gettext/patches/patch-ah
+++ b/devel/gettext/patches/patch-ah
@@ -1,8 +1,28 @@
-$NetBSD: patch-ah,v 1.4 2003/12/05 18:15:49 erh Exp $
+$NetBSD: patch-ah,v 1.5 2006/02/05 22:45:54 joerg Exp $
 
---- src/Makefile.in.orig	2002-08-06 08:59:06.000000000 -0500
-+++ src/Makefile.in	2003-12-04 17:34:23.000000000 -0600
-@@ -248,7 +248,7 @@
+--- gettext-tools/src/Makefile.in.orig	2006-02-03 14:37:39.000000000 +0000
++++ gettext-tools/src/Makefile.in
+@@ -185,9 +185,7 @@ msggrep_DEPENDENCIES = $(am__DEPENDENCIE
+ am_msginit_OBJECTS = msginit-msginit.$(OBJEXT) \
+ 	msginit-plural-count.$(OBJEXT) msginit-localealias.$(OBJEXT)
+ msginit_OBJECTS = $(am_msginit_OBJECTS)
+-msginit_DEPENDENCIES =  \
+-	../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \
+-	libgettextsrc.la
++msginit_DEPENDENCIES = libgettextsrc.la
+ am_msgmerge_OBJECTS = msgmerge-msgmerge.$(OBJEXT) \
+ 	msgmerge-plural-count.$(OBJEXT)
+ msgmerge_OBJECTS = $(am_msgmerge_OBJECTS)
+@@ -449,7 +447,7 @@ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ lispdir = @lispdir@
+-localedir = $(datadir)/locale
++localedir = /usr/pkg/share/locale
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -592,7 +590,7 @@ urlget_SOURCES = urlget.c
  # use iconv().
  libgettextsrc_la_LDFLAGS = \
    -release @VERSION@ \
@@ -10,39 +30,53 @@ $NetBSD: patch-ah,v 1.4 2003/12/05 18:15:49 erh Exp $
 +  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc
  
  
- # Link dependencies.
-@@ -267,9 +267,7 @@
- msgexec_LDADD = libgettextsrc.la
- msgfilter_LDADD = libgettextsrc.la
- msggrep_LDADD = libgettextsrc.la
--msginit_LDADD = ../intl/localealias.@INTL_LIBTOOL_SUFFIX_PREFIX@o \
--                ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \
--                libgettextsrc.la
-+msginit_LDADD = libgettextsrc.la
+ # How to build libgettextpo.la.
+@@ -623,8 +621,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@
+-msginit_LDADD = ../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \
+-                libgettextsrc.la @INTL_MACOSX_LIBS@
++msginit_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@
  
- msguniq_LDADD = libgettextsrc.la
+ msguniq_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@
  
-@@ -367,9 +365,7 @@
- msggrep_LDFLAGS =
- am_msginit_OBJECTS = msginit.$(OBJEXT)
- msginit_OBJECTS = $(am_msginit_OBJECTS)
--msginit_DEPENDENCIES = ../intl/localealias.@INTL_LIBTOOL_SUFFIX_PREFIX@o \
--	../intl/localename.@INTL_LIBTOOL_SUFFIX_PREFIX@o \
--	libgettextsrc.la
-+msginit_DEPENDENCIES = libgettextsrc.la
- msginit_LDFLAGS =
- am_msgmerge_OBJECTS = msgmerge.$(OBJEXT)
- msgmerge_OBJECTS = $(am_msgmerge_OBJECTS)
-@@ -731,9 +727,12 @@
+@@ -1349,7 +1346,7 @@ info-am:
+ 
+ install-data-am: install-data-local install-includeHEADERS
+ 
+-install-exec-am: install-binPROGRAMS install-exec-local \
++install-exec-am: install-binPROGRAMS \
+ 	install-libLTLIBRARIES
  
+ install-info: install-info-am
+@@ -1396,14 +1393,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+ 	uninstall-info-am uninstall-libLTLIBRARIES uninstall-local
  
- # No need to install libgettextsrc.a.
-+# Unless we're on AIX, where .a's are shared libraries.
- install-exec-am: install-exec-clean
- install-exec-clean:
-+.if ${OPSYS} != "AIX"
- 	$(RM) $(DESTDIR)$(libdir)/libgettextsrc.a
-+.endif
  
+-# No need to install libgettextsrc.a, except on AIX.
+-install-exec-local: install-libLTLIBRARIES install-exec-clean
+-install-exec-clean:
+-	case "@host_os@" in \
+-	  aix*) ;; \
+-	  *) $(RM) $(DESTDIR)$(libdir)/libgettextsrc.a ;; \
+-	esac
+-
  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
+ 	$(RM) $(DESTDIR)$(pkglibdir)/msgunfmt.net.exe
+ uninstall-csharp-no:
+ 
+-install-data-local: install-tcl
++install-data-local:
+ install-tcl:
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ 	$(INSTALL_DATA) $(srcdir)/msgunfmt.tcl $(DESTDIR)$(pkgdatadir)/msgunfmt.tcl
+ 
+-installdirs-local: installdirs-tcl
++installdirs-local:
+ installdirs-tcl:
+ 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ 
diff --git a/devel/gettext/patches/patch-aj b/devel/gettext/patches/patch-aj
index f21b3f02d3a..9fb65a21da0 100644
--- a/devel/gettext/patches/patch-aj
+++ b/devel/gettext/patches/patch-aj
@@ -1,20 +1,22 @@
-$NetBSD: patch-aj,v 1.3 2002/11/27 17:41:07 drochner Exp $
+$NetBSD: patch-aj,v 1.4 2006/02/05 22:45:54 joerg Exp $
 
---- Makefile.in.orig	Tue Aug  6 15:57:07 2002
-+++ Makefile.in	Sun Sep  1 16:51:37 2002
-@@ -149,13 +149,13 @@
+--- gettext-runtime/Makefile.in.orig	2006-02-03 14:42:03.000000000 +0000
++++ gettext-runtime/Makefile.in
+@@ -300,7 +300,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
- ACLOCAL_AMFLAGS = -I m4
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-tools/m4 -I ../autoconf-lib-link/m4 -I ../m4
+-SUBDIRS = doc intl intl-java intl-csharp lib @SUBDIR_libasprintf@ src po man m4
++SUBDIRS = doc lib src po man m4
+ DIST_SUBDIRS = doc intl intl-java intl-csharp lib libasprintf          src po man m4
+ EXTRA_DIST = BUGS Makefile.vms config.h_vms README.woe32 Makefile.msvc \
+ 	config.h.msvc windows/dllexport.h windows/intl.rc
+@@ -719,7 +719,7 @@ info: info-recursive
  
--MAKEINFO = env LANG= LANGUAGE= @MAKEINFO@
-+MAKEINFO = env LANG= LANGUAGE= /usr/bin/makeinfo
+ info-am:
  
- gettextsrcdir = $(datadir)/gettext
- gettextsrc_DATA = ABOUT-NLS
- gettextsrc_SCRIPTS = config.rpath mkinstalldirs
+-install-data-am: install-gettextsrcDATA
++install-data-am:
  
--SUBDIRS = doc intl intl-java lib libuniname src po projects misc man m4 tests
-+SUBDIRS = doc lib libuniname src po misc man
+ install-exec-am:
  
- EXTRA_DIST = config.rpath BUGS DISCLAIM PACKAGING README.gemtext \
-              djgpp/COPYING.DJ djgpp/Makefile.maint djgpp/README.DJ \
diff --git a/devel/gettext/patches/patch-ak b/devel/gettext/patches/patch-ak
index ec71cdd2691..c06f8876f93 100644
--- a/devel/gettext/patches/patch-ak
+++ b/devel/gettext/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.4 2003/04/27 19:18:21 jmmv Exp $
+$NetBSD: patch-ak,v 1.5 2006/02/05 22:45:54 joerg Exp $
 
---- doc/Makefile.in.orig	2002-08-06 15:57:45.000000000 +0200
-+++ doc/Makefile.in
-@@ -152,7 +152,7 @@ DVIPS = @DVIPS@ -D600
- # Documentation in Portable Document Format.
- TEXI2PDF = @TEXI2PDF@
- 
--docdir = $(prefix)/doc/@PACKAGE@
-+docdir = $(datadir)/doc/@PACKAGE@
- dvidir = $(docdir)
- psdir = $(docdir)
- pdfdir = $(docdir)
+--- gettext-runtime/intl/Makefile.in.orig	2006-02-04 19:34:01.000000000 +0000
++++ gettext-runtime/intl/Makefile.in
+@@ -257,7 +257,7 @@ check: all
+ # separate library.
+ # If you want to use the one which comes with this version of the
+ # package, you have to use `configure --with-included-gettext'.
+-install: install-exec install-data
++install:
+ install-exec: all
+ 	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+ 	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
diff --git a/devel/gettext/patches/patch-al b/devel/gettext/patches/patch-al
index 76793f5307d..4a698ce2b19 100644
--- a/devel/gettext/patches/patch-al
+++ b/devel/gettext/patches/patch-al
@@ -1,13 +1,22 @@
-$NetBSD: patch-al,v 1.1 2003/04/27 19:18:21 jmmv Exp $
+$NetBSD: patch-al,v 1.2 2006/02/05 22:45:54 joerg Exp $
 
---- man/Makefile.in.orig	2002-08-06 16:00:40.000000000 +0200
-+++ man/Makefile.in
-@@ -147,7 +147,7 @@ mandir = @mandir@
- PERL = @PERL@
+--- gettext-tools/po/Makefile.in.in.orig	2006-02-04 20:52:36.000000000 +0000
++++ gettext-tools/po/Makefile.in.in
+@@ -156,7 +156,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
  
- VERSION = @VERSION@
--docdir = $(prefix)/doc/@PACKAGE@
-+docdir = $(datadir)/doc/@PACKAGE@
- htmldir = $(docdir)
+ install: install-exec install-data
+ install-exec:
+-install-data: install-data-@USE_NLS@
++install-data:
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+ 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ 	  for file in $(DISTFILES.common) Makevars.template; do \
+@@ -215,7 +215,7 @@ install-strip: install
  
- localedir = $(datadir)/locale
+ installdirs: installdirs-exec installdirs-data
+ installdirs-exec:
+-installdirs-data: installdirs-data-@USE_NLS@
++installdirs-data:
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+ 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ 	else \
diff --git a/devel/gettext/patches/patch-am b/devel/gettext/patches/patch-am
deleted file mode 100644
index 8e39a19a5a5..00000000000
--- a/devel/gettext/patches/patch-am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/10/13 17:14:36 gavan Exp $
-
---- lib/execute.c.orig	2002-01-02 10:55:32.000000000 +0000
-+++ lib/execute.c
-@@ -56,6 +56,10 @@
- # define STDERR_FILENO 2
- #endif
- 
-+#ifndef HAVE_ENVIRON_DECL
-+extern char **environ;
-+#endif
-+
- #define _(str) gettext (str)
- 
- 
diff --git a/devel/gettext/patches/patch-an b/devel/gettext/patches/patch-an
index 7fac37420de..4016e389ddd 100644
--- a/devel/gettext/patches/patch-an
+++ b/devel/gettext/patches/patch-an
@@ -1,15 +1,13 @@
-$NetBSD: patch-an,v 1.1 2004/10/13 17:14:36 gavan Exp $
+$NetBSD: patch-an,v 1.2 2006/02/05 22:45:54 joerg Exp $
 
---- lib/pipe-bidi.c.orig	2002-01-02 10:55:32.000000000 +0000
-+++ lib/pipe-bidi.c
-@@ -51,6 +51,10 @@
- # define STDOUT_FILENO 1
- #endif
- 
-+#ifndef HAVE_ENVIRON_DECL
-+extern char **environ;
-+#endif
-+
- #define _(str) gettext (str)
+--- Makefile.in.orig	2006-02-04 21:41:03.000000000 +0000
++++ Makefile.in
+@@ -153,7 +153,7 @@ subdirs = @subdirs@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+-SUBDIRS = autoconf-lib-link gettext-runtime gettext-tools
++SUBDIRS = gettext-runtime gettext-tools
  
+ # DJGPP port.
  
diff --git a/devel/gettext/patches/patch-ao b/devel/gettext/patches/patch-ao
deleted file mode 100644
index 90cfc8a05e7..00000000000
--- a/devel/gettext/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/10/13 17:14:36 gavan Exp $
-
---- lib/pipe-in.c.orig	2002-01-02 10:55:32.000000000 +0000
-+++ lib/pipe-in.c
-@@ -51,6 +51,10 @@
- # define STDOUT_FILENO 1
- #endif
- 
-+#ifndef HAVE_ENVIRON_DECL
-+extern char **environ;
-+#endif
-+
- #define _(str) gettext (str)
- 
- 
diff --git a/devel/gettext/patches/patch-ap b/devel/gettext/patches/patch-ap
deleted file mode 100644
index 47a896ea697..00000000000
--- a/devel/gettext/patches/patch-ap
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2004/10/13 17:14:36 gavan Exp $
-
---- lib/pipe-out.c.orig	2002-01-02 10:55:32.000000000 +0000
-+++ lib/pipe-out.c
-@@ -51,6 +51,10 @@
- # define STDOUT_FILENO 1
- #endif
- 
-+#ifndef HAVE_ENVIRON_DECL
-+extern char **environ;
-+#endif
-+
- #define _(str) gettext (str)
- 
-