Changes 0.18.2:

* xgettext now understands the block comment syntax of Guile 2.0.
* libgettextpo library:
  - The initial msgstr of a new message is now "", not NULL.
  - Bug fixes in the functions po_message_is_range, po_file_check_all,
    po_message_check_all.
* Installation options:
  The configure options --with-xz and --with-bzip2 can be used to specify
  alternate compression methods for the archive used by the 'autopoint'
  program. These options, together with --with-git, allow to trade
  dependencies against installed package size. --with-xz has the highest
  compression rate, followed by --with-git, followed by --with-bzip2.
* Autoconf macros:
  - The autoconf macros installed by 'gettextize' now work with the
    forthcoming Automake 1.14 and require Autoconf version 2.60 or
    newer.
* Portability:
  - Building on MacOS X 10.7, Cygwin 1.7.10, and newer 64-bit mingw is
    now supported.

12 files changed, 41 insertions, 51 deletions

diff --git a/devel/gettext/patches/patch-aa b/devel/gettext/patches/patch-aa
index 3bdb2380d66..25b0e246e1c 100644
--- a/devel/gettext/patches/patch-aa
+++ b/devel/gettext/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2011/04/12 17:41:28 adam Exp $
+$NetBSD: patch-aa,v 1.13 2013/01/31 21:45:04 adam Exp $
 
 --- gettext-runtime/configure.orig	2010-06-06 20:11:32.000000000 +0000
 +++ gettext-runtime/configure
-@@ -18205,10 +18205,6 @@ $as_echo "$ac_res" >&6; }
+@@ -19798,10 +19798,6 @@ $as_echo "$ac_res" >&6; }
  
        if test "$nls_cv_use_gnu_gettext" = "yes"; then
                  BUILD_INCLUDED_LIBINTL=yes
diff --git a/devel/gettext/patches/patch-ab b/devel/gettext/patches/patch-ab
index 8c9dcf6ad3f..e04b4b8ab02 100644
--- a/devel/gettext/patches/patch-ab
+++ b/devel/gettext/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2011/04/12 17:41:28 adam Exp $
+$NetBSD: patch-ab,v 1.9 2013/01/31 21:45:04 adam Exp $
 
 --- gettext-tools/misc/Makefile.in.orig	2010-06-06 20:12:31.000000000 +0000
 +++ gettext-tools/misc/Makefile.in
-@@ -1451,7 +1451,7 @@ info: info-am
+@@ -1719,7 +1719,7 @@ info: info-am
  
  info-am:
  
diff --git a/devel/gettext/patches/patch-ad b/devel/gettext/patches/patch-ad
index d88faf77590..aac2d757fac 100644
--- a/devel/gettext/patches/patch-ad
+++ b/devel/gettext/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2011/04/12 17:41:28 adam Exp $
+$NetBSD: patch-ad,v 1.5 2013/01/31 21:45:04 adam Exp $
 
---- gettext-tools/Makefile.in.orig	2010-06-06 20:12:33.000000000 +0000
+--- gettext-tools/Makefile.in.orig	2012-12-25 05:33:31.000000000 +0000
 +++ gettext-tools/Makefile.in
-@@ -1248,7 +1248,7 @@ top_builddir = @top_builddir@
+@@ -1500,7 +1500,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 ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.4 2011/04/12 17:41:28 adam Exp $
  
  # Allow users to use "gnulib-tool --update".
  
-@@ -1765,8 +1765,7 @@ info: info-recursive
+@@ -2029,8 +2029,7 @@ info: info-recursive
  
  info-am:
  
diff --git a/devel/gettext/patches/patch-ae b/devel/gettext/patches/patch-ae
index 9340c17b155..1a68bbb4c9a 100644
--- a/devel/gettext/patches/patch-ae
+++ b/devel/gettext/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2011/08/05 00:36:10 adam Exp $
+$NetBSD: patch-ae,v 1.6 2013/01/31 21:45:04 adam Exp $
 
---- gettext-tools/configure.orig	2010-06-06 20:12:20.000000000 +0000
+--- gettext-tools/configure.orig	2012-12-25 05:33:28.000000000 +0000
 +++ gettext-tools/configure
-@@ -20035,10 +20035,6 @@ $as_echo "$ac_res" >&6; }
+@@ -21811,10 +21811,6 @@ $as_echo "$ac_res" >&6; }
  
        if test "$nls_cv_use_gnu_gettext" = "yes"; then
                  BUILD_INCLUDED_LIBINTL=yes
