USE_PKGLOCALEDIR.

5 files changed, 9 insertions, 44 deletions

diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 3ea948f4e36..c4c64b5d1ab 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/10/22 23:53:25 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/11/30 14:55:06 grant Exp $
 # FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $
 
 DISTNAME=	gawk-3.1.0
@@ -16,8 +16,8 @@ BUILD_DEPENDS+=		gettext>=0.10.35nb1:../../devel/gettext
 
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
+USE_PKGLOCALEDIR=	# defined
 TEXINFO_OVERRIDE=	# defined
-MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 EVAL_PREFIX+=		GETTEXT_PREFIX=gettext
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo
index e0cde8a32ac..8b0b1d22505 100644
--- a/lang/gawk/distinfo
+++ b/lang/gawk/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/11/22 12:05:20 salo Exp $
+$NetBSD: distinfo,v 1.6 2002/11/30 14:55:06 grant Exp $
 
 SHA1 (gawk-3.1.0.tar.gz) = c41fd1d7277c839abc39727b5f9fa823f13ae17e
 Size (gawk-3.1.0.tar.gz) = 1614873 bytes
-SHA1 (patch-aa) = 32d5aa34c9198e850b695b16d40d677c77d90cb1
-SHA1 (patch-ab) = 54abab5baf6f48bb520c947b96e069908ea39bb9
-SHA1 (patch-ac) = 66a783ba533bdf7544b2cf278ee14c17736de3a9
+SHA1 (patch-aa) = e97ecd85a9ff5d5c5aeb66d00242211e95594be8
diff --git a/lang/gawk/patches/patch-aa b/lang/gawk/patches/patch-aa
index ab3c73b34c0..bcd58e3e606 100644
--- a/lang/gawk/patches/patch-aa
+++ b/lang/gawk/patches/patch-aa
@@ -1,13 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2002/04/04 13:58:27 seb Exp $
+$NetBSD: patch-aa,v 1.3 2002/11/30 14:55:06 grant Exp $
 
---- Makefile.in.orig	Tue May 15 19:09:12 2001
-+++ Makefile.in
-@@ -212,9 +212,9 @@
- # stuff for compiling gawk/pgawk
- DEFPATH = "\".:$(datadir)\""
+--- Makefile.in.orig	Wed May 16 03:09:12 2001
++++ Makefile.in	Sun Dec  1 01:54:01 2002
+@@ -214,7 +214,7 @@
  
--DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"$(datadir)/locale\""
-+DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"$(prefix)/${PKGLOCALEDIR}/locale\""
+ DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"$(datadir)/locale\""
  
 -INCLUDES = -I. -I$(srcdir) -I$(srcdir)/intl
 +INCLUDES = -I. -I$(srcdir)
diff --git a/lang/gawk/patches/patch-ab b/lang/gawk/patches/patch-ab
deleted file mode 100644
index cd6b88f36a0..00000000000
--- a/lang/gawk/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2002/11/22 12:05:20 salo Exp $
-
---- intl/Makefile.in.orig	Tue Jun 27 14:15:29 2000
-+++ intl/Makefile.in	Tue Nov 19 04:50:34 2002
-@@ -31,8 +31,8 @@
- libdir = $(exec_prefix)/lib
- includedir = $(prefix)/include
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
--gnulocaledir = $(prefix)/share/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
-+gnulocaledir = $(localedir)
- gettextsrcdir = @datadir@/gettext/intl
- aliaspath = $(localedir):.
- subdir = intl
diff --git a/lang/gawk/patches/patch-ac b/lang/gawk/patches/patch-ac
deleted file mode 100644
index 639e0800618..00000000000
--- a/lang/gawk/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/11/19 12:52:56 salo Exp $
-
---- po/Makefile.in.in.orig	Sat Mar 17 10:22:52 2001
-+++ po/Makefile.in.in	Tue Nov 19 04:51:06 2002
-@@ -19,8 +19,8 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
--gnulocaledir = $(prefix)/share/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
-+gnulocaledir = $(localedir)
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
-