From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jun 30 06:20:09 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4AAC31065672 for ; Thu, 30 Jun 2011 06:20:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2B9958FC18 for ; Thu, 30 Jun 2011 06:20:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p5U6K88N090221 for ; Thu, 30 Jun 2011 06:20:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p5U6K8XO090220; Thu, 30 Jun 2011 06:20:08 GMT (envelope-from gnats) Resent-Date: Thu, 30 Jun 2011 06:20:08 GMT Resent-Message-Id: <201106300620.p5U6K8XO090220@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sunpoet Po-Chuan Hsieh Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B5A2106566B for ; Thu, 30 Jun 2011 06:10:35 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from sunpoet.net (sunpoet.net [220.133.12.240]) by mx1.freebsd.org (Postfix) with ESMTP id 075E38FC0C for ; Thu, 30 Jun 2011 06:10:34 +0000 (UTC) Received: by sunpoet.net (Postfix, from userid 1000) id 6085E3691; Thu, 30 Jun 2011 14:10:20 +0800 (CST) Message-Id: <20110630061020.6085E3691@sunpoet.net> Date: Thu, 30 Jun 2011 14:10:20 +0800 (CST) From: Sunpoet Po-Chuan Hsieh To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: tmseck@web.de Subject: ports/158522: [PATCH] www/squid31: various changes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jun 2011 06:20:09 -0000 >Number: 158522 >Category: ports >Synopsis: [PATCH] www/squid31: various changes >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: Thu Jun 30 06:20:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 8.2-STABLE amd64 >Organization: The FreeBSD Project >Environment: System: FreeBSD bonjour.sunpoet.net 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Jun 20 21:52:00 CST 2011 >Description: - Remove DISTNAME - Use PLIST_DIRSTRY for ETCDIR: configuration file (not in PLIST) is ETCDIR/squid.conf by default - Use ETCDIR - Make portlint happier - Bump PORTREVISION for PLIST change Port maintainer (tmseck@web.de) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- squid-3.1.12_1.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/squid31/Makefile,v retrieving revision 1.252 diff -u -u -r1.252 Makefile --- Makefile 23 Jun 2011 15:11:18 -0000 1.252 +++ Makefile 30 Jun 2011 06:09:01 -0000 @@ -51,6 +51,7 @@ PORTNAME= squid PORTVERSION= 3.1.${SQUID_STABLE_VER} +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://mirrors.ccs.neu.edu/Squid/ \ @@ -69,10 +70,8 @@ http://www1.jp.squid-cache.org/Versions/v3/3.1/ \ http://www1.za.squid-cache.org/Versions/v3/3.1/ MASTER_SITE_SUBDIR= squid -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,10 +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 +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + LATEST_LINK= squid31 SQUID_STABLE_VER= 12 @@ -96,9 +99,6 @@ USE_PERL5= yes USE_RC_SUBR= squid -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - SQUID_UID?= squid SQUID_GID?= squid @@ -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' \ --- squid-3.1.12_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: