Changes 0.18.1:

* msggrep: A '$' anchor in a regular expression now also matches the end of
  the string, even if it does not end in a newline.
* Dependencies:
  The libraries and programs are now linked with libunistring if this library
  is already installed.
* Installation options:
  The configure option --with-cvs is deprecated. The 'autopoint' program will
  now use the 'git' program by default to compress its archive. If the
  configure option --without-git is specified, 'autopoint' will not rely on
  'git', but will instead rely on a locally installed a 3 MB large archive.

Changes 0.18:
* Runtime behaviour:
  - On MacOS X and Windows systems, <libintl.h> now extends setlocale() and
    newlocale() so that their determination of the default locale considers
    the choice the user has made in the system control panels.
  - On MacOS X systems, the gettext()/dgettext()/... functions now respect the
    locale of the current thread, if a thread-specific locale has been set.
* PO file format:
  There is a new field 'Language' in the header entry.  It denotes the language
  code (plus optional country code) for the PO file.  This field can be used
  by automated tools, such as spell checkers.  It is expected to be more
  reliable than looking at the file name or at the 'Language-Team' field in
  the header entry.
  msgmerge, msgcat, msgen have a new option --lang that allows to specify
  this field.  Additionally, msgmerge fills in this new field by looking at
  the 'Language-Team' field (if the --lang option is not given).
* xgettext and PO file format:
  For messages with plural forms, programmers can inform the translators
  about the range of possible values of the numeric argument, like this:
    /* xgettext: range: 0..15 */
  This information 'range: 0..15' is stored in the PO file as a flag attached
  to the message.  Translators can produce better translations when they know
  that the numeric argument is small.
* Colorized PO files:
  msgattrib, msgcomm, msgconv, msgen, msgfilter, msggrep, msginit, msgmerge,
  msgunfmt, msguniq, xgettext now have options --color and --style, like msgcat
  has since version 0.17.
* msgmerge is up to 10 times faster when the PO and POT files are large.
  This speedup was contributed by Ralf Wildenhues.
* msgcmp has a new option -N/--no-fuzzy-matching, like msgmerge has since
  version 0.12.
* msgfilter now sets environment variables during the invocation of the
  filter, indicating the msgid and location of the messge being processed.
* xgettext now can extract plural forms from Qt 4 programs. The recommended
  xgettext command-line options for this case are:
    --qt --keyword=tr:1,1t --keyword=tr:1,2c,2t --keyword=tr:1,1,2c,3t
* xgettext --language=GCC-source now recognizes also the format strings
  used in the Fortran front-end of the GCC compiler, and marks them as
  'gfc-internal-format'.
* autopoint can now be used to update several PO directories all together.

21 files changed, 21 insertions, 458 deletions

diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile
index c305aebda63..9bd889b6687 100644
--- a/devel/gettext-tools/Makefile
+++ b/devel/gettext-tools/Makefile
@@ -1,26 +1,17 @@
-# $NetBSD: Makefile,v 1.14 2011/02/09 05:52:07 dholland Exp $
+# $NetBSD: Makefile,v 1.15 2011/04/12 17:41:29 adam Exp $
 
-DISTNAME=	gettext-0.14.6
-PKGNAME=	gettext-tools-0.14.6
-PKGREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU:=gettext/}
+.include "../../devel/gettext/Makefile.common"
 
-MAINTAINER=	joerg@NetBSD.org
-HOMEPAGE=	http://www.gnu.org/software/gettext/gettext.html
+PKGNAME=	${DISTNAME:S/-/-tools-/}
 COMMENT=	Tools for providing messages in different languages
-LICENSE=	gnu-gpl-v2
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+#MAKE_JOBS_SAFE=		no
 
-BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.14.5
-CONFLICTS=		gettext<0.14.5
+DISTINFO_FILE=	${.CURDIR}/../../devel/gettext/distinfo
+PATCHDIR=	${.CURDIR}/../../devel/gettext/patches
 
-MAKE_JOBS_SAFE=		no
-
-USE_LIBTOOL=		yes
+USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ARGS+=	--disable-csharp
 CONFIGURE_ENV+=		GCJ= ac_cv_prog_GCJ= ac_cv_prog_JAR=
