[pkgsrc/trunk]: pkgsrc/www/lynx GNU gettext-lib version < 0.11.x expects esca...

[ben <ben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d16448ff3b00
branches:  trunk
changeset: 470778:d16448ff3b00
user:      ben <ben%pkgsrc.org@localhost>
date:      Thu Mar 11 22:10:48 2004 +0000

description:
GNU gettext-lib version < 0.11.x expects escaped characters in a way
incompatible with newer versions of gettext-lib.  Detect gettext-lib
version and work around bug when necessary.

diffstat:

 www/lynx/Makefile         |  10 ++--------
 www/lynx/distinfo         |   3 ++-
 www/lynx/patches/patch-af |  16 ++++++++++++++++
 3 files changed, 20 insertions(+), 9 deletions(-)

diffs (66 lines):

diff -r 91a4a4f1ae9f -r d16448ff3b00 www/lynx/Makefile
--- a/www/lynx/Makefile Thu Mar 11 22:07:23 2004 +0000
+++ b/www/lynx/Makefile Thu Mar 11 22:10:48 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2004/03/03 21:14:41 ben Exp $
+# $NetBSD: Makefile,v 1.69 2004/03/11 22:10:48 ben Exp $
 #
 
 DISTNAME=      lynx2.8.5
-WRKSRC=                ${WRKDIR}/lynx2-8-5
 PKGNAME=       lynx-2.8.5
 CATEGORIES=    www
 MASTER_SITES=  http://lynx.isc.org/${DISTNAME}/ \
@@ -19,6 +18,7 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
+WRKSRC=                        ${WRKDIR}/${DISTNAME:S/./-/g}
 USE_BUILDLINK3=                yes
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
@@ -108,12 +108,6 @@
 CONFIGURE_ARGS+=       --enable-ipv6
 .endif
 
-SUBST_CLASSES+=                gettext
-SUBST_MESSAGE.gettext= "Fixing Chinese PO file."
-SUBST_STAGE.gettext=   post-patch
-SUBST_FILES.gettext=   po/zh_TW.po
-SUBST_SED.gettext=     '/^msgstr/s/\(\\[^"[:alpha:]]\)/\\\1/g'
-
 post-install:
        ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/lynx
 
diff -r 91a4a4f1ae9f -r d16448ff3b00 www/lynx/distinfo
--- a/www/lynx/distinfo Thu Mar 11 22:07:23 2004 +0000
+++ b/www/lynx/distinfo Thu Mar 11 22:10:48 2004 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2004/03/11 20:53:17 ben Exp $
+$NetBSD: distinfo,v 1.13 2004/03/11 22:10:48 ben Exp $
 
 SHA1 (lynx2.8.5.tar.bz2) = c70866f67c1365b55e0c9c0c569190f5919d28d4
 Size (lynx2.8.5.tar.bz2) = 2177287 bytes
 SHA1 (patch-aa) = ac17101b5dfa296298f1fcd58e8b14673c2855bb
 SHA1 (patch-ae) = 5dff036d9fc35dca528acb530f779dce4a98cddd
+SHA1 (patch-af) = 819cdfae5e8181423f5be68cc202a6e074560e75
diff -r 91a4a4f1ae9f -r d16448ff3b00 www/lynx/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/lynx/patches/patch-af Thu Mar 11 22:10:48 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1 2004/03/11 22:10:48 ben Exp $
+
+--- po/makefile.inn.orig       2004-01-28 11:30:38.000000000 -0800
++++ po/makefile.inn
+@@ -71,6 +71,11 @@ INSTOBJEXT = @INSTOBJEXT@
+       $(MSGFMT) -o $@ $<
+ 
+ .po.gmo:
++      @if [ `$(GMSGFMT) --version | head -1 | cut -d . -f 2` -lt 11 ]; then \
++              mv $< $<.bak; \
++              sed '/^msgstr/s/\([^\\]\)\(\\[^[:print:]]\)/\1\\\2/g' \
++                      <$<.bak >$<; \
++      fi
+       file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+         && rm -f $$file && $(GMSGFMT) -o $$file $<
+