diff options
| author | joerg <joerg@pkgsrc.org> | 2006-08-29 14:03:39 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-08-29 14:03:39 +0000 |
| commit | dacbbc80f99b6b153800fc4132a89ffd4cea03fc (patch) | |
| tree | 6fa3d6870d5f58727c5b7ff287832ca0fbd493ad /textproc | |
| parent | f3dc414d710150f230460616e0f9cf0bce88b75c (diff) | |
| download | pkgsrc-dacbbc80f99b6b153800fc4132a89ffd4cea03fc.tar.gz | |
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 <wa1ter@myrealbox.com> for the tracing down the faulting
expression.
Bump revision.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/intltool/Makefile | 3 | ||||
| -rw-r--r-- | textproc/intltool/distinfo | 3 | ||||
| -rw-r--r-- | textproc/intltool/patches/patch-aa | 30 |
3 files changed, 34 insertions, 2 deletions
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile index a9d87cf3d9b..82660ce8ca2 100644 --- a/textproc/intltool/Makefile +++ b/textproc/intltool/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2006/05/30 22:19:53 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2006/08/29 14:03:39 joerg Exp $ # DISTNAME= intltool-0.35.0 +PKGREVISION= 1 CATEGORIES= textproc devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/intltool/0.35/} EXTRACT_SUFX= .tar.bz2 diff --git a/textproc/intltool/distinfo b/textproc/intltool/distinfo index e0bc34b0708..58a01860e2e 100644 --- a/textproc/intltool/distinfo +++ b/textproc/intltool/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.19 2006/05/30 22:19:53 wiz Exp $ +$NetBSD: distinfo,v 1.20 2006/08/29 14:03:39 joerg Exp $ SHA1 (intltool-0.35.0.tar.bz2) = 5e4e90e79696dbca1798753bd4135aa8556887f4 RMD160 (intltool-0.35.0.tar.bz2) = 00cd68879d9743f52c03ca723f20ac0aab6e79e0 Size (intltool-0.35.0.tar.bz2) = 129933 bytes +SHA1 (patch-aa) = 8b28063597bd942b016d96ffc842197399ef818e diff --git a/textproc/intltool/patches/patch-aa b/textproc/intltool/patches/patch-aa new file mode 100644 index 00000000000..031a348ef6b --- /dev/null +++ b/textproc/intltool/patches/patch-aa @@ -0,0 +1,30 @@ +$NetBSD: patch-aa,v 1.6 2006/08/29 14:03:39 joerg Exp $ + +--- intltool-merge.in.in.orig 2006-08-28 10:58:43.000000000 +0200 ++++ intltool-merge.in.in +@@ -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; + } + +- if (/^msgstr "((\\.|[^\\])*)"/) ++ if (/^msgstr "((\\.|[^\\]+)*)"/) + { + $msgstr = unescape_po_string($1); + $inmsgstr = 1; + $inmsgid = 0; + } + +- if (/^"((\\.|[^\\])*)"/) ++ if (/^"((\\.|[^\\]+)*)"/) + { + $msgid .= unescape_po_string($1) if $inmsgid; + $msgstr .= unescape_po_string($1) if $inmsgstr; |