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.

4 files changed, 7 insertions, 8 deletions

diff --git a/www/squid/Makefile.squid b/www/squid/Makefile.squid
index c56c223c920..199ab5f7002 100644
--- a/www/squid/Makefile.squid
+++ b/www/squid/Makefile.squid
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.squid,v 1.15 2009/11/02 15:43:20 taca Exp $
+# $NetBSD: Makefile.squid,v 1.16 2010/02/20 15:11:40 tron Exp $
 #
 # used by www/squid27/Makefile
 # used by www/squid30/Makefile
@@ -60,10 +60,12 @@ SUBST_MESSAGE.confs=	Fixing configuration files.
 
 CHECK_PORTABILITY_SKIP+=	icons/icons.shar
 
-INSTALL_TARGET=		install install-pinger
 INSTALLATION_DIRS=	bin libexec ${PKGMANDIR}/man8 sbin \
 			share/squid share/squid/errors share/squid/icons \
 			${DOCDIR} ${EGDIR}
+SPECIAL_PERMS+=		libexec/pinger ${SETUID_ROOT_PERMS}
+
+PKG_DESTDIR_SUPPORT?=	user-destdir
 
 POST_INSTALL_EXTRA?=
 
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 061fb04c5d3..4adc906058f 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2010/02/14 13:27:52 taca Exp $
+# $NetBSD: Makefile,v 1.13 2010/02/20 15:11:40 tron Exp $
 
 DISTNAME=	squid-2.7.STABLE7
 PKGNAME=	${DISTNAME:S/STABLE//}
@@ -15,7 +15,6 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=		perl
 GNU_CONFIGURE=		yes
-PKG_DESTDIR_SUPPORT=	destdir
 MESSAGE_SRC=		../squid/MESSAGE MESSAGE
 
 .include "../../www/squid/Makefile.squid"
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index ee7109ba3bd..a9305fb4fae 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/02/14 13:37:02 taca Exp $
+# $NetBSD: Makefile,v 1.21 2010/02/20 15:11:40 tron Exp $
 
 DISTNAME=	squid-3.0.STABLE24
 PKGNAME=	${DISTNAME:S/STABLE//}
@@ -15,7 +15,6 @@ LICENSE=	gnu-gpl-v2
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		perl
 GNU_CONFIGURE=		yes
-PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../www/squid/Makefile.squid"
 .include "../../www/squid/options.mk"
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 0f13ddc2344..96639e3292a 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2010/02/02 13:57:49 tron Exp $
+# $NetBSD: Makefile,v 1.18 2010/02/20 15:11:40 tron Exp $
 
 DISTNAME=	squid-3.1.0.16
 PKGNAME=	${DISTNAME}	# Necessary for "pkgsrc/www/squid/options.mk"
@@ -15,7 +15,6 @@ LICENSE=	gnu-gpl-v2
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		perl gmake
 GNU_CONFIGURE=		yes
-PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../www/squid/Makefile.squid"