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.

18 files changed, 164 insertions, 203 deletions

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 936c23e9378..47ab81c1ea8 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,27 +1,20 @@
-# $NetBSD: Makefile,v 1.78 2010/10/27 15:43:55 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2011/04/12 17:41:28 adam Exp $
 
-DISTNAME=	gettext-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
 COMMENT=	Tools for providing messages in different languages
 LICENSE=	gnu-gpl-v2
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+DEPENDS+=	gettext-m4-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-m4
+DEPENDS+=	gettext-tools-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-tools
+BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.18
 
-DEPENDS+=		gettext-m4-0.14.6{,nb[0-9]*}:../../devel/gettext-m4
-DEPENDS+=		gettext-tools-0.14.6{,nb[0-9]*}:../../devel/gettext-tools
-BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.14.5
-
-USE_LIBTOOL=		yes
+USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
 SHLIBTOOL_OVERRIDE=	# empty
-CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ARGS+=	--disable-csharp
+CONFIGURE_ARGS+=	--without-git
+CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ENV+=		GCJ= ac_cv_prog_GCJ=
 CONFIGURE_ENV+=		HAVE_GCJ_IN_PATH=
 CONFIGURE_ENV+=		HAVE_JAVAC_IN_PATH=
@@ -36,7 +29,6 @@ USE_BUILTIN.gettext=	no # force use of pkgsrc gettext-lib
 
 do-install:
 	cd ${WRKSRC}/gettext-tools && ${MAKE} install-gettextsrcSCRIPTS DESTDIR=${DESTDIR}
-	cd ${WRKSRC}/gettext-tools/lib && ${MAKE} install-gettextsrcDATA DESTDIR=${DESTDIR}
 	cd ${WRKSRC}/gettext-tools/projects && ${MAKE} install DESTDIR=${DESTDIR}
 	cd ${WRKSRC}/gettext-tools/misc && ${MAKE} install DESTDIR=${DESTDIR}
 	cd ${WRKSRC}/gettext-tools/src && ${MAKE} install-tcl install-exec-local DESTDIR=${DESTDIR}
diff --git a/devel/gettext/Makefile.common b/devel/gettext/Makefile.common
new file mode 100644
index 00000000000..069fa752a6d
--- /dev/null
+++ b/devel/gettext/Makefile.common
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile.common,v 1.1 2011/04/12 17:41:28 adam Exp $
+#
+# used by devel/gettext/Makefile
+# used by devel/gettext-asprintf/Makefile
+# used by devel/gettext-lib/Makefile
+# used by devel/gettext-m4/Makefile
+# used by devel/gettext-tools/Makefile
+
+DISTNAME=	gettext-0.18.1.1
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNU:=gettext/}
+
+MAINTAINER?=	joerg@NetBSD.org
+HOMEPAGE=	http://www.gnu.org/software/gettext/gettext.html
+LICENSE=	gnu-gpl-v3
+
+CONFLICTS=	gettext<=0.10.35
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
diff --git a/devel/gettext/PLIST b/devel/gettext/PLIST
index 25446bfdf83..a7753086718 100644
--- a/devel/gettext/PLIST
+++ b/devel/gettext/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:48:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2011/04/12 17:41:28 adam Exp $
 bin/autopoint
 bin/gettextize
 lib/gettext/hostname
@@ -8,9 +8,8 @@ lib/gettext/user-email
 man/man1/autopoint.1
 man/man1/gettextize.1
 share/gettext/ABOUT-NLS
-share/gettext/archive.tar.gz
+share/gettext/archive.dir.tar.gz
 share/gettext/config.rpath
-share/gettext/gettext.h
 share/gettext/intl/COPYING.LIB-2.0
 share/gettext/intl/COPYING.LIB-2.1
 share/gettext/intl/ChangeLog
@@ -25,15 +24,19 @@ share/gettext/intl/dgettext.c
 share/gettext/intl/dngettext.c
 share/gettext/intl/eval-plural.h
 share/gettext/intl/explodename.c
+share/gettext/intl/export.h
 share/gettext/intl/finddomain.c
 share/gettext/intl/gettext.c
 share/gettext/intl/gettextP.h
 share/gettext/intl/gmo.h
