Date: 8 Aug 2010 12:54:52 -0000 From: Thomas-Martin Seck <tmseck@web.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/149426: [Maintainer] www/squid31: update to 3.1.6 Message-ID: <20100808125452.27590.qmail@wcfields.tmseck.homedns.org> Resent-Message-ID: <201008081320.o78DK7Li029536@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 149426
>Category: ports
>Synopsis: [Maintainer] www/squid31: update to 3.1.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 08 13:20:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Thomas-Martin Seck
>Release: FreeBSD 8.0-RELEASE amd64
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of August 8, 2010.
>Description:
- update to 3.1.6
- work around a build issue by adding the path to the included libtool
to CFLAGS explicitly if needed
>How-To-Repeat:
>Fix:
Apply this patch:
Index: Makefile
===================================================================
--- Makefile (.../www/squid31) (Revision 1860)
+++ Makefile (.../local/squid31) (Revision 1860)
@@ -48,12 +48,9 @@
# to indicate variance within an accelerator setup. Typically used
# together with other code that adds custom HTTP headers to the
# requests.
-# --disable-loadable-modules
-# Do not support loadable modules.
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/ \
@@ -75,8 +72,7 @@
DISTNAME= squid-3.1.${SQUID_STABLE_VER}
DIST_SUBDIR= squid3.1
-PATCHFILES= squid-3.1-9996.patch squid-3.1-9998.patch \
- squid-3.1-10001.patch squid-3.1-10003.patch
+PATCHFILES=
PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \
http://www2.us.squid-cache.org/%SUBDIR%/ \
http://www1.at.squid-cache.org/%SUBDIR%/ \
@@ -92,7 +88,7 @@
LATEST_LINK= squid31
-SQUID_STABLE_VER= 4
+SQUID_STABLE_VER= 6
CONFLICTS= squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]*
GNU_CONFIGURE= yes
@@ -181,10 +177,15 @@
ERR_URN_RESOLVE ERR_WRITE_ERROR ERR_ZERO_SIZE_OBJECT
error_dirs= af ar az bg ca cs da de el en es et fa fi fr he hu hy id it \
- ja ko lt lv ms nl pl pt pt-br ro ru sk sv th tr uk uz \
+ ja ko lt lv ms nl pl pt pt-br ro ru sk sr sv th tr uk uz \
zh-cn zh-tw \
templates
+# XXX: this is probably a bug in 3.1.6: sr-latn should probably a symlink but
+# is installed as a directory; if this is intentional the directory is
+# currently empty which is not really useful either.
+error_dirs+= sr-latn
+
error_dir_links= ar-ae ar-bh ar-dz ar-eg ar-iq ar-jo ar-kw ar-lb \
ar-ly ar-ma ar-om ar-qa ar-sa ar-sy ar-tn ar-ye \
az-az bg-bg cs-cz da-dk \
@@ -200,7 +201,8 @@
fr-be fr-ca fr-ch fr-fr fr-lu fr-mc \
he-il hu-hu hy-am id-id it-ch it-it \
ja-jp ko-kp ko-kr lt-lt lv-lv ms-my nl-nl \
- pl-pl pt-pt ro-md ro-ro ru-ru sk-sk sv-fi sv-se \
+ pl-pl pt-pt ro-md ro-ro ru-ru sk-sk \
+ sr-latn-cs sr-sp sv-fi sv-se \
th-th tr-tr uk-ua zh-hk zh-mo zh-sg
libexec= cachemgr.cgi digest_pw_auth diskd ip_user_check \
@@ -372,10 +374,15 @@
CONFIGURE_ARGS+= --enable-follow-x-forwarded-for
.endif
.if defined(WITH_SQUID_ECAP)
-CONFIGURE_ARGS+= --enable-ecap
+CONFIGURE_ARGS+= --enable-ecap --enable-loadable-modules
+# XXX: work around issues with the bundled libtool from 3.1.5 onwards;
+# we need to tell c++ where to find them explicitly
+CFLAGS+= -I${WRKSRC}/libltdl
LIB_DEPENDS+= ecap:${PORTSDIR}/www/libecap
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+.else
+CONFIGURE_ARGS+= --disable-ecap --disable-loadable-modules
.endif
.if defined(WITH_SQUID_ICAP)
CONFIGURE_ARGS+= --enable-icap-client
Index: distinfo
===================================================================
--- distinfo (.../www/squid31) (Revision 1860)
+++ distinfo (.../local/squid31) (Revision 1860)
@@ -1,15 +1,3 @@
-MD5 (squid3.1/squid-3.1.4.tar.bz2) = 3fb544ae02fadc2b4085f62bb927e861
-SHA256 (squid3.1/squid-3.1.4.tar.bz2) = 13ea33907c64f417afaf596b04550cd950f57dc43357d309ffa92cfac2de58f6
-SIZE (squid3.1/squid-3.1.4.tar.bz2) = 2391480
-MD5 (squid3.1/squid-3.1-9996.patch) = fb7015ac764dc983bad8f4e8f0a680cb
-SHA256 (squid3.1/squid-3.1-9996.patch) = fb2de712f92ffca73605922f08e2184175533a9e1e9df4178af0fddfdc6f1111
-SIZE (squid3.1/squid-3.1-9996.patch) = 1214
-MD5 (squid3.1/squid-3.1-9998.patch) = 285521327dc60bc33d4da1debdd5c2d5
-SHA256 (squid3.1/squid-3.1-9998.patch) = 1e4223c57fc4dce47d4dea641483da7c6c168f840d20a5f6dc7412671ad47a32
-SIZE (squid3.1/squid-3.1-9998.patch) = 1831
-MD5 (squid3.1/squid-3.1-10001.patch) = 64e06d8dcb502629aba961ccb668a1af
-SHA256 (squid3.1/squid-3.1-10001.patch) = d143fbe3f0971cee6c608c55e5dada12a8eae7a91a6703c8faac0354afa763b5
-SIZE (squid3.1/squid-3.1-10001.patch) = 1456
-MD5 (squid3.1/squid-3.1-10003.patch) = c51b389275838d8ed5abdf2ccd36c18c
-SHA256 (squid3.1/squid-3.1-10003.patch) = 3a458219c3ea274869a3fceafba10d08790a8027f93bccbae5fb65f70bcf3e34
-SIZE (squid3.1/squid-3.1-10003.patch) = 1875
+MD5 (squid3.1/squid-3.1.6.tar.bz2) = e9e2e9a9b5a305ba717be93ebb85f245
+SHA256 (squid3.1/squid-3.1.6.tar.bz2) = e1de72d85a1b607e7dd477e29c4582b34f844af675211cb273421c920073f4fa
+SIZE (squid3.1/squid-3.1.6.tar.bz2) = 2421219
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100808125452.27590.qmail>