Attachment #32903 for bug #54153





PORTNAME=	squid
PORTVERSION=	2.5
PORTREVISION=	4
CATEGORIES=	www
MASTER_SITES=	\
	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
	ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
MASTER_SITE_SUBDIR=	squid-2/STABLE
DISTNAME=	squid-2.5.STABLE3
EXTRACT_SUFX=	.tar.bz2
DIST_SUBDIR=	squid2.5

PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES=	squid-2.5.STABLE3-Lithuanian.patch \
		squid-2.5.STABLE3-deny_info.patch \
		squid-2.5.STABLE3-cache_dir_doc.patch \
		squid-2.5.STABLE3-devnull.patch \
		squid-2.5.STABLE3-log_quote.patch \
		squid-2.5.STABLE3-rfc_reference.patch \
		squid-2.5.STABLE3-external_acl_ident.patch \
		squid-2.5.STABLE3-gcc-3_3.patch \
		squid-2.5.STABLE3-carpfactor.patch \
		squid-2.5.STABLE3-neighbor_type_domain.patch \
		squid-2.5.STABLE3-header_access_peer.patch \
		squid-2.5.STABLE3-memwarnsbrk.patch \
		squid-2.5.STABLE3-hostscomments.patch \
		squid-2.5.STABLE3-store_check_cachable_stats.patch \
		squid-2.5.STABLE3-cachePeerPingsSentsnmp.patch \
		squid-2.5.STABLE3-minimum_retry_timeout.patch \
		squid-2.5.STABLE3-tcp_reset_leak.patch \
		squid-2.5.STABLE3-hostheader.patch \
		squid-2.5.STABLE3-reply_body_max_size.patch \
		squid-2.5.STABLE3-ie_refresh.patch \
		squid-2.5.STABLE3-http_reply_access-denied.patch \
		squid-2.5.STABLE3-SENT_PASV.patch \
		squid-2.5.STABLE3-peer_digest_not_found_assertion.patch \
		squid-2.5.STABLE3-round_robin_max_size.patch
PATCH_DIST_STRIP=	-p1

MAINTAINER=	adrian@freebsd.org
COMMENT=	The successful WWW proxy cache and accelerator

DIST_SUBDIR=	squid2.5
PATCH_DIST_STRIP= -p1
GNU_CONFIGURE=	yes
USE_BZIP2=	yes
USE_PERL5=	yes
USE_REINPLACE=	yes
# Follow the apache port's lead...

#CONFIGURE_ARGS+= --enable-underscores
#  - Enable control of different heap replacement algorithms at runtime.
#CONFIGURE_ARGS+= --enable-heap-replacement

MAN8=	pam_auth.8 squid_unix_group.8 squid.8

post-patch:
	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure




