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.

6 files changed, 34 insertions, 45 deletions

diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile
index 5bb6273a5da..082bf32d6f2 100644
--- a/devel/gettext-lib/Makefile
+++ b/devel/gettext-lib/Makefile
@@ -1,27 +1,16 @@
-# $NetBSD: Makefile,v 1.51 2010/10/28 09:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2011/04/12 17:41:28 adam Exp $
 
-DISTNAME=	gettext-0.14.6
-PKGNAME=	gettext-lib-0.14.6
-SVR4_PKGNAME=	gttli
-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/-/-lib-/}
+SVR4_PKGNAME=	gttli
 COMMENT=	Internationalized Message Handling Library (libintl)
-LICENSE=	gnu-gpl-v2
-
-CONFLICTS=		gettext<=0.10.35
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
+USE_LANGUAGES=		c
 CONFIGURE_ARGS+=	--with-included-gettext
 CONFIGURE_ARGS+=	--disable-csharp
-CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
-MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
+MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 
 CFLAGS+=		${CFLAGS.${ICONV_TYPE}-iconv}
 CFLAGS.gnu-iconv+=	-DHAVE_GNU_ICONV
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk
index a8f231fe88f..71a4905af46 100644
--- a/devel/gettext-lib/buildlink3.mk
+++ b/devel/gettext-lib/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.31 2009/03/20 19:24:13 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2011/04/12 17:41:28 adam Exp $
 
 BUILDLINK_TREE+=	gettext
 
 .if !defined(GETTEXT_BUILDLINK3_MK)
 GETTEXT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.14.5
+BUILDLINK_API_DEPENDS.gettext+=	gettext-lib>=0.18
 BUILDLINK_PKGSRCDIR.gettext?=	../../devel/gettext-lib
 BUILDLINK_LIBNAME.gettext=	intl
 BUILDLINK_LDADD.gettext=	${BUILDLINK_LIBNAME.gettext:S/^/-l/:S/^-l$//}
@@ -21,10 +21,10 @@ BUILDLINK_LDADD.gettext+=	${BUILDLINK_LDADD.iconv}
 # to LIBS to workaround this brokenness.
 #
 BROKEN_GETTEXT_DETECTION?=	no
-.  if !empty(BROKEN_GETTEXT_DETECTION:M[yY][eE][sS])
+.if !empty(BROKEN_GETTEXT_DETECTION:M[yY][eE][sS])
 BUILDLINK_LIBS.gettext+=	${BUILDLINK_LDADD.gettext}
 CONFIGURE_ENV+=			INTLLIBS="${BUILDLINK_LDADD.gettext}"
-.  endif
+.endif
 
 CHECK_BUILTIN.gettext:=	yes
 .include "../../devel/gettext-lib/builtin.mk"
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk
index 5353e9362f7..ea214fa3c49 100644
--- a/devel/gettext-lib/builtin.mk
+++ b/devel/gettext-lib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.40 2011/01/21 21:24:11 wiz Exp $
+# $NetBSD: builtin.mk,v 1.41 2011/04/12 17:41:28 adam Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -50,14 +50,14 @@ USE_BUILTIN.gettext=	${IS_BUILTIN.gettext}
 	!empty(IS_BUILTIN.gettext:M[yY][eE][sS])
 USE_BUILTIN.gettext=	yes
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.gettext}
-.	 if !empty(USE_BUILTIN.gettext:M[yY][eE][sS])
+.        if !empty(USE_BUILTIN.gettext:M[yY][eE][sS])
 USE_BUILTIN.gettext!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.gettext:Q}; then \
 		${ECHO} yes;						\
 	else								\
 		${ECHO} no;						\
 	fi
-.	 endif
+.        endif
 .      endfor
 .    endif
 # XXX
diff --git a/devel/gettext-lib/distinfo b/devel/gettext-lib/distinfo
index 7f3be543af6..98394463c74 100644
--- a/devel/gettext-lib/distinfo
+++ b/devel/gettext-lib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.17 2010/10/28 09:34:19 wiz Exp $
+$NetBSD: distinfo,v 1.18 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) = b0d25a2e9547649a3d6d583bdfc98255dcafbf90
-SHA1 (patch-ab) = fc4da46f6f7003c22880455dfe66ff161aa92135
+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) = bd69b8c279dcf917fad953c2f64348fc2128bc4b
+SHA1 (patch-ab) = c5aef1ef15c91203697cd9817b6b03713f2a8b6f
diff --git a/devel/gettext-lib/patches/patch-aa b/devel/gettext-lib/patches/patch-aa
index aef1c1bd239..17b3e8d05f8 100644
--- a/devel/gettext-lib/patches/patch-aa
+++ b/devel/gettext-lib/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.6 2010/02/05 08:44:04 obache Exp $
+$NetBSD: patch-aa,v 1.7 2011/04/12 17:41:28 adam Exp $
 
---- gettext-runtime/intl/localcharset.c.orig	2005-05-20 13:07:51.000000000 -0700
+--- gettext-runtime/intl/localcharset.c.orig	2010-06-06 12:49:57.000000000 +0000
 +++ gettext-runtime/intl/localcharset.c
-@@ -23,6 +23,10 @@
- # include <config.h>
- #endif
+@@ -21,6 +21,10 @@
+ 
+ #include <config.h>
  
 +#if !defined(HAVE_GNU_ICONV)
 +
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.6 2010/02/05 08:44:04 obache Exp $
  /* Specification.  */
  #include "localcharset.h"
  
-@@ -407,3 +411,4 @@ locale_charset ()
+@@ -547,3 +551,4 @@ locale_charset (void)
  
    return codeset;
  }
diff --git a/devel/gettext-lib/patches/patch-ab b/devel/gettext-lib/patches/patch-ab
index d57ec10a231..4f38a71dfa5 100644
--- a/devel/gettext-lib/patches/patch-ab
+++ b/devel/gettext-lib/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.4 2010/02/05 08:44:04 obache Exp $
+$NetBSD: patch-ab,v 1.5 2011/04/12 17:41:28 adam Exp $
 
---- gettext-runtime/intl/Makefile.in.orig	Thu Jul 25 08:49:57 2002
-+++ gettext-runtime/intl/Makefile.in	Mon Mar 15 14:39:58 2004
-@@ -156,8 +156,7 @@ libintl.la libgnuintl.la: $(OBJECTS)
- 	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
- 	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) -lc \
+--- gettext-runtime/intl/Makefile.in.orig	2010-06-06 12:49:57.000000000 +0000
++++ gettext-runtime/intl/Makefile.in
+@@ -223,8 +223,7 @@ libintl.la libgnuintl.la: $(OBJECTS) $(O
+ 	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ @LTLIBC@ \
+ 	  $(OBJECTS_RES_@WOE32@) \
  	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
 -	  -rpath $(libdir) \
 -	  -no-undefined
@@ -12,8 +12,8 @@ $NetBSD: patch-ab,v 1.4 2010/02/05 08:44:04 obache Exp $
  
  # Libtool's library version information for libintl.
  # Before making a gettext release, the gettext maintainer must change this
-@@ -264,7 +263,7 @@ install-exec: all
- 	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+@@ -386,7 +385,7 @@ install-exec: all
+ 	  $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
  	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
  	  $(LIBTOOL) --mode=install \
 -	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \