From 94a2330211f6019ffc059c1be1acae48a2909595 Mon Sep 17 00:00:00 2001
From: dholland <dholland@pkgsrc.org>
Date: Mon, 21 Jul 2008 04:50:40 +0000
Subject: 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.
---
 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(-)
 create mode 100644 graphics/gliv/patches/patch-aa
 create mode 100644 graphics/gliv/patches/patch-ab

(limited to 'graphics/gliv')

diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index 74a5865312a..9f027277065 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -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 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 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 --git a/graphics/gliv/distinfo b/graphics/gliv/distinfo
index 418767930b5..492f885cdf3 100644
--- a/graphics/gliv/distinfo
+++ b/graphics/gliv/distinfo
@@ -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 --git a/graphics/gliv/patches/patch-aa b/graphics/gliv/patches/patch-aa
new file mode 100644
index 00000000000..01ea36cf9a0
--- /dev/null
+++ b/graphics/gliv/patches/patch-aa
@@ -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 --git a/graphics/gliv/patches/patch-ab b/graphics/gliv/patches/patch-ab
new file mode 100644
index 00000000000..cd3804292d3
--- /dev/null
+++ b/graphics/gliv/patches/patch-ab
@@ -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:
-- 
cgit v1.2.3