diff options
author | tron <tron> | 2009-05-04 22:29:41 +0000 |
---|---|---|
committer | tron <tron> | 2009-05-04 22:29:41 +0000 |
commit | 1cf9bd3c9684d6a6940e5cf2fc8b6ab8e7b84496 (patch) | |
tree | 2e81cd4950c7e01c4c9ac81795ca13509fb26c4e /www/squid31 | |
parent | 2cc310dd1da69a8cd3b0bb1a2ab227919055d972 (diff) | |
download | pkgsrc-1cf9bd3c9684d6a6940e5cf2fc8b6ab8e7b84496.tar.gz |
Various improvements for the "squid31" package by Michael van Elst:
- Make sure that "errorpage.css" gets installed into the correct
directory.
- Install "msntauth.conf".
- Correct default pid file location.
Diffstat (limited to 'www/squid31')
-rw-r--r-- | www/squid31/Makefile | 7 | ||||
-rw-r--r-- | www/squid31/PLIST | 4 | ||||
-rw-r--r-- | www/squid31/distinfo | 7 | ||||
-rw-r--r-- | www/squid31/patches/patch-ad | 18 | ||||
-rw-r--r-- | www/squid31/patches/patch-aj | 26 | ||||
-rw-r--r-- | www/squid31/patches/patch-al | 13 | ||||
-rw-r--r-- | www/squid31/patches/patch-aq | 13 |
7 files changed, 11 insertions, 77 deletions
diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 723a256b797..70f96fbc0f9 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ +# $NetBSD: Makefile,v 1.2 2009/05/04 22:29:41 tron Exp $ DISTNAME= squid-3.1.0.7 PKGNAME= ${DISTNAME} # Necessary for "pkgsrc/www/squid/options.mk" +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v3/3.1/ EXTRACT_SUFX= .tar.bz2 @@ -19,6 +20,10 @@ PKG_DESTDIR_SUPPORT= destdir .include "../../www/squid/Makefile.squid" CONFIGURE_ARGS+= --with-default-user=${SQUID_USER} +CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/squid.pid + +EGFILES+= errors/errorpage.css +CONF_FILES+= ${PREFIX}/${EGDIR}/errorpage.css ${PKG_SYSCONFDIR}/errorpage.css SQUID_BACKENDS?= ufs SQUID_NTLM_AUTH_HELPERS?= fakeauth diff --git a/www/squid31/PLIST b/www/squid31/PLIST index fca5f5ec250..eabdf05d61a 100644 --- a/www/squid31/PLIST +++ b/www/squid31/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/05/04 22:29:41 tron Exp $ bin/squidclient libexec/cachemgr.cgi ${PLIST.da_ldap}libexec/digest_ldap_auth @@ -37,4 +37,6 @@ share/examples/squid/cachemgr.conf share/examples/squid/mime.conf share/examples/squid/msntauth.conf share/examples/squid/squid.conf +share/examples/squid/errorpage.css +share/examples/squid/msntauth.conf ${PLIST.snmp}share/squid/mib.txt diff --git a/www/squid31/distinfo b/www/squid31/distinfo index 0a14ef53c61..67eb4265db5 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ +$NetBSD: distinfo,v 1.2 2009/05/04 22:29:41 tron Exp $ SHA1 (squid-3.1.0.7.tar.bz2) = feba409242548f0ca2041ac1c968873453f3e0c6 RMD160 (squid-3.1.0.7.tar.bz2) = a58496c69ee54e8495f2f959452ef8bed51a6f9e @@ -6,16 +6,13 @@ Size (squid-3.1.0.7.tar.bz2) = 2254073 bytes SHA1 (patch-aa) = 5f040d8e35cc1640633e0997363a6a615ae769b2 SHA1 (patch-ab) = 7b89982f19c97398684dfca192a56e7077bfa21f SHA1 (patch-ac) = bf2508739b8917d9d7bebba3deae01b8b49986da -SHA1 (patch-ad) = 6e67574732b38d2ddf8b351854abfd78a5903420 SHA1 (patch-af) = 4f584a053df4f59c55af7f06a31787c9e36c8aa6 SHA1 (patch-ag) = 1d4172d406d3e34a9582d60ebab649dbe369d985 SHA1 (patch-ah) = e4cb16cbd65f558146204e450e794ab247c7b617 SHA1 (patch-ai) = 0390e101199a81f782aa94815098351000f300cf -SHA1 (patch-aj) = fbdde957ef10fc87dad7b4486aba5a0f3625e49b +SHA1 (patch-aj) = 71fc177631bffb38ed2ed9f6caef8dffbd53b335 SHA1 (patch-ak) = 8cb0aaa7ea9d2241096cf82cf3640eea060ae85c -SHA1 (patch-al) = cd8eca5a945de8901d84beb432c3be59a6814e9c SHA1 (patch-am) = ca5280be592db8b4037f6f8e11866972cd44a6b9 SHA1 (patch-an) = 940c7a212a5ecfc3a2ae3bb545d4c3de8a6d6e08 SHA1 (patch-ao) = 38e056cbffccf0c38731403f6319cc0a51af0325 SHA1 (patch-ap) = 3b307114608b898d6462ef193c0a8be8ac074772 -SHA1 (patch-aq) = 3a13380ab91a3d4fb15ff3548c6511990cde0bbc diff --git a/www/squid31/patches/patch-ad b/www/squid31/patches/patch-ad deleted file mode 100644 index 33ed236e62e..00000000000 --- a/www/squid31/patches/patch-ad +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ - -Don't install configuration files. - ---- helpers/basic_auth/MSNT/Makefile.in.orig 2008-06-22 12:35:48.000000000 +0900 -+++ helpers/basic_auth/MSNT/Makefile.in -@@ -590,9 +590,9 @@ info: info-am - - 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 - diff --git a/www/squid31/patches/patch-aj b/www/squid31/patches/patch-aj deleted file mode 100644 index c16f37f89d6..00000000000 --- a/www/squid31/patches/patch-aj +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ - ---- src/Makefile.in.orig 2009-04-08 12:51:29.000000000 +0200 -+++ src/Makefile.in -@@ -1899,7 +1899,7 @@ DEFAULT_LOG_PREFIX = @DEFAULT_LOG_DIR@ - DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log - DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log - DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log --DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid -+DEFAULT_PID_FILE = $(VARBASE)/run/squid.pid - DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state - DEFAULT_SWAP_DIR = $(localstatedir)/cache - DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` -@@ -4297,10 +4297,10 @@ info: info-recursive - - info-am: - --install-data-am: install-data-local install-dataDATA -+install-data-am: install-dataDATA - - install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \ -- install-sbinPROGRAMS install-sysconfDATA -+ install-sbinPROGRAMS - - install-info: install-info-recursive - diff --git a/www/squid31/patches/patch-al b/www/squid31/patches/patch-al deleted file mode 100644 index 1ecdd904604..00000000000 --- a/www/squid31/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ - ---- tools/Makefile.in.orig 2008-06-22 12:35:54.000000000 +0900 -+++ tools/Makefile.in -@@ -794,7 +794,7 @@ info: info-recursive - - info-am: - --install-data-am: install-data-local -+install-data-am: - - install-exec-am: install-binPROGRAMS install-libexecPROGRAMS - diff --git a/www/squid31/patches/patch-aq b/www/squid31/patches/patch-aq deleted file mode 100644 index c059c72beab..00000000000 --- a/www/squid31/patches/patch-aq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aq,v 1.1.1.1 2009/04/20 21:27:40 tron Exp $ - ---- errors/Makefile.in.orig 2009-04-08 12:51:20.000000000 +0200 -+++ errors/Makefile.in -@@ -280,7 +280,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - errordir = $(datadir)/errors - DEFAULT_ERROR_DIR = $(errordir) --DEFAULT_STYLESHEET = $(sysconfdir)/errorpage.css -+DEFAULT_STYLESHEET = $(EGDIR)/errorpage.css - - # List of automated translations possible: - TRANSLATIONS = \ |