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.

3 files changed, 22 insertions, 28 deletions

diff --git a/devel/gettext-m4/Makefile b/devel/gettext-m4/Makefile
index 34c12d790ee..91e6fca8bb3 100644
--- a/devel/gettext-m4/Makefile
+++ b/devel/gettext-m4/Makefile
@@ -1,30 +1,21 @@
-# $NetBSD: Makefile,v 1.17 2010/01/30 16:28:00 heinz Exp $
+# $NetBSD: Makefile,v 1.18 2011/04/12 17:41:28 adam Exp $
 
-DISTNAME=	gettext-0.14.6
-PKGNAME=	gettext-m4-0.14.6
-SVR4_PKGNAME=	gttm4
-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/-/-m4-/}
+SVR4_PKGNAME=	gttm4
 COMMENT=	Autoconf/automake m4 files for GNU NLS library
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS=		gettext<=0.10.35nb1
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 NO_BUILD=		yes
 NO_CONFIGURE=		yes
 
 INSTALLATION_DIRS+=	share/aclocal
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC:Q}/gettext-runtime/m4/*.m4 \
+	${INSTALL_DATA} ${WRKSRC}/gettext-runtime/m4/*.m4 \
 		${DESTDIR}${PREFIX}/share/aclocal
-	${INSTALL_DATA} ${WRKSRC:Q}/autoconf-lib-link/m4/*.m4 \
+	${INSTALL_DATA} ${WRKSRC}/gettext-tools/m4/*.m4 \
 		${DESTDIR}${PREFIX}/share/aclocal
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gettext-m4/PLIST b/devel/gettext-m4/PLIST
index e1275a42bc5..85239bf85d5 100644
--- a/devel/gettext-m4/PLIST
+++ b/devel/gettext-m4/PLIST
@@ -1,31 +1,34 @@
-@comment $NetBSD: PLIST,v 1.3 2006/02/05 22:45:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/04/12 17:41:28 adam Exp $
 share/aclocal/ansi-c++.m4
 share/aclocal/codeset.m4
+share/aclocal/exported.m4
+share/aclocal/fcntl-o.m4
 share/aclocal/gettext.m4
 share/aclocal/glibc2.m4
 share/aclocal/glibc21.m4
+share/aclocal/hostname.m4
 share/aclocal/iconv.m4
 share/aclocal/intdiv0.m4
+share/aclocal/intl.m4
+share/aclocal/intldir.m4
+share/aclocal/intlmacosx.m4
 share/aclocal/intmax.m4
 share/aclocal/inttypes-pri.m4
-share/aclocal/inttypes.m4
 share/aclocal/inttypes_h.m4
-share/aclocal/isc-posix.m4
 share/aclocal/lcmessage.m4
-share/aclocal/lib-ld.m4
-share/aclocal/lib-link.m4
-share/aclocal/lib-prefix.m4
-share/aclocal/longdouble.m4
+share/aclocal/lock.m4
 share/aclocal/longlong.m4
 share/aclocal/nls.m4
 share/aclocal/po.m4
 share/aclocal/printf-posix.m4
 share/aclocal/progtest.m4
-share/aclocal/signed.m4
+share/aclocal/setlocale.m4
+share/aclocal/siginfo.m4
 share/aclocal/size_max.m4
 share/aclocal/stdint_h.m4
+share/aclocal/threadlib.m4
 share/aclocal/uintmax_t.m4
-share/aclocal/ulonglong.m4
+share/aclocal/visibility.m4
 share/aclocal/wchar_t.m4
 share/aclocal/wint_t.m4
 share/aclocal/xsize.m4
diff --git a/devel/gettext-m4/distinfo b/devel/gettext-m4/distinfo
index 25c980ab084..402d38dbff2 100644
--- a/devel/gettext-m4/distinfo
+++ b/devel/gettext-m4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2006/07/26 06:53:02 adam Exp $
+$NetBSD: distinfo,v 1.5 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 (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