head 1.10; access; symbols pkgsrc-2013Q2:1.9.0.4 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.2 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.8.0.14 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.12 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.10 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.8 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.6 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.4 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.2 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.7.0.42 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.40 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.38 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.36 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.34 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.32 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.30 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.28 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.26 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.24 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.22 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.20 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.18 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.16 pkgsrc-2008Q1:1.7.0.14 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.12 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.10 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.8 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.6 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.4 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.2 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.6.0.4 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.2 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.4.0.16 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.14 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.12 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.10 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.8 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.6 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.4 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.2 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.3.0.4 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1 netbsd-1-5-PATCH001:1.1 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1; locks; strict; comment @# @; 1.10 date 2013.07.21.20.27.20; author wiz; state dead; branches; next 1.9; commitid isRYmLv5ePFRtnYw; 1.9 date 2013.01.31.21.45.04; author adam; state Exp; branches; next 1.8; 1.8 date 2011.04.12.17.41.28; author adam; state Exp; branches; next 1.7; 1.7 date 2006.07.26.06.53.02; author adam; state Exp; branches; next 1.6; 1.6 date 2006.02.11.17.44.39; author joerg; state Exp; branches; next 1.5; 1.5 date 2006.02.05.22.45.54; author joerg; state Exp; branches; next 1.4; 1.4 date 2003.12.05.18.15.49; author erh; state Exp; branches; next 1.3; 1.3 date 2002.12.11.22.27.26; author jlam; state Exp; branches; next 1.2; 1.2 date 2002.11.27.17.41.07; author drochner; state dead; branches; next 1.1; 1.1 date 2000.06.30.17.07.36; author danw; state Exp; branches; next ; desc @@ 1.10 log @Remove unneeded patch after gettext-0.18.3 update. @ text @$NetBSD: patch-ah,v 1.9 2013/01/31 21:45:04 adam Exp $ --- gettext-tools/src/Makefile.in.orig 2012-12-25 05:33:34.000000000 +0000 +++ gettext-tools/src/Makefile.in @@@@ -2901,7 +2901,7 @@@@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-binPROGRAMS install-exec-local \ +install-exec-am: install-binPROGRAMS \ install-libLTLIBRARIES install-html: install-html-am @@@@ -2965,14 +2965,6 @@@@ uninstall-am: uninstall-binPROGRAMS unin uninstall-local -# No need to install libgettextsrc.a, except on AIX. -install-exec-local: install-libLTLIBRARIES install-exec-clean -install-exec-clean: - case "@@host_os@@" in \ - aix*) ;; \ - *) $(RM) $(DESTDIR)$(libdir)/libgettextsrc.a ;; \ - esac - 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 @@@@ -3076,12 +3068,12 @@@@ uninstall-csharp-yes: all-csharp-yes $(RM) $(DESTDIR)$(pkglibdir)/msgunfmt.net.exe uninstall-csharp-no: -install-data-local: install-tcl +install-data-local: install-tcl: $(mkdir_p) $(DESTDIR)$(pkgdatadir) $(INSTALL_DATA) $(srcdir)/msgunfmt.tcl $(DESTDIR)$(pkgdatadir)/msgunfmt.tcl -installdirs-local: installdirs-tcl +installdirs-local: installdirs-tcl: $(mkdir_p) $(DESTDIR)$(pkgdatadir) @ 1.9 log @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. @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @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, 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. @ text @d3 1 a3 1 --- gettext-tools/src/Makefile.in.orig 2010-06-06 20:12:32.000000000 +0000 d5 1 a5 1 @@@@ -2763,7 +2763,7 @@@@ install-dvi: install-dvi-am d14 1 a14 1 @@@@ -2827,14 +2827,6 @@@@ uninstall-am: uninstall-binPROGRAMS unin d29 1 a29 1 @@@@ -2938,12 +2930,12 @@@@ uninstall-csharp-yes: all-csharp-yes @ 1.7 log @Changes 0.14.6: * Updated the meaning of 'gcc-internal-format' to match GCC 4.1. @ text @d3 1 a3 1 --- gettext-tools/src/Makefile.in.orig 2006-06-21 18:53:45.000000000 +0200 d5 1 a5 27 @@@@ -183,9 +183,7 @@@@ msggrep_DEPENDENCIES = $(am__DEPENDENCIE am_msginit_OBJECTS = msginit-msginit.$(OBJEXT) \ msginit-plural-count.$(OBJEXT) msginit-localealias.$(OBJEXT) msginit_OBJECTS = $(am_msginit_OBJECTS) -msginit_DEPENDENCIES = \ - ../intl/localename.@@INTL_LIBTOOL_SUFFIX_PREFIX@@o \ - libgettextsrc.la +msginit_DEPENDENCIES = libgettextsrc.la am_msgmerge_OBJECTS = msgmerge-msgmerge.$(OBJEXT) \ msgmerge-plural-count.$(OBJEXT) msgmerge_OBJECTS = $(am_msgmerge_OBJECTS) @@@@ -591,7 +589,7 @@@@ urlget_SOURCES = urlget.c # use iconv(). libgettextsrc_la_LDFLAGS = \ -release @@VERSION@@ \ - ../lib/libgettextlib.la @@LTLIBINTL@@ @@LTLIBICONV@@ -lc -no-undefined + ../lib/libgettextlib.la @@LTLIBINTL@@ @@LTLIBICONV@@ -lc # How to build libgettextpo.la. @@@@ -622,8 +620,7 @@@@ msgen_LDADD = libgettextsrc.la @@INTL_MAC msgexec_LDADD = libgettextsrc.la @@INTL_MACOSX_LIBS@@ msgfilter_LDADD = libgettextsrc.la @@INTL_MACOSX_LIBS@@ msggrep_LDADD = $(LIBGREP) libgettextsrc.la @@INTL_MACOSX_LIBS@@ -msginit_LDADD = ../intl/localename.@@INTL_LIBTOOL_SUFFIX_PREFIX@@o \ - libgettextsrc.la @@INTL_MACOSX_LIBS@@ +msginit_LDADD = libgettextsrc.la @@INTL_MACOSX_LIBS@@ d7 1 a7 5 msguniq_LDADD = libgettextsrc.la @@INTL_MACOSX_LIBS@@ @@@@ -1348,7 +1345,7 @@@@ info-am: install-data-am: install-data-local install-includeHEADERS d13 3 a15 3 install-info: install-info-am @@@@ -1395,14 +1392,6 @@@@ uninstall-am: uninstall-binPROGRAMS unin uninstall-info-am uninstall-libLTLIBRARIES uninstall-local d29 1 a29 1 @@@@ -1506,12 +1495,12 @@@@ uninstall-csharp-yes: all-csharp-yes d36 1 a36 1 $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) d42 1 a42 1 $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) @ 1.6 log @Remove localestatedir fragment, it gets handled properly automatically. Fix pkglint warning for SHLIBTOOL. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.5 2006/02/05 22:45:54 joerg Exp $ d3 1 a3 1 --- gettext-tools/src/Makefile.in.orig 2006-02-03 14:37:39.000000000 +0000 d5 1 a5 1 @@@@ -185,9 +185,7 @@@@ msggrep_DEPENDENCIES = $(am__DEPENDENCIE d16 1 a16 1 @@@@ -592,7 +590,7 @@@@ urlget_SOURCES = urlget.c d25 1 a25 1 @@@@ -623,8 +621,7 @@@@ msgen_LDADD = libgettextsrc.la @@INTL_MAC d35 1 a35 1 @@@@ -1349,7 +1346,7 @@@@ info-am: d44 1 a44 1 @@@@ -1396,14 +1393,6 @@@@ uninstall-am: uninstall-binPROGRAMS unin d59 1 a59 1 @@@@ -1507,12 +1496,12 @@@@ uninstall-csharp-yes: all-csharp-yes @ 1.5 log @Update gettext to 0.14.5. Many bugfixes and improvements, including support for relocable programs, Qt support, separation of the PO processing functions into a separate library and more. Reorganise the gettext infrastructure by splitting of the tools into devel/gettext-tools, which will be used by the tools framework. The remaining devel/gettext package contains gettextize and autopoint aka the infrastructure to embbed gettext into a package. Due to the ABI and API changes, a recursive revision bump will follow. Take blaim by receiving the maintainer hat. With input from jlam@@, reed@@ and wiz@@. @ text @d1 1 a1 1 $NetBSD$ a15 9 @@@@ -449,7 +447,7 @@@@ install_sh = @@install_sh@@ libdir = @@libdir@@ libexecdir = @@libexecdir@@ lispdir = @@lispdir@@ -localedir = $(datadir)/locale +localedir = /usr/pkg/share/locale localstatedir = @@localstatedir@@ mandir = @@mandir@@ mkdir_p = @@mkdir_p@@ @ 1.4 log @If we're on AIX, don't remove the .a library: it's the shared library. Combine patch-ai into patch-ah to make future updates easier. @ text @d1 1 a1 1 $NetBSD: $ d3 23 a25 3 --- src/Makefile.in.orig 2002-08-06 08:59:06.000000000 -0500 +++ src/Makefile.in 2003-12-04 17:34:23.000000000 -0600 @@@@ -248,7 +248,7 @@@@ d33 32 a64 34 # Link dependencies. @@@@ -267,9 +267,7 @@@@ msgexec_LDADD = libgettextsrc.la msgfilter_LDADD = libgettextsrc.la msggrep_LDADD = libgettextsrc.la -msginit_LDADD = ../intl/localealias.@@INTL_LIBTOOL_SUFFIX_PREFIX@@o \ - ../intl/localename.@@INTL_LIBTOOL_SUFFIX_PREFIX@@o \ - libgettextsrc.la +msginit_LDADD = libgettextsrc.la msguniq_LDADD = libgettextsrc.la @@@@ -367,9 +365,7 @@@@ msggrep_LDFLAGS = am_msginit_OBJECTS = msginit.$(OBJEXT) msginit_OBJECTS = $(am_msginit_OBJECTS) -msginit_DEPENDENCIES = ../intl/localealias.@@INTL_LIBTOOL_SUFFIX_PREFIX@@o \ - ../intl/localename.@@INTL_LIBTOOL_SUFFIX_PREFIX@@o \ - libgettextsrc.la +msginit_DEPENDENCIES = libgettextsrc.la msginit_LDFLAGS = am_msgmerge_OBJECTS = msgmerge.$(OBJEXT) msgmerge_OBJECTS = $(am_msgmerge_OBJECTS) @@@@ -731,9 +727,12 @@@@ # No need to install libgettextsrc.a. +# Unless we're on AIX, where .a's are shared libraries. install-exec-am: install-exec-clean install-exec-clean: +.if ${OPSYS} != "AIX" $(RM) $(DESTDIR)$(libdir)/libgettextsrc.a +.endif d67 16 @ 1.3 log @Don't use -no-undefined when building with libtool as it causes problems on Solaris due to a missing shared libgcc library. This addresses PR 19214 by grant@@netbsd.org. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- src/Makefile.in.orig Tue Aug 6 06:59:06 2002 +++ src/Makefile.in @@@@ -248,7 +248,7 @@@@ urlget_SOURCES = urlget.c d14 35 @ 1.2 log @bite the bullet and upgrade to 0.11.5 There are too many changes to list in a sensible way. The most visible change for me is that libintl requires libiconv now. Also untangled the 3 sub-pkgs -- a common patch dir makes it too complex. This pkg used to expose buildlink2 problems - the pkg libintl was pulled in in cases where USE_GNU_GETTEXT was not set. There were some improvements to libtool filtering, and x11/gtk builds now, so I hope this is settled. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.1 2000/06/30 17:07:36 danw Exp $ d3 8 a10 4 --- intl/loadinfo.h.orig Fri Jun 23 03:27:25 2000 +++ intl/loadinfo.h Fri Jun 23 03:52:01 2000 @@@@ -50,8 +50,8 @@@@ }; d13 1 a13 18 -extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset, - size_t name_len)); +extern char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset, + size_t name_len)); extern struct loaded_l10nfile * _nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list, @@@@ -70,7 +70,9 @@@@ const char **modifier, const char **territory, const char **codeset, - const char **normalized_codeset, + char **normalized_codeset, const char **special, const char **sponsor, const char **revision)); + +extern char *_nl_find_language PARAMS ((const char *name)); @ 1.1 log @Add bugfixes from glibc and build a shared library version of libintl. Bump version to 0.10.35nb1. @ text @d1 1 a1 1 $NetBSD$ @