+share/gettext/intl/hash-string.c
 share/gettext/intl/hash-string.h
 share/gettext/intl/intl-compat.c
+share/gettext/intl/intl-exports.c
 share/gettext/intl/l10nflist.c
 share/gettext/intl/langprefs.c
 share/gettext/intl/libgnuintl.h.in
+share/gettext/intl/libintl.rc
 share/gettext/intl/loadinfo.h
 share/gettext/intl/loadmsgcat.c
 share/gettext/intl/localcharset.c
@@ -41,6 +44,8 @@ share/gettext/intl/localcharset.h
 share/gettext/intl/locale.alias
 share/gettext/intl/localealias.c
 share/gettext/intl/localename.c
+share/gettext/intl/lock.c
+share/gettext/intl/lock.h
 share/gettext/intl/log.c
 share/gettext/intl/ngettext.c
 share/gettext/intl/os2compat.c
@@ -59,13 +64,17 @@ 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/setlocale.c
 share/gettext/intl/textdomain.c
+share/gettext/intl/threadlib.c
+share/gettext/intl/tsearch.c
+share/gettext/intl/tsearch.h
 share/gettext/intl/vasnprintf.c
 share/gettext/intl/vasnprintf.h
 share/gettext/intl/vasnwprintf.h
+share/gettext/intl/version.c
 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
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index e18616d552b..72a160a8c5d 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,18 +1,17 @@
-$NetBSD: distinfo,v 1.18 2006/07/26 06:53:02 adam Exp $
+$NetBSD: distinfo,v 1.19 2011/04/12 17:41:28 adam 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-ad) = 53bf06d6073cd2ff4a09a688b1df3d294ef7ddb4
-SHA1 (patch-ae) = f2efed6024ef1aa3fb972c043e0900676659c766
-SHA1 (patch-ag) = 9a39ea58e8e8c10c747ab34fe198072c8663d6b0
-SHA1 (patch-ah) = b33e4c81a8046e4f45b927613af59a0d99a4d0bb
-SHA1 (patch-aj) = 5a28ee9299b5c0e7ba10621bf73b638cafdcfa7e
-SHA1 (patch-ak) = 3f2aa72291aae5e024a3bb833b46973221be3b95
-SHA1 (patch-al) = 2ed0cbf8e2e9a03ac3f8aaff447a07f578010472
-SHA1 (patch-an) = f99f345f9b23f72e4a462445bcce8281dd1e5308
-SHA1 (patch-ao) = 9e81b05b6e1ee76197c360a441264588607a475c
-SHA1 (patch-ap) = c01087cbbac18051435a817bb028061e463bd923
-SHA1 (patch-aq) = fcdcbd1fd042f77c666245ca9c43ca21bf24e350
+SHA1 (gettext-0.18.1.1.tar.gz) = 5009deb02f67fc3c59c8ce6b82408d1d35d4e38f
+RMD160 (gettext-0.18.1.1.tar.gz) = 0ca0b6bf0219440404a86f0c16cbac3d1a2ecd37
+Size (gettext-0.18.1.1.tar.gz) = 15139737 bytes
+SHA1 (patch-aa) = 198a771d64a3e3e0496e410d87f39cf895f16142
+SHA1 (patch-ab) = 042c66c8934d5b61b33c668c1befe2db5d507ecd
+SHA1 (patch-ad) = 100e262fa1aa4a1362404e7da527371bb6421728
+SHA1 (patch-ae) = ba5da7dfd502c5891ef20952afc5667137287f44
+SHA1 (patch-ag) = 2594cf5d3fd8c72e4fffe73c0e12406c9d893acc
+SHA1 (patch-ah) = 2cc427846d979b1e4e0bb38bc49a283af9cd32c3
+SHA1 (patch-aj) = 04ba988c371c98c0d42d613f15a895ab40b8a0f9
+SHA1 (patch-ak) = 669ae63baa07c860c047d6c7e390092f2f9d512b
+SHA1 (patch-al) = e0dcee0340fb9fdbd996be885548871ffb34dab2
+SHA1 (patch-am) = b0598906d2d37b5e20edf23123d8dd749dc23edb
+SHA1 (patch-an) = 2429e923e8172d2e6149cf22741e1e01657af19a
+SHA1 (patch-ao) = cd524bc7af4f6b514a7138b0830e901f90a785e0
diff --git a/devel/gettext/patches/patch-aa b/devel/gettext/patches/patch-aa
index 843f7ed9352..3bdb2380d66 100644
--- a/devel/gettext/patches/patch-aa
+++ b/devel/gettext/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.11 2006/02/05 22:45:53 joerg Exp $
+$NetBSD: patch-aa,v 1.12 2011/04/12 17:41:28 adam Exp $
 
