pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/wget Override sysconfdir in INSTALL_MAKE_FLAGS ins...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c30ffae9648c
branches:  trunk
changeset: 510888:c30ffae9648c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Apr 06 03:44:03 2006 +0000

description:
Override sysconfdir in INSTALL_MAKE_FLAGS instead of patching the
Makefile to force installation of the sample config file into the
examples directory.

diffstat:

 net/wget/Makefile         |   4 +++-
 net/wget/distinfo         |   3 +--
 net/wget/patches/patch-ag |  30 ------------------------------
 3 files changed, 4 insertions(+), 33 deletions(-)

diffs (63 lines):

diff -r ff09c970299a -r c30ffae9648c net/wget/Makefile
--- a/net/wget/Makefile Thu Apr 06 03:33:28 2006 +0000
+++ b/net/wget/Makefile Thu Apr 06 03:44:03 2006 +0000
@@ -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 @@
 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 -r ff09c970299a -r c30ffae9648c net/wget/distinfo
--- a/net/wget/distinfo Thu Apr 06 03:33:28 2006 +0000
+++ b/net/wget/distinfo Thu Apr 06 03:44:03 2006 +0000
@@ -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 -r ff09c970299a -r c30ffae9648c net/wget/patches/patch-ag
--- a/net/wget/patches/patch-ag Thu Apr 06 03:33:28 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 \



Home | Main Index | Thread Index | Old Index