Sat Feb 20 15:11:40 2010 UTC ()
Don't use the "install-pinger" target to change the permissions of
"libexec/pinger", simply use "SPECIAL_PERMS".

Now all three "squid" packages support user destination dir installation.


(tron)
diff -r1.15 -r1.16 pkgsrc/www/squid/Makefile.squid
diff -r1.12 -r1.13 pkgsrc/www/squid27/Makefile
diff -r1.20 -r1.21 pkgsrc/www/squid30/Makefile
diff -r1.17 -r1.18 pkgsrc/www/squid31/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/www/squid/Attic/Makefile.squid (expand / switch to unified diff)

--- pkgsrc/www/squid/Attic/Makefile.squid 2009/11/02 15:43:20 1.15
+++ pkgsrc/www/squid/Attic/Makefile.squid 2010/02/20 15:11:40 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.squid,v 1.15 2009/11/02 15:43:20 taca Exp $ 1# $NetBSD: Makefile.squid,v 1.16 2010/02/20 15:11:40 tron Exp $
2# 2#
3# used by www/squid27/Makefile 3# used by www/squid27/Makefile
4# used by www/squid30/Makefile 4# used by www/squid30/Makefile
5# used by www/squid31/Makefile 5# used by www/squid31/Makefile
6 6
7.include "Makefile.common" 7.include "Makefile.common"
8 8
9SQUID_MASTER_SITES= ftp://ftp.squid-cache.org/pub/squid/ \ 9SQUID_MASTER_SITES= ftp://ftp.squid-cache.org/pub/squid/ \
10 http://ftp.nluug.nl/internet/squid/ 10 http://ftp.nluug.nl/internet/squid/
11 11
12DOCDIR= share/doc/squid 12DOCDIR= share/doc/squid
13EGDIR= share/examples/squid 13EGDIR= share/examples/squid
14BUILD_DEFS+= LOGDIR VARBASE 14BUILD_DEFS+= LOGDIR VARBASE
@@ -50,30 +50,32 @@ DOCFILES= ChangeLog RELEASENOTES.html do @@ -50,30 +50,32 @@ DOCFILES= ChangeLog RELEASENOTES.html do
50READMES= README.FreeBSD README.NetBSD README.OpenBSD README.Solaris 50READMES= README.FreeBSD README.NetBSD README.OpenBSD README.Solaris
51EGFILES= src/mime.conf.default src/squid.conf.default \ 51EGFILES= src/mime.conf.default src/squid.conf.default \
52 helpers/basic_auth/MSNT/msntauth.conf.default \ 52 helpers/basic_auth/MSNT/msntauth.conf.default \
53 tools/cachemgr.conf 53 tools/cachemgr.conf
54 54
55SUBST_CLASSES+= confs 55SUBST_CLASSES+= confs
56SUBST_STAGE.confs= pre-configure 56SUBST_STAGE.confs= pre-configure
57SUBST_FILES.confs= src/cf.data.pre 57SUBST_FILES.confs= src/cf.data.pre
58SUBST_SED.confs= -e "s/@USER@/${SQUID_USER}/" 58SUBST_SED.confs= -e "s/@USER@/${SQUID_USER}/"
59SUBST_MESSAGE.confs= Fixing configuration files. 59SUBST_MESSAGE.confs= Fixing configuration files.
60 60
61CHECK_PORTABILITY_SKIP+= icons/icons.shar 61CHECK_PORTABILITY_SKIP+= icons/icons.shar
62 62
63INSTALL_TARGET= install install-pinger 
64INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man8 sbin \ 63INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man8 sbin \
65 share/squid share/squid/errors share/squid/icons \ 64 share/squid share/squid/errors share/squid/icons \
66 ${DOCDIR} ${EGDIR} 65 ${DOCDIR} ${EGDIR}
 66SPECIAL_PERMS+= libexec/pinger ${SETUID_ROOT_PERMS}
 67
 68PKG_DESTDIR_SUPPORT?= user-destdir
