head	1.23;
access;
symbols
	pkgsrc-2013Q3:1.22.0.6
	pkgsrc-2013Q3-base:1.22
	pkgsrc-2013Q2:1.22.0.4
	pkgsrc-2013Q2-base:1.22
	pkgsrc-2013Q1:1.22.0.2
	pkgsrc-2013Q1-base:1.22
	pkgsrc-2012Q4:1.21.0.2
	pkgsrc-2012Q4-base:1.21
	pkgsrc-2012Q3:1.19.0.14
	pkgsrc-2012Q3-base:1.19
	pkgsrc-2012Q2:1.19.0.12
	pkgsrc-2012Q2-base:1.19
	pkgsrc-2012Q1:1.19.0.10
	pkgsrc-2012Q1-base:1.19
	pkgsrc-2011Q4:1.19.0.8
	pkgsrc-2011Q4-base:1.19
	pkgsrc-2011Q3:1.19.0.6
	pkgsrc-2011Q3-base:1.19
	pkgsrc-2011Q2:1.19.0.4
	pkgsrc-2011Q2-base:1.19
	pkgsrc-2011Q1:1.19.0.2
	pkgsrc-2011Q1-base:1.19
	pkgsrc-2010Q4:1.18.0.4
	pkgsrc-2010Q4-base:1.18
	pkgsrc-2010Q3:1.18.0.2
	pkgsrc-2010Q3-base:1.18
	pkgsrc-2010Q2:1.16.0.4
	pkgsrc-2010Q2-base:1.16
	pkgsrc-2010Q1:1.16.0.2
	pkgsrc-2010Q1-base:1.16
	pkgsrc-2009Q4:1.15.0.2
	pkgsrc-2009Q4-base:1.15
	pkgsrc-2009Q3:1.14.0.2
	pkgsrc-2009Q3-base:1.14
	pkgsrc-2009Q2:1.10.0.2
	pkgsrc-2009Q2-base:1.10
	pkgsrc-2009Q1:1.4.0.2
	pkgsrc-2009Q1-base:1.4
	pkgsrc-2008Q4:1.3.0.4
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.2
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.1.0.2
	cube-native-xorg-base:1.1;
locks; strict;
comment	@# @;


1.23
date	2013.12.10.14.51.20;	author adam;	state dead;
branches;
next	1.22;
commitid	zVPPiduBnqfJ3Bgx;

1.22
date	2013.02.10.18.18.10;	author adam;	state Exp;
branches;
next	1.21;

1.21
date	2012.11.08.04.18.45;	author taca;	state Exp;
branches;
next	1.20;

1.20
date	2012.10.28.06.31.05;	author asau;	state Exp;
branches;
next	1.19;

1.19
date	2011.03.04.19.56.51;	author gdt;	state Exp;
branches;
next	1.18;

1.18
date	2010.07.29.03.04.16;	author taca;	state Exp;
branches;
next	1.17;

1.17
date	2010.07.29.02.59.20;	author taca;	state Exp;
branches;
next	1.16;

1.16
date	2010.02.20.15.11.40;	author tron;	state Exp;
branches;
next	1.15;

1.15
date	2009.11.02.15.43.20;	author taca;	state Exp;
branches;
next	1.14;

1.14
date	2009.07.27.11.29.08;	author taca;	state Exp;
branches;
next	1.13;

1.13
date	2009.07.07.18.44.28;	author tron;	state Exp;
branches;
next	1.12;

1.12
date	2009.07.07.15.21.36;	author tron;	state Exp;
branches;
next	1.11;

1.11
date	2009.07.07.15.01.12;	author tron;	state Exp;
branches;
next	1.10;

1.10
date	2009.07.01.02.17.11;	author taca;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	2009.06.30.17.11.29;	author taca;	state Exp;
branches;
next	1.8;

1.8
date	2009.06.14.22.58.10;	author joerg;	state Exp;
branches;
next	1.7;

1.7
date	2009.06.06.22.49.50;	author tron;	state Exp;
branches;
next	1.6;

1.6
date	2009.05.04.22.29.41;	author tron;	state Exp;
branches;
next	1.5;

1.5
date	2009.04.20.21.29.53;	author tron;	state Exp;
branches;
next	1.4;

1.4
date	2009.03.08.11.39.23;	author apb;	state Exp;
branches;
next	1.3;

