View | Details | Raw Unified | Return to bug 192824
Collapse All | Expand All

(-)./Makefile (-37 / +53 lines)
Lines 18-26 Link Here
18
		http://www2.us.squid-cache.org/%SUBDIR%/ \
18
		http://www2.us.squid-cache.org/%SUBDIR%/ \
19
		http://www1.at.squid-cache.org/%SUBDIR%/ \
19
		http://www1.at.squid-cache.org/%SUBDIR%/ \
20
		http://www.eu.squid-cache.org/%SUBDIR%/ \
20
		http://www.eu.squid-cache.org/%SUBDIR%/ \
21
		http://www1.jp.squid-cache.org/%SUBDIR%/
21
		http://www1.jp.squid-cache.org/%SUBDIR%/ \
22
		http://master.squid-cache.org/~amosjeffries/patches/:nosid
22
PATCH_SITE_SUBDIR=	Versions/v3/${PORTVERSION:R}/changesets
23
PATCH_SITE_SUBDIR=	Versions/v3/${PORTVERSION:R}/changesets
23
PATCHFILES=	#empty
24
PATCHFILES=	FreeBSD_silence_nosuid_mk1.patch:nosid
24
25
25
MAINTAINER=	ports@FreeBSD.org
26
MAINTAINER=	ports@FreeBSD.org
26
COMMENT=	HTTP Caching Proxy
27
COMMENT=	HTTP Caching Proxy
Lines 32-38 Link Here
32
33
33
CONFLICTS_INSTALL=	squid-2.[0-9].* squid32-* cacheboy-[0-9]* lusca-head-[0-9]*
34
CONFLICTS_INSTALL=	squid-2.[0-9].* squid32-* cacheboy-[0-9]* lusca-head-[0-9]*
34
USES=		perl5 tar:bzip2 shebangfix
35
USES=		perl5 tar:bzip2 shebangfix
35
SHEBANG_FILES=	scripts/*.pl contrib/*.pl src/*.pl tools/*.pl
36
SHEBANG_FILES=	scripts/*.pl contrib/*.pl src/*.pl tools/*.pl\
37
		helpers/external_acl/kerberos_ldap_group/cert_tool
36
GNU_CONFIGURE=	yes
38
GNU_CONFIGURE=	yes
37
USE_RC_SUBR=	squid
39
USE_RC_SUBR=	squid
38
40
Lines 93-98 Link Here
93
95
94
ECAP_USES=		pkgconfig:build
96
ECAP_USES=		pkgconfig:build
95
97
98
etc_files=	squid/cachemgr.conf.sample\
99
		squid/errorpage.css.sample\
100
		squid/mime.conf.sample\
101
		squid/msntauth.conf.sample\
102
		squid/squid.conf.sample
103
change_files=	ChangeLog\
104
		contrib/nextstep/makepkg\
105
		contrib/nextstep/post_install\
106
		errors/Makefile.am\
107
		errors/Makefile.in\
108
		helpers/basic_auth/MSNT/Makefile.am\
109
		helpers/basic_auth/MSNT/Makefile.in\
110
		src/Makefile.am\
111
		src/Makefile.in\
112
		src/cf_gen.cc\
113
		src/squid.8.in\
114
		tools/Makefile.am\
115
		tools/Makefile.in
116
96
icon_silk_files=	application.png arrow_up.png bomb.png box.png \
117
icon_silk_files=	application.png arrow_up.png bomb.png box.png \
97
			bricks.png bullet_red.png cd.png chart_line.png \
118
			bricks.png bullet_red.png cd.png chart_line.png \
98
			compress.png computer_link.png css.png cup.png \
119
			compress.png computer_link.png css.png cup.png \
Lines 160-166 Link Here
160
		diskd \
181
		diskd \
161
		helper-mux.pl
182
		helper-mux.pl
162
183
163
.if !defined(SQUID_CONFIGURE_ARGS) || ${SQUID_CONFIGURE_ARGS:M*--disable-unlinkd*} == ""
184
.if !defined(SQUID_CONFIGURE_ARGS)\
185
 || ${SQUID_CONFIGURE_ARGS:M*--disable-unlinkd*} == ""
164
libexec+=	unlinkd
186
libexec+=	unlinkd
165
.endif
187
.endif
166
188
Lines 187-193 Link Here
187
209
188
.include <bsd.port.options.mk>
210
.include <bsd.port.options.mk>
189
211
190
.if ${CC:T:Mclang} == "clang" || ${CXX:T:Mclang++} == "clang++" \
212
.if ${CC:T:Mclang*} || ${CXX:T:Mclang++*} \
191
 || ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000024
213
 || ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000024
192
CXXFLAGS+=	-Wno-unused-private-field
214
CXXFLAGS+=	-Wno-unused-private-field
193
.endif
215
.endif
Lines 214-228 Link Here
214
		ext_unix_group_acl \
236
		ext_unix_group_acl \
215
		ntlm_fake_auth \
237
		ntlm_fake_auth \
216
		ntlm_smb_lm_auth
238
		ntlm_smb_lm_auth
217
PLIST_FILES+=	basic_getpwnam_auth.8.gz basic_ncsa_auth.8.gz \
218
		basic_pam_auth.8.gz basic_radius_auth.8.gz basic_db_auth.8.gz \
219
		digest_file_auth.8.gz ext_file_userip_acl.8.gz \
220
		ext_time_quota_acl.8.gz ext_unix_group_acl.8.gz
221
.if ${PORT_OPTIONS:MAUTH_LDAP}
239
.if ${PORT_OPTIONS:MAUTH_LDAP}
222
USE_OPENLDAP=	yes
240
USE_OPENLDAP=	yes
223
CFLAGS+=	-I${LOCALBASE}/include
241
CFLAGS+=	-I${LOCALBASE}/include
224
LDFLAGS+=	-L${LOCALBASE}/lib
242
LDFLAGS+=	-L${LOCALBASE}/lib
225
PLIST_FILES+=	basic_ldap_auth.8.gz ext_ldap_group_acl.8.gz
243
PLIST_FILES+=	man/man8/basic_ldap_auth.8.gz\
244
		man/man8/ext_ldap_group_acl.8.gz
226
basic_auth+=	LDAP
245
basic_auth+=	LDAP
227
external_acl+=	LDAP_group
246
external_acl+=	LDAP_group
228
libexec+=	basic_ldap_auth ext_ldap_group_acl
247
libexec+=	basic_ldap_auth ext_ldap_group_acl
Lines 232-238 Link Here
232
CFLAGS+=	-I${LOCALBASE}/include
251
CFLAGS+=	-I${LOCALBASE}/include
233
CPPFLAGS+=	-I${LOCALBASE}/include
252
CPPFLAGS+=	-I${LOCALBASE}/include
234
LDFLAGS+=	-L${LOCALBASE}/lib
253
LDFLAGS+=	-L${LOCALBASE}/lib
235
PLIST_FILES+=	basic_sasl_auth.8.gz
254
PLIST_FILES+=	man/man8/basic_sasl_auth.8.gz
236
basic_auth+=	SASL
255
basic_auth+=	SASL
237
libexec+=	basic_sasl_auth
256
libexec+=	basic_sasl_auth
238
.endif
257
.endif
Lines 243-256 Link Here
243
external_acl+=	wbinfo_group
262
external_acl+=	wbinfo_group
244
libexec+=	basic_smb_auth basic_smb_auth.sh \
263
libexec+=	basic_smb_auth basic_smb_auth.sh \
245
		ext_wbinfo_group_acl
264
		ext_wbinfo_group_acl
246
PLIST_FILES+=	ext_wbinfo_group_acl.8.gz
265
PLIST_FILES+=	man/man8/ext_wbinfo_group_acl.8.gz
247
.endif
266
.endif
248
.if ${PORT_OPTIONS:MAUTH_SQL}
267
.if ${PORT_OPTIONS:MAUTH_SQL}
249
USE_MYSQL=	yes
268
USE_MYSQL=	yes
250
RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
269
RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
251
external_acl+=	SQL_session
270
external_acl+=	SQL_session
252
libexec+=	ext_sql_session_acl
271
libexec+=	ext_sql_session_acl
253
PLIST_FILES+=	ext_sql_session_acl.8.gz
272
PLIST_FILES+=	man/man8/ext_sql_session_acl.8.gz
254
.endif
273
.endif
255
# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
274
# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
256
.if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS)
275
.if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS)
Lines 262-268 Link Here
262
negotiate_auth=	kerberos wrapper
281
negotiate_auth=	kerberos wrapper
263
libexec+=	negotiate_kerberos_auth negotiate_kerberos_auth_test \
282
libexec+=	negotiate_kerberos_auth negotiate_kerberos_auth_test \
264
		negotiate_wrapper_auth
283
		negotiate_wrapper_auth
265
PLIST_FILES+=	negotiate_kerberos_auth.8.gz
284
PLIST_FILES+=	man/man8/negotiate_kerberos_auth.8.gz
266
# the kerberos_ldap_group external helper depends on LDAP and SASL:
285
# the kerberos_ldap_group external helper depends on LDAP and SASL:
267
.if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}
286
.if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}
268
external_acl+=	kerberos_ldap_group
287
external_acl+=	kerberos_ldap_group
Lines 340-346 Link Here
340
.endif
359
.endif
341
.if ${PORT_OPTIONS:MICMP}
360
.if ${PORT_OPTIONS:MICMP}
342
CONFIGURE_ARGS+=	--enable-icmp
361
CONFIGURE_ARGS+=	--enable-icmp
343
libexec+=	pinger
362
PLIST_FILES+=	"@mode	4510"\
363
		"@group	squid"\
364
		libexec/squid/pinger\
365
		"@group"\
366
		"@mode"
344
.endif
367
.endif
345
.if ${PORT_OPTIONS:MDNS_HELPER}
368
.if ${PORT_OPTIONS:MDNS_HELPER}
346
CONFIGURE_ARGS+=	--disable-internal-dns
369
CONFIGURE_ARGS+=	--disable-internal-dns
Lines 446-459 Link Here
446
CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
469
CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
447
470
448
PLIST_DIRS=	%%ETCDIR%%/icons/silk %%ETCDIR%%/icons libexec/squid
471
PLIST_DIRS=	%%ETCDIR%%/icons/silk %%ETCDIR%%/icons libexec/squid
449
PLIST_FILES=	"@sample %%ETCDIR%%/cachemgr.conf.sample" \
472
PLIST_FILES+=	${etc_files:S,^,"@sample etc/",} \
450
		"@sample %%ETCDIR%%/errorpage.css.sample" \
451
		%%ETCDIR%%/icons/SN.png \
473
		%%ETCDIR%%/icons/SN.png \
452
		"@sample %%ETCDIR%%/mime.conf.sample" \
474
		%%ETCDIR%%/mib.txt\
453
		%%ETCDIR%%/mib.txt \
475
		%%ETCDIR%%/squid.conf.documented\
454
		"@sample %%ETCDIR%%/msntauth.conf.sample" \
455
		%%ETCDIR%%/squid.conf.documented \
456
		"@sample %%ETCDIR%%/squid.conf.sample" \
457
		${icon_silk_files:S,^,%%ETCDIR%%/icons/silk/,} \
476
		${icon_silk_files:S,^,%%ETCDIR%%/icons/silk/,} \
458
		${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,} \
477
		${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,} \
459
		man/man8/cachemgr.cgi.8.gz \
478
		man/man8/cachemgr.cgi.8.gz \
Lines 465-471 Link Here
465
		man/man8/digest_file_auth.8.gz \
484
		man/man8/digest_file_auth.8.gz \
466
		man/man8/ext_file_userip_acl.8.gz \
485
		man/man8/ext_file_userip_acl.8.gz \
467
		man/man8/ext_unix_group_acl.8.gz \
486
		man/man8/ext_unix_group_acl.8.gz \
468
		man/man8/negotiate_kerberos_auth.8.gz \
469
		man/man8/ext_time_quota_acl.8.gz \
487
		man/man8/ext_time_quota_acl.8.gz \
470
		man/man8/squid.8.gz \
488
		man/man8/squid.8.gz \
471
		man/man1/squidclient.1.gz
489
		man/man1/squidclient.1.gz
Lines 482-491 Link Here
482
		/var/squid/logs /var/squid
500
		/var/squid/logs /var/squid
483
501
484
post-patch:
502
post-patch:
485
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/cf.data.pre
503
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
486
# Prevent installation of .orig files by deleting them.
504
		${WRKSRC}/src/cf.data.pre
487
	@${FIND} ${WRKSRC} -name '*.bak' -delete
505
	@cd ${WRKSRC} && ${REINPLACE_CMD}\
488
	@${FIND} ${WRKSRC} -name '*.orig' -delete
506
		-e 's|\.conf\.default|.conf.sample|'\
507
		-e 's|)\.default|).sample|'\
508
		${change_files}
509
	@cd ${WRKSRC} && ${MV} helpers/basic_auth/MSNT/msntauth.conf.default\
510
		helpers/basic_auth/MSNT/msntauth.conf.sample
511
	@cd ${WRKSRC} && ${MV} src/mime.conf.default src/mime.conf.sample
512
	@${REINPLACE_CMD} -e 's,echo |,echo =head1 |,'\
513
		${WRKSRC}/helpers/basic_auth/DB/config.test\
514
		${WRKSRC}/helpers/external_acl/SQL_session/config.test
489
515
490
post-install:
516
post-install:
491
.if ${PORT_OPTIONS:MEXAMPLES}
517
.if ${PORT_OPTIONS:MEXAMPLES}
Lines 493-512 Link Here
493
	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql \
519
	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql \
494
		${STAGEDIR}${EXAMPLESDIR}
520
		${STAGEDIR}${EXAMPLESDIR}
495
.endif
521
.endif
496
.if ${PORT_OPTIONS:MICMP}
497
	${CHMOD} 4510 ${STAGEDIR}${PREFIX}/libexec/squid/pinger; \
498
	${CHGRP} squid ${STAGEDIR}${PREFIX}/libexec/squid/pinger
499
.endif
500
.if ${PORT_OPTIONS:MDOCS}
522
.if ${PORT_OPTIONS:MDOCS}
501
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
523
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
502
	cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR}
524
	cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR}
503
.endif
525
.endif
504
	${MKDIR} ${STAGEDIR}/var/squid/logs
526
	${MKDIR} ${STAGEDIR}/var/squid/logs
505
	(cd ${STAGEDIR}${ETCDIR} && \
506
		${MV} cachemgr.conf.default cachemgr.conf.sample ; \
507
		${MV} errorpage.css.default errorpage.css.sample ; \
508
		${MV} mime.conf.default mime.conf.sample ; \
509
		${MV} msntauth.conf.default msntauth.conf.sample ; \
510
		${MV} squid.conf.default squid.conf.sample )
511
527
512
.include <bsd.port.mk>
528
.include <bsd.port.mk>
(-)./distinfo (+2 lines)
Lines 1-2 Link Here
1
SHA256 (squid3.3/squid-3.3.11.tar.bz2) = 6b314cd706693522f01d5ab1930f3aa7a9b03a913bc0e699def16cca8d15ea54
1
SHA256 (squid3.3/squid-3.3.11.tar.bz2) = 6b314cd706693522f01d5ab1930f3aa7a9b03a913bc0e699def16cca8d15ea54
2
SIZE (squid3.3/squid-3.3.11.tar.bz2) = 2989941
2
SIZE (squid3.3/squid-3.3.11.tar.bz2) = 2989941
3
SHA256 (squid3.3/FreeBSD_silence_nosuid_mk1.patch) = 6fd9e55812e18463e92c83d1376e65ca54b2857606f59f4aa1b7d2716af2b72c
4
SIZE (squid3.3/FreeBSD_silence_nosuid_mk1.patch) = 1295

Return to bug 192824