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

(-)Makefile (-9 / +16 lines)
Lines 16-22 Link Here
16
#
16
#
17
# SQUID_LANGUAGES
17
# SQUID_LANGUAGES
18
#   A list of languages for which error page files should be installed
18
#   A list of languages for which error page files should be installed
19
#   (default: all)
19
#   (default: all available)
20
#
20
#
21
#   E.g. use `make SQUID_LANGUAGES="English French"' if you want to
21
#   E.g. use `make SQUID_LANGUAGES="English French"' if you want to
22
#   install the files for these languages only.
22
#   install the files for these languages only.
Lines 25-31 Link Here
25
#
25
#
26
# SQUID_DEFAULT_LANG
26
# SQUID_DEFAULT_LANG
27
#   If you define SQUID_LANGUAGES, select which language should be the default
27
#   If you define SQUID_LANGUAGES, select which language should be the default
28
#   one (this variable defaults to English). This setting can be overwritten
28
#   one (this variable defaults to "templates"). This setting can be overwritten
29
#   with squid.conf's error_directory directive.
29
#   with squid.conf's error_directory directive.
30
#
30
#
31
# SQUID_CONFIGURE_ARGS
31
# SQUID_CONFIGURE_ARGS
Lines 102-108 Link Here
102
102
103
LATEST_LINK=	squid30
103
LATEST_LINK=	squid30
104
104
105
SQUID_STABLE_VER=	8
105
SQUID_STABLE_VER=	9
106
106
107
CONFLICTS=	squid-2.[0-9].* cacheboy-[0-9]*
107
CONFLICTS=	squid-2.[0-9].* cacheboy-[0-9]*
108
GNU_CONFIGURE=	yes
108
GNU_CONFIGURE=	yes
Lines 147-153 Link Here
147
		SQUID_ICAP "Enable ICAP client functionality" off \
147
		SQUID_ICAP "Enable ICAP client functionality" off \
148
		SQUID_ESI "Enable ESI support (experimental)" off \
148
		SQUID_ESI "Enable ESI support (experimental)" off \
149
		SQUID_AUFS "Enable the aufs storage scheme" off \
149
		SQUID_AUFS "Enable the aufs storage scheme" off \
150
		SQUID_COSS "Enable the COSS storage scheme" off \
150
		SQUID_COSS "Enable COSS (currently not available)" off \
151
		SQUID_KQUEUE "Use kqueue(2) (experimental)" on \
151
		SQUID_KQUEUE "Use kqueue(2) (experimental)" on \
152
		SQUID_LARGEFILE "Support log and cache files >2GB" off \
152
		SQUID_LARGEFILE "Support log and cache files >2GB" off \
153
		SQUID_STACKTRACES "Create backtraces on fatal errors" off \
153
		SQUID_STACKTRACES "Create backtraces on fatal errors" off \
Lines 253-259 Link Here
253
CFLAGS+=	${PTHREAD_CFLAGS}
253
CFLAGS+=	${PTHREAD_CFLAGS}
254
.endif
254
.endif
255
.if defined(WITH_SQUID_COSS)
255
.if defined(WITH_SQUID_COSS)
256
storage_schemes+=	coss
256
# Starting with 3.0.STABLE9, COSS is disabled in Squid-3 until fixes
257
# from the 2.x series are backported to 3.x.
258
# storage_schemes+=	coss
257
.endif
259
.endif
258
CONFIGURE_ARGS+=	--enable-storeio="${storage_schemes}"
260
CONFIGURE_ARGS+=	--enable-storeio="${storage_schemes}"
259
261
Lines 382-388 Link Here
382
			Serbian Simplify_Chinese Slovak Spanish Swedish \
384
			Serbian Simplify_Chinese Slovak Spanish Swedish \
383
			Traditional_Chinese Turkish Ukrainian-1251 \
385
			Traditional_Chinese Turkish Ukrainian-1251 \
384
			Ukrainian-koi8-u Ukrainian-utf8