1.3
date	2008.09.15.17.33.26;	author taca;	state Exp;
branches;
next	1.2;

1.2
date	2008.09.15.17.30.24;	author taca;	state Exp;
branches;
next	1.1;

1.1
date	2008.09.12.16.03.05;	author taca;	state Exp;
branches;
next	;

1.10.2.1
date	2009.08.02.13.17.58;	author spz;	state Exp;
branches;
next	;


desc
@@


1.23
log
@www/squid incorporated into www/squid3
@
text
@# $NetBSD: Makefile.squid,v 1.22 2013/02/10 18:18:10 adam Exp $
#
# used by www/squid27/Makefile
# used by www/squid3/Makefile

.include "Makefile.common"

SQUID_MASTER_SITES=	ftp://ftp.squid-cache.org/pub/squid/ \
			http://ftp.nluug.nl/internet/squid/

DOCDIR=		share/doc/squid
EGDIR=		share/examples/squid
BUILD_DEFS+=	LOGDIR VARBASE
MAKE_ENV+=	INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
MAKE_ENV+=	PKG_PREFIX=${PREFIX:Q} VARBASE=${VARBASE:Q}

CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+=	--localstatedir=${SQUID_DATADIR:Q}
CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/share/squid
CONFIGURE_ARGS+=	--enable-cachemgr-hostname=localhost
CONFIGURE_ARGS+=	--enable-delay-pools
CONFIGURE_ARGS+=	--enable-icmp
CONFIGURE_ARGS+=	--enable-removal-policies=lru,heap
CONFIGURE_ARGS+=	--enable-poll
CONFIGURE_ARGS+=	--enable-storeio=${SQUID_BACKENDS:Q}
CONFIGURE_ARGS+=	--with-aio

PLIST_SRC=	${WRKDIR}/PLIST

MESSAGE_SRC?=		../squid/MESSAGE
RCD_SCRIPTS=		squid
RCD_SCRIPT_SRC.squid?=	../squid/files/squid.sh

