Date: Sat, 17 May 2014 20:37:24 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189898: [patch] Add staging support to www/squid Message-ID: <201405172037.s4HKbOMb042726@cgiserv.freebsd.org> Resent-Message-ID: <201405172040.s4HKe03h054156@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189898
>Category: ports
>Synopsis: [patch] Add staging support to www/squid
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat May 17 20:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Joseph Benden
>Release: FreeBSD 11
>Organization:
>Environment:
FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014 root@lucy:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Adds staging support, added shebangfixes, and USES tar:bzip2 to www/squid.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/squid/Makefile b/www/squid/Makefile
index e77f475..47f5f44 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,7 +1,6 @@
# Created by: Adrian Chadd <adrian@FreeBSD.org>
# $FreeBSD$
-NO_STAGE= yes
# Tunables not (yet) configurable via 'make config':
# SQUID_{U,G}ID
# Which user/group Squid should run as (default: squid/squid).
@@ -116,8 +115,19 @@ SQUID_STABLE_VER= 9
CONFLICTS_INSTALL= squid-2.[^7]* squid3?-* cacheboy-[0-9]* lusca-head-[0-9]*
USES= perl5
+USES+= shebangfix
+USES+= tar:bzip2
+SHEBANG_FILES= scripts/*.pl \
+ src/mk-globals-c.pl \
+ src/mk-string-arrays.pl \
+ contrib/rredir.pl \
+ contrib/user-agents.pl \
+ contrib/url-normalizer.pl \
+ helpers/basic_auth/multi-domain-NTLM/smb_auth.pl \
+ helpers/basic_auth/POP3/pop3.pl \
+ helpers/ntlm_auth/no_check/no_check.pl \
+ helpers/external_acl/wbinfo_group/wbinfo_group.pl
GNU_CONFIGURE= yes
-USE_BZIP2= yes
USE_RC_SUBR= squid
SQUID_UID?= squid
@@ -418,16 +428,16 @@ pre-su-install:
post-install:
.if ${PORT_OPTIONS:MEXAMPLES}
- @${MKDIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${STAGEDIR}${EXAMPLESDIR}
.endif
.if ${PORT_OPTIONS:MPINGER}
- ${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
- ${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
+ ${CHMOD} 4510 ${STAGEDIR}${PREFIX}/libexec/squid/pinger; \
+ ${CHGRP} ${SQUID_GID} ${STAGEDIR}${PREFIX}/libexec/squid/pinger
.endif
.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${STAGEDIR}${DOCSDIR}
.endif
@${SETENV} PKG_PREFIX=${PREFIX} \
${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405172037.s4HKbOMb042726>