@@ -13,13 +13,3 @@ $NetBSD: patch-ae,v 1.5 2011/08/05 00:36:10 adam Exp $
        fi
  
        CATOBJEXT=
-@@ -40606,7 +40602,9 @@ else
- #include <stdlib.h>
- #include <string.h> /* for strcpy */
- /* The stpncpy prototype is missing in <string.h> on AIX 4.  */
-+#ifndef __APPLE__
- extern char *stpncpy (char *dest, const char *src, size_t n);
-+#endif
- int main () {
-   const char *src = "Hello";
-   char dest[10];
diff --git a/devel/gettext/patches/patch-ag b/devel/gettext/patches/patch-ag
index be2794c4d65..9f4140ee8b9 100644
--- a/devel/gettext/patches/patch-ag
+++ b/devel/gettext/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.8 2011/04/12 17:41:28 adam Exp $
+$NetBSD: patch-ag,v 1.9 2013/01/31 21:45:04 adam Exp $
 
---- gettext-tools/gnulib-lib/Makefile.in.orig	2010-06-06 20:12:29.000000000 +0000
+--- gettext-tools/gnulib-lib/Makefile.in.orig	2012-12-25 05:33:32.000000000 +0000
 +++ gettext-tools/gnulib-lib/Makefile.in
-@@ -3034,7 +3034,7 @@ check: $(BUILT_SOURCES)
+@@ -2935,7 +2935,7 @@ check: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) check-am
  all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
  installdirs:
@@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.8 2011/04/12 17:41:28 adam Exp $
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: $(BUILT_SOURCES)
-@@ -3100,7 +3100,7 @@ info: info-am
+@@ -3007,7 +3007,7 @@ info: info-am
  
  info-am:
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ag,v 1.8 2011/04/12 17:41:28 adam Exp $
  
  install-dvi: install-dvi-am
  
-@@ -3366,13 +3366,6 @@ getopt.h: getopt.in.h $(ARG_NONNULL_H)
+@@ -3300,13 +3300,6 @@ getopt.h: getopt.in.h $(top_builddir)/co
  	} > $@-t && \
  	mv -f $@-t $@
  
diff --git a/devel/gettext/patches/patch-ah b/devel/gettext/patches/patch-ah
index 3455d36bd66..6bf676474f2 100644
--- a/devel/gettext/patches/patch-ah
+++ b/devel/gettext/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.8 2011/04/12 17:41:28 adam Exp $
+$NetBSD: patch-ah,v 1.9 2013/01/31 21:45:04 adam Exp $
 
---- gettext-tools/src/Makefile.in.orig	2010-06-06 20:12:32.000000000 +0000
+--- gettext-tools/src/Makefile.in.orig	2012-12-25 05:33:34.000000000 +0000
 +++ gettext-tools/src/Makefile.in
-@@ -2763,7 +2763,7 @@ install-dvi: install-dvi-am
+@@ -2901,7 +2901,7 @@ install-dvi: install-dvi-am
  
  install-dvi-am:
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.8 2011/04/12 17:41:28 adam Exp $
  	install-libLTLIBRARIES
  
  install-html: install-html-am
-@@ -2827,14 +2827,6 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -2965,14 +2965,6 @@ uninstall-am: uninstall-binPROGRAMS unin
  	uninstall-local
  
  
@@ -26,7 +26,7 @@ $NetBSD: patch-ah,v 1.8 2011/04/12 17:41:28 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
-@@ -2938,12 +2930,12 @@ uninstall-csharp-yes: all-csharp-yes
+@@ -3076,12 +3068,12 @@ uninstall-csharp-yes: all-csharp-yes
  	$(RM) $(DESTDIR)$(pkglibdir)/msgunfmt.net.exe
  uninstall-csharp-no:
  
diff --git a/devel/gettext/patches/patch-aj b/devel/gettext/patches/patch-aj
index eac51a43963..4e3b26b1948 100644
--- a/devel/gettext/patches/patch-aj
+++ b/devel/gettext/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.5 2011/04/12 17:41:28 adam Exp $
+$NetBSD: patch-aj,v 1.6 2013/01/31 21:45:04 adam Exp $
 
---- gettext-runtime/Makefile.in.orig	2010-06-06 20:11:38.000000000 +0000
+--- gettext-runtime/Makefile.in.orig	2012-12-25 05:30:40.000000000 +0000
 +++ gettext-runtime/Makefile.in
