Index: branches/2014Q2/www/squidguard/Makefile =================================================================== --- branches/2014Q2/www/squidguard/Makefile (revision 352034) +++ branches/2014Q2/www/squidguard/Makefile (revision 352035) @@ -1,125 +1,126 @@ # $FreeBSD$ PORTNAME= squidGuard PORTVERSION= 1.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= www MASTER_SITES= http://www.squidguard.org/Downloads/:a \ http://www.squidguard.org/Downloads/Contrib/:b DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:a \ squidGuard-1.4-quoted_string_support.diff:b \ squidGuard-1.4-dnsbl.patch:b EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= madpilot@FreeBSD.org COMMENT= A fast redirector for squid LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USE_BDB= 40+ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-db-inc=${BDB_INCLUDE_DIR} \ --with-db-lib=${BDB_LIB_DIR} \ --with-sg-config=${ETCDIR}/${PORTNAME}.conf \ --with-sg-dbhome=${DATADIR} \ --with-sg-logdir=${LOGDIR} \ + --with-squiduser=${SQUID_UID} \ --exec-prefix=${PREFIX} CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include SQUID_UID?= squid SQUID_GID?= squid PLIST_SUB+= SQUID_UID='${SQUID_UID}' SQUID_GID='${SQUID_GID}' DATADIR?= /var/db/${PORTNAME} ETCDIR= ${PREFIX}/etc/squid _DATADIR= ${WRKDIR}/data LOGDIR?= /var/log/${PORTNAME} PLIST_SUB+= LOGDIR="${LOGDIR}" SUB_FILES= pkg-deinstall pkg-message SUB_LIST= PORTNAME=${PORTNAME} OPTIONS_DEFINE= DNS_BL DOCS EXAMPLES LDAP QUOTE_STRING OPTIONS_SINGLE= SV OPTIONS_SINGLE_SV= SQUID27 SQUID32 SQUID33 OPTIONS_DEFAULT= SQUID27 EXAMPLES_DESC= Install sample blacklists DNS_BL_DESC= Enable DNS based blacklists QUOTE_STRING_DESC= Add quoted string patch SQUID27_DESC= Depend on Squid 2.7.x SQUID32_DESC= Depend on Squid 3.2.x SQUID33_DESC= Depend on Squid 3.3.x OPTIONS_SUB= yes SQUID27_RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid SQUID32_RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid32 SQUID33_RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid33 LDAP_CONFIGURE_ON= --with-ldap LDAP_CONFIGURE_OFF= --without-ldap LDAP_LDFLAGS= -L${LOCALBASE}/lib LDAP_USE= OPENLDAP=yes .include pre-fetch: @if [ ${SQUID_UID} = "squid" -o ${SQUID_GID} = "squid" ] ; then \ ${ECHO_MSG} "===> SQUID_UID is set to \"${SQUID_UID}\" and SQUID_GID is set to \"${SQUID_GID}\"." ; \ ${ECHO_MSG} " To change this specify them with your make arguments, e.g." ; \ ${ECHO_MSG} " make SQUID_UID=nobody SQUID_GID=nogroup" ; \ fi post-patch: @${REINPLACE_CMD} \ -e 's,-ldb,-l${BDB_LIB_NAME},' ${WRKSRC}/configure @if [ "${BDB_LIB_NAME}" = "db-4.2" ] ; then \ ${REINPLACE_CMD} -E -e 's,(db_version),\1_4002,g' \ ${WRKSRC}/configure ; \ fi .if ${PORT_OPTIONS:MQUOTE_STRING} ${PATCH} -d ${WRKSRC} --forward --quiet -p2 <${DISTDIR}/squidGuard-1.4-quoted_string_support.diff .endif .if ${PORT_OPTIONS:MDNS_BL} ${PATCH} -d ${WRKSRC} --forward --quiet -p1 <${DISTDIR}/squidGuard-1.4-dnsbl.patch .endif post-build: .if ${PORT_OPTIONS:MEXAMPLES} @${ECHO_MSG} "===> Preparing blacklists" @${MKDIR} ${_DATADIR} @${TAR} -C ${_DATADIR} --exclude *.diff -pxzf \ ${WRKSRC}/samples/dest/blacklists.tar.gz @${MV} -f ${_DATADIR}/blacklists/README ${WRKDIR}/README.blacklists @${MV} -f ${_DATADIR}/blacklists/* ${_DATADIR}/ @${RM} -r ${_DATADIR}/blacklists .endif pre-install: .if ${PORT_OPTIONS:MEXAMPLES} @${ECHO_MSG} "===> Installing sample blacklists" @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/blacklists @(cd ${_DATADIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/blacklists) @${INSTALL_DATA} ${WRKDIR}/README.blacklists ${STAGEDIR}${EXAMPLESDIR} @${CHOWN} -R ${SQUID_UID}:${SQUID_GID} ${STAGEDIR}${EXAMPLESDIR}/blacklists @${CHMOD} -R 550 ${STAGEDIR}${EXAMPLESDIR}/blacklists @${ECHO_MSG} " -> Sample blacklists installed in ${EXAMPLESDIR}/blacklists" .endif @${ECHO_MSG} "===> Installing sample configuration file" @${MKDIR} ${STAGEDIR}${ETCDIR} @${SED} -e "s|@sg_dbhome@|${EXAMPLESDIR}/blacklists|" -e "s|@sg_logdir@|${LOGDIR}|" \ ${WRKSRC}/samples/sample.conf.in \ >${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample ; \ ${ECHO_MSG} " -> Sample configuration file installed in: ${ETCDIR}" ; \ post-install: @${ECHO_MSG} "===> Installing ${PORTNAME} documentation" @${MKDIR} ${STAGEDIR}${DOCSDIR} . for i in ${WRKSRC}/doc/*.txt ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.gif ${WRKSRC}/doc/README @${INSTALL_DATA} ${WRKSRC}$i ${STAGEDIR}${DOCSDIR} . endfor @${ECHO_MSG} " -> Documentation installed in: ${DOCSDIR}" @${MKDIR} ${STAGEDIR}${LOGDIR} @${CHOWN} -R ${SQUID_UID}:${SQUID_GID} ${STAGEDIR}${LOGDIR} .include Index: branches/2014Q2/www/squidguard/pkg-plist =================================================================== --- branches/2014Q2/www/squidguard/pkg-plist (revision 352034) +++ branches/2014Q2/www/squidguard/pkg-plist (revision 352035) @@ -1,79 +1,79 @@ bin/squidGuard @unexec if cmp -s %D/etc/squid/squidGuard.conf.sample %D/etc/squid/squidGuard.conf; then rm -f %D/etc/squid/squidGuard.conf; fi etc/squid/squidGuard.conf.sample @exec if [ ! -f %D/etc/squid/squidGuard.conf ]; then cp -p %D/%F %B/squidGuard.conf; fi %%PORTDOCS%%%%DOCSDIR%%/LDAPFlow.txt %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/authentication.html %%PORTDOCS%%%%DOCSDIR%%/authentication.txt %%PORTDOCS%%%%DOCSDIR%%/configuration.html %%PORTDOCS%%%%DOCSDIR%%/configuration.txt %%PORTDOCS%%%%DOCSDIR%%/configure.html %%PORTDOCS%%%%DOCSDIR%%/configure.txt %%PORTDOCS%%%%DOCSDIR%%/expressionlist.html %%PORTDOCS%%%%DOCSDIR%%/expressionlist.txt %%PORTDOCS%%%%DOCSDIR%%/extended.html %%PORTDOCS%%%%DOCSDIR%%/extended.txt %%PORTDOCS%%%%DOCSDIR%%/faq.html %%PORTDOCS%%%%DOCSDIR%%/faq.txt %%PORTDOCS%%%%DOCSDIR%%/features.html %%PORTDOCS%%%%DOCSDIR%%/features.txt %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/install.html %%PORTDOCS%%%%DOCSDIR%%/install.txt %%PORTDOCS%%%%DOCSDIR%%/installation.html %%PORTDOCS%%%%DOCSDIR%%/installation.txt %%PORTDOCS%%%%DOCSDIR%%/ldap-ad-tips.html %%PORTDOCS%%%%DOCSDIR%%/ldap-ad-tips.txt %%PORTDOCS%%%%DOCSDIR%%/ldap.html %%PORTDOCS%%%%DOCSDIR%%/ldap.txt %%PORTDOCS%%%%DOCSDIR%%/runtimeops.html %%PORTDOCS%%%%DOCSDIR%%/runtimeops.txt %%PORTDOCS%%%%DOCSDIR%%/troubleshoot.html %%PORTDOCS%%%%DOCSDIR%%/troubleshoot.txt %%PORTDOCS%%%%DOCSDIR%%/squidGuard.gif %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/ads/domains %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/ads/urls %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/blacklists/ads %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/aggressive/domains %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/aggressive/urls %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/blacklists/aggressive %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/audio-video/domains %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/audio-video/urls %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/blacklists/audio-video %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/drugs/domains %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/drugs/urls %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/blacklists/drugs %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/gambling/domains %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/gambling/urls %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/blacklists/gambling %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/hacking/domains %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/hacking/urls %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/blacklists/hacking %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/mail/domains %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/blacklists/mail %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/porn/domains %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/porn/expressions %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/porn/urls %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/blacklists/porn %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/proxy/domains %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/proxy/urls %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/blacklists/proxy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/violence/domains %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/violence/expressions %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/violence/urls %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/blacklists/violence %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/warez/domains %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklists/warez/urls %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/blacklists/warez %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/blacklists %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.blacklists %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTEXAMPLES%%@exec chown -R %%SQUID_UID%%:%%SQUID_GID%% %D/%%EXAMPLESDIR%%/blacklists %%PORTEXAMPLES%%@exec chmod -R 550 %D/%%EXAMPLESDIR%%/blacklists @exec mkdir -p %%DATADIR%% || true @exec mkdir -p %%LOGDIR%% || true %%PORTEXAMPLES%%@exec chown -R %%SQUID_UID%%:%%SQUID_GID%% %%LOGDIR%% -@exec rmdir %%DATADIR%% 2>/dev/null || true -@exec rmdir %%LOGDIR%% 2>/dev/null || true +@unexec rmdir %%DATADIR%% 2>/dev/null || true +@unexec rmdir %%LOGDIR%% 2>/dev/null || true Index: branches/2014Q2 =================================================================== --- branches/2014Q2 (revision 352034) +++ branches/2014Q2 (revision 352035) Property changes on: branches/2014Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r351965