diff options
| author | jlam <jlam> | 2006-04-06 03:44:03 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-04-06 03:44:03 +0000 |
| commit | 04a89c192dff621cc4c08a4c6ff43c95f2bd1a07 (patch) | |
| tree | e68cb151aca8401f0bd975af639f3a5b938472d9 | |
| parent | 4d59490cd48406b41bbe4e7108d9fe1b88fb818a (diff) | |
| download | pkgsrc-04a89c192dff621cc4c08a4c6ff43c95f2bd1a07.tar.gz | |
Override sysconfdir in INSTALL_MAKE_FLAGS instead of patching the
Makefile to force installation of the sample config file into the
examples directory.
| -rw-r--r-- | net/wget/Makefile | 4 | ||||
| -rw-r--r-- | net/wget/distinfo | 3 | ||||
| -rw-r--r-- | net/wget/patches/patch-ag | 30 |
3 files changed, 4 insertions, 33 deletions
diff --git a/net/wget/Makefile b/net/wget/Makefile index 4d9ec3da2ce..537aa280b10 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.90 2006/04/06 03:20:54 jlam Exp $ +# $NetBSD: Makefile,v 1.91 2006/04/06 03:44:03 jlam Exp $ DISTNAME= wget-1.10.2 PKGREVISION= 1 @@ -24,6 +24,8 @@ EGDIR= ${PREFIX}/share/examples/wget CONF_FILES= ${EGDIR}/wgetrc ${PKG_SYSCONFDIR}/wgetrc INFO_FILES= # PLIST +INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q} + .include "../../mk/bsd.prefs.mk" .include "options.mk" diff --git a/net/wget/distinfo b/net/wget/distinfo index 9520d4e71c0..2e9b63fc4a1 100644 --- a/net/wget/distinfo +++ b/net/wget/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.28 2005/10/14 10:12:12 adam Exp $ +$NetBSD: distinfo,v 1.29 2006/04/06 03:44:03 jlam Exp $ SHA1 (wget-1.10.2.tar.gz) = a258357297959964fd42fed6afa1a4cce9069980 RMD160 (wget-1.10.2.tar.gz) = 2969f534ad811034048f3558b975c6452883ebda Size (wget-1.10.2.tar.gz) = 1213056 bytes -SHA1 (patch-ag) = c501bc48070ba9b71d51d6cdebf5c3e5d5aa5ffb diff --git a/net/wget/patches/patch-ag b/net/wget/patches/patch-ag deleted file mode 100644 index 71d904e7156..00000000000 --- a/net/wget/patches/patch-ag +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ag,v 1.6 2005/07/02 15:10:23 wiz Exp $ - ---- doc/Makefile.in.orig 2005-06-06 22:42:17.000000000 +0200 -+++ 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 - - # -@@ -131,7 +132,7 @@ install.man: $(MAN) - - # install sample.wgetrc - install.wgetrc: $(srcdir)/sample.wgetrc -- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/examples/@PACKAGE@ - @if test -f $(DESTDIR)$(WGETRC); then \ - if cmp -s $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC); then echo ""; \ - else \ |