-@@ -943,7 +943,7 @@ ACLOCAL_AMFLAGS = -I m4 -I ../m4 -I gnul
+@@ -1159,7 +1159,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
@@ -11,7 +11,7 @@ $NetBSD: patch-aj,v 1.5 2011/04/12 17:41:28 adam Exp $
  
  # Allow users to use "gnulib-tool --update".
  
-@@ -1410,7 +1410,7 @@ info: info-recursive
+@@ -1637,7 +1637,7 @@ info: info-recursive
  
  info-am:
  
diff --git a/devel/gettext/patches/patch-ak b/devel/gettext/patches/patch-ak
index 4c1369df811..482e7e5c8ff 100644
--- a/devel/gettext/patches/patch-ak
+++ b/devel/gettext/patches/patch-ak
@@ -1,11 +1,11 @@
-$NetBSD: patch-ak,v 1.6 2011/04/12 17:41:28 adam Exp $
+$NetBSD: patch-ak,v 1.7 2013/01/31 21:45:04 adam Exp $
 
---- gettext-runtime/intl/Makefile.in.orig	2010-06-06 12:49:57.000000000 +0000
+--- gettext-runtime/intl/Makefile.in.orig	2012-12-25 05:16:50.000000000 +0000
 +++ gettext-runtime/intl/Makefile.in
-@@ -379,7 +379,7 @@ check: all
+@@ -378,7 +378,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'.
+ # package, you have to use "configure --with-included-gettext".
 -install: install-exec install-data
 +install:
  install-exec: all
diff --git a/devel/gettext/patches/patch-al b/devel/gettext/patches/patch-al
index d674cd2f513..945b0301b89 100644
--- a/devel/gettext/patches/patch-al
+++ b/devel/gettext/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.3 2011/04/12 17:41:28 adam Exp $
+$NetBSD: patch-al,v 1.4 2013/01/31 21:45:04 adam Exp $
 
 --- gettext-tools/po/Makefile.in.in.orig	2010-06-06 12:49:57.000000000 +0000
 +++ gettext-tools/po/Makefile.in.in
-@@ -207,7 +207,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
+@@ -216,7 +216,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
  	fi
  
  
diff --git a/devel/gettext/patches/patch-am b/devel/gettext/patches/patch-am
index e5098ac44e7..5c37d37dc56 100644
--- a/devel/gettext/patches/patch-am
+++ b/devel/gettext/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.3 2011/04/12 17:41:28 adam Exp $
+$NetBSD: patch-am,v 1.4 2013/01/31 21:45:04 adam Exp $
 
---- gettext-tools/man/Makefile.in.orig	2010-06-06 20:12:31.000000000 +0000
+--- gettext-tools/man/Makefile.in.orig	2012-12-25 05:33:33.000000000 +0000
 +++ gettext-tools/man/Makefile.in
-@@ -1185,8 +1185,7 @@ gettextize.x autopoint.x
+@@ -1433,8 +1433,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 \
diff --git a/devel/gettext/patches/patch-an b/devel/gettext/patches/patch-an
index 5773ca36e66..fd1d4e510c3 100644
--- a/devel/gettext/patches/patch-an
+++ b/devel/gettext/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.3 2011/04/12 17:41:28 adam Exp $
+$NetBSD: patch-an,v 1.4 2013/01/31 21:45:04 adam Exp $
 
 --- Makefile.in.orig	2010-06-06 20:12:52.000000000 +0000
 +++ Makefile.in
-@@ -211,7 +211,7 @@ top_builddir = @top_builddir@
+@@ -249,7 +249,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
  ACLOCAL_AMFLAGS = -I m4
diff --git a/devel/gettext/patches/patch-ao b/devel/gettext/patches/patch-ao
index be8512ccb30..d14de8de59c 100644
--- a/devel/gettext/patches/patch-ao
+++ b/devel/gettext/patches/patch-ao
@@ -1,6 +1,6 @@
-$NetBSD: patch-ao,v 1.4 2011/04/12 17:41:28 adam Exp $
+$NetBSD: patch-ao,v 1.5 2013/01/31 21:45:04 adam Exp $
 
---- gettext-tools/config.h.in.orig	2010-06-06 20:12:24.000000000 +0000
+--- gettext-tools/config.h.in.orig	2012-12-25 05:33:29.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.4 2011/04/12 17:41:28 adam Exp $
  
  /* Default value for alignment of strings in .mo file.  */
  #define DEFAULT_OUTPUT_ALIGNMENT 1
-@@ -1717,8 +1721,12 @@
- /* Define to 1 if you have the `wctob' function. */
+@@ -2009,8 +2013,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.4 2011/04/12 17:41:28 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