head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.24 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.22 pkgsrc-2012Q4-base:1.9 pkgsrc-2011Q4:1.9.0.20 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q2:1.9.0.18 pkgsrc-2011Q2-base:1.9 pkgsrc-2009Q4:1.9.0.16 pkgsrc-2009Q4-base:1.9 pkgsrc-2008Q4:1.9.0.14 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.12 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.10 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.8 pkgsrc-2008Q2-base:1.9 pkgsrc-2008Q1:1.9.0.6 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.4 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.9.0.2 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.7.0.6 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.4 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.2 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.6.0.2 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.5.0.16 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.14 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.12 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.10 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.8 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.6 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.4 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.2 pkgsrc-2004Q3-base:1.5 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.2 pkgsrc-2003Q4-base:1.3; locks; strict; comment @# @; 1.9 date 2007.09.18.20.22.13; author drochner; state dead; branches; next 1.8; 1.8 date 2007.08.08.21.57.16; author wiz; state Exp; branches; next 1.7; 1.7 date 2006.12.15.19.31.47; author drochner; state dead; branches; next 1.6; 1.6 date 2006.08.29.14.03.39; author joerg; state Exp; branches; next 1.5; 1.5 date 2004.06.27.17.27.12; author jmmv; state dead; branches; next 1.4; 1.4 date 2003.12.13.17.19.26; author jmmv; state Exp; branches; next 1.3; 1.3 date 2003.08.17.19.47.39; author jmmv; state Exp; branches; next 1.2; 1.2 date 2003.06.03.19.27.53; author jmmv; state Exp; branches; next 1.1; 1.1 date 2003.02.19.13.22.55; author jmmv; state Exp; branches; next ; desc @@ 1.9 log @update to 0.36.2 changes: minor bugfixes @ text @$NetBSD: patch-aa,v 1.8 2007/08/08 21:57:16 wiz Exp $ --- intltool-merge.in.in.orig 2007-08-03 01:35:52.000000000 +0200 +++ intltool-merge.in.in @@@@ -115,13 +115,6 @@@@ sub isGNUGettextTool return 0; } -if (! isGNUGettextTool ("$iconv")) -{ - print STDERR " *** GNU iconv is not found on this system!\n". - " *** Without it, intltool-merge can not convert encodings.\n"; - exit; -} - # Use this instead of \w for XML files to handle more possible characters. my $w = "[-A-Za-z0-9._:]"; @ 1.8 log @Do not insist on GNU iconv. NetBSD iconv, for example, is perfectly fine. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @update to 0.35.1 changes: -Make regex patterns greedier, to avoid perl stack overflows -Add code to detect DATADIRNAME -Support older/non-GNU versions of diff when validating tests -Add new mode to support quoted text in any file -Fix the warning message for missing IT_PROG_INTLTOOL and error out @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2006/08/29 14:03:39 joerg Exp $ d3 1 a3 1 --- intltool-merge.in.in.orig 2006-08-28 10:58:43.000000000 +0200 d5 3 a7 12 @@@@ -415,7 +415,7 @@@@ sub create_translation_database { $nextfuzzy = 1 if /^#, fuzzy/; - if (/^msgid "((\\.|[^\\])*)"/ ) + if (/^msgid "((\\.|[^\\]+)*)"/ ) { $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr; $msgid = ""; @@@@ -431,14 +431,14 @@@@ sub create_translation_database $nextfuzzy = 0; } d9 9 a17 7 - if (/^msgstr "((\\.|[^\\])*)"/) + if (/^msgstr "((\\.|[^\\]+)*)"/) { $msgstr = unescape_po_string($1); $inmsgstr = 1; $inmsgid = 0; } a18 5 - if (/^"((\\.|[^\\])*)"/) + if (/^"((\\.|[^\\]+)*)"/) { $msgid .= unescape_po_string($1) if $inmsgid; $msgstr .= unescape_po_string($1) if $inmsgstr; @ 1.6 log @Adjust regex patterns used for line matching in translation catalogs to generate less back tracing. On DragonFly 1.6 (but not 1.4) Perl would hit the stack size in wm/metacity's dz.po otherwise. Thanks to walt for the tracing down the faulting expression. Bump revision. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Update to 0.31. While here, make this package also install the xml-i18n-tools utility to obsolete the standalone xml-i18n-tools package. Changes since 0.30: * Usage of [no-xml] option in AC_PROG_INTLTOOL to avoid requiring XML::Parser Perl module. (Rodney Dawes) * Support for C#. (Rodney) * Support for running intltool-update without autoconf, or with po/Makevars file (as used in gettext). (Danilo Segan) * New XML merging (compatible with pre-0.27.2 intltool) -- bug #130802 -- entity decoding and encoding is not done anymore for XML. (Danilo) * Multiple-output XML merging now produces simpler files, and sets "xml:lang" only when translation is used -- bug #46650. (Danilo) * Support for passing comments to translators from XML and GConf schema files. (Danilo) * Many bug fixes (Rodney, Danilo, Callum McKenzie) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2003/12/13 17:19:26 jmmv Exp $ d3 28 a30 29 --- Makefile.in.orig 2003-12-08 23:47:27.000000000 +0100 +++ Makefile.in @@@@ -70,7 +70,7 @@@@ SUBDIRS = . tests doc doc-i18n-tool modu NULL = -aclocal_macros = intltool.m4 xml-i18n-tools.m4 +aclocal_macros = intltool.m4 CLEANFILES = \ intltoolize \ @@@@ -99,9 +99,6 @@@@ pkgdata_DATA = \ intltool-po-Makefile.in.in-patch-6 \ intltool-po-Makefile.in.in-patch-7 \ intltool-po-Makefile.in.in-patch-8 \ - xml-i18n-po-Makefile.in.in-patch-1 \ - xml-i18n-po-Makefile.in.in-patch-2 \ - xml-i18n-po-Makefile.in.in-patch-5 \ $(NULL) @@@@ -112,7 +109,6 @@@@ aclocal_DATA = $(aclocal_macros) bin_SCRIPTS = \ intltoolize \ - xml-i18n-toolize \ intltool-update \ intltool-merge \ intltool-extract \ @ 1.4 log @Update to 0.28 and take maintainership: * made intltool-merge use XML::Parser (#116526 and others) [Brian Cameron] - added and updated tests - updated so that intltool-merge doesn't add a trailing '\n' character to CDATA values. - Corrected the logic of encoding/decoding the string before/after translation. - Added it to build, made it install (Kenneth Christiansen) - Added missing DESTDIR (Abel Cheung) - Also nstall OrigTree.pm in the distribution tree (Malcolm Tredinnick) - Check for the XML::Parser module at build time (Malcolm Tredinnick) * Added INTLTOOL_KBD_RULE for GOK\s *.kdb files (Bill Haneman) * Added --multiple-output option (Kenneth Christiansen) * Avoid bashism in xgettext version check. (#120267) (Abel Cheung) * Handle standard GNU gettext 0.12 and 0.13 installations (Malcolm Tredinnick) * Fix the running of test 18 (multiple output test) (Malcolm Tredinnick) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2003/08/17 19:47:39 jmmv Exp $ @ 1.3 log @Update to 0.27.1: - Fixed .xam support (Abel Cheung) - Fixed intltool-update, it's not usable with 0.27 :-( (Carlos Perelló Marín) - intltool-update -m tells you about files that are at POTFILES.in but does not exists anymore (Abel Cheung) - Small scheme support fixes (Callum McKenzie) - Added support for .lang files (Gustavo Giraldez) - Added support for .xam files (Abel Cheung) - Updated I18N-HOWTO (Kenneth, Bruno Haible) - Updated all manual pages and command help (Abel Cheung) - Improved the package name detection code (Abel Cheung) - better .server files handling (Abel Cheung) - source code with non-ASCII chars support with GNU gettext 0.12 (bug #99005, Abel Cheung, Carlos Perelló Marín) - intltool-unicodify is deprecated, please use msgconv (Abel Cheung) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2003/06/03 19:27:53 jmmv Exp $ d3 1 a3 1 --- Makefile.in.orig 2003-08-12 02:07:57.000000000 +0200 d5 1 a5 1 @@@@ -75,13 +75,13 @@@@ SUBDIRS = . tests doc doc-i18n-tool d12 20 a31 18 CLEANFILES = intltoolize xml-i18n-toolize intltool-extract.in intltool-merge.in intltool-update.in intltool-extract intltool-merge intltool-prepare intltool-update *.gz $(NULL) # These are required by intltoolize and xml-i18n-toolize. -pkgdata_DATA = intltool-extract.in intltool-merge.in intltool-update.in intltool-po-Makefile.in.in-patch-1 intltool-po-Makefile.in.in-patch-2 intltool-po-Makefile.in.in-patch-3 intltool-po-Makefile.in.in-patch-4 intltool-po-Makefile.in.in-patch-5 intltool-po-Makefile.in.in-patch-6 intltool-po-Makefile.in.in-patch-7 xml-i18n-po-Makefile.in.in-patch-1 xml-i18n-po-Makefile.in.in-patch-2 xml-i18n-po-Makefile.in.in-patch-5 $(NULL) +pkgdata_DATA = intltool-extract.in intltool-merge.in intltool-update.in intltool-po-Makefile.in.in-patch-1 intltool-po-Makefile.in.in-patch-2 intltool-po-Makefile.in.in-patch-3 intltool-po-Makefile.in.in-patch-4 intltool-po-Makefile.in.in-patch-5 intltool-po-Makefile.in.in-patch-6 intltool-po-Makefile.in.in-patch-7 $(NULL) # This macro file should be visible to Automake's aclocal. @@@@ -89,7 +89,7 @@@@ aclocal_DATA = $(aclocal_macros) # The intltool distributor and installed versions of scripts -bin_SCRIPTS = intltoolize xml-i18n-toolize intltool-update intltool-merge intltool-extract intltool-prepare $(NULL) +bin_SCRIPTS = intltoolize intltool-update intltool-merge intltool-extract intltool-prepare $(NULL) EXTRA_DIST = $(aclocal_macros) intltoolize.in xml-i18n-toolize.in intltool-extract.in.in intltool-merge.in.in intltool-update.in.in intltool-prepare.in intltool.spec.in $(pkgdata_DATA) $(NULL) @ 1.2 log @Update to 0.26: - Handle no translations in get_newest_po_age (Rodney Dawes) - Cleaned up tests and fixed few bugs (Kenneth) - Send error messages to stderr, and fix other similar bugs (bug #105013, Denis Barbier) - handle using a different output file. (James Henstridge) - Correct the invocation of INTLTOOL_MERGE. (bug #106898, Malcolm Tredinnick) - Extract attributes in XML when there are spaces arount the equal sign (Alberto Manuel Brand?o Sim?es) - use iconv -f, instead of iconv --f (bug #105181, Hidetoshi Tajima) - Added variable substitution. (Kenneth) - Added small section for packages not using the aufo* tools (Kenneth) - Call msgmerge with options before non-options to fix potential non-GNU getopt issues. (Gregory Stark, Jordi Mallach) - Make it work when running an UTF-8 locale (Kenneth) - Fix some iconv/charset issues (bug #113121, Morten Welinder) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2003/02/19 13:22:55 jmmv Exp $ d3 1 a3 1 --- Makefile.in.orig 2003-05-17 12:58:55.000000000 +0200 d5 1 a5 1 @@@@ -69,7 +69,7 @@@@ SUBDIRS = . tests doc doc-i18n-tool d12 18 a29 20 CLEANFILES = \ intltoolize \ @@@@ -98,9 +98,6 @@@@ pkgdata_DATA = \ intltool-po-Makefile.in.in-patch-5 \ intltool-po-Makefile.in.in-patch-6 \ intltool-po-Makefile.in.in-patch-7 \ - xml-i18n-po-Makefile.in.in-patch-1 \ - xml-i18n-po-Makefile.in.in-patch-2 \ - xml-i18n-po-Makefile.in.in-patch-5 \ $(NULL) @@@@ -111,7 +108,6 @@@@ aclocal_DATA = $(aclocal_macros) bin_SCRIPTS = \ intltoolize \ - xml-i18n-toolize \ intltool-update \ intltool-merge \ intltool-extract \ @ 1.1 log @Do not install the xml-i18n-toolize program, so this package can coexist with xml-i18n-tools. Bump PKGREVISION. This fixes the build of the gnome meta-package; pointed out by tron. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.in.orig 2003-01-06 20:50:41.000000000 +0100 d14 1 a14 2 @@@@ -97,9 +97,6 @@@@ pkgdata_DATA = \ intltool-po-Makefile.in.in-patch-4 \ d17 1 d24 1 a24 1 @@@@ -110,7 +107,6 @@@@ aclocal_DATA = $(aclocal_macros) @