@@ -32,7 +23,6 @@ LDFLAGS.AIX+=		-Wl,-brtl
 
 SHLIBTOOL_OVERRIDE=	# empty
 INFO_FILES=		yes
-MAKE_JOBS_SAFE=		no
 
 BROKEN_GETTEXT_DETECTION=	yes
 USE_BUILTIN.gettext=	no # force use of pkgsrc gettext-lib
diff --git a/devel/gettext-tools/PLIST b/devel/gettext-tools/PLIST
index 3fc29a92224..deedcf22d65 100644
--- a/devel/gettext-tools/PLIST
+++ b/devel/gettext-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:48:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/04/12 17:41:29 adam Exp $
 bin/envsubst
 bin/gettext
 bin/gettext.sh
@@ -17,6 +17,7 @@ bin/msgmerge
 bin/msgunfmt
 bin/msguniq
 bin/ngettext
+bin/recode-sr-latin
 bin/xgettext
 include/gettext-po.h
 info/gettext.info
@@ -40,6 +41,7 @@ man/man1/msgmerge.1
 man/man1/msgunfmt.1
 man/man1/msguniq.1
 man/man1/ngettext.1
+man/man1/recode-sr-latin.1
 man/man1/xgettext.1
 man/man3/bind_textdomain_codeset.3
 man/man3/bindtextdomain.3
@@ -72,6 +74,9 @@ 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_23.html
+share/doc/gettext/gettext_24.html
+share/doc/gettext/gettext_25.html
 share/doc/gettext/gettext_3.html
 share/doc/gettext/gettext_4.html
 share/doc/gettext/gettext_5.html
@@ -98,11 +103,14 @@ 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/recode-sr-latin.1.html
 share/doc/gettext/textdomain.3.html
 share/doc/gettext/tutorial.html
 share/doc/gettext/xgettext.1.html
 share/locale/be/LC_MESSAGES/gettext-runtime.mo
 share/locale/be/LC_MESSAGES/gettext-tools.mo
+share/locale/bg/LC_MESSAGES/gettext-runtime.mo
+share/locale/bg/LC_MESSAGES/gettext-tools.mo
 share/locale/ca/LC_MESSAGES/gettext-runtime.mo
 share/locale/ca/LC_MESSAGES/gettext-tools.mo
 share/locale/cs/LC_MESSAGES/gettext-runtime.mo
@@ -117,10 +125,12 @@ share/locale/en@boldquot/LC_MESSAGES/gettext-runtime.mo
 share/locale/en@boldquot/LC_MESSAGES/gettext-tools.mo
 share/locale/en@quot/LC_MESSAGES/gettext-runtime.mo
 share/locale/en@quot/LC_MESSAGES/gettext-tools.mo
+share/locale/eo/LC_MESSAGES/gettext-runtime.mo
 share/locale/es/LC_MESSAGES/gettext-runtime.mo
 share/locale/es/LC_MESSAGES/gettext-tools.mo
 share/locale/et/LC_MESSAGES/gettext-runtime.mo
 share/locale/et/LC_MESSAGES/gettext-tools.mo
+share/locale/eu/LC_MESSAGES/gettext-tools.mo
 share/locale/fi/LC_MESSAGES/gettext-runtime.mo
 share/locale/fi/LC_MESSAGES/gettext-tools.mo
 share/locale/fr/LC_MESSAGES/gettext-runtime.mo
@@ -136,12 +146,12 @@ share/locale/ja/LC_MESSAGES/gettext-runtime.mo
 share/locale/ja/LC_MESSAGES/gettext-tools.mo
 share/locale/ko/LC_MESSAGES/gettext-runtime.mo
 share/locale/ko/LC_MESSAGES/gettext-tools.mo
+share/locale/nb/LC_MESSAGES/gettext-runtime.mo
+share/locale/nb/LC_MESSAGES/gettext-tools.mo
 share/locale/nl/LC_MESSAGES/gettext-runtime.mo
 share/locale/nl/LC_MESSAGES/gettext-tools.mo
 share/locale/nn/LC_MESSAGES/gettext-runtime.mo
 share/locale/nn/LC_MESSAGES/gettext-tools.mo