---- gettext-runtime/configure.orig	2006-02-03 14:56:53.000000000 +0000
+--- gettext-runtime/configure.orig	2010-06-06 20:11:32.000000000 +0000
 +++ gettext-runtime/configure
-@@ -31906,10 +31906,6 @@ echo "${ECHO_T}$gt_cv_func_gnugettext2_l
+@@ -18205,10 +18205,6 @@ $as_echo "$ac_res" >&6; }
  
        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"
+-        LIBINTL="\${top_builddir}/intl/libintl.la $LIBICONV $LIBTHREAD"
+-        LTLIBINTL="\${top_builddir}/intl/libintl.la $LTLIBICONV $LTLIBTHREAD"
 -        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
        fi
  
diff --git a/devel/gettext/patches/patch-ab b/devel/gettext/patches/patch-ab
index 8d81c50c6eb..8c9dcf6ad3f 100644
--- a/devel/gettext/patches/patch-ab
+++ b/devel/gettext/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.7 2006/07/26 06:53:02 adam Exp $
+$NetBSD: patch-ab,v 1.8 2011/04/12 17:41:28 adam Exp $
 
---- gettext-tools/misc/Makefile.in.orig	2006-06-21 14:30:05.000000000 +0200
+--- gettext-tools/misc/Makefile.in.orig	2010-06-06 20:12:31.000000000 +0000
 +++ gettext-tools/misc/Makefile.in
-@@ -576,7 +576,7 @@ info: info-am
+@@ -1451,7 +1451,7 @@ info: info-am
  
  info-am:
  
 -install-data-am: install-gettextsrcDATA install-lispLISP
 +install-data-am: install-gettextsrcDATA
  
- install-exec-am: install-binSCRIPTS
+ install-dvi: install-dvi-am
  
diff --git a/devel/gettext/patches/patch-ad b/devel/gettext/patches/patch-ad
index 9926fc7b453..d88faf77590 100644
--- a/devel/gettext/patches/patch-ad
+++ b/devel/gettext/patches/patch-ad
@@ -1,22 +1,23 @@
-$NetBSD: patch-ad,v 1.3 2006/02/05 22:45:53 joerg Exp $
+$NetBSD: patch-ad,v 1.4 2011/04/12 17:41:28 adam Exp $
 
---- gettext-tools/Makefile.in.orig	2006-02-03 15:55:59.000000000 +0000
+--- gettext-tools/Makefile.in.orig	2010-06-06 20:12:33.000000000 +0000
 +++ gettext-tools/Makefile.in
-@@ -348,7 +348,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -1248,7 +1248,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  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
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
+-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
++SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po man tests
+ 
+ # Allow users to use "gnulib-tool --update".
+ 
+@@ -1765,8 +1765,7 @@ info: info-recursive
  
  info-am:
  
--install-data-am: install-gettextsrcSCRIPTS
+-install-data-am: install-examplesbuildauxDATA \
+-	install-gettextsrcSCRIPTS
 +install-data-am:
  
- install-exec-am:
+ install-dvi: install-dvi-recursive
  
diff --git a/devel/gettext/patches/patch-ae b/devel/gettext/patches/patch-ae
index 71bac2c941c..38638457f56 100644
--- a/devel/gettext/patches/patch-ae
+++ b/devel/gettext/patches/patch-ae
@@ -1,14 +1,14 @@
-$NetBSD: patch-ae,v 1.3 2006/02/05 22:45:53 joerg Exp $
+$NetBSD: patch-ae,v 1.4 2011/04/12 17:41:28 adam Exp $
 
---- gettext-tools/configure.orig	2006-02-03 17:13:33.000000000 +0000
+--- gettext-tools/configure.orig	2010-06-06 20:12:20.000000000 +0000
 +++ gettext-tools/configure
