[pkgsrc/trunk]: pkgsrc/www/squid31 Stop the "squid31" package from cluttering...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a780c50adbea
branches:  trunk
changeset: 393110:a780c50adbea
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun May 17 14:17:42 2009 +0000

description:
Stop the "squid31" package from cluttering "${PKG_SYSCONFDIR}" with
various configuration and example files. Leave the installation of the
example files to "pkgsrc" instead.

Problem reported by Hasso Tepper in private e-mail.

diffstat:

 www/squid31/Makefile         |   4 ++--
 www/squid31/distinfo         |   5 ++++-
 www/squid31/patches/patch-ad |  13 +++++++++++++
 www/squid31/patches/patch-ae |  25 +++++++++++++++++++++++++
 www/squid31/patches/patch-al |  16 ++++++++++++++++
 5 files changed, 60 insertions(+), 3 deletions(-)

diffs (105 lines):

diff -r f1e14cb2c782 -r a780c50adbea www/squid31/Makefile
--- a/www/squid31/Makefile      Sun May 17 14:16:56 2009 +0000
+++ b/www/squid31/Makefile      Sun May 17 14:17:42 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2009/05/05 07:49:48 tron Exp $
+# $NetBSD: Makefile,v 1.4 2009/05/17 14:17:42 tron Exp $
 
 DISTNAME=      squid-3.1.0.7
 PKGNAME=       ${DISTNAME}     # Necessary for "pkgsrc/www/squid/options.mk"
-PKGREVISION=    2
+PKGREVISION=    3
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v3/3.1/
 EXTRACT_SUFX=  .tar.bz2
diff -r f1e14cb2c782 -r a780c50adbea www/squid31/distinfo
--- a/www/squid31/distinfo      Sun May 17 14:16:56 2009 +0000
+++ b/www/squid31/distinfo      Sun May 17 14:17:42 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2009/05/04 22:29:41 tron Exp $
+$NetBSD: distinfo,v 1.3 2009/05/17 14:17:42 tron Exp $
 
 SHA1 (squid-3.1.0.7.tar.bz2) = feba409242548f0ca2041ac1c968873453f3e0c6
 RMD160 (squid-3.1.0.7.tar.bz2) = a58496c69ee54e8495f2f959452ef8bed51a6f9e
@@ -6,12 +6,15 @@
 SHA1 (patch-aa) = 5f040d8e35cc1640633e0997363a6a615ae769b2
 SHA1 (patch-ab) = 7b89982f19c97398684dfca192a56e7077bfa21f
 SHA1 (patch-ac) = bf2508739b8917d9d7bebba3deae01b8b49986da
+SHA1 (patch-ad) = 81d173c37a635b09ae6ea5648fa0cd31f51f641a
+SHA1 (patch-ae) = b1833170580e93248af867f003c37ce8afbb5e6f
 SHA1 (patch-af) = 4f584a053df4f59c55af7f06a31787c9e36c8aa6
 SHA1 (patch-ag) = 1d4172d406d3e34a9582d60ebab649dbe369d985
 SHA1 (patch-ah) = e4cb16cbd65f558146204e450e794ab247c7b617
 SHA1 (patch-ai) = 0390e101199a81f782aa94815098351000f300cf
 SHA1 (patch-aj) = 71fc177631bffb38ed2ed9f6caef8dffbd53b335
 SHA1 (patch-ak) = 8cb0aaa7ea9d2241096cf82cf3640eea060ae85c
+SHA1 (patch-al) = 996b30e87a595850b8b0532762c45eb82928026b
 SHA1 (patch-am) = ca5280be592db8b4037f6f8e11866972cd44a6b9
 SHA1 (patch-an) = 940c7a212a5ecfc3a2ae3bb545d4c3de8a6d6e08
 SHA1 (patch-ao) = 38e056cbffccf0c38731403f6319cc0a51af0325
diff -r f1e14cb2c782 -r a780c50adbea www/squid31/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid31/patches/patch-ad      Sun May 17 14:17:42 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2009/05/17 14:17:42 tron Exp $
+
+--- tools/Makefile.in.orig     2009-04-08 11:51:33.000000000 +0100
++++ tools/Makefile.in  2009-05-17 14:24:36.000000000 +0100
+@@ -809,7 +809,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-data-local
++install-data-am:
+ 
+ install-exec-am: install-binPROGRAMS install-libexecPROGRAMS
+ 
diff -r f1e14cb2c782 -r a780c50adbea www/squid31/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid31/patches/patch-ae      Sun May 17 14:17:42 2009 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.1 2009/05/17 14:17:42 tron Exp $
+
+--- errors/Makefile.in.orig    2009-04-08 11:51:20.000000000 +0100
++++ errors/Makefile.in 2009-05-17 14:32:03.000000000 +0100
+@@ -509,13 +509,13 @@
+               done; \
+         fi \
+       done; \
+-      $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
+-      if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \
+-              echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_STYLESHEET)" ; \
+-      else \
+-              echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET)"; \
+-              $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET); \
+-      fi
++#     $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
++#     if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \
++#             echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_STYLESHEET)" ; \
++#     else \
++#             echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET)"; \
++#             $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET); \
++#     fi
+ 
+ uninstall-local:
+       @ for l in $(LANGUAGES) templates; do \
diff -r f1e14cb2c782 -r a780c50adbea www/squid31/patches/patch-al
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid31/patches/patch-al      Sun May 17 14:17:42 2009 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-al,v 1.3 2009/05/17 14:17:42 tron Exp $
+
+--- helpers/basic_auth/MSNT/Makefile.in.orig   2009-04-08 11:51:21.000000000 +0100
++++ helpers/basic_auth/MSNT/Makefile.in        2009-05-17 14:52:58.000000000 +0100
+@@ -605,9 +605,9 @@
+ 
+ info-am:
+ 
+-install-data-am: install-data-local
++install-data-am:
+ 
+-install-exec-am: install-libexecPROGRAMS install-sysconfDATA
++install-exec-am: install-libexecPROGRAMS
+ 
+ install-info: install-info-am
+