Date: Sun, 18 May 2014 00:13:44 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189902: [patch] Add staging support to www/squid32 Message-ID: <201405180013.s4I0Di1j071551@cgiserv.freebsd.org> Resent-Message-ID: <201405180020.s4I0K0ja034430@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189902
>Category: ports
>Synopsis: [patch] Add staging support to www/squid32
>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: Sun May 18 00:20: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/squid32.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/www/squid32/Makefile b/www/squid32/Makefile
index 7572a7d..0c6810d 100644
--- a/www/squid32/Makefile
+++ b/www/squid32/Makefile
@@ -44,9 +44,32 @@ LICENSE_FILE= ${WRKSRC}/COPYING
SQUID_STABLE_VER= 13
CONFLICTS_INSTALL= squid-2.[0-9].* squid33-* cacheboy-[0-9]* lusca-head-[0-9]*
-USES= perl5
+USES= perl5 tar:bzip2 shebangfix
+SHEBANG_FILES= scripts/AnnounceCache.pl \
+ scripts/access-log-matrix.pl \
+ scripts/cache-compare.pl \
+ scripts/cachetrace.pl \
+ scripts/check_cache.pl \
+ scripts/fileno-to-pathname.pl \
+ scripts/flag_truncs.pl \
+ scripts/icp-test.pl \
+ scripts/find-alive.pl \
+ scripts/trace-job.pl \
+ scripts/trace-master.pl \
+ scripts/icpserver.pl \
+ scripts/tcp-banger.pl \
+ scripts/udp-banger.pl \
+ scripts/upgrade-1.0-store.pl \
+ scripts/calc-must-ids.pl \
+ contrib/rredir.pl \
+ contrib/user-agents.pl \
+ contrib/url-normalizer.pl \
+ src/mk-globals-c.pl \
+ src/mk-string-arrays.pl \
+ tools/helper-mux.pl \
+ tools/helper-ok-dying.pl \
+ tools/helper-ok.pl
GNU_CONFIGURE= yes
-USE_BZIP2= yes
USE_RC_SUBR= squid
USERS= squid
@@ -203,7 +226,6 @@ CONFIGURE_ARGS= --with-default-user=squid \
--disable-linux-tproxy \
--disable-translation
-NO_STAGE= yes
.include <bsd.port.pre.mk>
.if ${CC:T:Mclang} == "clang" || ${CXX:T:Mclang++} == "clang++" || ${OSVERSION} >= 1000024
@@ -470,7 +492,24 @@ PLIST_DIRS= %%ETCDIR%%/icons/silk %%ETCDIR%%/icons libexec/squid
PLIST_FILES= ${etc_files:S,^,etc/,} \
%%ETCDIR%%/icons/SN.png \
${icon_silk_files:S,^,%%ETCDIR%%/icons/silk/,} \
- ${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
+ ${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,} \
+ man/man8/cachemgr.cgi.8.gz \
+ man/man8/basic_db_auth.8.gz \
+ man/man8/basic_getpwnam_auth.8.gz \
+ man/man8/basic_ncsa_auth.8.gz \
+ man/man8/basic_pam_auth.8.gz \
+ man/man8/basic_radius_auth.8.gz \
+ man/man8/digest_file_auth.8.gz \
+ man/man8/ext_file_userip_acl.8.gz \
+ man/man8/ext_unix_group_acl.8.gz \
+ man/man8/negotiate_kerberos_auth.8.gz \
+ man/man8/squid.8.gz \
+ man/man1/squidclient.1.gz \
+ %%ETCDIR%%/cachemgr.conf \
+ %%ETCDIR%%/mime.conf \
+ %%ETCDIR%%/msntauth.conf \
+ %%ETCDIR%%/squid.conf \
+ %%ETCDIR%%/errorpage.css
PLIST_FILES+= %%ETCDIR%%/errors/COPYRIGHT %%ETCDIR%%/errors/TRANSLATORS
.for d in ${error_dirs}
@@ -479,7 +518,9 @@ PLIST_FILES+= ${error_files:S,^,%%ETCDIR%%/errors/${d}/,}
.endfor
PLIST_FILES+= ${error_dir_links:S,^,%%ETCDIR%%/errors/,}
PLIST_DIRS+= %%ETCDIR%%/errors
-PLIST_DIRSTRY+= %%ETCDIR%%
+PLIST_DIRSTRY+= %%ETCDIR%% /var/log/squid /var/run/squid \
+ /var/squid/cache/squid /var/squid/cache \
+ /var/squid/logs /var/squid %%EXAMPLESDIR%%
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -497,15 +538,15 @@ pre-su-install:
post-install:
.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${STAGEDIR}${EXAMPLESDIR}
.endif
.if ${PORT_OPTIONS:MICMP}
- ${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
- ${CHGRP} squid ${PREFIX}/libexec/squid/pinger
+ ${CHMOD} 4510 ${STAGEDIR}${PREFIX}/libexec/squid/pinger; \
+ ${CHGRP} squid ${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?201405180013.s4I0Di1j071551>