CONFS=		cachemgr.conf mime.conf squid.conf msntauth.conf
.for f in ${CONFS}
CONF_FILES+=	${PREFIX}/${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
OWN_DIRS=	${SQUID_DATADIR}
OWN_DIRS_PERMS+=${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
		${SQUID_DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750

DOCFILES=	ChangeLog RELEASENOTES.html doc/debug-sections.txt
READMES=	README.FreeBSD README.NetBSD README.OpenBSD README.Solaris
EGFILES=	src/mime.conf.default src/squid.conf.default \
		helpers/basic_auth/MSNT/msntauth.conf.default \
		tools/cachemgr.conf

SUBST_CLASSES+=		confs
SUBST_STAGE.confs=	pre-configure
SUBST_FILES.confs=	src/cf.data.pre
SUBST_SED.confs=	-e "s/@@USER@@/${SQUID_USER}/"
SUBST_MESSAGE.confs=	Fixing configuration files.

CHECK_PORTABILITY_SKIP+=	icons/icons.shar

INSTALLATION_DIRS=	bin libexec ${PKGMANDIR}/man8 sbin \
			share/squid share/squid/errors share/squid/icons \
			${DOCDIR} ${EGDIR}
SPECIAL_PERMS+=		libexec/pinger ${SETUID_ROOT_PERMS}

POST_INSTALL_EXTRA?=

post-install: ${POST_INSTALL_EXTRA}
	for f in ${EGFILES}; do \
		${INSTALL_DATA}	${WRKSRC}/$$f \
			${DESTDIR}${PREFIX}/${EGDIR}/`basename $$f .default`; \
	done
	for f in ${DOCFILES}; do \
		${INSTALL_DATA} ${WRKSRC}/$$f \
			${DESTDIR}${PREFIX}/${DOCDIR}; \
	done
	for f in ${READMES}; do \
		${INSTALL_DATA} ${PKGDIR}/../squid/files/$$f \
			${DESTDIR}${PREFIX}/${DOCDIR}; \
	done
	${CHMOD} -w ${DESTDIR}${PREFIX}/libexec/pinger
	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
	${CHMOD} +w ${PLIST_SRC}
	(${FIND} ${DESTDIR}${PREFIX}/share/squid/errors \! -type d -print; \
	 ${FIND} ${DESTDIR}${PREFIX}/share/squid/icons \! -type d -print) | \
	${SED} -e 's#^${DESTDIR}${PREFIX}/##' | ${SORT} >>${PLIST_SRC}
@


1.22
log
@Adjusted for www/squid3
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.21 2012/11/08 04:18:45 taca Exp $
@


1.21
log
@Move --enable-auth to each squid package from common Makefile.squid.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.20 2012/10/28 06:31:05 asau Exp $
d4 1
a4 1
# used by www/squid31/Makefile
a13 2

#
d17 10
a26 10
CONFIGURE_ARGS=	--sysconfdir=${PKG_SYSCONFDIR:Q} \
		--localstatedir=${SQUID_DATADIR:Q} \
		--datarootdir=${PREFIX}/share/squid \
		--enable-cachemgr-hostname=localhost \
		--enable-delay-pools \
		--enable-icmp \
		--enable-removal-policies=lru,heap \
		--enable-poll \
		--enable-storeio=${SQUID_BACKENDS:Q} \
		--with-aio
a27 1
#
d39 1
a39 2
OWN_DIRS_PERMS+= \
		${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
@


1.20
log
@Drop superfluous PKG_DESTDIR_SUPPORT, "user-destdir" is default these days.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.19 2011/03/04 19:56:51 gdt Exp $
a21 1
		--enable-auth=basic,digest,ntlm \
@


1.19
log
@chmod +w file copied into WRKDIR.

Don't assume sources are writeble.  Fixes build with CVSREAD=t.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.18 2010/07/29 03:04:16 taca Exp $
a65 2
PKG_DESTDIR_SUPPORT?=	user-destdir

@


1.18
log
@Remove "used by www/squid30/Makefile" comment line.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.17 2010/07/29 02:59:20 taca Exp $
d85 1
@


1.17
log
@--enable-underscores option had gone.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.16 2010/02/20 15:11:40 tron Exp $
a3 1
# used by www/squid30/Makefile
@


1.16
log
@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.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.15 2009/11/02 15:43:20 taca Exp $
a28 1
		--enable-underscores \
@


1.15
log
@
Make MESSAGE_SRC settable by each squid* pacakge.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.14 2009/07/27 11:29:08 taca Exp $
a62 1
INSTALL_TARGET=		install install-pinger
d66 3
@


1.14
log
@Make it DESTDIR careful.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.13 2009/07/07 18:44:28 tron Exp $
d36 1
a36 1
MESSAGE_SRC=		../squid/MESSAGE
@


1.13
log
@Add mirror on "ftp.nluug.nl" to master site list.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.12 2009/07/07 15:21:36 tron Exp $
d83 1
a83 1
	${CHMOD} -w ${PREFIX}/libexec/pinger
d85 3
a87 3
	(${FIND} ${PREFIX}/share/squid/errors \! -type d -print;	\
	 ${FIND} ${PREFIX}/share/squid/icons \! -type d -print) |	\
	${SED} -e 's#^${PREFIX}/##' | ${SORT} >>${PLIST_SRC}
@


1.12
log
@Improve package list creation to work with symbolic links as well.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.11 2009/07/07 15:01:12 tron Exp $
a2 1
# used by www/squid26/Makefile
d9 2
a10 1
SQUID_MASTER_SITES=	ftp://ftp.squid-cache.org/pub/squid/
@


1.11
log
@General improvements:
1.) Allow individual "squid*" packages to register an extra target that
    is run before the common "post-install" target.
2.) Use a much simpler logic to figure out what files get installed into
    "share/squid/errors" and "share/squid/icons".

Tested with the "squid27" and the "squid31" package.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.10 2009/07/01 02:17:11 taca Exp $
d85 2
a86 2
	(${FIND} ${PREFIX}/share/squid/errors -type f -print;	\
	 ${FIND} ${PREFIX}/share/squid/icons -type f -print) |	\
@


1.10
log
@Add squid's common ftp download URL as SQUID_MASTER_SITES.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.9 2009/06/30 17:11:29 taca Exp $
d68 3
a70 1
post-install:
d85 3
a87 11
	(							\
	cd ${WRKSRC}/errors;					\
	for i in *; do						\
		${TEST} -d $$i &&				\
		(${LS} $$i/ERR_* |				\
		${SED} -e 's@@^@@share/squid/errors/@@');		\
	done; 							\
	cd ${WRKSRC}/icons;					\
	${LS} anthony-*.gif |					\
		${SED} -e 's@@^@@share/squid/icons/@@';		\
	) >>${PLIST_SRC}
@


1.10.2.1
log
@Pullup ticket 2840 - requested by tron
security update

Revisions pulled up:
- pkgsrc/www/squid/Makefile.squid		1.14
- pkgsrc/www/squid31/DESCR			1.2
- pkgsrc/www/squid31/Makefile			1.13
- pkgsrc/www/squid31/PLIST			1.3
- pkgsrc/www/squid31/distinfo			1.11
- pkgsrc/www/squid31/patches/patch-ad		1.5
- pkgsrc/www/squid31/patches/patch-ae		1.3

Files deleted:
pkgsrc/www/squid31/patches/patch-aa
pkgsrc/www/squid31/patches/patch-ab


   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Tue Jul  7 18:25:13 UTC 2009

   Modified Files:
   	pkgsrc/www/squid31: Makefile distinfo
   	pkgsrc/www/squid31/patches: patch-ae

   Log Message:
   Update "squid31" package to version 3.1.0.9. Changes since version 3.1.0.8:
   - Bug 2682: Add ftp_epsv control to disable EPSV support.
   - Bug 2665: Detach automake system from using -I.
   - Bug 2395: FTP auth errors not displayed
   - ... also several changes and bugs closed in 3.0.STABLE16
   - Port from 2.7: Show local address on listening sockets
   - Add "tag" type acl matching tags set by external acl helpers.
   - Adds Language alias linker/installer/upgrade scripts
   - Support for GCC 4.4
   - Fix false NAT lookup errors on Linux
   - Fix many Windows port issues
   - Fix squid_kerb_auth helepr install location
   - Better detection of IPv6 stack types
   - Updates Licensing information for Squid 3.1
   - ... and many packaging portability build and install issues


   To generate a diff of this commit:
   cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/squid31/Makefile
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/squid31/distinfo
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/squid31/patches/patch-ae

   -----

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Wed Jul  8 15:02:01 UTC 2009

   Modified Files:
   	pkgsrc/www/squid31: Makefile

   Log Message:
   Fix destdir build.


   To generate a diff of this commit:
   cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/squid31/Makefile

   -----

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sun Jul 12 09:45:02 UTC 2009

   Modified Files:
   	pkgsrc/www/squid31: Makefile distinfo
   Added Files:
   	pkgsrc/www/squid31/patches: patch-aa

   Log Message:
   Add fix for Squid bug 2707 to make anonymous FTP work again.


   To generate a diff of this commit:
   cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/squid31/Makefile
   cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/squid31/distinfo
   cvs rdiff -u -r0 -r1.3 pkgsrc/www/squid31/patches/patch-aa

   -----

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sun Jul 19 23:05:38 UTC 2009

   Modified Files:
   	pkgsrc/www/squid31: DESCR Makefile PLIST distinfo
   	pkgsrc/www/squid31/patches: patch-aa patch-ad patch-ae

   Log Message:
   Update "squid31" package to version 3.1.0.11.
   Changes since version 3.1.0.9:
   - Bug 2087: Support adaptation sets and chains
   - Bug 2459: dns error message broken when error handling delayed
   - Support ICAP Retry
   - Support ICAP retries based on the ICAP responses status code
   - Support logging ICAP
   - Support logging total DNS wait time
   - Support logging response times of adaptation transactions
   - General logging enhancements
   - Dynamically form chains based on ICAP X-Next-Services header
   - Support cross-transactional ICAP header exchange
   - Bug 2680: Regression Crash after rotate with no helpers running
   - Bug 2695: Regression in WCCPv2 L2 mask assignment
   - Bug 2707: Regression in FTP anonymous auth
   - Bug 422, 2706: RFC 2616 Date header requirements
   - Bug 1087: ESI processor not quoting attributes correctly.
   - Bug 1338: File prefetches aborted despite range_offset
   - Bug 2080: wbinfo_group.pl - false positive under certain conditions
   - Bug 2092: select loop 32-bit call counter overflows
   - Bug 2127: delay pools class 4 crashes with ntlm auth
   - Bug 2611: document fast/slow acl types
   - Bug 2614: Potential loss of adapted body data from eCAP adapters
   - Bug 2658: Missing TextException copy constructor
   - Bug 2659: String length overflows on append, leading to segfaults
   - Bug 2699: Build failure NTLM smb_lm helper
   - Bug 2709: TRANSLATIONS not installed
   - Bug 2710: squid_kerb_auth non-terminated string
   - Delay pools 64-bit buckets and IPv6-polish
   - Break forwarding loops for "transparent" or "intercept" http_ports.
   - Add --disable-translation option to detatch .po from error negotiation
   - Add squidclient man(1) page
   - Add localhost to default permitted networks
   - http_port allow-direct option to allow direct forwarding in accelerator m=
   ode
   - ... and many testing infrastructure updates
   - ... and much adaptation polish and improvements


   To generate a diff of this commit:
   cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/www/squid31/DESCR
   cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/squid31/Makefile
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/squid31/PLIST
   cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/squid31/distinfo
   cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/squid31/patches/patch-aa
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/squid31/patches/patch-ad
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/squid31/patches/patch-ae

   -----

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sun Jul 19 23:28:04 UTC 2009

   Modified Files:
   	pkgsrc/www/squid31: distinfo
   	pkgsrc/www/squid31/patches: patch-aa

   Log Message:
   Add Squid bug number.


   To generate a diff of this commit:
   cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/squid31/distinfo
   cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/squid31/patches/patch-aa

   -----

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Mon Jul 20 13:56:31 UTC 2009

   Modified Files:
   	pkgsrc/www/squid31: Makefile distinfo
   Added Files:
   	pkgsrc/www/squid31/patches: patch-ab

   Log Message:
   Add fix for Squid bug 2395 which makes FTP connection to e.g.
   "ftp.fu-berlin.de" work again.


   To generate a diff of this commit:
   cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/squid31/Makefile
   cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/squid31/distinfo
   cvs rdiff -u -r0 -r1.3 pkgsrc/www/squid31/patches/patch-ab

   -----

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Mon Jul 27 16:35:55 UTC 2009

   Modified Files:
   	pkgsrc/www/squid31: Makefile distinfo
   Removed Files:
   	pkgsrc/www/squid31/patches: patch-aa patch-ab

   Log Message:
   Update "squid31" package to version 3.1.0.12.
   Changes since version 3.1.0.11:
   - Bug 2716: Chunked request Signed/Unsigned build error
   - Bug 2674: Remove limit on HTTP headers read.
   - Bug 2620: Invalid HTTP response codes causes segfault
   - Fix FTP EPSV negotiation parser.
   - Fix Via string when leak checking is enabled (valgrind etc)
   - ... and several documentation and testing additions

   This update also fixes the security vulnerabilites reported in
   the SQUID-2009:2 advisory.


   To generate a diff of this commit:
   cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/squid31/Makefile
   cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/squid31/distinfo
   cvs rdiff -u -r1.6 -r0 pkgsrc/www/squid31/patches/patch-aa
   cvs rdiff -u -r1.3 -r0 pkgsrc/www/squid31/patches/patch-ab

   -----

   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Tue Jul  7 15:01:12 UTC 2009

   Modified Files:
           pkgsrc/www/squid: Makefile.squid

   Log Message:
   General improvements:
   1.) Allow individual "squid*" packages to register an extra target that
       is run before the common "post-install" target.
   2.) Use a much simpler logic to figure out what files get installed into
       "share/squid/errors" and "share/squid/icons".

   Tested with the "squid27" and the "squid31" package.


   To generate a diff of this commit:
   cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/squid/Makefile.squid

   -----

   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Tue Jul  7 15:21:37 UTC 2009

   Modified Files:
           pkgsrc/www/squid: Makefile.squid

   Log Message:
   Improve package list creation to work with symbolic links as well.


   To generate a diff of this commit:
   cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/squid/Makefile.squid

   -----

   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Tue Jul  7 18:44:28 UTC 2009

   Modified Files:
           pkgsrc/www/squid: Makefile.squid

   Log Message:
   Add mirror on "ftp.nluug.nl" to master site list.


   To generate a diff of this commit:
   cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/squid/Makefile.squid

   -----

   Module Name:    pkgsrc
   Committed By:   taca
   Date:           Mon Jul 27 11:29:08 UTC 2009

   Modified Files:
           pkgsrc/www/squid: Makefile.squid

   Log Message:
   Make it DESTDIR careful.


   To generate a diff of this commit:
   cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/squid/Makefile.squid
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.14 2009/07/27 11:29:08 taca Exp $
d3 1
d10 1
a10 2
SQUID_MASTER_SITES=	ftp://ftp.squid-cache.org/pub/squid/ \
			http://ftp.nluug.nl/internet/squid/
