Attachment 116568 Details for Bug 158524 – squid-2.7.9_1.patch

[patch] squid-2.7.9_1.patch

squid-2.7.9_1.patch (text/plain), 2.08 KB, created by Po-Chuan Hsieh on 2011-06-30 07:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Po-Chuan Hsieh

Created: 2011-06-30 07:20:09 UTC

Size: 2.08 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/squid/Makefile,v
>retrieving revision 1.229
>diff -u -u -r1.229 Makefile
>--- Makefile	23 Jun 2011 15:11:18 -0000	1.229
>+++ Makefile	30 Jun 2011 06:11:26 -0000
>@@ -77,6 +77,7 @@
> 
> PORTNAME=	squid
> PORTVERSION=	2.7.${SQUID_STABLE_VER}
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
> 		http://mirrors.ccs.neu.edu/Squid/ \
>@@ -107,8 +108,8 @@
> 		http://www1.jp.squid-cache.org/%SUBDIR%/ \
> 		http://www2.tw.squid-cache.org/%SUBDIR%/
> PATCH_SITE_SUBDIR=	Versions/v2/2.7/changesets
>-PATCHFILES=
> PATCH_DIST_STRIP=	-p1
>+PATCHFILES=	# empty
> 
> MAINTAINER=	tmseck@web.de
> COMMENT=	HTTP Caching Proxy
>@@ -199,10 +200,10 @@
> 
> CONFIGURE_ARGS=	--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} \
> 		--enable-removal-policies="lru heap" \
> 		--disable-linux-netfilter \
> 		--disable-linux-tproxy \
>@@ -383,20 +384,19 @@
> # Finally, add additional user specified configuration options:
> CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
> 
>-CONFIGURE_ENV+=		CFLAGS="${CFLAGS}" \
>-			CPPFLAGS="${CPPFLAGS}"\
>-			LDFLAGS="${LDFLAGS}" \
>+CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}" \
> 			GREP="${GREP}"
> 
>-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/,}
> 
> .for d in ${SQUID_LANGUAGES}
>-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_DIRS+=	etc/squid/errors etc/squid
>+PLIST_DIRS+=	%%ETCDIR%%/errors
>+PLIST_DIRSTRY+=	%%ETCDIR%%
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \

Actions: View | Diff

Attachments on bug 158524: 116568