386
			Ukrainian-koi8-u Ukrainian-utf8
385
SQUID_DEFAULT_LANG?=	English
387
SQUID_DEFAULT_LANG?=	templates
386
CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
388
CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
387
			--enable-default-err-language=${SQUID_DEFAULT_LANG}
389
			--enable-default-err-language=${SQUID_DEFAULT_LANG}
388
390
Lines 397-403 Link Here
397
PLIST_FILES=	${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \
399
PLIST_FILES=	${etc_files:S,^,etc/,} ${icon_files:S,^,etc/squid/icons/,} \
398
		${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
400
		${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
399
401
400
.for d in ${SQUID_LANGUAGES}
402
.for d in ${SQUID_LANGUAGES} templates
401
PLIST_DIRS+=	etc/squid/errors/${d}
403
PLIST_DIRS+=	etc/squid/errors/${d}
402
PLIST_FILES+=	${error_files:S,^,etc/squid/errors/${d}/,}
404
PLIST_FILES+=	${error_files:S,^,etc/squid/errors/${d}/,}
403
.endfor
405
.endfor
Lines 415-424 Link Here
415
	@${FIND} ${WRKSRC} -name '*.bak' -delete
417
	@${FIND} ${WRKSRC} -name '*.bak' -delete
416
	@${FIND} ${WRKSRC} -name '*.orig' -delete
418
	@${FIND} ${WRKSRC} -name '*.orig' -delete
417
# XXX:
419
# XXX:
418
# Remove error pages that were prematurely integrated into 3.0.STABLE2.
420
# Remove error pages that were prematurely integrated into 3.0.STABLE.
419
# This is done to keep the package list manageable by installing the same
421
# This is done to keep the package list manageable by installing the same
420
# set of error files for every language:
422
# set of error files for every language:
421
	@for d in Ukrainian-1251 Ukrainian-koi8-u Ukrainian-utf8; \
423
	@for d in Ukrainian-1251 Ukrainian-koi8-u Ukrainian-utf8 templates; \
422
		do ${RM} -f ${WRKSRC}/errors/$${d}/ERR_SECURE_CONNECT_FAIL; \
424
		do ${RM} -f ${WRKSRC}/errors/$${d}/ERR_SECURE_CONNECT_FAIL; \
423
	 done
425
	 done
424
426
Lines 446-450 Link Here
446
	@${ECHO_CMD} ""
448
	@${ECHO_CMD} ""
447
	@${CAT} ${PKGMESSAGE}
449
	@${CAT} ${PKGMESSAGE}
448
	@${ECHO_CMD} ""
450
	@${ECHO_CMD} ""
451
.if defined(WITH_SQUID_COSS)
452
	@${ECHO_CMD} "Note: COSS support is currently disabled in Squid-3 by the Squid developers."
453
	@${ECHO_CMD} "Please check your squid.conf and comment out any 'cache_dir coss' definitions."
454
	@${ECHO_CMD} ""
455
.endif
449
456
450
.include <bsd.port.post.mk>
457
.include <bsd.port.post.mk>
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (squid3.0/squid-3.0.STABLE8.tar.bz2) = 4b89ea6dd701258eed955b545b2d7e55
1
MD5 (squid3.0/squid-3.0.STABLE9.tar.bz2) = 4009abfbf33d86f40db3ec4280716a0e
2
SHA256 (squid3.0/squid-3.0.STABLE8.tar.bz2) = 8f9effc3bf17ff7bd5aa39a812af24ef782fd1556ad97f3e80566757e2323781
2
SHA256 (squid3.0/squid-3.0.STABLE9.tar.bz2) = 4a3ca3ca3e84704d306be7f89a7badde119755e69c9cd4234f3dbaf09ab5bc2f
3
SIZE (squid3.0/squid-3.0.STABLE8.tar.bz2) = 1786518
3
SIZE (squid3.0/squid-3.0.STABLE9.tar.bz2) = 1795406

Return to bug 127627