-share/locale/no/LC_MESSAGES/gettext-runtime.mo
-share/locale/no/LC_MESSAGES/gettext-tools.mo
 share/locale/pl/LC_MESSAGES/gettext-runtime.mo
 share/locale/pl/LC_MESSAGES/gettext-tools.mo
 share/locale/pt/LC_MESSAGES/gettext-runtime.mo
@@ -168,5 +178,6 @@ 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_HK/LC_MESSAGES/gettext-runtime.mo
 share/locale/zh_TW/LC_MESSAGES/gettext-runtime.mo
 share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
diff --git a/devel/gettext-tools/distinfo b/devel/gettext-tools/distinfo
deleted file mode 100644
index d7ae2ba2601..00000000000
--- a/devel/gettext-tools/distinfo
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: distinfo,v 1.9 2010/02/05 11:18:12 obache Exp $
-
-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) = d13af25a5fbe3e4141b67bbeaeaf637482e78442
-SHA1 (patch-ac) = 2ecf4b3e10e64b6d73249ecc2673fae1395f283a
-SHA1 (patch-ad) = 53bf06d6073cd2ff4a09a688b1df3d294ef7ddb4
-SHA1 (patch-ae) = f2efed6024ef1aa3fb972c043e0900676659c766
-SHA1 (patch-af) = a767c2877a2a4b54eb3653b373f5d7d9a6dec52f
-SHA1 (patch-ag) = 9a39ea58e8e8c10c747ab34fe198072c8663d6b0
-SHA1 (patch-ah) = b33e4c81a8046e4f45b927613af59a0d99a4d0bb
-SHA1 (patch-aj) = 5a28ee9299b5c0e7ba10621bf73b638cafdcfa7e
-SHA1 (patch-ak) = 3f2aa72291aae5e024a3bb833b46973221be3b95
-SHA1 (patch-al) = 0a41f77406acf3959a64819a333b369ab2141610
-SHA1 (patch-am) = c130b93748604e3823ba17d29af9d91aaeecfcde
-SHA1 (patch-an) = f99f345f9b23f72e4a462445bcce8281dd1e5308
-SHA1 (patch-ao) = 9e81b05b6e1ee76197c360a441264588607a475c
-SHA1 (patch-ap) = 2955c2d6b2b2d52248d449a0b7ea025a0d632bea
-SHA1 (patch-aq) = 5071a9358707ee8831fa0fcfb6a4cd35a21f7547
-SHA1 (patch-ar) = 587e9788aee5180a0425c0eb0797e6f8e68da864
-SHA1 (patch-as) = d6d13bb226c12a8f6549314bfa6a426f258fe014
diff --git a/devel/gettext-tools/patches/patch-aa b/devel/gettext-tools/patches/patch-aa
deleted file mode 100644
index ed93a46d59f..00000000000
--- a/devel/gettext-tools/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index c405da3c55d..00000000000
--- a/devel/gettext-tools/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/07/26 06:53:02 adam Exp $
-
---- gettext-tools/misc/Makefile.in.orig	2006-06-21 14:30:05.000000000 +0200
-+++ gettext-tools/misc/Makefile.in
-@@ -576,7 +576,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-ac b/devel/gettext-tools/patches/patch-ac
deleted file mode 100644
index 2da9247eb68..00000000000
--- a/devel/gettext-tools/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/11/26 18:09:04 tron Exp $
-
---- gettext-tools/lib/pipe.c.orig	2005-05-20 22:03:42.000000000 +0100
-+++ gettext-tools/lib/pipe.c	2007-11-26 17:50:22.000000000 +0000
-@@ -61,8 +61,13 @@
- #endif
- 
- #ifndef HAVE_ENVIRON_DECL
-+#ifdef __APPLE__
-+#include <crt_externs.h>
-+#define environ (*_NSGetEnviron())
-+#else
- extern char **environ;
- #endif
-+#endif
- 
- #ifndef STDIN_FILENO
- # define STDIN_FILENO 0
diff --git a/devel/gettext-tools/patches/patch-ad b/devel/gettext-tools/patches/patch-ad
deleted file mode 100644
index 5cbc71bb54b..00000000000
--- a/devel/gettext-tools/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index 7b8a526ebfd..00000000000
--- a/devel/gettext-tools/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$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-af b/devel/gettext-tools/patches/patch-af
deleted file mode 100644
index a856abd2226..00000000000
--- a/devel/gettext-tools/patches/patch-af
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/11/26 18:09:05 tron Exp $
-
---- gettext-tools/lib/execute.c.orig	2005-05-20 22:03:42.000000000 +0100
-+++ gettext-tools/lib/execute.c	2007-11-26 17:51:20.000000000 +0000
-@@ -62,8 +62,13 @@
- #endif
- 
- #ifndef HAVE_ENVIRON_DECL
-+#ifdef __APPLE__
-+#include <crt_externs.h>
-+#define environ (*_NSGetEnviron())
-+#else
- extern char **environ;
- #endif
-+#endif
- 
- #ifndef STDIN_FILENO
- # define STDIN_FILENO 0
diff --git a/devel/gettext-tools/patches/patch-ag b/devel/gettext-tools/patches/patch-ag
deleted file mode 100644
index e04cc05100e..00000000000
--- a/devel/gettext-tools/patches/patch-ag
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2006/07/26 06:53:02 adam Exp $
-
---- gettext-tools/lib/Makefile.in.orig	2006-06-21 14:30:05.000000000 +0200
-+++ gettext-tools/lib/Makefile.in
-@@ -453,7 +453,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.
-@@ -681,7 +681,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)
-@@ -733,7 +733,7 @@ info: info-am
- 
- info-am:
- 
--install-data-am: install-examplesbuildauxDATA install-gettextsrcDATA
-+install-data-am:
- 
- install-exec-am: install-exec-local install-libLTLIBRARIES
- 
-@@ -779,15 +779,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
deleted file mode 100644
index 35b626133a8..00000000000
--- a/devel/gettext-tools/patches/patch-ah
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2006/07/26 06:53:02 adam Exp $
-
---- gettext-tools/src/Makefile.in.orig	2006-06-21 18:53:45.000000000 +0200
-+++ gettext-tools/src/Makefile.in
-@@ -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)
--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)
-@@ -591,7 +589,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.
-@@ -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@
--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@
- 
-@@ -1348,7 +1345,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
-@@ -1395,14 +1392,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
-@@ -1506,12 +1495,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
deleted file mode 100644
index e998e282036..00000000000
--- a/devel/gettext-tools/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index 40a1ee13119..00000000000
--- a/devel/gettext-tools/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 41382c2b65e..00000000000
--- a/devel/gettext-tools/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index fae6b3c3a4e..00000000000
--- a/devel/gettext-tools/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index 679a464c55b..00000000000
--- a/devel/gettext-tools/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$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.
- 
diff --git a/devel/gettext-tools/patches/patch-ao b/devel/gettext-tools/patches/patch-ao
deleted file mode 100644
index ed53fbb1d49..00000000000
--- a/devel/gettext-tools/patches/patch-ao
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2006/02/14 22:31:42 joerg Exp $
-
---- gettext-tools/config.h.in.orig	2006-02-14 15:40:12.000000000 +0100
-+++ gettext-tools/config.h.in
-@@ -1,5 +1,9 @@
- /* config.h.in.  Generated from configure.ac by autoheader.  */
- 
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#endif
-+
- 
- /* Default value for alignment of strings in .mo file.  */
- #define DEFAULT_OUTPUT_ALIGNMENT 1
-@@ -500,8 +504,12 @@
- /* Define to 1 if you have the `wcslen' function. */
- #undef HAVE_WCSLEN
- 
-+#if !defined(__NetBSD__) || __NetBSD_Version__ >= 200000000
-+/* NetBSD before 2.0 doesn't provide wctype_t in wctype.h */
-+
- /* Define to 1 if you have the <wctype.h> header file. */
- #undef HAVE_WCTYPE_H
-+#endif
- 
- /* Define to 1 if you have the `wcwidth' function. */
- #undef HAVE_WCWIDTH
diff --git a/devel/gettext-tools/patches/patch-ap b/devel/gettext-tools/patches/patch-ap
deleted file mode 100644
index f377700142e..00000000000
--- a/devel/gettext-tools/patches/patch-ap
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/07/06 13:10:27 markd Exp $
-
---- gettext-tools/lib/vasprintf.c.orig	2006-06-28 23:14:51.332244000 +1200
-+++ gettext-tools/lib/vasprintf.c
-@@ -40,7 +40,13 @@ int_vasprintf (char **result, const char
-   /* Add one to make sure that it is never zero, which might cause malloc
-      to return NULL.  */
-   size_t total_width = strlen (format) + 1;
--  va_list ap = *args;
-+  va_list ap;
-+
-+#ifdef va_copy
-+  va_copy (ap, *args);
-+#else
-+  ap = *args;
-+#endif
- 
-   while (*p != '\0')
-     {
-@@ -109,6 +115,9 @@ int_vasprintf (char **result, const char
- 	  p++;
- 	}
-     }
-+#ifdef va_copy
-+  va_end (ap);
-+#endif
- #ifdef TEST
-   global_total_width = total_width;
- #endif
diff --git a/devel/gettext-tools/patches/patch-aq b/devel/gettext-tools/patches/patch-aq
deleted file mode 100644
index ecdda22e085..00000000000
--- a/devel/gettext-tools/patches/patch-aq
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2007/03/12 23:59:47 rillig Exp $
-
-Don't call varargs macros with zero arguments, since that is not
-required by ISO C99 and only gcc can handle it.
-
-Fixed in gettext-tools-0.16.
-
---- gettext-tools/src/po-lex.h.orig	2005-05-20 23:03:44.000000000 +0200
-+++ gettext-tools/src/po-lex.h	2007-03-12 23:26:26.000000000 +0100
-@@ -73,7 +73,7 @@ extern void po_lex_pass_obsolete_entries
- 
- /* ISO C 99 is smart enough to allow optimizations like this.
-    Note: OpenVMS 7.3 cc pretends to support ISO C 99 but chokes on '...'.  */
--#if __STDC__ && (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L && !defined __DECC)
-+#if 0
- 
- /* CAUTION: If you change this macro, you must also make identical
-    changes to the function of the same name in src/po-lex.c  */
-@@ -109,7 +109,7 @@ extern void po_lex_pass_obsolete_entries
-   } while (0)
- 
- /* GCC is also smart enough to allow optimizations like this.  */
--#elif __STDC__ && defined __GNUC__ && __GNUC__ >= 2 && !defined __APPLE_CC__
-+#elif 0
- 
- /* CAUTION: If you change this macro, you must also make identical
-    changes to the function of the same name in src/po-lex.c  */
diff --git a/devel/gettext-tools/patches/patch-ar b/devel/gettext-tools/patches/patch-ar
deleted file mode 100644
index 87b9679cdf3..00000000000
--- a/devel/gettext-tools/patches/patch-ar
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2007/03/12 23:59:47 rillig Exp $
-
-See patch-aq.
-
---- gettext-tools/src/po-lex.c.orig	2005-05-20 23:03:44.000000000 +0200
-+++ gettext-tools/src/po-lex.c	2007-03-12 23:26:10.000000000 +0100
-@@ -70,9 +70,7 @@ int gram_pos_column;
- /* Error handling during the parsing of a PO file.
-    These functions can access gram_pos and gram_pos_column.  */
- 
--#if !(__STDC__ && \
--      ((defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L && !defined __DECC) \
--       || (defined __GNUC__ && __GNUC__ >= 2 && !defined __APPLE_CC__)))
-+#if 1
- 
- /* CAUTION: If you change this function, you must also make identical
-    changes to the macro of the same name in src/po-lex.h  */
diff --git a/devel/gettext-tools/patches/patch-as b/devel/gettext-tools/patches/patch-as
deleted file mode 100644
index 602e4f6f727..00000000000
--- a/devel/gettext-tools/patches/patch-as
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-as,v 1.1 2010/02/05 11:18:12 obache Exp $
-
-Treat Haiku like BeOS
-
-http://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=40d88197eef9efb44102f8fd6ce10141ca61fb3c
-
---- gettext-tools/lib/binary-io.h.orig	2005-05-20 21:03:41.000000000 +0000
-+++ gettext-tools/lib/binary-io.h
-@@ -31,8 +31,8 @@
- # define O_BINARY _O_BINARY
- # define O_TEXT _O_TEXT
- #endif
--#ifdef __BEOS__
--  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
-+#if defined __BEOS__ || defined __HAIKU__
-+  /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect.  */
- # undef O_BINARY
- # undef O_TEXT
- #endif