[pkgsrc/trunk]: pkgsrc/graphics/gliv Add USE_TOOLS+=gawk and patch accordingl...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/be3ca6198aca
branches:  trunk
changeset: 544837:be3ca6198aca
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon Jul 21 04:50:40 2008 +0000

description:
Add USE_TOOLS+=gawk and patch accordingly due to heavily nonportable
awk scripts. Fixes PR 33851.

Bump version; the broken scripts were messing up the build without
causing it to overtly fail.

diffstat:

 graphics/gliv/Makefile         |   5 +++--
 graphics/gliv/distinfo         |   4 +++-
 graphics/gliv/patches/patch-aa |  13 +++++++++++++
 graphics/gliv/patches/patch-ab |  17 +++++++++++++++++
 4 files changed, 36 insertions(+), 3 deletions(-)

diffs (71 lines):

diff -r 816c9026430e -r be3ca6198aca graphics/gliv/Makefile
--- a/graphics/gliv/Makefile    Mon Jul 21 02:59:18 2008 +0000
+++ b/graphics/gliv/Makefile    Mon Jul 21 04:50:40 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2008/06/20 01:09:22 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2008/07/21 04:50:40 dholland Exp $
 
 DISTNAME=      gliv-1.9.6
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  http://guichaz.free.fr/gliv/files/
 EXTRACT_SUFX=  .tar.bz2
@@ -13,7 +14,7 @@
 
 USE_DIRS+=             xdg-1.1
 USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake msgfmt pkg-config
+USE_TOOLS+=            gawk gmake msgfmt pkg-config
 GNU_CONFIGURE=         yes
 
 INSTALLATION_DIRS=     share/pixmaps share/applications
diff -r 816c9026430e -r be3ca6198aca graphics/gliv/distinfo
--- a/graphics/gliv/distinfo    Mon Jul 21 02:59:18 2008 +0000
+++ b/graphics/gliv/distinfo    Mon Jul 21 04:50:40 2008 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.10 2006/11/24 15:44:25 drochner Exp $
+$NetBSD: distinfo,v 1.11 2008/07/21 04:50:40 dholland Exp $
 
 SHA1 (gliv-1.9.6.tar.bz2) = 7c1b070eaf73d0884abddc19d287a7b938a5e4fe
 RMD160 (gliv-1.9.6.tar.bz2) = 23424c5f96ee4c1f05fada5be6a60a9dcc2de781
 Size (gliv-1.9.6.tar.bz2) = 518971 bytes
+SHA1 (patch-aa) = f1475d5620665ddbb4c2d2b8de7f0845b71dd64c
+SHA1 (patch-ab) = e3f4f677dca27a67e88fd25bbbf6fc350073cab5
diff -r 816c9026430e -r be3ca6198aca graphics/gliv/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gliv/patches/patch-aa    Mon Jul 21 04:50:40 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2008/07/21 04:50:40 dholland Exp $
+
+--- src/Makefile.in~   2006-11-18 09:21:13.000000000 -0500
++++ src/Makefile.in    2008-07-21 00:40:37.000000000 -0400
+@@ -574,7 +574,7 @@
+       gperf -n --multiple-iterations 64 --output $@ $<
+ 
+ help_text.c: $(top_srcdir)/README $(top_srcdir)/tools/help2c.awk
+-      awk -f $(top_srcdir)/tools/help2c.awk < $(top_srcdir)/README > $@
++      gawk -f $(top_srcdir)/tools/help2c.awk < $(top_srcdir)/README > $@
+ 
+ glade_actions.c include/glade_actions.h: $(top_srcdir)/tools/glade/actions/gliv-actions.glade
+       cd $(top_srcdir)/tools/glade/actions && ./make_glade_actions.sh
diff -r 816c9026430e -r be3ca6198aca graphics/gliv/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gliv/patches/patch-ab    Mon Jul 21 04:50:40 2008 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.3 2008/07/21 04:50:40 dholland Exp $
+
+--- tools/Makefile.in~ 2006-11-18 09:21:13.000000000 -0500
++++ tools/Makefile.in  2008-07-21 00:41:38.000000000 -0400
+@@ -491,10 +491,10 @@
+ all-local: _gliv gliv.ggo
+ 
+ gliv.ggo: gengetopt.awk gliv.options
+-      awk -f gengetopt.awk < gliv.options > $@
++      gawk -f gengetopt.awk < gliv.options > $@
+ 
+ _gliv: zsh.awk gliv.options gperf2zsh.sh formats.gperf
+-      (awk -f zsh.awk < gliv.options; ./gperf2zsh.sh formats.gperf) > $@
++      (gawk -f zsh.awk < gliv.options; ./gperf2zsh.sh formats.gperf) > $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: