3 files changed, 22 insertions, 51 deletions
diff --git a/lang/gawk/patches/patch-aa b/lang/gawk/patches/patch-aa
index 3193901c21e..ab3c73b34c0 100644
--- a/lang/gawk/patches/patch-aa
+++ b/lang/gawk/patches/patch-aa
@@ -1,15 +1,27 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/12/10 17:33:39 bouyer Exp $
+$NetBSD: patch-aa,v 1.2 2002/04/04 13:58:27 seb Exp $
 
---- Makefile.in.old	Thu Dec  9 12:39:13 1999
-+++ Makefile.in	Thu Dec  9 12:40:18 1999
-@@ -179,10 +179,6 @@
- 	fullname=gawk-$(REL).`./gawk '{print $$3}' $(srcdir)/patchlevel.h` ; \
- 	$(INSTALL_PROGRAM) gawk $(bindir)/$$fullname ; \
- 	(cd $(bindir); $(LN) $$fullname gawk)
--	(cd $(bindir); \
+--- Makefile.in.orig	Tue May 15 19:09:12 2001
++++ Makefile.in
+@@ -212,9 +212,9 @@
+ # stuff for compiling gawk/pgawk
+ DEFPATH = "\".:$(datadir)\""
+ 
+-DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"$(datadir)/locale\""
++DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"$(prefix)/${PKGLOCALEDIR}/locale\""
+ 
+-INCLUDES = -I. -I$(srcdir) -I$(srcdir)/intl
++INCLUDES = -I. -I$(srcdir)
+ 
+ # We want hard links for install-exec-hook, below
+ LN = ln
+@@ -755,9 +755,7 @@
+ 	(fullname=gawk-`./gawk --version | sed 1q | awk '{print $$3}'` ; \
+ 	cd $(DESTDIR)$(bindir); \
+ 	$(LN) gawk $$fullname ; \
 -	if [ ! -f awk ]; \
 -	then	$(LN_S) gawk awk; \
 -	fi; exit 0)
- 	cd doc && $(MAKE) install
- 	cd awklib && $(MAKE) install
++	exit 0)
  
+ # Undo the above when uninstalling
+ uninstall-links:
diff --git a/lang/gawk/patches/patch-ab b/lang/gawk/patches/patch-ab
deleted file mode 100644
index 7f442808126..00000000000
--- a/lang/gawk/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/12/10 17:33:39 bouyer Exp $
-
---- awklib/Makefile.in.old	Wed Oct  7 13:33:20 1998
-+++ awklib/Makefile.in	Thu Dec  9 12:50:12 1999
-@@ -27,6 +27,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- 
- CC = @CC@
- CFLAGS = @CFLAGS@
-@@ -73,7 +74,7 @@
- 	sed 's;/usr/local/libexec/awk;$(libexecdir);' < groupawk.in) > group.awk
- 
- install: igawk $(AUXPROGS) $(AUXAWK)
--	$(INSTALL_PROGRAM) igawk $(bindir)/igawk
-+	$(INSTALL_SCRIPT) igawk $(bindir)/igawk
- 	for i in $(AUXPROGS) ; do \
- 		$(INSTALL_PROGRAM) $$i $(libexecdir)/$$i ; \
- 	done
diff --git a/lang/gawk/patches/patch-ac b/lang/gawk/patches/patch-ac
deleted file mode 100644
index bb5056eb345..00000000000
--- a/lang/gawk/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/12/10 17:33:40 bouyer Exp $
-
---- configure.old	Thu Dec  9 12:50:37 1999
-+++ configure	Thu Dec  9 12:51:24 1999
-@@ -939,6 +939,7 @@
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_PROGRAM='${INSTALL}'
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
-@@ -3359,6 +3360,7 @@
- s%@CPP@%$CPP%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@SET_MAKE@%$SET_MAKE%g
- s%@build@%$build%g
- s%@build_alias@%$build_alias%g