-@@ -39057,10 +39057,6 @@ echo "${ECHO_T}$gt_cv_func_gnugettext2_l
+@@ -20035,10 +20035,6 @@ $as_echo "$ac_res" >&6; }
  
        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"
+-        LIBINTL="\${top_builddir}/intl/libintl.la $LIBICONV $LIBTHREAD"
+-        LTLIBINTL="\${top_builddir}/intl/libintl.la $LTLIBICONV $LTLIBTHREAD"
 -        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
        fi
  
diff --git a/devel/gettext/patches/patch-ag b/devel/gettext/patches/patch-ag
index b05d8296e1e..be2794c4d65 100644
--- a/devel/gettext/patches/patch-ag
+++ b/devel/gettext/patches/patch-ag
@@ -1,47 +1,36 @@
-$NetBSD: patch-ag,v 1.7 2006/07/26 06:53:02 adam Exp $
+$NetBSD: patch-ag,v 1.8 2011/04/12 17:41:28 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)
+--- gettext-tools/gnulib-lib/Makefile.in.orig	2010-06-06 20:12:29.000000000 +0000
++++ gettext-tools/gnulib-lib/Makefile.in
+@@ -3034,7 +3034,7 @@ check: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) check-am
- all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
+ all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
  installdirs:
--	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(examplesbuildauxdir)" "$(DESTDIR)$(gettextsrcdir)"; do \
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gettextsrcdir)" "$(DESTDIR)$(pkgdatadir)"; do \
 +	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gettextsrcdir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: $(BUILT_SOURCES)
-@@ -733,7 +733,7 @@ info: info-am
+@@ -3100,7 +3100,7 @@ info: info-am
  
  info-am:
  
--install-data-am: install-examplesbuildauxDATA install-gettextsrcDATA
+-install-data-am: install-gettextsrcDATA install-pkgdataDATA
 +install-data-am:
  
- install-exec-am: install-exec-local install-libLTLIBRARIES
+ install-dvi: install-dvi-am
  
-@@ -779,15 +779,6 @@ uninstall-am: uninstall-examplesbuildaux
- 	uninstall-gettextsrcDATA uninstall-info-am \
- 	uninstall-libLTLIBRARIES uninstall-local
+@@ -3366,13 +3366,6 @@ getopt.h: getopt.in.h $(ARG_NONNULL_H)
+ 	} > $@-t && \
+ 	mv -f $@-t $@
  
--
 -# 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 ;; \
+-	  *) rm -f $(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@
+ # This is a Makefile rule that generates multiple files at once; see the
+ # automake documentation, node "Multiple Outputs", for details.
+ html-ostream.h : $(top_srcdir)/../build-aux/moopp html-ostream.oo.h html-ostream.oo.c ostream.oo.h
diff --git a/devel/gettext/patches/patch-ah b/devel/gettext/patches/patch-ah
index 4d99992ee17..3455d36bd66 100644
--- a/devel/gettext/patches/patch-ah
+++ b/devel/gettext/patches/patch-ah
@@ -1,48 +1,18 @@
-$NetBSD: patch-ah,v 1.7 2006/07/26 06:53:02 adam Exp $
+$NetBSD: patch-ah,v 1.8 2011/04/12 17:41:28 adam Exp $
 
---- gettext-tools/src/Makefile.in.orig	2006-06-21 18:53:45.000000000 +0200
+--- gettext-tools/src/Makefile.in.orig	2010-06-06 20:12:32.000000000 +0000
 +++ 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
+@@ -2763,7 +2763,7 @@ install-dvi: install-dvi-am
  
- 
- # 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-dvi-am:
  
 -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
+ install-html: install-html-am
+@@ -2827,14 +2827,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+ 	uninstall-local
  
  
 -# No need to install libgettextsrc.a, except on AIX.
@@ -56,18 +26,18 @@ $NetBSD: patch-ah,v 1.7 2006/07/26 06:53:02 adam 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
-@@ -1506,12 +1495,12 @@ uninstall-csharp-yes: all-csharp-yes
+@@ -2938,12 +2930,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)
+ 	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
  	$(INSTALL_DATA) $(srcdir)/msgunfmt.tcl $(DESTDIR)$(pkgdatadir)/msgunfmt.tcl
  
 -installdirs-local: installdirs-tcl
 +installdirs-local:
  installdirs-tcl:
