View | Details | Raw Unified | Return to bug 189898 | Differences between
and this patch

Collapse All | Expand All

(-)b/www/squid/Makefile (-9 / +30 lines)
Lines 1-7 Link Here
1
# Created by: Adrian Chadd <adrian@FreeBSD.org>
1
# Created by: Adrian Chadd <adrian@FreeBSD.org>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
NO_STAGE=	yes
5
# Tunables not (yet) configurable via 'make config':
4
# Tunables not (yet) configurable via 'make config':
6
# SQUID_{U,G}ID
5
# SQUID_{U,G}ID
7
#   Which user/group Squid should run as (default: squid/squid).
6
#   Which user/group Squid should run as (default: squid/squid).
Lines 116-123 SQUID_STABLE_VER= 9 Link Here
116
115
117
CONFLICTS_INSTALL=	squid-2.[^7]* squid3?-* cacheboy-[0-9]* lusca-head-[0-9]*
116
CONFLICTS_INSTALL=	squid-2.[^7]* squid3?-* cacheboy-[0-9]* lusca-head-[0-9]*
118
USES=		perl5
117
USES=		perl5
118
USES+=		shebangfix
119
USES+=		tar:bzip2
120
SHEBANG_FILES=	scripts/*.pl \
121
		src/mk-globals-c.pl \
122
		src/mk-string-arrays.pl \
123
		contrib/rredir.pl \
124
		contrib/user-agents.pl \
125
		contrib/url-normalizer.pl \
126
		helpers/basic_auth/multi-domain-NTLM/smb_auth.pl \
127
		helpers/basic_auth/POP3/pop3.pl \
128
		helpers/ntlm_auth/no_check/no_check.pl \
129
		helpers/external_acl/wbinfo_group/wbinfo_group.pl
119
GNU_CONFIGURE=	yes
130
GNU_CONFIGURE=	yes
120
USE_BZIP2=	yes
121
USE_RC_SUBR=	squid
131
USE_RC_SUBR=	squid
122
132
123
SQUID_UID?=	squid
133
SQUID_UID?=	squid
Lines 391-403 CONFIGURE_ENV+= GREP="${GREP}" Link Here
391
PLIST_DIRS=	%%ETCDIR%%/icons libexec/squid
401
PLIST_DIRS=	%%ETCDIR%%/icons libexec/squid
392
PLIST_FILES=	${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \
402
PLIST_FILES=	${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \
393
		${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
403
		${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
404
PLIST_FILES+=	man/man8/cachemgr.cgi.8.gz \
405
		man/man8/ncsa_auth.8.gz \
406
		man/man8/pam_auth.8.gz \
407
		man/man8/squid.8.gz \
408
		man/man8/squid_db_auth.8.gz \
409
		man/man8/squid_session.8.gz \
410
		man/man8/squid_unix_group.8.gz \
411
		%%ETCDIR%%/cachemgr.conf \
412
		%%ETCDIR%%/mime.conf \
413
		%%ETCDIR%%/msntauth.conf \
414
		%%ETCDIR%%/squid.conf
394
415
395
.for d in ${SQUID_LANGUAGES}
416
.for d in ${SQUID_LANGUAGES}
396
PLIST_DIRS+=	%%ETCDIR%%/errors/${d}
417
PLIST_DIRS+=	%%ETCDIR%%/errors/${d}
397
PLIST_FILES+=	${error_files:S,^,%%ETCDIR%%/errors/${d}/,}
418
PLIST_FILES+=	${error_files:S,^,%%ETCDIR%%/errors/${d}/,}
398
.endfor
419
.endfor
399
PLIST_DIRS+=	%%ETCDIR%%/errors
420
PLIST_DIRS+=	%%ETCDIR%%/errors
400
PLIST_DIRSTRY+=	%%ETCDIR%%
421
PLIST_DIRSTRY+=	%%ETCDIR%% /var/squid/logs /var/squid
401
422
402
post-patch:
423
post-patch:
403
	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
424
	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
Lines 418-433 pre-su-install: Link Here
418
439
419
post-install:
440
post-install:
420
.if ${PORT_OPTIONS:MEXAMPLES}
441
.if ${PORT_OPTIONS:MEXAMPLES}
421
	@${MKDIR} ${EXAMPLESDIR}
442
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
422
	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}
443
	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${STAGEDIR}${EXAMPLESDIR}
423
.endif
444
.endif
424
.if ${PORT_OPTIONS:MPINGER}
445
.if ${PORT_OPTIONS:MPINGER}
425
	${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
446
	${CHMOD} 4510 ${STAGEDIR}${PREFIX}/libexec/squid/pinger; \
426
	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
447
	${CHGRP} ${SQUID_GID} ${STAGEDIR}${PREFIX}/libexec/squid/pinger
427
.endif
448
.endif
428
.if ${PORT_OPTIONS:MDOCS}
449
.if ${PORT_OPTIONS:MDOCS}
429
	@${MKDIR} ${DOCSDIR}
450
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
430
	cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR}
451
	cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${STAGEDIR}${DOCSDIR}
431
.endif
452
.endif
432
	@${SETENV} PKG_PREFIX=${PREFIX} \
453
	@${SETENV} PKG_PREFIX=${PREFIX} \
433
	    ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
454
	    ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL

Return to bug 189898