d68 1
a68 3
POST_INSTALL_EXTRA?=

post-install: ${POST_INSTALL_EXTRA}
d81 1
a81 1
	${CHMOD} -w ${DESTDIR}${PREFIX}/libexec/pinger
d83 11
a93 3
	(${FIND} ${DESTDIR}${PREFIX}/share/squid/errors \! -type d -print; \
	 ${FIND} ${DESTDIR}${PREFIX}/share/squid/icons \! -type d -print) | \
	${SED} -e 's#^${DESTDIR}${PREFIX}/##' | ${SORT} >>${PLIST_SRC}
@


1.9
log
@Revert generating PLIST for error files except @@dirrm.
It was accidently deleted by previous commit.

Also stop using PLIST.common_end here.

It should fix some bulk problem of squid27/squid30/squid31 packages.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.8 2009/06/14 22:58:10 joerg Exp $
d10 3
a12 1
DOCDIR=	share/doc/squid
@


1.8
log
@Remove @@dirrm related logic.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.7 2009/06/06 22:49:50 tron Exp $
d82 6
a91 1
	${CAT} ${PKGDIR}/PLIST.common_end >>${PLIST_SRC}
@


1.7
log
@Remove write permission from "libexec/pinger" because it is installed
setuid "root".
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.6 2009/05/04 22:29:41 tron Exp $
a81 8
	cd ${WRKSRC}/errors;					\
	for i in *; do						\
		${TEST} -d $$i &&				\
		(${LS} $$i/ERR_* |				\
		${SED} -e 's@@^@@share/squid/errors/@@';		\
		${ECHO} "@@dirrm share/squid/errors/$$i");	\
	done; 							\
	${ECHO} "@@dirrm share/squid/errors";			\
