Split the gettext tools from devel/gettext into devel/gettext-tools

as part of the update to gettext 0.14.5.

The gettext-tools package contains all the development tools, but
autopoint and gettextize.

15 files changed, 482 insertions, 0 deletions

diff --git a/devel/gettext-tools/DESCR b/devel/gettext-tools/DESCR
new file mode 100644
index 00000000000..c577b265e29
--- /dev/null
+++ b/devel/gettext-tools/DESCR
@@ -0,0 +1,6 @@
+GNU gettext provides the necessary tools and libraries for handling
+messages in different languages, as one of the steps to
+internationalisation (or i18n) of a utility.
+
+This package contains the various development tools. gettextize and
+autopoint are packaged separately.
diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile
new file mode 100644
index 00000000000..9cf9f8c15ba
--- /dev/null
+++ b/devel/gettext-tools/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+
+DISTNAME=		gettext-0.14.5
+PKGNAME=		gettext-tools-0.14.5
+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
+
+BUILDLINK_DEPENDS.gettext+=	gettext-lib>=0.14.5
+CONFLICTS=		gettext<0.14.5
+
+USE_PKGLOCALEDIR=	yes
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+SHLIBTOOL_OVERRIDE=	libtool
+CONFIGURE_ARGS+=	--without-included-gettext
+
+INFO_FILES=		gettext.info
+
+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
new file mode 100644
index 00000000000..2a6240c59ea
--- /dev/null
+++ b/devel/gettext-tools/PLIST
@@ -0,0 +1,173 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+bin/envsubst
+bin/gettext
+bin/gettext.sh
+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
+include/gettext-po.h
+lib/libgettextlib.la
+lib/libgettextpo.la
+lib/libgettextsrc.la
+man/man1/envsubst.1
+man/man1/gettext.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/FAQ.html
+share/doc/gettext/autopoint.1.html
+share/doc/gettext/bind_textdomain_codeset.3.html
+share/doc/gettext/bindtextdomain.3.html
+share/doc/gettext/envsubst.1.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/tutorial.html
+share/doc/gettext/xgettext.1.html
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/en@boldquot/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/en@boldquot/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/en@quot/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/en@quot/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gettext-tools.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gettext-runtime.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
+@dirrm share/doc/gettext
diff --git a/devel/gettext-tools/distinfo b/devel/gettext-tools/distinfo
new file mode 100644
index 00000000000..b05e10ef410
--- /dev/null
+++ b/devel/gettext-tools/distinfo
@@ -0,0 +1,16 @@
+$NetBSD: distinfo,v 1.1.1.1 2006/02/05 22:38:15 joerg 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 (patch-aa) = da7ff06b28645b7c63ae9e49a29a8014f07dcec1
+SHA1 (patch-ab) = 91eb4e65d63747a19315a21c9274f6c44dddf38e
+SHA1 (patch-ad) = 53bf06d6073cd2ff4a09a688b1df3d294ef7ddb4
+SHA1 (patch-ae) = f2efed6024ef1aa3fb972c043e0900676659c766
+SHA1 (patch-ag) = 1979c71e9a65e85ca9bad63bb905b46d4e2a4046
+SHA1 (patch-ah) = 93532219a032e55fd740fd8c223b062fd66f3aa9
+SHA1 (patch-aj) = 5a28ee9299b5c0e7ba10621bf73b638cafdcfa7e
+SHA1 (patch-ak) = 3f2aa72291aae5e024a3bb833b46973221be3b95
+SHA1 (patch-al) = 0a41f77406acf3959a64819a333b369ab2141610
+SHA1 (patch-am) = c130b93748604e3823ba17d29af9d91aaeecfcde
+SHA1 (patch-an) = f99f345f9b23f72e4a462445bcce8281dd1e5308
diff --git a/devel/gettext-tools/patches/patch-aa b/devel/gettext-tools/patches/patch-aa
new file mode 100644
index 00000000000..ed93a46d59f
--- /dev/null
+++ b/devel/gettext-tools/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+
+--- 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
+                 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-tools/patches/patch-ab b/devel/gettext-tools/patches/patch-ab
new file mode 100644
index 00000000000..0bc30cc7d45
--- /dev/null
+++ b/devel/gettext-tools/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+
+--- 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:
+ 
+-install-data-am: install-gettextsrcDATA install-lispLISP
++install-data-am: install-gettextsrcDATA
+ 
+ install-exec-am: install-binSCRIPTS
+ 
diff --git a/devel/gettext-tools/patches/patch-ad b/devel/gettext-tools/patches/patch-ad
new file mode 100644
index 00000000000..5cbc71bb54b
--- /dev/null
+++ b/devel/gettext-tools/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1.1.1 2006/02/05 22:38:15 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-tools/patches/patch-ae b/devel/gettext-tools/patches/patch-ae
new file mode 100644
index 00000000000..7b8a526ebfd
--- /dev/null
+++ b/devel/gettext-tools/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1.1.1 2006/02/05 22:38:15 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-tools/patches/patch-ag b/devel/gettext-tools/patches/patch-ag
new file mode 100644
index 00000000000..86f169dcf12
--- /dev/null
+++ b/devel/gettext-tools/patches/patch-ag
@@ -0,0 +1,47 @@
+$NetBSD: patch-ag,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+
+--- 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@ \
+-  @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
++  @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
+ 
+ info-am:
+ 
+-install-data-am: install-examplesbuildauxDATA install-gettextsrcDATA
++install-data-am:
+ 
+ install-exec-am: install-exec-local install-libLTLIBRARIES
+ 
+@@ -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-tools/patches/patch-ah b/devel/gettext-tools/patches/patch-ah
new file mode 100644
index 00000000000..85c889a3da6
--- /dev/null
+++ b/devel/gettext-tools/patches/patch-ah
@@ -0,0 +1,73 @@
+$NetBSD: patch-ah,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+
+--- 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)
+@@ -592,7 +590,7 @@ urlget_SOURCES = urlget.c
+ # use iconv().
+ libgettextsrc_la_LDFLAGS = \
+   -release @VERSION@ \
+-  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
++  ../lib/libgettextlib.la @LTLIBINTL@ @LTLIBICONV@ -lc
+ 
+ 
+ # 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 @INTL_MACOSX_LIBS@
+ 
+@@ -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, 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-tools/patches/patch-aj b/devel/gettext-tools/patches/patch-aj
new file mode 100644
index 00000000000..e998e282036
--- /dev/null
+++ b/devel/gettext-tools/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+
+--- 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 -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
+ 
+ info-am:
+ 
+-install-data-am: install-gettextsrcDATA
++install-data-am:
+ 
+ install-exec-am:
+ 
diff --git a/devel/gettext-tools/patches/patch-ak b/devel/gettext-tools/patches/patch-ak
new file mode 100644
index 00000000000..40a1ee13119
--- /dev/null
+++ b/devel/gettext-tools/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+
+--- 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-tools/patches/patch-al b/devel/gettext-tools/patches/patch-al
new file mode 100644
index 00000000000..41382c2b65e
--- /dev/null
+++ b/devel/gettext-tools/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+
+--- gettext-tools/po/Makefile.in.in.orig	2006-02-04 19:55:59.000000000 +0000
++++ gettext-tools/po/Makefile.in.in
+@@ -154,7 +154,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
+ 	fi
+ 
+ 
+-install: install-exec install-data
++install: install-exec install-data-@USE_NLS@
+ install-exec:
+ install-data: install-data-@USE_NLS@
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
diff --git a/devel/gettext-tools/patches/patch-am b/devel/gettext-tools/patches/patch-am
new file mode 100644
index 00000000000..fae6b3c3a4e
--- /dev/null
+++ b/devel/gettext-tools/patches/patch-am
@@ -0,0 +1,14 @@
+$NetBSD: patch-am,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+
+--- gettext-tools/man/Makefile.in.orig	2006-02-04 20:16:58.000000000 +0000
++++ gettext-tools/man/Makefile.in
+@@ -328,8 +328,7 @@ gettextize.x autopoint.x
+ # Likewise.
+ man_MAN1OTHER = \
+ msgcmp.1 msgfmt.1 msgmerge.1 msgunfmt.1 xgettext.1 \
+-msgattrib.1 msgcat.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 msgfilter.1 msggrep.1 msginit.1 msguniq.1 \
+-gettextize.1 autopoint.1
++msgattrib.1 msgcat.1 msgcomm.1 msgconv.1 msgen.1 msgexec.1 msgfilter.1 msggrep.1 msginit.1 msguniq.1
+ 
+ man_MAN1 = $(man_MAN1OTHER)
+ man_MANS = $(man_MAN1)
diff --git a/devel/gettext-tools/patches/patch-an b/devel/gettext-tools/patches/patch-an
new file mode 100644
index 00000000000..679a464c55b
--- /dev/null
+++ b/devel/gettext-tools/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1.1.1 2006/02/05 22:38:15 joerg Exp $
+
+--- 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.
+