- 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ 	$(mkdir_p) $(DESTDIR)$(pkgdatadir)
  
diff --git a/devel/gettext/patches/patch-aj b/devel/gettext/patches/patch-aj
index 9fb65a21da0..eac51a43963 100644
--- a/devel/gettext/patches/patch-aj
+++ b/devel/gettext/patches/patch-aj
@@ -1,22 +1,22 @@
-$NetBSD: patch-aj,v 1.4 2006/02/05 22:45:54 joerg Exp $
+$NetBSD: patch-aj,v 1.5 2011/04/12 17:41:28 adam Exp $
 
---- gettext-runtime/Makefile.in.orig	2006-02-03 14:42:03.000000000 +0000
+--- gettext-runtime/Makefile.in.orig	2010-06-06 20:11:38.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
+@@ -943,7 +943,7 @@ ACLOCAL_AMFLAGS = -I m4 -I ../m4 -I gnul
+ # The list of subdirectories depends on whether --disable-libasprintf was
+ # specified.
+ @ENABLE_LIBASPRINTF_TRUE@SUBDIR_libasprintf = libasprintf
+-SUBDIRS = doc intl intl-java intl-csharp gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests
++SUBDIRS = doc gnulib-lib src po man m4 tests
+ 
+ # Allow users to use "gnulib-tool --update".
+ 
+@@ -1410,7 +1410,7 @@ info: info-recursive
  
  info-am:
  
 -install-data-am: install-gettextsrcDATA
 +install-data-am:
  
- install-exec-am:
+ install-dvi: install-dvi-recursive
  
diff --git a/devel/gettext/patches/patch-ak b/devel/gettext/patches/patch-ak
index c06f8876f93..4c1369df811 100644
--- a/devel/gettext/patches/patch-ak
+++ b/devel/gettext/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.5 2006/02/05 22:45:54 joerg Exp $
+$NetBSD: patch-ak,v 1.6 2011/04/12 17:41:28 adam Exp $
 
---- gettext-runtime/intl/Makefile.in.orig	2006-02-04 19:34:01.000000000 +0000
+--- gettext-runtime/intl/Makefile.in.orig	2010-06-06 12:49:57.000000000 +0000
 +++ gettext-runtime/intl/Makefile.in
-@@ -257,7 +257,7 @@ check: all
+@@ -379,7 +379,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'.
diff --git a/devel/gettext/patches/patch-al b/devel/gettext/patches/patch-al
index 4a698ce2b19..d674cd2f513 100644
--- a/devel/gettext/patches/patch-al
+++ b/devel/gettext/patches/patch-al
@@ -1,22 +1,13 @@
-$NetBSD: patch-al,v 1.2 2006/02/05 22:45:54 joerg Exp $
+$NetBSD: patch-al,v 1.3 2011/04/12 17:41:28 adam Exp $
 
---- gettext-tools/po/Makefile.in.in.orig	2006-02-04 20:52:36.000000000 +0000
+--- gettext-tools/po/Makefile.in.in.orig	2010-06-06 12:49:57.000000000 +0000
 +++ gettext-tools/po/Makefile.in.in
-@@ -156,7 +156,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
+@@ -207,7 +207,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
+ 	fi
  
- 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
  
- installdirs: installdirs-exec installdirs-data
- installdirs-exec:
--installdirs-data: installdirs-data-@USE_NLS@
-+installdirs-data:
+-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 \
- 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
- 	else \
diff --git a/devel/gettext/patches/patch-am b/devel/gettext/patches/patch-am
new file mode 100644
index 00000000000..e5098ac44e7
--- /dev/null
+++ b/devel/gettext/patches/patch-am
@@ -0,0 +1,14 @@
+$NetBSD: patch-am,v 1.3 2011/04/12 17:41:28 adam Exp $
+
+--- gettext-tools/man/Makefile.in.orig	2010-06-06 20:12:31.000000000 +0000
++++ gettext-tools/man/Makefile.in
+@@ -1185,8 +1185,7 @@ gettextize.x autopoint.x
+ 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 \
+-recode-sr-latin.1 \
+-gettextize.1 autopoint.1
++recode-sr-latin.1
+ 
+ man_MAN1 = $(man_MAN1OTHER)
+ man_MANS = $(man_MAN1)
diff --git a/devel/gettext/patches/patch-an b/devel/gettext/patches/patch-an
index 4016e389ddd..5773ca36e66 100644
--- a/devel/gettext/patches/patch-an
+++ b/devel/gettext/patches/patch-an
@@ -1,12 +1,12 @@
-$NetBSD: patch-an,v 1.2 2006/02/05 22:45:54 joerg Exp $
+$NetBSD: patch-an,v 1.3 2011/04/12 17:41:28 adam Exp $
 
