USE_PKGLOCALEDIR.

5 files changed, 11 insertions, 55 deletions

diff --git a/net/wget/Makefile b/net/wget/Makefile
index b9b6cb52210..5b2eaafc20c 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2002/12/01 01:00:55 grant Exp $
+# $NetBSD: Makefile,v 1.53 2002/12/01 01:04:03 grant Exp $
 
 DISTNAME=	wget-1.7
 PKGREVISION=	2
@@ -15,20 +15,20 @@ COMMENT=	Retrieve files from the 'net via HTTP and FTP
 
 USE_PERL5=	build
 
-BUILD_USES_MSGFMT=	YES
-USE_BUILDLINK2=		YES
+BUILD_USES_MSGFMT=	# defined
+USE_BUILDLINK2=		# defined
 
-USE_GMAKE=	YES
-GNU_CONFIGURE=	YES
-MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
+USE_GMAKE=		# defined
+GNU_CONFIGURE=		# defined
+USE_PKGLOCALEDIR=	# defined
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
-EGDIR=		${PREFIX}/share/examples/wget
-CONF_FILES=	${EGDIR}/wgetrc ${PKG_SYSCONFDIR}/wgetrc
+EGDIR=			${PREFIX}/share/examples/wget
+CONF_FILES=		${EGDIR}/wgetrc ${PKG_SYSCONFDIR}/wgetrc
 
-INFO_FILES=	wget.info
+INFO_FILES=		wget.info
 
-BUILD_DEFS+=    USE_INET6
+BUILD_DEFS+=    	USE_INET6
 
 # to get USE_INET6
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/wget/distinfo b/net/wget/distinfo
index beefc024912..119ce822033 100644
--- a/net/wget/distinfo
+++ b/net/wget/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.13 2002/11/21 11:05:56 grant Exp $
+$NetBSD: distinfo,v 1.14 2002/12/01 01:04:03 grant Exp $
 
 SHA1 (wget-1.7.tar.gz) = b44118972c11a410b81ad3d306861b370071e611
 Size (wget-1.7.tar.gz) = 945138 bytes
 SHA1 (wget-17-v6-20010716a.diff.gz) = 02ddc575dc2cd33b38a2b111662198b77ef67491
 Size (wget-17-v6-20010716a.diff.gz) = 49827 bytes
-SHA1 (patch-aa) = 98c944716c403d0501505fc52c69c898d7870ea5
-SHA1 (patch-ab) = 797716b5a213c1e6b12f9407769e606b50818a67
-SHA1 (patch-ac) = 20cc35210374c68ddcaf39830620d853b4311988
 SHA1 (patch-ad) = 8994c291eb3e06c87a6c83dfc2b02fbf9f318c34
 SHA1 (patch-ae) = 1400b747cb0b2cd4311e566941cbc8ff3e59c76d
 SHA1 (patch-af) = 99947fe7a56611cd0c949ddd7736971e96627731
diff --git a/net/wget/patches/patch-aa b/net/wget/patches/patch-aa
deleted file mode 100644
index 98fe944f8a5..00000000000
--- a/net/wget/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2001/06/27 04:58:51 jlam Exp $
-
---- Makefile.in.orig	Sat Dec 30 23:46:03 2000
-+++ Makefile.in
-@@ -39,7 +39,7 @@
- sysconfdir  = @sysconfdir@
- mandir      = @mandir@
- manext      = 1
--localedir   = $(prefix)/share/locale
-+localedir   = $(prefix)/${PKGLOCALEDIR}/locale
- 
- CC = @CC@
- CFLAGS = @CFLAGS@
diff --git a/net/wget/patches/patch-ab b/net/wget/patches/patch-ab
deleted file mode 100644
index 6d14388c0fc..00000000000
--- a/net/wget/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/07/22 15:31:54 tron Exp $
-
---- po/Makefile.in.in.orig	Thu Apr 12 14:25:22 2001
-+++ po/Makefile.in.in	Sun Jul 22 17:21:13 2001
-@@ -21,8 +21,8 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
--gnulocaledir = $(prefix)/share/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
-+gnulocaledir = $(prefix)/$(PKGLOCALEDIR)/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
- 
diff --git a/net/wget/patches/patch-ac b/net/wget/patches/patch-ac
deleted file mode 100644
index 4e55c16344a..00000000000
--- a/net/wget/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/07/22 15:31:54 tron Exp $
-
---- src/Makefile.in.orig	Thu Apr 12 14:25:22 2001
-+++ src/Makefile.in	Sun Jul 22 17:21:51 2001
-@@ -33,7 +33,7 @@
- exec_prefix  = @exec_prefix@
- bindir       = @bindir@
- sysconfdir   = @sysconfdir@
--localedir    = $(prefix)/share/locale
-+localedir    = $(prefix)/$(PKGLOCALEDIR)/locale
- 
- DESTDIR      =
-