Update gettext* to 0.18.3:

Version 0.18.3 - July 2013

* Runtime behaviour:
  On Mac OS X systems, the setlocale() function now properly
  invalidates loaded message catalogs when a locale has been set.

* Programming languages support:

  - C++:
    The gnu::autosprintf class now provides an assignment operator.

  - Glade:
    xgettext now supports GtkBuider file format used by Glade 3.
    xgettext now also extracts contexts (msgctxt) from Glade 2 and
    GtkBuider files.

  - JavaScript:
    xgettext now partially supports JavaScript.  Since the current
    JavaScript specification (ECMA-262) does not define the standard
    set of formatting methods nor translation functions, the
    implementation supports only a limited set of formatting methods
    and translation functions commonly used in Gjs and other popular
    JavaScript implemenations and libraries.

  - Lua:
    xgettext now supports Lua, using Ľubomír Remák's lua-gettext.

  - Python:
    xgettext and msgfmt's format string checking now recognize Python
    format string in braced syntax (PEP 3101).  xgettext now also
    supports explicit string concatenation with '+' and handles
    platform dependent line terminators (LF/CR/CRLF) transparently.

  - Tcl:
    Bug fix in xgettext Unicode escape handling.

  - Vala:
    xgettext now supports Vala.

* msgattrib now has --previous option to keep previous msgid when
  making messages fuzzy, similar to msgmerge --previous.

* msgfmt now checks PO file headers more strictly with less
  false-positives.

* 'gettextize' now checks macro directories specified with
  AC_CONFIGURE_MACRO_DIRS in configure.ac.

* Portability:
  - msginit now does not require GNU sed.
  - The Makefile rule for generating en@quot and en@boldquot now uses
    @SED@ variable instead of hard-coded 'sed' command to allow users
    to supply GNU sed.

* Future backward-incompatibilities:
  - In future Gettext versions, the files installed by 'gettextize'
    will require Automake 1.10 or later.  This will improve the
    compatibility of user projects with newer Automake versions.

3 files changed, 12 insertions, 13 deletions

diff --git a/devel/gettext/Makefile.common b/devel/gettext/Makefile.common
index 2cf1a3af892..b2e0c79f9aa 100644
--- a/devel/gettext/Makefile.common
+++ b/devel/gettext/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2013/03/11 16:55:19 adam Exp $
+# $NetBSD: Makefile.common,v 1.5 2013/07/21 20:24:52 wiz Exp $
 #
 # used by devel/gettext/Makefile
 # used by devel/gettext-asprintf/Makefile
@@ -6,7 +6,7 @@
 # used by devel/gettext-m4/Makefile
 # used by devel/gettext-tools/Makefile
 
-DISTNAME=	gettext-0.18.2.1
+DISTNAME=	gettext-0.18.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=gettext/}
 
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index 9e2190b4ea4..0fb704a3d77 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.22 2013/03/11 16:55:19 adam Exp $
+$NetBSD: distinfo,v 1.23 2013/07/21 20:24:52 wiz Exp $
 
-SHA1 (gettext-0.18.2.1.tar.gz) = 86066950cac2fcc49cc7bd23f5ea16bed522b410
-RMD160 (gettext-0.18.2.1.tar.gz) = 4fcd8c5fe1de96f7224cdcf160fd9e6b008ab3df
-Size (gettext-0.18.2.1.tar.gz) = 15901092 bytes
+SHA1 (gettext-0.18.3.tar.gz) = 1ef780d0e56ae174c2781d71790cdf77a276a4a0
+RMD160 (gettext-0.18.3.tar.gz) = bee5a4b42bd8f888073983dd0ab36aa6685f6da1
+Size (gettext-0.18.3.tar.gz) = 16171945 bytes
 SHA1 (patch-aa) = ec9cad88d5a0de67b70d417915ec0f1cfb3552b2
 SHA1 (patch-ab) = caf95d3fa21ce5cab9febc9f6e9164e633ab39e0
 SHA1 (patch-ad) = e53a4a500ce70ba1dd6c6aae6d6032d5d91f5d16
 SHA1 (patch-ae) = 662975f811495f13604001964fcc6e3d13b1276c
 SHA1 (patch-ag) = 57cd120015eeddcb8ca1d7605c42af3374755c96
-SHA1 (patch-ah) = cf7710601945d2ab2f49dfc00c2bdfb79a29db4f
 SHA1 (patch-aj) = d5e66478ddf343ad74eb8429de47c567a81a8481
 SHA1 (patch-ak) = 05b06eae21fcf49af91479a63c5b9bbc1388101c
 SHA1 (patch-al) = 15563935bd43886309dd95a0816a5c2153b5da3c
 SHA1 (patch-am) = 816003fde7c6c331757ed91d4ecc4b49a4c541b9
 SHA1 (patch-an) = c78b531f1a55bb5509c89d5fbba2a8da425486e5
-SHA1 (patch-ao) = d9294a06155ba85ecc28ac544e8b4e258ae931b7
+SHA1 (patch-ao) = d0ab5520f53f38c7b2eb76395c5d6dd24407ef4f
diff --git a/devel/gettext/patches/patch-ao b/devel/gettext/patches/patch-ao
index d14de8de59c..aaf3385d21e 100644
--- a/devel/gettext/patches/patch-ao
+++ b/devel/gettext/patches/patch-ao
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.5 2013/01/31 21:45:04 adam Exp $
+$NetBSD: patch-ao,v 1.6 2013/07/21 20:24:52 wiz Exp $
 
---- gettext-tools/config.h.in.orig	2012-12-25 05:33:29.000000000 +0000
+--- gettext-tools/config.h.in.orig	2013-07-07 09:20:54.000000000 +0000
 +++ gettext-tools/config.h.in
 @@ -1,5 +1,9 @@
  /* config.h.in.  Generated from configure.ac by autoheader.  */
@@ -12,8 +12,8 @@ $NetBSD: patch-ao,v 1.5 2013/01/31 21:45:04 adam Exp $
  
  /* Default value for alignment of strings in .mo file.  */
  #define DEFAULT_OUTPUT_ALIGNMENT 1
-@@ -2009,8 +2013,12 @@
- /* Define to 1 if you have the 'wctob' function. */
+@@ -2037,8 +2041,12 @@
+ /* Define to 1 if you have the `wctob' function. */
  #undef HAVE_WCTOB
  
 +#if !defined(__NetBSD__) || __NetBSD_Version__ >= 200000000
@@ -23,5 +23,5 @@ $NetBSD: patch-ao,v 1.5 2013/01/31 21:45:04 adam Exp $
  #undef HAVE_WCTYPE_H
 +#endif
  
- /* Define to 1 if you have the 'wcwidth' function. */
+ /* Define to 1 if you have the `wcwidth' function. */
  #undef HAVE_WCWIDTH