@


1.6
log
@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.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.5 2009/04/20 21:29:53 tron Exp $
d79 1
@


1.5
log
@Add and enable "squid31" package.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.4 2009/03/08 11:39:23 apb Exp $
d67 12
a78 11
.for f in ${EGFILES}
	${INSTALL_DATA}	${WRKSRC}/${f} \
		${DESTDIR}${PREFIX}/${EGDIR}/`basename ${f} .default`
.endfor
.for f in ${DOCFILES}
	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR}
.endfor
.for f in ${READMES}
	${INSTALL_DATA} ${PKGDIR}/../squid/files/${f} \
		${DESTDIR}${PREFIX}/${DOCDIR}
.endfor
@


1.4
log
@Add share/squid to INSTALLATION_DIRS, so it gets created explicitly with
mode 755 instead of implicitly with whatever mode is implied by the
umask.

Bump PKGREVISION for squid27 and squid30 packages.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.3 2008/09/15 17:33:26 taca Exp $
d6 1
@


1.3
log
@Add comments who use this file.
@
text
@d1 1
a1 1
# $NetBSD: Makefile.squid,v 1.2 2008/09/15 17:30:24 taca Exp $
d61 3
a63 2
INSTALLATION_DIRS=	bin libexec ${PKGMANDIR}/man8 sbin ${DOCDIR} \
			${EGDIR} share/squid/errors share/squid/icons
@


1.2
log
@Fix (revert) some definitions exchage betweem Makefile.common and
Makefile.squid since previous change break squidGuard package.

Noted by joerg@@ via private mail.
@
text
@d1 5
a5 1
# $NetBSD: Makefile.squid,v 1.1 2008/09/12 16:03:05 taca Exp $
@


1.1
log
@Adding missing files to be added. (Oops!)

Noted by Klaus Klein via private mail.
@
text
@d1 1
a1 1
# $NetBSD$
d5 3
a7 1
PKG_SYSCONFSUBDIR?=		squid
d9 3
a11 5
SQUID_USER?=			squid
SQUID_GROUP?=			squid

PKG_GROUPS_VARS+=		SQUID_GROUP
PKG_USERS_VARS+=		SQUID_USER
d13 12
a24 3
PKG_GROUPS=			${SQUID_GROUP}
PKG_USERS=			${SQUID_USER}:${SQUID_GROUP}
PKG_GECOS.${SQUID_USER}=	Squid Web-Cache pseudo-user
@