MD5 (squid2.5/squid-2.5.STABLE3.tar.bz2) = ed5eb7835d00fdecc7dd7c1837542df2
MD5 (squid2.5/squid-2.5.STABLE3-Lithuanian.patch) = 382e2ba1e7e150f70c8c0355dd98e3cc
MD5 (squid2.5/squid-2.5.STABLE3-deny_info.patch) = fd6d2d1a5a75b06e86b743f51866c861
MD5 (squid2.5/squid-2.5.STABLE3-cache_dir_doc.patch) = e7f6d2bd28430e10999b12001cbb4cae
MD5 (squid2.5/squid-2.5.STABLE3-devnull.patch) = a31d669461e2893996f27b5d10ab06b9
MD5 (squid2.5/squid-2.5.STABLE3-log_quote.patch) = 9e391cbb39226abc89281cd4138ddb98
MD5 (squid2.5/squid-2.5.STABLE3-rfc_reference.patch) = 48996215282d80caf3b5cbbbdb7965b7
MD5 (squid2.5/squid-2.5.STABLE3-external_acl_ident.patch) = a7ab2152b202bf9941ee8200f20b3032
MD5 (squid2.5/squid-2.5.STABLE3-gcc-3_3.patch) = 49195dd7f3745c0f54c0ca07068b2d67
MD5 (squid2.5/squid-2.5.STABLE3-carpfactor.patch) = ac2a5f8304b29951ee3579cce10a6ea6
MD5 (squid2.5/squid-2.5.STABLE3-neighbor_type_domain.patch) = 3edd72ec42e0b49b36096a6a8fff6b2a
MD5 (squid2.5/squid-2.5.STABLE3-header_access_peer.patch) = 5015f95e0db20ddcb25082a92f8861a8
MD5 (squid2.5/squid-2.5.STABLE3-memwarnsbrk.patch) = 47cc7566f9584c6f8c764afcb95ce636
MD5 (squid2.5/squid-2.5.STABLE3-hostscomments.patch) = dabea14824e5b3d48b211c933471036a
MD5 (squid2.5/squid-2.5.STABLE3-store_check_cachable_stats.patch) = 04477bf0722026a67bbd6954b02c9374
MD5 (squid2.5/squid-2.5.STABLE3-cachePeerPingsSentsnmp.patch) = b0ecd095062a21d72b15a817f4e821b5
MD5 (squid2.5/squid-2.5.STABLE3-minimum_retry_timeout.patch) = b265b000b2f5d48a385f68c6d987cbea
MD5 (squid2.5/squid-2.5.STABLE3-tcp_reset_leak.patch) = 49c5aeb54467e7cbf44edd2271006bb3
MD5 (squid2.5/squid-2.5.STABLE3-hostheader.patch) = b786122d2353e1e607d1d02e18a86b61
MD5 (squid2.5/squid-2.5.STABLE3-reply_body_max_size.patch) = f869e793478ad6c3c706424d0236dcaa
MD5 (squid2.5/squid-2.5.STABLE3-ie_refresh.patch) = 82bfba0cde950541c6aef5e8b52db010
MD5 (squid2.5/squid-2.5.STABLE3-http_reply_access-denied.patch) = 2abe9bd50e6561251dfd96d2583d15bc
MD5 (squid2.5/squid-2.5.STABLE3-SENT_PASV.patch) = c394ec388054b1f86d419006250400bd
MD5 (squid2.5/squid-2.5.STABLE3-peer_digest_not_found_assertion.patch) = f071e6e3ba5a56ce5d0350d7528b597c
MD5 (squid2.5/squid-2.5.STABLE3-round_robin_max_size.patch) = 081a220c874765395394baa4482a8913

Line 0 Link Here

(-)squid/files/patch-aa (+11 lines)
	1	--- include/squid_types.h.orig Mon Jul 7 00:45:26 2003
	2	+++ include/squid_types.h Mon Jul 7 00:48:39 2003
	3	@@ -66,8 +66,5 @@
	4	#if HAVE_SYS_TYPES_H
	5	#include <sys/types.h>
	6	#endif
	7	-#if HAVE_SYS_BITYPES_H
	8	-#include <sys/bitypes.h>
	9	-#endif
	10
	11	#endif /* SQUID_TYPES_H */

Lines 42-45 Link Here

(-)squid/pkg-install (-1 lines)
42	;;	42	;;
43	esac	43	esac
44	exit 0	44	exit 0
45




libexec/ip_user_check
libexec/yp_auth
libexec/pam_auth
man/man8/pam_auth.8
libexec/ncsa_auth
libexec/squid_unix_group
man/man8/squid_unix_group.8
sbin/RunAccel
sbin/RunCache
sbin/squidclient
sbin/squid
man/man8/squid.8
@exec mkdir -p %D/squid/cache
@exec chown nobody:nogroup %D/squid/cache
@exec mkdir -p %D/squid/logs

Return to bug 54153

Lines 7-32 Link Here

(-)squid/Makefile (-6 / +33 lines)
7		7
8	PORTNAME= squid	8	PORTNAME= squid
9	PORTVERSION= 2.5	9	PORTVERSION= 2.5
10	PORTREVISION= 3	10	PORTREVISION= 4
11	CATEGORIES= www	11	CATEGORIES= www
12	MASTER_SITES= \	12	MASTER_SITES= \
13	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \	13	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
14	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \	14	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
15	ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \	15	ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
16	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \	16	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
17	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}	17	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
18	MASTER_SITE_SUBDIR= squid-2/STABLE	18	MASTER_SITE_SUBDIR= squid-2/STABLE
19	DISTNAME= squid-2.5.STABLE2	19	DISTNAME= squid-2.5.STABLE3
20	EXTRACT_SUFX= .tar.gz	20	EXTRACT_SUFX= .tar.bz2
		21	DIST_SUBDIR= squid2.5
