Date: Wed, 6 Jul 2011 13:51:18 +0200 (CEST) From: Thomas-Martin Seck <tmseck@web.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/158685: [Maintainer] www/squid31: update to 3.1.14 Message-ID: <20110706115118.0C461130C20@wcfields.tmseck.homedns.org> Resent-Message-ID: <201107061210.p66CAC6r017110@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158685 >Category: ports >Synopsis: [Maintainer] www/squid31: update to 3.1.14 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jul 06 12:10:12 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Thomas-Martin Seck >Release: FreeBSD 8.2-RELEASE amd64 >Organization: a private site in Germany >Environment: FreeBSD ports collection as of July 6, 2011. >Description: - Update to 3.1.14 - Integrate changes from ports/158522 by sunpoet@ >How-To-Repeat: >Fix: Apply this patch: Index: distinfo =================================================================== --- distinfo (.../www/squid31) (Revision 1926) +++ distinfo (.../local/squid31) (Revision 1926) @@ -1,2 +1,2 @@ -SHA256 (squid3.1/squid-3.1.12.tar.bz2) = 1f67b8587432ca61c372015e468d8b91f32f836d8373e407ab33b1b6ec7fc322 -SIZE (squid3.1/squid-3.1.12.tar.bz2) = 2491613 +SHA256 (squid3.1/squid-3.1.14.tar.bz2) = 8faf16d73ae44029e698160386c45ab853f2fc842601bd550a1c5461815d8a3e +SIZE (squid3.1/squid-3.1.14.tar.bz2) = 2510694 Index: Makefile =================================================================== --- Makefile (.../www/squid31) (Revision 1926) +++ Makefile (.../local/squid31) (Revision 1926) @@ -72,7 +72,6 @@ DISTNAME= squid-3.1.${SQUID_STABLE_VER} DIST_SUBDIR= squid3.1 -PATCHFILES= PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ http://www2.us.squid-cache.org/%SUBDIR%/ \ http://www1.at.squid-cache.org/%SUBDIR%/ \ @@ -82,13 +81,14 @@ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://www2.tw.squid-cache.org/%SUBDIR%/ PATCH_SITE_SUBDIR= Versions/v3/3.1/changesets +PATCHFILES= # empty MAINTAINER= tmseck@web.de COMMENT= HTTP Caching Proxy LATEST_LINK= squid31 -SQUID_STABLE_VER= 12 +SQUID_STABLE_VER= 14 CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes @@ -216,10 +216,10 @@ CONFIGURE_ARGS= --with-default-user=${SQUID_UID} \ --bindir=${PREFIX}/sbin \ --sbindir=${PREFIX}/sbin \ - --datadir=${PREFIX}/etc/squid \ + --datadir=${ETCDIR} \ --libexecdir=${PREFIX}/libexec/squid \ --localstatedir=/var/squid \ - --sysconfdir=${PREFIX}/etc/squid \ + --sysconfdir=${ETCDIR} \ --with-logdir=/var/log/squid \ --with-pidfile=/var/run/squid/squid.pid \ --enable-removal-policies="lru heap" \ @@ -415,21 +415,20 @@ # Finally, add additional user specified configuration options: CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} -CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CPPFLAGS}"\ - LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" -PLIST_DIRS= etc/squid/icons libexec/squid -PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \ +PLIST_DIRS= %%ETCDIR%%/icons libexec/squid +PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \ ${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,} -PLIST_FILES+= etc/squid/errors/COPYRIGHT etc/squid/errors/TRANSLATORS +PLIST_FILES+= %%ETCDIR%%/errors/COPYRIGHT %%ETCDIR%%/errors/TRANSLATORS .for d in ${error_dirs} -PLIST_DIRS+= etc/squid/errors/${d} -PLIST_FILES+= ${error_files:S,^,etc/squid/errors/${d}/,} +PLIST_DIRS+= %%ETCDIR%%/errors/${d} +PLIST_FILES+= ${error_files:S,^,%%ETCDIR%%/errors/${d}/,} .endfor -PLIST_FILES+= ${error_dir_links:S,^,etc/squid/errors/,} -PLIST_DIRS+= etc/squid/errors etc/squid +PLIST_FILES+= ${error_dir_links:S,^,%%ETCDIR%%/errors/,} +PLIST_DIRS+= %%ETCDIR%%/errors +PLIST_DIRSTRY+= %%ETCDIR%% post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110706115118.0C461130C20>