67 69
68POST_INSTALL_EXTRA?= 70POST_INSTALL_EXTRA?=
69 71
70post-install: ${POST_INSTALL_EXTRA} 72post-install: ${POST_INSTALL_EXTRA}
71 for f in ${EGFILES}; do \ 73 for f in ${EGFILES}; do \
72 ${INSTALL_DATA} ${WRKSRC}/$$f \ 74 ${INSTALL_DATA} ${WRKSRC}/$$f \
73 ${DESTDIR}${PREFIX}/${EGDIR}/`basename $$f .default`; \ 75 ${DESTDIR}${PREFIX}/${EGDIR}/`basename $$f .default`; \
74 done 76 done
75 for f in ${DOCFILES}; do \ 77 for f in ${DOCFILES}; do \
76 ${INSTALL_DATA} ${WRKSRC}/$$f \ 78 ${INSTALL_DATA} ${WRKSRC}/$$f \
77 ${DESTDIR}${PREFIX}/${DOCDIR}; \ 79 ${DESTDIR}${PREFIX}/${DOCDIR}; \
78 done 80 done
79 for f in ${READMES}; do \ 81 for f in ${READMES}; do \
cvs diff -r1.12 -r1.13 pkgsrc/www/squid27/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/squid27/Attic/Makefile 2010/02/14 13:27:52 1.12
+++ pkgsrc/www/squid27/Attic/Makefile 2010/02/20 15:11:40 1.13
@@ -1,23 +1,22 @@ @@ -1,23 +1,22 @@
1# $NetBSD: Makefile,v 1.12 2010/02/14 13:27:52 taca Exp $ 1# $NetBSD: Makefile,v 1.13 2010/02/20 15:11:40 tron Exp $
2 2
3DISTNAME= squid-2.7.STABLE7 3DISTNAME= squid-2.7.STABLE7
4PKGNAME= ${DISTNAME:S/STABLE//} 4PKGNAME= ${DISTNAME:S/STABLE//}
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= ${SQUID_MASTER_SITES} \ 7MASTER_SITES= ${SQUID_MASTER_SITES} \
8 http://www.squid-cache.org/Versions/v2/2.7/ 8 http://www.squid-cache.org/Versions/v2/2.7/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= taca@NetBSD.org 11MAINTAINER= taca@NetBSD.org
12HOMEPAGE= http://www.squid-cache.org/ 12HOMEPAGE= http://www.squid-cache.org/
13COMMENT= Post-Harvest_cached WWW proxy cache and accelerator 13COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16USE_TOOLS+= perl 16USE_TOOLS+= perl
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18PKG_DESTDIR_SUPPORT= destdir 
19MESSAGE_SRC= ../squid/MESSAGE MESSAGE 18MESSAGE_SRC= ../squid/MESSAGE MESSAGE
20 19
21.include "../../www/squid/Makefile.squid" 20.include "../../www/squid/Makefile.squid"
22.include "../../www/squid/options.mk" 21.include "../../www/squid/options.mk"
23.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/www/squid30/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/squid30/Attic/Makefile 2010/02/14 13:37:02 1.20
+++ pkgsrc/www/squid30/Attic/Makefile 2010/02/20 15:11:40 1.21
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1# $NetBSD: Makefile,v 1.20 2010/02/14 13:37:02 taca Exp $ 1# $NetBSD: Makefile,v 1.21 2010/02/20 15:11:40 tron Exp $
2 2
3DISTNAME= squid-3.0.STABLE24 3DISTNAME= squid-3.0.STABLE24
4PKGNAME= ${DISTNAME:S/STABLE//} 4PKGNAME= ${DISTNAME:S/STABLE//}
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= ${SQUID_MASTER_SITES} \ 6MASTER_SITES= ${SQUID_MASTER_SITES} \
7 http://www.squid-cache.org/Versions/v3/3.0/ 7 http://www.squid-cache.org/Versions/v3/3.0/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= taca@NetBSD.org 10MAINTAINER= taca@NetBSD.org
11HOMEPAGE= http://www.squid-cache.org/ 11HOMEPAGE= http://www.squid-cache.org/
12COMMENT= Post-Harvest_cached WWW proxy cache and accelerator 12COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_TOOLS+= perl 16USE_TOOLS+= perl
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18PKG_DESTDIR_SUPPORT= destdir 
19 18
20.include "../../www/squid/Makefile.squid" 19.include "../../www/squid/Makefile.squid"
21.include "../../www/squid/options.mk" 20.include "../../www/squid/options.mk"
22.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/www/squid31/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/squid31/Attic/Makefile 2010/02/02 13:57:49 1.17
+++ pkgsrc/www/squid31/Attic/Makefile 2010/02/20 15:11:40 1.18
@@ -1,31 +1,30 @@ @@ -1,31 +1,30 @@
1# $NetBSD: Makefile,v 1.17 2010/02/02 13:57:49 tron Exp $ 1# $NetBSD: Makefile,v 1.18 2010/02/20 15:11:40 tron Exp $
2 2
3DISTNAME= squid-3.1.0.16 3DISTNAME= squid-3.1.0.16
4PKGNAME= ${DISTNAME} # Necessary for "pkgsrc/www/squid/options.mk" 4PKGNAME= ${DISTNAME} # Necessary for "pkgsrc/www/squid/options.mk"
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://www.squid-cache.org/Versions/v3/3.1/ \ 6MASTER_SITES= http://www.squid-cache.org/Versions/v3/3.1/ \
7 ${SQUID_MASTER_SITES} 7 ${SQUID_MASTER_SITES}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= tron@NetBSD.org 10MAINTAINER= tron@NetBSD.org
11HOMEPAGE= http://www.squid-cache.org/ 11HOMEPAGE= http://www.squid-cache.org/
12COMMENT= Post-Harvest_cached WWW proxy cache and accelerator 12COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_TOOLS+= perl gmake 16USE_TOOLS+= perl gmake
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18PKG_DESTDIR_SUPPORT= destdir 
19 18
20.include "../../www/squid/Makefile.squid" 19.include "../../www/squid/Makefile.squid"
21 20
22CONFIGURE_ARGS+= --with-default-user=${SQUID_USER} 21CONFIGURE_ARGS+= --with-default-user=${SQUID_USER}
23CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/squid.pid 22CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/squid.pid
24 23
25EGFILES+= errors/errorpage.css 24EGFILES+= errors/errorpage.css
26CONF_FILES+= ${PREFIX}/${EGDIR}/errorpage.css ${PKG_SYSCONFDIR}/errorpage.css 25CONF_FILES+= ${PREFIX}/${EGDIR}/errorpage.css ${PKG_SYSCONFDIR}/errorpage.css
27 26
28SQUID_BACKENDS?= ufs 27SQUID_BACKENDS?= ufs
29SQUID_NTLM_AUTH_HELPERS?= fakeauth 28SQUID_NTLM_AUTH_HELPERS?= fakeauth
30.include "../../www/squid/options.mk" 29.include "../../www/squid/options.mk"
31 30