21		22
22	PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/	23	PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
		24	PATCHFILES= squid-2.5.STABLE3-Lithuanian.patch \
		25	squid-2.5.STABLE3-deny_info.patch \
		26	squid-2.5.STABLE3-cache_dir_doc.patch \
		27	squid-2.5.STABLE3-devnull.patch \
		28	squid-2.5.STABLE3-log_quote.patch \
		29	squid-2.5.STABLE3-rfc_reference.patch \
		30	squid-2.5.STABLE3-external_acl_ident.patch \
		31	squid-2.5.STABLE3-gcc-3_3.patch \
		32	squid-2.5.STABLE3-carpfactor.patch \
		33	squid-2.5.STABLE3-neighbor_type_domain.patch \
		34	squid-2.5.STABLE3-header_access_peer.patch \
		35	squid-2.5.STABLE3-memwarnsbrk.patch \
		36	squid-2.5.STABLE3-hostscomments.patch \
		37	squid-2.5.STABLE3-store_check_cachable_stats.patch \
		38	squid-2.5.STABLE3-cachePeerPingsSentsnmp.patch \
		39	squid-2.5.STABLE3-minimum_retry_timeout.patch \
		40	squid-2.5.STABLE3-tcp_reset_leak.patch \
		41	squid-2.5.STABLE3-hostheader.patch \
		42	squid-2.5.STABLE3-reply_body_max_size.patch \
		43	squid-2.5.STABLE3-ie_refresh.patch \
		44	squid-2.5.STABLE3-http_reply_access-denied.patch \
		45	squid-2.5.STABLE3-SENT_PASV.patch \
		46	squid-2.5.STABLE3-peer_digest_not_found_assertion.patch \
		47	squid-2.5.STABLE3-round_robin_max_size.patch
		48	PATCH_DIST_STRIP= -p1
23		49
24	MAINTAINER= adrian@freebsd.org	50	MAINTAINER= adrian@freebsd.org
25	COMMENT= The successful WWW proxy cache and accelerator	51	COMMENT= The successful WWW proxy cache and accelerator
26		52
27	DIST_SUBDIR= squid2.5
28	PATCH_DIST_STRIP= -p1
29	GNU_CONFIGURE= yes	53	GNU_CONFIGURE= yes
		54	USE_BZIP2= yes
30	USE_PERL5= yes	55	USE_PERL5= yes
31	USE_REINPLACE= yes	56	USE_REINPLACE= yes
32	# Follow the apache port's lead...	57	# Follow the apache port's lead...
Lines 102-107 Link Here
102	#CONFIGURE_ARGS+= --enable-underscores	127	#CONFIGURE_ARGS+= --enable-underscores
103	# - Enable control of different heap replacement algorithms at runtime.	128	# - Enable control of different heap replacement algorithms at runtime.
104	#CONFIGURE_ARGS+= --enable-heap-replacement	129	#CONFIGURE_ARGS+= --enable-heap-replacement
		130
		131	MAN8= pam_auth.8 squid_unix_group.8 squid.8
105		132
106	post-patch:	133	post-patch:
107	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/configure	134	@${REINPLACE_CMD} -e 's\|-lpthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/configure

Line 1 Link Here

