diff options
author | adam <adam@pkgsrc.org> | 2013-01-31 21:45:03 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2013-01-31 21:45:03 +0000 |
commit | fa99a4de6b89f6caa980badab74bc5ee4fbfc3d0 (patch) | |
tree | 0832ad29d2d5e84c4559003a4eefb438b07ae953 /devel | |
parent | 4668aa81519d4d6907ea7fdcf5b46ae6d7d9106b (diff) | |
download | pkgsrc-fa99a4de6b89f6caa980badab74bc5ee4fbfc3d0.tar.gz |
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.
Diffstat (limited to 'devel')
27 files changed, 96 insertions, 116 deletions
diff --git a/devel/gettext-asprintf/Makefile b/devel/gettext-asprintf/Makefile index e6930f47526..c5cf6ad5385 100644 --- a/devel/gettext-asprintf/Makefile +++ b/devel/gettext-asprintf/Makefile @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.9 2011/04/12 17:41:28 adam Exp $ +# $NetBSD: Makefile,v 1.10 2013/01/31 21:45:04 adam Exp $ .include "../../devel/gettext/Makefile.common" PKGNAME= ${DISTNAME:S/-/-asprintf-/} COMMENT= Provides a printf-like interface for C++ +DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo +PATCHDIR= ${.CURDIR}/../../devel/gettext/patches + CONFIGURE_DIRS= gettext-runtime BUILD_DIRS= gettext-runtime/libasprintf diff --git a/devel/gettext-asprintf/distinfo b/devel/gettext-asprintf/distinfo deleted file mode 100644 index caa83c1ebe7..00000000000 --- a/devel/gettext-asprintf/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.3 2011/04/12 17:41:28 adam Exp $ - -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 diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile index 64a5eba1b21..465579ea3b8 100644 --- a/devel/gettext-lib/Makefile +++ b/devel/gettext-lib/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.53 2012/08/29 09:01:01 sbd Exp $ +# $NetBSD: Makefile,v 1.54 2013/01/31 21:45:04 adam Exp $ .include "../../devel/gettext/Makefile.common" PKGNAME= ${DISTNAME:S/-/-lib-/} -PKGREVISION= 1 SVR4_PKGNAME= gttli COMMENT= Internationalized Message Handling Library (libintl) diff --git a/devel/gettext-lib/distinfo b/devel/gettext-lib/distinfo index 98394463c74..7d041696a78 100644 --- a/devel/gettext-lib/distinfo +++ b/devel/gettext-lib/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.18 2011/04/12 17:41:28 adam Exp $ +$NetBSD: distinfo,v 1.19 2013/01/31 21:45:04 adam Exp $ -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 +SHA1 (gettext-0.18.2.tar.gz) = 47685e20abf9df6e5fede9efd04442943a96818b +RMD160 (gettext-0.18.2.tar.gz) = d46eebcab3b8125e16b9f039ff4da5efabc380ff +Size (gettext-0.18.2.tar.gz) = 15697875 bytes +SHA1 (patch-aa) = aed0e4e34c45fd442ee15254f494fe02c9dd55f7 +SHA1 (patch-ab) = 74694c609b942038e8db88bd8ff8edd4700a175f diff --git a/devel/gettext-lib/patches/patch-aa b/devel/gettext-lib/patches/patch-aa index 17b3e8d05f8..923d502f7cf 100644 --- a/devel/gettext-lib/patches/patch-aa +++ b/devel/gettext-lib/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.7 2011/04/12 17:41:28 adam Exp $ +$NetBSD: patch-aa,v 1.8 2013/01/31 21:45:04 adam Exp $ ---- gettext-runtime/intl/localcharset.c.orig 2010-06-06 12:49:57.000000000 +0000 +--- gettext-runtime/intl/localcharset.c.orig 2012-12-24 00:33:38.000000000 +0000 +++ gettext-runtime/intl/localcharset.c -@@ -21,6 +21,10 @@ +@@ -19,6 +19,10 @@ #include <config.h> @@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.7 2011/04/12 17:41:28 adam Exp $ /* Specification. */ #include "localcharset.h" -@@ -547,3 +551,4 @@ locale_charset (void) +@@ -556,3 +560,4 @@ locale_charset (void) return codeset; } diff --git a/devel/gettext-lib/patches/patch-ab b/devel/gettext-lib/patches/patch-ab index 4f38a71dfa5..05ed2da61f7 100644 --- a/devel/gettext-lib/patches/patch-ab +++ b/devel/gettext-lib/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.5 2011/04/12 17:41:28 adam Exp $ +$NetBSD: patch-ab,v 1.6 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 -@@ -223,8 +223,7 @@ libintl.la libgnuintl.la: $(OBJECTS) $(O +@@ -222,8 +222,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) \ @@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.5 2011/04/12 17:41:28 adam Exp $ # Libtool's library version information for libintl. # Before making a gettext release, the gettext maintainer must change this -@@ -386,7 +385,7 @@ install-exec: all +@@ -385,7 +384,7 @@ install-exec: all $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ $(LIBTOOL) --mode=install \ diff --git a/devel/gettext-m4/Makefile b/devel/gettext-m4/Makefile index 9d19303e1a1..c413b244f50 100644 --- a/devel/gettext-m4/Makefile +++ b/devel/gettext-m4/Makefile @@ -1,13 +1,15 @@ -# $NetBSD: Makefile,v 1.19 2011/12/27 21:18:05 christos Exp $ +# $NetBSD: Makefile,v 1.20 2013/01/31 21:45:04 adam Exp $ .include "../../devel/gettext/Makefile.common" PKGNAME= ${DISTNAME:S/-/-m4-/} -PKGREVISION= 1 SVR4_PKGNAME= gttm4 COMMENT= Autoconf/automake m4 files for GNU NLS library LICENSE= gnu-gpl-v2 +DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo +PATCHDIR= ${.CURDIR}/../../devel/gettext/patches + NO_BUILD= yes NO_CONFIGURE= yes diff --git a/devel/gettext-m4/PLIST b/devel/gettext-m4/PLIST index 2377f6850ef..7a1649e3989 100644 --- a/devel/gettext-m4/PLIST +++ b/devel/gettext-m4/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2011/12/27 21:18:05 christos Exp $ -share/aclocal/ansi-c++.m4 +@comment $NetBSD: PLIST,v 1.6 2013/01/31 21:45:04 adam Exp $ share/aclocal/codeset.m4 share/aclocal/exported.m4 share/aclocal/fcntl-o.m4 diff --git a/devel/gettext-m4/distinfo b/devel/gettext-m4/distinfo deleted file mode 100644 index 402d38dbff2..00000000000 --- a/devel/gettext-m4/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.5 2011/04/12 17:41:28 adam Exp $ - -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 diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile index 8b1042b2688..058c85b6bfd 100644 --- a/devel/gettext-tools/Makefile +++ b/devel/gettext-tools/Makefile @@ -1,22 +1,19 @@ -# $NetBSD: Makefile,v 1.19 2011/12/17 10:15:12 sbd Exp $ +# $NetBSD: Makefile,v 1.20 2013/01/31 21:45:05 adam Exp $ .include "../../devel/gettext/Makefile.common" PKGNAME= ${DISTNAME:S/-/-tools-/} -PKGREVISION= 3 COMMENT= Tools for providing messages in different languages -#MAKE_JOBS_SAFE= no - DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo PATCHDIR= ${.CURDIR}/../../devel/gettext/patches USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes -CONFIGURE_ARGS+= --without-included-gettext CONFIGURE_ARGS+= --disable-csharp -CONFIGURE_ARGS+= --without-git CONFIGURE_ARGS+= --with-included-libcroco +CONFIGURE_ARGS+= --without-git +CONFIGURE_ARGS+= --without-included-gettext CONFIGURE_ENV+= GCJ= ac_cv_prog_GCJ= ac_cv_prog_JAR= CONFIGURE_ENV+= HAVE_GCJ_IN_PATH= CONFIGURE_ENV+= HAVE_JAVAC_IN_PATH= @@ -37,6 +34,7 @@ post-install: ${INSTALL_MAN} ${WRKSRC}/gettext-tools/man/gettextize.1 \ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 -.include "../../mk/termcap.buildlink3.mk" +.include "../../archivers/xz/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gettext-tools/PLIST b/devel/gettext-tools/PLIST index 5f1eee8b0dc..6fe3efc07e1 100644 --- a/devel/gettext-tools/PLIST +++ b/devel/gettext-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2011/07/13 20:50:05 tron Exp $ +@comment $NetBSD: PLIST,v 1.9 2013/01/31 21:45:05 adam Exp $ bin/autopoint bin/envsubst bin/gettext @@ -111,7 +111,7 @@ share/doc/gettext/recode-sr-latin.1.html share/doc/gettext/textdomain.3.html share/doc/gettext/tutorial.html share/doc/gettext/xgettext.1.html -share/gettext/archive.dir.tar.gz +share/gettext/archive.dir.tar.xz share/locale/be/LC_MESSAGES/gettext-runtime.mo share/locale/be/LC_MESSAGES/gettext-tools.mo share/locale/bg/LC_MESSAGES/gettext-runtime.mo @@ -143,6 +143,7 @@ share/locale/fr/LC_MESSAGES/gettext-tools.mo share/locale/ga/LC_MESSAGES/gettext-runtime.mo share/locale/gl/LC_MESSAGES/gettext-runtime.mo share/locale/gl/LC_MESSAGES/gettext-tools.mo +share/locale/hr/LC_MESSAGES/gettext-runtime.mo share/locale/id/LC_MESSAGES/gettext-runtime.mo share/locale/id/LC_MESSAGES/gettext-tools.mo share/locale/it/LC_MESSAGES/gettext-runtime.mo @@ -157,6 +158,7 @@ share/locale/nl/LC_MESSAGES/gettext-runtime.mo share/locale/nl/LC_MESSAGES/gettext-tools.mo share/locale/nn/LC_MESSAGES/gettext-runtime.mo share/locale/nn/LC_MESSAGES/gettext-tools.mo +share/locale/pa/LC_MESSAGES/gettext-tools.mo share/locale/pl/LC_MESSAGES/gettext-runtime.mo share/locale/pl/LC_MESSAGES/gettext-tools.mo share/locale/pt/LC_MESSAGES/gettext-runtime.mo diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 3c7c6824f50..bc55d440e76 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.80 2011/10/20 10:22:51 adam Exp $ +# $NetBSD: Makefile,v 1.81 2013/01/31 21:45:03 adam Exp $ .include "../../devel/gettext/Makefile.common" -PKGREVISION= 1 - COMMENT= Tools for providing messages in different languages LICENSE= gnu-gpl-v2 diff --git a/devel/gettext/Makefile.common b/devel/gettext/Makefile.common index f751dcfed41..e769916a759 100644 --- a/devel/gettext/Makefile.common +++ b/devel/gettext/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2012/10/31 11:16:59 asau Exp $ +# $NetBSD: Makefile.common,v 1.3 2013/01/31 21:45:03 adam 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.1.1 +DISTNAME= gettext-0.18.2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=gettext/} diff --git a/devel/gettext/PLIST b/devel/gettext/PLIST index f4e25f11c7d..55ad620b160 100644 --- a/devel/gettext/PLIST +++ b/devel/gettext/PLIST @@ -1,12 +1,10 @@ -@comment $NetBSD: PLIST,v 1.14 2011/10/20 10:22:51 adam Exp $ +@comment $NetBSD: PLIST,v 1.15 2013/01/31 21:45:03 adam Exp $ lib/gettext/hostname lib/gettext/project-id lib/gettext/urlget lib/gettext/user-email share/gettext/ABOUT-NLS share/gettext/config.rpath -share/gettext/intl/COPYING.LIB-2.0 -share/gettext/intl/COPYING.LIB-2.1 share/gettext/intl/ChangeLog share/gettext/intl/Makefile.in share/gettext/intl/VERSION @@ -30,7 +28,7 @@ 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/libgnuintl.in.h share/gettext/intl/libintl.rc share/gettext/intl/loadinfo.h share/gettext/intl/loadmsgcat.c @@ -67,6 +65,7 @@ share/gettext/intl/tsearch.h share/gettext/intl/vasnprintf.c share/gettext/intl/vasnprintf.h share/gettext/intl/vasnwprintf.h +share/gettext/intl/verify.h share/gettext/intl/version.c share/gettext/intl/wprintf-parse.h share/gettext/intl/xsize.h diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo index 3d7b46a1f6b..204c179ba18 100644 --- a/devel/gettext/distinfo +++ b/devel/gettext/distinfo @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.20 2011/08/05 00:36:09 adam Exp $ +$NetBSD: distinfo,v 1.21 2013/01/31 21:45:03 adam Exp $ -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) = 9def50f2976ee7e84bbd809662c296108c5e0483 -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 +SHA1 (gettext-0.18.2.tar.gz) = 47685e20abf9df6e5fede9efd04442943a96818b +RMD160 (gettext-0.18.2.tar.gz) = d46eebcab3b8125e16b9f039ff4da5efabc380ff +Size (gettext-0.18.2.tar.gz) = 15697875 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 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 |