---- Makefile.in.orig	2006-02-04 21:41:03.000000000 +0000
+--- Makefile.in.orig	2010-06-06 20:12:52.000000000 +0000
 +++ Makefile.in
-@@ -153,7 +153,7 @@ subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -211,7 +211,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
--SUBDIRS = autoconf-lib-link gettext-runtime gettext-tools
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = gnulib-local 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
index 1810d00e19f..be8512ccb30 100644
--- a/devel/gettext/patches/patch-ao
+++ b/devel/gettext/patches/patch-ao
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.3 2006/02/14 22:31:42 joerg Exp $
+$NetBSD: patch-ao,v 1.4 2011/04/12 17:41:28 adam Exp $
 
---- gettext-tools/config.h.in.orig	2006-02-14 15:40:12.000000000 +0100
+--- gettext-tools/config.h.in.orig	2010-06-06 20:12:24.000000000 +0000
 +++ gettext-tools/config.h.in
 @@ -1,5 +1,9 @@
  /* config.h.in.  Generated from configure.ac by autoheader.  */
@@ -12,9 +12,9 @@ $NetBSD: patch-ao,v 1.3 2006/02/14 22:31:42 joerg Exp $
  
  /* 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
+@@ -1717,8 +1721,12 @@
+ /* Define to 1 if you have the `wctob' function. */
+ #undef HAVE_WCTOB
  
 +#if !defined(__NetBSD__) || __NetBSD_Version__ >= 200000000
 +/* NetBSD before 2.0 doesn't provide wctype_t in wctype.h */
diff --git a/devel/gettext/patches/patch-ap b/devel/gettext/patches/patch-ap
deleted file mode 100644
index f35f7241b26..00000000000
--- a/devel/gettext/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.4 2006/02/21 20:04:03 jschauma Exp $
-
---- gettext-tools/src/po-lex.c.orig	2005-05-20 16:43:18.000000000 -0400
-+++ gettext-tools/src/po-lex.c	2006-02-21 15:00:22.000000000 -0500
-@@ -70,7 +70,7 @@
- /* Error handling during the parsing of a PO file.
-    These functions can access gram_pos and gram_pos_column.  */
- 
--#if !(__STDC__ && \
-+#if !defined __sgi && !(__STDC__ && \
-       ((defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L && !defined __DECC) \
-        || (defined __GNUC__ && __GNUC__ >= 2 && !defined __APPLE_CC__)))
- 
diff --git a/devel/gettext/patches/patch-aq b/devel/gettext/patches/patch-aq
deleted file mode 100644
index 8bd2a7db699..00000000000
--- a/devel/gettext/patches/patch-aq
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aq,v 1.2 2006/02/21 20:04:03 jschauma Exp $
-
---- gettext-tools/src/po-lex.h.orig	2005-05-20 16:43:21.000000000 -0400
-+++ gettext-tools/src/po-lex.h	2006-02-21 15:01:02.000000000 -0500
-@@ -109,7 +109,8 @@
-   } while (0)
- 
- /* GCC is also smart enough to allow optimizations like this.  */
--#elif __STDC__ && defined __GNUC__ && __GNUC__ >= 2 && !defined __APPLE_CC__
-+#elif __STDC__ && defined __GNUC__ && __GNUC__ >= 2 && !defined __APPLE_CC__ \
-+	&& !defined __sgi
- 
- /* CAUTION: If you change this macro, you must also make identical
-    changes to the function of the same name in src/po-lex.c  */