(-)squid/distinfo (-1 / +25 lines)
1	MD5 (squid2.5/squid-2.5.STABLE2.tar.gz) = 806c27e2b5a7bd9d788390f5ea5a5dc1	1	MD5 (squid2.5/squid-2.5.STABLE3.tar.bz2) = ed5eb7835d00fdecc7dd7c1837542df2
		2	MD5 (squid2.5/squid-2.5.STABLE3-Lithuanian.patch) = 382e2ba1e7e150f70c8c0355dd98e3cc
		3	MD5 (squid2.5/squid-2.5.STABLE3-deny_info.patch) = fd6d2d1a5a75b06e86b743f51866c861
		4	MD5 (squid2.5/squid-2.5.STABLE3-cache_dir_doc.patch) = e7f6d2bd28430e10999b12001cbb4cae
		5	MD5 (squid2.5/squid-2.5.STABLE3-devnull.patch) = a31d669461e2893996f27b5d10ab06b9
		6	MD5 (squid2.5/squid-2.5.STABLE3-log_quote.patch) = 9e391cbb39226abc89281cd4138ddb98
		7	MD5 (squid2.5/squid-2.5.STABLE3-rfc_reference.patch) = 48996215282d80caf3b5cbbbdb7965b7
		8	MD5 (squid2.5/squid-2.5.STABLE3-external_acl_ident.patch) = a7ab2152b202bf9941ee8200f20b3032
		9	MD5 (squid2.5/squid-2.5.STABLE3-gcc-3_3.patch) = 49195dd7f3745c0f54c0ca07068b2d67
		10	MD5 (squid2.5/squid-2.5.STABLE3-carpfactor.patch) = ac2a5f8304b29951ee3579cce10a6ea6
		11	MD5 (squid2.5/squid-2.5.STABLE3-neighbor_type_domain.patch) = 3edd72ec42e0b49b36096a6a8fff6b2a
		12	MD5 (squid2.5/squid-2.5.STABLE3-header_access_peer.patch) = 5015f95e0db20ddcb25082a92f8861a8
		13	MD5 (squid2.5/squid-2.5.STABLE3-memwarnsbrk.patch) = 47cc7566f9584c6f8c764afcb95ce636
		14	MD5 (squid2.5/squid-2.5.STABLE3-hostscomments.patch) = dabea14824e5b3d48b211c933471036a
		15	MD5 (squid2.5/squid-2.5.STABLE3-store_check_cachable_stats.patch) = 04477bf0722026a67bbd6954b02c9374
		16	MD5 (squid2.5/squid-2.5.STABLE3-cachePeerPingsSentsnmp.patch) = b0ecd095062a21d72b15a817f4e821b5
		17	MD5 (squid2.5/squid-2.5.STABLE3-minimum_retry_timeout.patch) = b265b000b2f5d48a385f68c6d987cbea
		18	MD5 (squid2.5/squid-2.5.STABLE3-tcp_reset_leak.patch) = 49c5aeb54467e7cbf44edd2271006bb3
		19	MD5 (squid2.5/squid-2.5.STABLE3-hostheader.patch) = b786122d2353e1e607d1d02e18a86b61
		20	MD5 (squid2.5/squid-2.5.STABLE3-reply_body_max_size.patch) = f869e793478ad6c3c706424d0236dcaa
		21	MD5 (squid2.5/squid-2.5.STABLE3-ie_refresh.patch) = 82bfba0cde950541c6aef5e8b52db010
		22	MD5 (squid2.5/squid-2.5.STABLE3-http_reply_access-denied.patch) = 2abe9bd50e6561251dfd96d2583d15bc
		23	MD5 (squid2.5/squid-2.5.STABLE3-SENT_PASV.patch) = c394ec388054b1f86d419006250400bd
		24	MD5 (squid2.5/squid-2.5.STABLE3-peer_digest_not_found_assertion.patch) = f071e6e3ba5a56ce5d0350d7528b597c
		25	MD5 (squid2.5/squid-2.5.STABLE3-round_robin_max_size.patch) = 081a220c874765395394baa4482a8913

Lines 822-836 Link Here

(-)squid/pkg-plist (-3 lines)
822	libexec/ip_user_check	822	libexec/ip_user_check
823	libexec/yp_auth	823	libexec/yp_auth
824	libexec/pam_auth	824	libexec/pam_auth
825	man/man8/pam_auth.8
826	libexec/ncsa_auth	825	libexec/ncsa_auth
827	libexec/squid_unix_group	826	libexec/squid_unix_group
828	man/man8/squid_unix_group.8
829	sbin/RunAccel	827	sbin/RunAccel
830	sbin/RunCache	828	sbin/RunCache
831	sbin/squidclient	829	sbin/squidclient
832	sbin/squid	830	sbin/squid
833	man/man8/squid.8
834	@exec mkdir -p %D/squid/cache	831	@exec mkdir -p %D/squid/cache
835	@exec chown nobody:nogroup %D/squid/cache	832	@exec chown nobody:nogroup %D/squid/cache
836	@exec mkdir -p %D/squid/logs	833	@exec mkdir -p %D/squid/logs