kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* pkglint friendly.

Browse source 
* Add and Update PKG_OPTIONS related to storage backend.

- squid-backend-null: "null" type of storage backend had been deperecated.
- Add squid-backend-rock.
- Revive squid-backend-aufs.

Bump PKGREVISION.
This commit is contained in:
taca 2013-03-13 17:11:25 +00:00
parent dd25a7d4dd
commit 268e290c6d
4 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
www/squid3/Makefile
View file

@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.4 2013/03/13 12:36:39 adam Exp $
# $NetBSD: Makefile,v 1.5 2013/03/13 17:11:25 taca Exp $
DISTNAME= squid-3.3.3
PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
${SQUID_MASTER_SITES}

4
www/squid3/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.4 2013/03/13 12:36:39 adam Exp $
$NetBSD: distinfo,v 1.5 2013/03/13 17:11:25 taca Exp $
SHA1 (squid-3.3.3.tar.xz) = 2ad7c1b47efbd8969d2452f9b68c915af06d2729
RMD160 (squid-3.3.3.tar.xz) = bfabc65771afa77c3b8867d09924cce202105656
@ -6,7 +6,7 @@ Size (squid-3.3.3.tar.xz) = 2174400 bytes
SHA1 (patch-configure) = 8e5eb49a8d04c77f3cf9de9390a8992268421cb6
SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
SHA1 (patch-helpers_basic_auth_MSNT_Makefile.in) = 74a0379d3ec0c2601dbb62b16df889bf4edcaedf
SHA1 (patch-src_Makefile.in) = 919797e74c378daad88b5ac1ee7efe6f5f580a33
SHA1 (patch-src_Makefile.in) = 32bc968a7680414d87acf1a4c96822a3d80c2030
SHA1 (patch-src_base_TidyPointer.h) = 93428d26bb2479fc845764a324658eaacd26588e
SHA1 (patch-src_ip_Intercept.cc) = 972ad12063bcf3d24704976960f1a71452d0aa87
SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4

17
www/squid3/options.mk
View file

@ -1,8 +1,8 @@
# $NetBSD: options.mk,v 1.3 2013/03/05 01:59:51 taca Exp $
# $NetBSD: options.mk,v 1.4 2013/03/13 17:11:25 taca Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.squid
PKG_SUPPORTED_OPTIONS= inet6 snmp ssl squid-backend-diskd squid-backend-null \
squid-backend-ufs squid-carp squid-unlinkd \
PKG_SUPPORTED_OPTIONS= inet6 snmp ssl squid-backend-aufs squid-backend-diskd \
squid-backend-rock squid-backend-ufs squid-carp squid-unlinkd \
squid-kerberos-helper squid-ldap-helper squid-pam-helper
PKG_OPTIONS_LEGACY_OPTS= diskd:squid-backend-diskd \
null:squid-backend-null ufs:squid-backend-ufs \
@ -56,7 +56,7 @@ PKG_SUPPORTED_OPTIONS+= squid-arp-acl
.include "../../mk/bsd.options.mk"
SQUID_BACKENDS?= ufs null
SQUID_BACKENDS?= ufs
SQUID_BASIC_AUTH_HELPERS?= MSNT NCSA NIS getpwnam
SQUID_DIGEST_AUTH_HELPERS?= password
SQUID_NTLM_AUTH_HELPERS?= SMB
@ -117,11 +117,20 @@ CONFIGURE_ARGS+= --enable-ssl --with-openssl=${SSLBASE:Q}
. include "../../security/openssl/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Msquid-backend-aufs)
SQUID_BACKENDS+= aufs
. include "../../mk/pthread.buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Msquid-backend-diskd)
SQUID_BACKENDS+= diskd
PLIST.diskd= yes
.endif
.if !empty(PKG_OPTIONS:Msquid-backend-rock)
SQUID_BACKENDS+= rock
.endif
.if empty(PKG_OPTIONS:Msquid-unlinkd)
CONFIGURE_ARGS+= --disable-unlinkd
.else

4
www/squid3/patches/patch-src_Makefile.in
View file

@ -1,4 +1,6 @@
$NetBSD: patch-src_Makefile.in,v 1.1 2013/02/10 18:16:53 adam Exp $
$NetBSD: patch-src_Makefile.in,v 1.2 2013/03/13 17:11:26 taca Exp $
Don't install squid.conf.
--- src/Makefile.in.orig 2013-02-09 07:30:35.000000000 +0000
+++ src/Makefile.in