9 files changed, 3 insertions, 103 deletions
diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index 244740da2ec..53989f324a5 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/11/23 18:47:16 seb Exp $
+# $NetBSD: Makefile,v 1.32 2002/11/30 13:45:17 grant Exp $
 #
 
 DISTNAME=		texinfo-4.3
@@ -13,10 +13,10 @@ COMMENT=		GNU info file manipulation utilities
 
 USE_BUILDLINK2=		yes
 USE_GNU_GETTEXT=	yes
+USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 AUTOMAKE_PATTERNS+=	configure.ac
 AUTOMAKE_PATTERNS+=	config.in
 
diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo
index 1cd5fa651be..7388dd1435f 100644
--- a/devel/gtexinfo/distinfo
+++ b/devel/gtexinfo/distinfo
@@ -1,14 +1,7 @@
-$NetBSD: distinfo,v 1.8 2002/11/17 01:17:31 seb Exp $
+$NetBSD: distinfo,v 1.9 2002/11/30 13:45:18 grant Exp $
 
 SHA1 (texinfo-4.3.tar.gz) = 12a6cf035e4275ad0ed99e515533a07fb8b541b7
 Size (texinfo-4.3.tar.gz) = 1808898 bytes
-SHA1 (patch-aa) = 83676785d0728f4fc0881aaac3c7d07a40295bf1
-SHA1 (patch-ab) = e881e3822713b13afebbe5b13bef65a756252bab
 SHA1 (patch-ac) = bf22fe2b8920c88a357ce9c1202690ed291c5b92
 SHA1 (patch-ad) = 1c998cdb8b0831e15eef7df6c4f8ef108455619e
-SHA1 (patch-ae) = 3dfc7bfd103a55165d88831043b6fa06253f30e7
-SHA1 (patch-af) = 5f29901d5a96c499a70a70706861b4ed0a84ed32
-SHA1 (patch-ag) = 841cc0f666471e5efe4767541e0677b37c76affd
-SHA1 (patch-ah) = d10dbce5903110ecf198136b96ea9dba348c6644
 SHA1 (patch-ai) = 8a1e92497d3a6cd5dec50ec9e9cf35046d214c8c
-SHA1 (patch-aj) = 0a1266238553b352b8572f2fb33e633f72395e14
diff --git a/devel/gtexinfo/patches/patch-aa b/devel/gtexinfo/patches/patch-aa
deleted file mode 100644
index 512910f3f4c..00000000000
--- a/devel/gtexinfo/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2002/11/17 01:17:31 seb Exp $
-
---- info/Makefile.am.orig	Fri Mar 22 22:26:49 2002
-+++ info/Makefile.am
-@@ -18,7 +18,7 @@
- bin_PROGRAMS = ginfo infokey
- transform = s/ginfo/info/; @program_transform_name@
- 
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- 
- # -I. for funs.h.
- # Automake puts -I.. and -I$(srcdir) into DEFS by default, but
diff --git a/devel/gtexinfo/patches/patch-ab b/devel/gtexinfo/patches/patch-ab
deleted file mode 100644
index 37643108066..00000000000
--- a/devel/gtexinfo/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2002/11/17 01:17:31 seb Exp $
-
---- info/Makefile.in.orig	Mon Apr  1 16:13:22 2002
-+++ info/Makefile.in
-@@ -119,7 +119,7 @@
- # user-specified name transformations.
- bin_PROGRAMS = ginfo infokey
- 
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- 
- # -I. for funs.h.
- # Automake puts -I.. and -I$(srcdir) into DEFS by default, but
diff --git a/devel/gtexinfo/patches/patch-ae b/devel/gtexinfo/patches/patch-ae
deleted file mode 100644
index 9687a5ba2d2..00000000000
--- a/devel/gtexinfo/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.8 2002/11/17 01:17:31 seb Exp $
-
---- makeinfo/Makefile.am.orig	Fri Mar  8 20:43:31 2002
-+++ makeinfo/Makefile.am
-@@ -12,7 +12,7 @@
- 
- bin_PROGRAMS = makeinfo
- 
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
- LDADD = ../lib/libtxi.a @LIBINTL@
- 
diff --git a/devel/gtexinfo/patches/patch-af b/devel/gtexinfo/patches/patch-af
deleted file mode 100644
index 65e5906b1f8..00000000000
--- a/devel/gtexinfo/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2002/11/17 01:17:31 seb Exp $
-
---- makeinfo/Makefile.in.orig	Mon Apr  1 16:13:44 2002
-+++ makeinfo/Makefile.in
-@@ -114,7 +114,7 @@
- 
- bin_PROGRAMS = makeinfo
- 
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
- LDADD = ../lib/libtxi.a @LIBINTL@
- 
diff --git a/devel/gtexinfo/patches/patch-ag b/devel/gtexinfo/patches/patch-ag
deleted file mode 100644
index c1d46c0690a..00000000000
--- a/devel/gtexinfo/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2002/11/17 01:17:32 seb Exp $
-
---- util/Makefile.am.orig	Wed Oct  9 16:19:41 2002
-+++ util/Makefile.am
-@@ -22,7 +22,7 @@ ginstall_info_SOURCES = install-info.c 
- # user-specified name transformations.
- transform = s/ginstall-info/install-info/; @program_transform_name@
- 
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
- LDADD = ../lib/libtxi.a @LIBINTL@
- 
diff --git a/devel/gtexinfo/patches/patch-ah b/devel/gtexinfo/patches/patch-ah
deleted file mode 100644
index 21b588162ac..00000000000
--- a/devel/gtexinfo/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2002/11/17 01:17:32 seb Exp $
-
-Patch file manually stripped down.
-
---- util/Makefile.in.orig	Sat Nov 16 23:25:45 2002
-+++ util/Makefile.in
-@@ -162,7 +162,7 @@ bin_SCRIPTS = texi2dvi
- # bug, IMHO, but this is easier than patching Automake.)
- ginstall_info_SOURCES = install-info.c 
- 
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
- LDADD = ../lib/libtxi.a @LIBINTL@
- 
diff --git a/devel/gtexinfo/patches/patch-aj b/devel/gtexinfo/patches/patch-aj
deleted file mode 100644
index 4dce376efd9..00000000000
--- a/devel/gtexinfo/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/11/17 01:17:32 seb Exp $
-
---- po/Makefile.in.in.orig     Thu Mar 14 15:41:37 2002
-+++ po/Makefile.in.in  Fri Oct 11 03:33:58 2002
-@@ -21,7 +21,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- gettextsrcdir = $(datadir)/gettext/po
-
- INSTALL = @INSTALL@