- honour PKG_SYSCONFDIR

- bump PKGREVISION

from Julio Merino in pkg/18981.

4 files changed, 42 insertions, 5 deletions

diff --git a/net/wget/Makefile b/net/wget/Makefile
index ca4936ed48e..1337bb0098f 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2002/09/18 19:51:55 tron Exp $
+# $NetBSD: Makefile,v 1.50 2002/11/21 11:05:56 grant Exp $
 
 DISTNAME=	wget-1.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU:=wget/}
 
@@ -21,6 +21,10 @@ USE_BUILDLINK2=		YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 MAKE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+EGDIR=		${PREFIX}/share/examples/wget
+CONF_FILES=	${EGDIR}/wgetrc ${PKG_SYSCONFDIR}/wgetrc
 
 INFO_FILES=	wget.info
 
@@ -48,4 +52,5 @@ CONFIGURE_ARGS+=--with-ssl=${SSLBASE}
 .include "../../devel/gettext-lib/buildlink2.mk"
 
 .include "../../mk/texinfo.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wget/PLIST b/net/wget/PLIST
index 04b5fd74e04..63fe864c42a 100644
--- a/net/wget/PLIST
+++ b/net/wget/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2002/03/30 13:57:02 pooka Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/11/21 11:05:56 grant Exp $
 bin/wget
-etc/wgetrc
 man/man1/wget.1
 @unexec ${INSTALL_INFO} --delete %D/info/wget.info %D/info/dir
 info/wget.info
@@ -31,3 +30,5 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/zh/LC_MESSAGES/wget.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/wget.mo
+share/examples/wget/wgetrc
+@dirrm share/examples/wget
diff --git a/net/wget/distinfo b/net/wget/distinfo
index e7151cbe380..beefc024912 100644
--- a/net/wget/distinfo
+++ b/net/wget/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2002/10/21 14:46:26 mycroft Exp $
+$NetBSD: distinfo,v 1.13 2002/11/21 11:05:56 grant Exp $
 
 SHA1 (wget-1.7.tar.gz) = b44118972c11a410b81ad3d306861b370071e611
 Size (wget-1.7.tar.gz) = 945138 bytes
@@ -10,3 +10,4 @@ SHA1 (patch-ac) = 20cc35210374c68ddcaf39830620d853b4311988
 SHA1 (patch-ad) = 8994c291eb3e06c87a6c83dfc2b02fbf9f318c34
 SHA1 (patch-ae) = 1400b747cb0b2cd4311e566941cbc8ff3e59c76d
 SHA1 (patch-af) = 99947fe7a56611cd0c949ddd7736971e96627731
+SHA1 (patch-ag) = 76f6bee3384e99375ea1249bfd054f904d5b9750
diff --git a/net/wget/patches/patch-ag b/net/wget/patches/patch-ag
new file mode 100644
index 00000000000..90f2d9e2f08
--- /dev/null
+++ b/net/wget/patches/patch-ag
@@ -0,0 +1,30 @@
+$NetBSD: patch-ag,v 1.3 2002/11/21 11:05:57 grant Exp $
+
+--- doc/Makefile.in.orig	Thu Apr 12 14:25:22 2001
++++ doc/Makefile.in
+@@ -40,6 +40,7 @@ prefix     = @prefix@
+ infodir    = @infodir@
+ mandir     = @mandir@
+ manext     = 1
++datadir    = @datadir@
+ sysconfdir = @sysconfdir@
+ 
+ DESTDIR    =
+@@ -51,7 +52,7 @@ RM = rm -f
+ TEXI2POD     = ./texi2pod.pl
+ POD2MAN      = @POD2MAN@
+ MAN          = wget.$(manext)
+-WGETRC       = $(sysconfdir)/wgetrc
++WGETRC       = $(datadir)/examples/@PACKAGE@/wgetrc
+ SAMPLERCTEXI = sample.wgetrc.munged_for_texi_inclusion
+ 
+ #
+@@ -119,7 +120,7 @@ install.man: $(MAN)
+ 
+ # install sample.wgetrc
+ install.wgetrc: $(srcdir)/sample.wgetrc
+-	$(top_srcdir)/mkinstalldirs $(sysconfdir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/examples/@PACKAGE@
+ 	@if test -f $(WGETRC); then \
+ 	  if cmp -s $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); then echo ""; \
+ 	     else \