diff options
32 files changed, 264 insertions, 232 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index 92a95b12339c..48d944ab7624 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -13,11 +13,12 @@ MASTER_SITES= \ ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \ ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \ ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/ -DISTNAME= squid-2.3.STABLE3 +DISTNAME= squid-2.3.STABLE4 EXTRACT_SUFX= -src.tar.gz PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/ -PATCHFILES= squid-2.3.stable3-storeExpiredReferenceAge.patch +PATCHFILES= squid-2.3.stable4-ftp_icon_not_found.patch \ + squid-2.3.stable4-internal_dns_rcode_table_formatting.patch MAINTAINER= peter@freebsd.org @@ -27,7 +28,6 @@ GNU_CONFIGURE= yes # Follow the apache port's lead... CONFIGURE_ARGS= --bindir=${PREFIX}/sbin --sysconfdir=${PREFIX}/etc/squid \ --localstatedir=${PREFIX}/squid -CONFIGURE_ENV= CFLAGS="" STRIP= # won't install scripts correctly othervise. MAKEFILE= makefile @@ -92,6 +92,9 @@ MAKEFILE= makefile # - Enable control of different heap replacement algorithms at runtime. #CONFIGURE_ARGS+= --enable-heap-replacement +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + post-install: cd ${WRKSRC}/src; make install-pinger .for file in client squid diff --git a/www/squid/distinfo b/www/squid/distinfo index 7781215fd2c2..161b4a39edd6 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,2 +1,3 @@ -MD5 (squid2.3/squid-2.3.STABLE3-src.tar.gz) = 8c2384ea5e17c68941fea4cdeef3b6f7 -MD5 (squid2.3/squid-2.3.stable3-storeExpiredReferenceAge.patch) = e98c735db35ed1f38363e54d9bf6d788 +MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f +MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa +MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5 diff --git a/www/squid/files/patch-ak b/www/squid/files/patch-ak index 77563eb0b0f6..58a168a5247e 100644 --- a/www/squid/files/patch-ak +++ b/www/squid/files/patch-ak @@ -1,18 +1,17 @@ -*** /tmp/configure.in Sat Feb 7 21:20:29 1998 ---- configure.in Sat Feb 7 21:24:48 1998 -*************** -*** 19,31 **** - REGEXLIB='' # -lregex - LIBREGEX='' # libregex.a - -- dnl use directory structure of cached as default (hack) -- if test "$libexecdir" = '${exec_prefix}/libexec'; then -- libexecdir='${bindir}' -- localstatedir='${prefix}' -- -- fi -- - dnl use .exe suffix for executables on cygwin32 platform - case "$host_os" in - cygwin32) ---- 19,24 ---- +--- configure.in Tue Jul 18 12:45:29 2000 ++++ configure.in.next Fri Jul 28 02:49:54 2000 +@@ -19,14 +19,6 @@ + REGEXLIB='' # -lregex + LIBREGEX='' # libregex.a + +-dnl use directory structure of cached as default (hack) +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then +- libexecdir='${bindir}' +- localstatedir='${prefix}' +- +-fi +- + dnl use .exe suffix for executables on cygwin32 platform + case "$host_os" in + cygwin32|os2) diff --git a/www/squid/files/patch-al b/www/squid/files/patch-al index 169be61b6251..8134d8e05c95 100644 --- a/www/squid/files/patch-al +++ b/www/squid/files/patch-al @@ -1,15 +1,16 @@ ---- configure.orig Fri Feb 27 13:51:13 1998 -+++ configure Thu Mar 5 14:39:57 1998 -@@ -611,12 +611,6 @@ +--- configure Tue Jul 18 12:45:24 2000 ++++ configure.next Fri Jul 28 02:56:49 2000 +@@ -676,13 +676,6 @@ REGEXLIB='' # -lregex LIBREGEX='' # libregex.a --if test "$libexecdir" = '${exec_prefix}/libexec'; then +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then - libexecdir='${bindir}' - localstatedir='${prefix}' - -fi - case "$host_os" in - cygwin32) - exec_suffix=".exe" + cygwin32|os2) + exec_suffix=".exe" diff --git a/www/squid23/Makefile b/www/squid23/Makefile index 92a95b12339c..48d944ab7624 100644 --- a/www/squid23/Makefile +++ b/www/squid23/Makefile @@ -13,11 +13,12 @@ MASTER_SITES= \ ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \ ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \ ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/ -DISTNAME= squid-2.3.STABLE3 +DISTNAME= squid-2.3.STABLE4 EXTRACT_SUFX= -src.tar.gz PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/ -PATCHFILES= squid-2.3.stable3-storeExpiredReferenceAge.patch +PATCHFILES= squid-2.3.stable4-ftp_icon_not_found.patch \ + squid-2.3.stable4-internal_dns_rcode_table_formatting.patch MAINTAINER= peter@freebsd.org @@ -27,7 +28,6 @@ GNU_CONFIGURE= yes # Follow the apache port's lead... CONFIGURE_ARGS= --bindir=${PREFIX}/sbin --sysconfdir=${PREFIX}/etc/squid \ --localstatedir=${PREFIX}/squid -CONFIGURE_ENV= CFLAGS="" STRIP= # won't install scripts correctly othervise. MAKEFILE= makefile @@ -92,6 +92,9 @@ MAKEFILE= makefile # - Enable control of different heap replacement algorithms at runtime. #CONFIGURE_ARGS+= --enable-heap-replacement +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + post-install: cd ${WRKSRC}/src; make install-pinger .for file in client squid diff --git a/www/squid23/distinfo b/www/squid23/distinfo index 7781215fd2c2..161b4a39edd6 100644 --- a/www/squid23/distinfo +++ b/www/squid23/distinfo @@ -1,2 +1,3 @@ -MD5 (squid2.3/squid-2.3.STABLE3-src.tar.gz) = 8c2384ea5e17c68941fea4cdeef3b6f7 -MD5 (squid2.3/squid-2.3.stable3-storeExpiredReferenceAge.patch) = e98c735db35ed1f38363e54d9bf6d788 +MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f +MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa +MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5 diff --git a/www/squid23/files/patch-ak b/www/squid23/files/patch-ak index 77563eb0b0f6..58a168a5247e 100644 --- a/www/squid23/files/patch-ak +++ b/www/squid23/files/patch-ak @@ -1,18 +1,17 @@ -*** /tmp/configure.in Sat Feb 7 21:20:29 1998 ---- configure.in Sat Feb 7 21:24:48 1998 -*************** -*** 19,31 **** - REGEXLIB='' # -lregex - LIBREGEX='' # libregex.a - -- dnl use directory structure of cached as default (hack) -- if test "$libexecdir" = '${exec_prefix}/libexec'; then -- libexecdir='${bindir}' -- localstatedir='${prefix}' -- -- fi -- - dnl use .exe suffix for executables on cygwin32 platform - case "$host_os" in - cygwin32) ---- 19,24 ---- +--- configure.in Tue Jul 18 12:45:29 2000 ++++ configure.in.next Fri Jul 28 02:49:54 2000 +@@ -19,14 +19,6 @@ + REGEXLIB='' # -lregex + LIBREGEX='' # libregex.a + +-dnl use directory structure of cached as default (hack) +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then +- libexecdir='${bindir}' +- localstatedir='${prefix}' +- +-fi +- + dnl use .exe suffix for executables on cygwin32 platform + case "$host_os" in + cygwin32|os2) diff --git a/www/squid23/files/patch-al b/www/squid23/files/patch-al index 169be61b6251..8134d8e05c95 100644 --- a/www/squid23/files/patch-al +++ b/www/squid23/files/patch-al @@ -1,15 +1,16 @@ ---- configure.orig Fri Feb 27 13:51:13 1998 -+++ configure Thu Mar 5 14:39:57 1998 -@@ -611,12 +611,6 @@ +--- configure Tue Jul 18 12:45:24 2000 ++++ configure.next Fri Jul 28 02:56:49 2000 +@@ -676,13 +676,6 @@ REGEXLIB='' # -lregex LIBREGEX='' # libregex.a --if test "$libexecdir" = '${exec_prefix}/libexec'; then +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then - libexecdir='${bindir}' - localstatedir='${prefix}' - -fi - case "$host_os" in - cygwin32) - exec_suffix=".exe" + cygwin32|os2) + exec_suffix=".exe" diff --git a/www/squid24/Makefile b/www/squid24/Makefile index 92a95b12339c..48d944ab7624 100644 --- a/www/squid24/Makefile +++ b/www/squid24/Makefile @@ -13,11 +13,12 @@ MASTER_SITES= \ ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \ ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \ ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/ -DISTNAME= squid-2.3.STABLE3 +DISTNAME= squid-2.3.STABLE4 EXTRACT_SUFX= -src.tar.gz PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/ -PATCHFILES= squid-2.3.stable3-storeExpiredReferenceAge.patch +PATCHFILES= squid-2.3.stable4-ftp_icon_not_found.patch \ + squid-2.3.stable4-internal_dns_rcode_table_formatting.patch MAINTAINER= peter@freebsd.org @@ -27,7 +28,6 @@ GNU_CONFIGURE= yes # Follow the apache port's lead... CONFIGURE_ARGS= --bindir=${PREFIX}/sbin --sysconfdir=${PREFIX}/etc/squid \ --localstatedir=${PREFIX}/squid -CONFIGURE_ENV= CFLAGS="" STRIP= # won't install scripts correctly othervise. MAKEFILE= makefile @@ -92,6 +92,9 @@ MAKEFILE= makefile # - Enable control of different heap replacement algorithms at runtime. #CONFIGURE_ARGS+= --enable-heap-replacement +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + post-install: cd ${WRKSRC}/src; make install-pinger .for file in client squid diff --git a/www/squid24/distinfo b/www/squid24/distinfo index 7781215fd2c2..161b4a39edd6 100644 --- a/www/squid24/distinfo +++ b/www/squid24/distinfo @@ -1,2 +1,3 @@ -MD5 (squid2.3/squid-2.3.STABLE3-src.tar.gz) = 8c2384ea5e17c68941fea4cdeef3b6f7 -MD5 (squid2.3/squid-2.3.stable3-storeExpiredReferenceAge.patch) = e98c735db35ed1f38363e54d9bf6d788 +MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f +MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa +MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5 diff --git a/www/squid24/files/patch-ak b/www/squid24/files/patch-ak index 77563eb0b0f6..58a168a5247e 100644 --- a/www/squid24/files/patch-ak +++ b/www/squid24/files/patch-ak @@ -1,18 +1,17 @@ -*** /tmp/configure.in Sat Feb 7 21:20:29 1998 ---- configure.in Sat Feb 7 21:24:48 1998 -*************** -*** 19,31 **** - REGEXLIB='' # -lregex - LIBREGEX='' # libregex.a - -- dnl use directory structure of cached as default (hack) -- if test "$libexecdir" = '${exec_prefix}/libexec'; then -- libexecdir='${bindir}' -- localstatedir='${prefix}' -- -- fi -- - dnl use .exe suffix for executables on cygwin32 platform - case "$host_os" in - cygwin32) ---- 19,24 ---- +--- configure.in Tue Jul 18 12:45:29 2000 ++++ configure.in.next Fri Jul 28 02:49:54 2000 +@@ -19,14 +19,6 @@ + REGEXLIB='' # -lregex + LIBREGEX='' # libregex.a + +-dnl use directory structure of cached as default (hack) +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then +- libexecdir='${bindir}' +- localstatedir='${prefix}' +- +-fi +- + dnl use .exe suffix for executables on cygwin32 platform + case "$host_os" in + cygwin32|os2) diff --git a/www/squid24/files/patch-al b/www/squid24/files/patch-al index 169be61b6251..8134d8e05c95 100644 --- a/www/squid24/files/patch-al +++ b/www/squid24/files/patch-al @@ -1,15 +1,16 @@ ---- configure.orig Fri Feb 27 13:51:13 1998 -+++ configure Thu Mar 5 14:39:57 1998 -@@ -611,12 +611,6 @@ +--- configure Tue Jul 18 12:45:24 2000 ++++ configure.next Fri Jul 28 02:56:49 2000 +@@ -676,13 +676,6 @@ REGEXLIB='' # -lregex LIBREGEX='' # libregex.a --if test "$libexecdir" = '${exec_prefix}/libexec'; then +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then - libexecdir='${bindir}' - localstatedir='${prefix}' - -fi - case "$host_os" in - cygwin32) - exec_suffix=".exe" + cygwin32|os2) + exec_suffix=".exe" diff --git a/www/squid25/Makefile b/www/squid25/Makefile index 92a95b12339c..48d944ab7624 100644 --- a/www/squid25/Makefile +++ b/www/squid25/Makefile @@ -13,11 +13,12 @@ MASTER_SITES= \ ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \ ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \ ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/ -DISTNAME= squid-2.3.STABLE3 +DISTNAME= squid-2.3.STABLE4 EXTRACT_SUFX= -src.tar.gz PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/ -PATCHFILES= squid-2.3.stable3-storeExpiredReferenceAge.patch +PATCHFILES= squid-2.3.stable4-ftp_icon_not_found.patch \ + squid-2.3.stable4-internal_dns_rcode_table_formatting.patch MAINTAINER= peter@freebsd.org @@ -27,7 +28,6 @@ GNU_CONFIGURE= yes # Follow the apache port's lead... CONFIGURE_ARGS= --bindir=${PREFIX}/sbin --sysconfdir=${PREFIX}/etc/squid \ --localstatedir=${PREFIX}/squid -CONFIGURE_ENV= CFLAGS="" STRIP= # won't install scripts correctly othervise. MAKEFILE= makefile @@ -92,6 +92,9 @@ MAKEFILE= makefile # - Enable control of different heap replacement algorithms at runtime. #CONFIGURE_ARGS+= --enable-heap-replacement +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + post-install: cd ${WRKSRC}/src; make install-pinger .for file in client squid diff --git a/www/squid25/distinfo b/www/squid25/distinfo index 7781215fd2c2..161b4a39edd6 100644 --- a/www/squid25/distinfo +++ b/www/squid25/distinfo @@ -1,2 +1,3 @@ -MD5 (squid2.3/squid-2.3.STABLE3-src.tar.gz) = 8c2384ea5e17c68941fea4cdeef3b6f7 -MD5 (squid2.3/squid-2.3.stable3-storeExpiredReferenceAge.patch) = e98c735db35ed1f38363e54d9bf6d788 +MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f +MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa +MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5 diff --git a/www/squid25/files/patch-ak b/www/squid25/files/patch-ak index 77563eb0b0f6..58a168a5247e 100644 --- a/www/squid25/files/patch-ak +++ b/www/squid25/files/patch-ak @@ -1,18 +1,17 @@ -*** /tmp/configure.in Sat Feb 7 21:20:29 1998 ---- configure.in Sat Feb 7 21:24:48 1998 -*************** -*** 19,31 **** - REGEXLIB='' # -lregex - LIBREGEX='' # libregex.a - -- dnl use directory structure of cached as default (hack) -- if test "$libexecdir" = '${exec_prefix}/libexec'; then -- libexecdir='${bindir}' -- localstatedir='${prefix}' -- -- fi -- - dnl use .exe suffix for executables on cygwin32 platform - case "$host_os" in - cygwin32) ---- 19,24 ---- +--- configure.in Tue Jul 18 12:45:29 2000 ++++ configure.in.next Fri Jul 28 02:49:54 2000 +@@ -19,14 +19,6 @@ + REGEXLIB='' # -lregex + LIBREGEX='' # libregex.a + +-dnl use directory structure of cached as default (hack) +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then +- libexecdir='${bindir}' +- localstatedir='${prefix}' +- +-fi +- + dnl use .exe suffix for executables on cygwin32 platform + case "$host_os" in + cygwin32|os2) diff --git a/www/squid25/files/patch-al b/www/squid25/files/patch-al index 169be61b6251..8134d8e05c95 100644 --- a/www/squid25/files/patch-al +++ b/www/squid25/files/patch-al @@ -1,15 +1,16 @@ ---- configure.orig Fri Feb 27 13:51:13 1998 -+++ configure Thu Mar 5 14:39:57 1998 -@@ -611,12 +611,6 @@ +--- configure Tue Jul 18 12:45:24 2000 ++++ configure.next Fri Jul 28 02:56:49 2000 +@@ -676,13 +676,6 @@ REGEXLIB='' # -lregex LIBREGEX='' # libregex.a --if test "$libexecdir" = '${exec_prefix}/libexec'; then +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then - libexecdir='${bindir}' - localstatedir='${prefix}' - -fi - case "$host_os" in - cygwin32) - exec_suffix=".exe" + cygwin32|os2) + exec_suffix=".exe" diff --git a/www/squid26/Makefile b/www/squid26/Makefile index 92a95b12339c..48d944ab7624 100644 --- a/www/squid26/Makefile +++ b/www/squid26/Makefile @@ -13,11 +13,12 @@ MASTER_SITES= \ ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \ ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \ ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/ -DISTNAME= squid-2.3.STABLE3 +DISTNAME= squid-2.3.STABLE4 EXTRACT_SUFX= -src.tar.gz PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/ -PATCHFILES= squid-2.3.stable3-storeExpiredReferenceAge.patch +PATCHFILES= squid-2.3.stable4-ftp_icon_not_found.patch \ + squid-2.3.stable4-internal_dns_rcode_table_formatting.patch MAINTAINER= peter@freebsd.org @@ -27,7 +28,6 @@ GNU_CONFIGURE= yes # Follow the apache port's lead... CONFIGURE_ARGS= --bindir=${PREFIX}/sbin --sysconfdir=${PREFIX}/etc/squid \ --localstatedir=${PREFIX}/squid -CONFIGURE_ENV= CFLAGS="" STRIP= # won't install scripts correctly othervise. MAKEFILE= makefile @@ -92,6 +92,9 @@ MAKEFILE= makefile # - Enable control of different heap replacement algorithms at runtime. #CONFIGURE_ARGS+= --enable-heap-replacement +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + post-install: cd ${WRKSRC}/src; make install-pinger .for file in client squid diff --git a/www/squid26/distinfo b/www/squid26/distinfo index 7781215fd2c2..161b4a39edd6 100644 --- a/www/squid26/distinfo +++ b/www/squid26/distinfo @@ -1,2 +1,3 @@ -MD5 (squid2.3/squid-2.3.STABLE3-src.tar.gz) = 8c2384ea5e17c68941fea4cdeef3b6f7 -MD5 (squid2.3/squid-2.3.stable3-storeExpiredReferenceAge.patch) = e98c735db35ed1f38363e54d9bf6d788 +MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f +MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa +MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5 diff --git a/www/squid26/files/patch-ak b/www/squid26/files/patch-ak index 77563eb0b0f6..58a168a5247e 100644 --- a/www/squid26/files/patch-ak +++ b/www/squid26/files/patch-ak @@ -1,18 +1,17 @@ -*** /tmp/configure.in Sat Feb 7 21:20:29 1998 ---- configure.in Sat Feb 7 21:24:48 1998 -*************** -*** 19,31 **** - REGEXLIB='' # -lregex - LIBREGEX='' # libregex.a - -- dnl use directory structure of cached as default (hack) -- if test "$libexecdir" = '${exec_prefix}/libexec'; then -- libexecdir='${bindir}' -- localstatedir='${prefix}' -- -- fi -- - dnl use .exe suffix for executables on cygwin32 platform - case "$host_os" in - cygwin32) ---- 19,24 ---- +--- configure.in Tue Jul 18 12:45:29 2000 ++++ configure.in.next Fri Jul 28 02:49:54 2000 +@@ -19,14 +19,6 @@ + REGEXLIB='' # -lregex + LIBREGEX='' # libregex.a + +-dnl use directory structure of cached as default (hack) +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then +- libexecdir='${bindir}' +- localstatedir='${prefix}' +- +-fi +- + dnl use .exe suffix for executables on cygwin32 platform + case "$host_os" in + cygwin32|os2) diff --git a/www/squid26/files/patch-al b/www/squid26/files/patch-al index 169be61b6251..8134d8e05c95 100644 --- a/www/squid26/files/patch-al +++ b/www/squid26/files/patch-al @@ -1,15 +1,16 @@ ---- configure.orig Fri Feb 27 13:51:13 1998 -+++ configure Thu Mar 5 14:39:57 1998 -@@ -611,12 +611,6 @@ +--- configure Tue Jul 18 12:45:24 2000 ++++ configure.next Fri Jul 28 02:56:49 2000 +@@ -676,13 +676,6 @@ REGEXLIB='' # -lregex LIBREGEX='' # libregex.a --if test "$libexecdir" = '${exec_prefix}/libexec'; then +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then - libexecdir='${bindir}' - localstatedir='${prefix}' - -fi - case "$host_os" in - cygwin32) - exec_suffix=".exe" + cygwin32|os2) + exec_suffix=".exe" diff --git a/www/squid27/Makefile b/www/squid27/Makefile index 92a95b12339c..48d944ab7624 100644 --- a/www/squid27/Makefile +++ b/www/squid27/Makefile @@ -13,11 +13,12 @@ MASTER_SITES= \ ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \ ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \ ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/ -DISTNAME= squid-2.3.STABLE3 +DISTNAME= squid-2.3.STABLE4 EXTRACT_SUFX= -src.tar.gz PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/ -PATCHFILES= squid-2.3.stable3-storeExpiredReferenceAge.patch +PATCHFILES= squid-2.3.stable4-ftp_icon_not_found.patch \ + squid-2.3.stable4-internal_dns_rcode_table_formatting.patch MAINTAINER= peter@freebsd.org @@ -27,7 +28,6 @@ GNU_CONFIGURE= yes # Follow the apache port's lead... CONFIGURE_ARGS= --bindir=${PREFIX}/sbin --sysconfdir=${PREFIX}/etc/squid \ --localstatedir=${PREFIX}/squid -CONFIGURE_ENV= CFLAGS="" STRIP= # won't install scripts correctly othervise. MAKEFILE= makefile @@ -92,6 +92,9 @@ MAKEFILE= makefile # - Enable control of different heap replacement algorithms at runtime. #CONFIGURE_ARGS+= --enable-heap-replacement +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + post-install: cd ${WRKSRC}/src; make install-pinger .for file in client squid diff --git a/www/squid27/distinfo b/www/squid27/distinfo index 7781215fd2c2..161b4a39edd6 100644 --- a/www/squid27/distinfo +++ b/www/squid27/distinfo @@ -1,2 +1,3 @@ -MD5 (squid2.3/squid-2.3.STABLE3-src.tar.gz) = 8c2384ea5e17c68941fea4cdeef3b6f7 -MD5 (squid2.3/squid-2.3.stable3-storeExpiredReferenceAge.patch) = e98c735db35ed1f38363e54d9bf6d788 +MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f +MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa +MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5 diff --git a/www/squid27/files/patch-ak b/www/squid27/files/patch-ak index 77563eb0b0f6..58a168a5247e 100644 --- a/www/squid27/files/patch-ak +++ b/www/squid27/files/patch-ak @@ -1,18 +1,17 @@ -*** /tmp/configure.in Sat Feb 7 21:20:29 1998 ---- configure.in Sat Feb 7 21:24:48 1998 -*************** -*** 19,31 **** - REGEXLIB='' # -lregex - LIBREGEX='' # libregex.a - -- dnl use directory structure of cached as default (hack) -- if test "$libexecdir" = '${exec_prefix}/libexec'; then -- libexecdir='${bindir}' -- localstatedir='${prefix}' -- -- fi -- - dnl use .exe suffix for executables on cygwin32 platform - case "$host_os" in - cygwin32) ---- 19,24 ---- +--- configure.in Tue Jul 18 12:45:29 2000 ++++ configure.in.next Fri Jul 28 02:49:54 2000 +@@ -19,14 +19,6 @@ + REGEXLIB='' # -lregex + LIBREGEX='' # libregex.a + +-dnl use directory structure of cached as default (hack) +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then +- libexecdir='${bindir}' +- localstatedir='${prefix}' +- +-fi +- + dnl use .exe suffix for executables on cygwin32 platform + case "$host_os" in + cygwin32|os2) diff --git a/www/squid27/files/patch-al b/www/squid27/files/patch-al index 169be61b6251..8134d8e05c95 100644 --- a/www/squid27/files/patch-al +++ b/www/squid27/files/patch-al @@ -1,15 +1,16 @@ ---- configure.orig Fri Feb 27 13:51:13 1998 -+++ configure Thu Mar 5 14:39:57 1998 -@@ -611,12 +611,6 @@ +--- configure Tue Jul 18 12:45:24 2000 ++++ configure.next Fri Jul 28 02:56:49 2000 +@@ -676,13 +676,6 @@ REGEXLIB='' # -lregex LIBREGEX='' # libregex.a --if test "$libexecdir" = '${exec_prefix}/libexec'; then +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then - libexecdir='${bindir}' - localstatedir='${prefix}' - -fi - case "$host_os" in - cygwin32) - exec_suffix=".exe" + cygwin32|os2) + exec_suffix=".exe" diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 92a95b12339c..48d944ab7624 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -13,11 +13,12 @@ MASTER_SITES= \ ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \ ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \ ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/ -DISTNAME= squid-2.3.STABLE3 +DISTNAME= squid-2.3.STABLE4 EXTRACT_SUFX= -src.tar.gz PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/ -PATCHFILES= squid-2.3.stable3-storeExpiredReferenceAge.patch +PATCHFILES= squid-2.3.stable4-ftp_icon_not_found.patch \ + squid-2.3.stable4-internal_dns_rcode_table_formatting.patch MAINTAINER= peter@freebsd.org @@ -27,7 +28,6 @@ GNU_CONFIGURE= yes # Follow the apache port's lead... CONFIGURE_ARGS= --bindir=${PREFIX}/sbin --sysconfdir=${PREFIX}/etc/squid \ --localstatedir=${PREFIX}/squid -CONFIGURE_ENV= CFLAGS="" STRIP= # won't install scripts correctly othervise. MAKEFILE= makefile @@ -92,6 +92,9 @@ MAKEFILE= makefile # - Enable control of different heap replacement algorithms at runtime. #CONFIGURE_ARGS+= --enable-heap-replacement +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + post-install: cd ${WRKSRC}/src; make install-pinger .for file in client squid diff --git a/www/squid30/distinfo b/www/squid30/distinfo index 7781215fd2c2..161b4a39edd6 100644 --- a/www/squid30/distinfo +++ b/www/squid30/distinfo @@ -1,2 +1,3 @@ -MD5 (squid2.3/squid-2.3.STABLE3-src.tar.gz) = 8c2384ea5e17c68941fea4cdeef3b6f7 -MD5 (squid2.3/squid-2.3.stable3-storeExpiredReferenceAge.patch) = e98c735db35ed1f38363e54d9bf6d788 +MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f +MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa +MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5 diff --git a/www/squid30/files/patch-ak b/www/squid30/files/patch-ak index 77563eb0b0f6..58a168a5247e 100644 --- a/www/squid30/files/patch-ak +++ b/www/squid30/files/patch-ak @@ -1,18 +1,17 @@ -*** /tmp/configure.in Sat Feb 7 21:20:29 1998 ---- configure.in Sat Feb 7 21:24:48 1998 -*************** -*** 19,31 **** - REGEXLIB='' # -lregex - LIBREGEX='' # libregex.a - -- dnl use directory structure of cached as default (hack) -- if test "$libexecdir" = '${exec_prefix}/libexec'; then -- libexecdir='${bindir}' -- localstatedir='${prefix}' -- -- fi -- - dnl use .exe suffix for executables on cygwin32 platform - case "$host_os" in - cygwin32) ---- 19,24 ---- +--- configure.in Tue Jul 18 12:45:29 2000 ++++ configure.in.next Fri Jul 28 02:49:54 2000 +@@ -19,14 +19,6 @@ + REGEXLIB='' # -lregex + LIBREGEX='' # libregex.a + +-dnl use directory structure of cached as default (hack) +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then +- libexecdir='${bindir}' +- localstatedir='${prefix}' +- +-fi +- + dnl use .exe suffix for executables on cygwin32 platform + case "$host_os" in + cygwin32|os2) diff --git a/www/squid30/files/patch-al b/www/squid30/files/patch-al index 169be61b6251..8134d8e05c95 100644 --- a/www/squid30/files/patch-al +++ b/www/squid30/files/patch-al @@ -1,15 +1,16 @@ ---- configure.orig Fri Feb 27 13:51:13 1998 -+++ configure Thu Mar 5 14:39:57 1998 -@@ -611,12 +611,6 @@ +--- configure Tue Jul 18 12:45:24 2000 ++++ configure.next Fri Jul 28 02:56:49 2000 +@@ -676,13 +676,6 @@ REGEXLIB='' # -lregex LIBREGEX='' # libregex.a --if test "$libexecdir" = '${exec_prefix}/libexec'; then +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then - libexecdir='${bindir}' - localstatedir='${prefix}' - -fi - case "$host_os" in - cygwin32) - exec_suffix=".exe" + cygwin32|os2) + exec_suffix=".exe" diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 92a95b12339c..48d944ab7624 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -13,11 +13,12 @@ MASTER_SITES= \ ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/STABLE/ \ ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/STABLE/ \ ftp://ftp.net.lut.ac.uk/squid/squid-2/STABLE/ -DISTNAME= squid-2.3.STABLE3 +DISTNAME= squid-2.3.STABLE4 EXTRACT_SUFX= -src.tar.gz PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.3/bugs/ -PATCHFILES= squid-2.3.stable3-storeExpiredReferenceAge.patch +PATCHFILES= squid-2.3.stable4-ftp_icon_not_found.patch \ + squid-2.3.stable4-internal_dns_rcode_table_formatting.patch MAINTAINER= peter@freebsd.org @@ -27,7 +28,6 @@ GNU_CONFIGURE= yes # Follow the apache port's lead... CONFIGURE_ARGS= --bindir=${PREFIX}/sbin --sysconfdir=${PREFIX}/etc/squid \ --localstatedir=${PREFIX}/squid -CONFIGURE_ENV= CFLAGS="" STRIP= # won't install scripts correctly othervise. MAKEFILE= makefile @@ -92,6 +92,9 @@ MAKEFILE= makefile # - Enable control of different heap replacement algorithms at runtime. #CONFIGURE_ARGS+= --enable-heap-replacement +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure + post-install: cd ${WRKSRC}/src; make install-pinger .for file in client squid diff --git a/www/squid31/distinfo b/www/squid31/distinfo index 7781215fd2c2..161b4a39edd6 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -1,2 +1,3 @@ -MD5 (squid2.3/squid-2.3.STABLE3-src.tar.gz) = 8c2384ea5e17c68941fea4cdeef3b6f7 -MD5 (squid2.3/squid-2.3.stable3-storeExpiredReferenceAge.patch) = e98c735db35ed1f38363e54d9bf6d788 +MD5 (squid2.3/squid-2.3.STABLE4-src.tar.gz) = c38c083f44c222a8d026fa129c30b98f +MD5 (squid2.3/squid-2.3.stable4-ftp_icon_not_found.patch) = f1383b24672f9a8317c2c16302a94eaa +MD5 (squid2.3/squid-2.3.stable4-internal_dns_rcode_table_formatting.patch) = bec46f5a1fcbd9aa1deb9d518c5c11a5 diff --git a/www/squid31/files/patch-ak b/www/squid31/files/patch-ak index 77563eb0b0f6..58a168a5247e 100644 --- a/www/squid31/files/patch-ak +++ b/www/squid31/files/patch-ak @@ -1,18 +1,17 @@ -*** /tmp/configure.in Sat Feb 7 21:20:29 1998 ---- configure.in Sat Feb 7 21:24:48 1998 -*************** -*** 19,31 **** - REGEXLIB='' # -lregex - LIBREGEX='' # libregex.a - -- dnl use directory structure of cached as default (hack) -- if test "$libexecdir" = '${exec_prefix}/libexec'; then -- libexecdir='${bindir}' -- localstatedir='${prefix}' -- -- fi -- - dnl use .exe suffix for executables on cygwin32 platform - case "$host_os" in - cygwin32) ---- 19,24 ---- +--- configure.in Tue Jul 18 12:45:29 2000 ++++ configure.in.next Fri Jul 28 02:49:54 2000 +@@ -19,14 +19,6 @@ + REGEXLIB='' # -lregex + LIBREGEX='' # libregex.a + +-dnl use directory structure of cached as default (hack) +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then +- libexecdir='${bindir}' +- localstatedir='${prefix}' +- +-fi +- + dnl use .exe suffix for executables on cygwin32 platform + case "$host_os" in + cygwin32|os2) diff --git a/www/squid31/files/patch-al b/www/squid31/files/patch-al index 169be61b6251..8134d8e05c95 100644 --- a/www/squid31/files/patch-al +++ b/www/squid31/files/patch-al @@ -1,15 +1,16 @@ ---- configure.orig Fri Feb 27 13:51:13 1998 -+++ configure Thu Mar 5 14:39:57 1998 -@@ -611,12 +611,6 @@ +--- configure Tue Jul 18 12:45:24 2000 ++++ configure.next Fri Jul 28 02:56:49 2000 +@@ -676,13 +676,6 @@ REGEXLIB='' # -lregex LIBREGEX='' # libregex.a --if test "$libexecdir" = '${exec_prefix}/libexec'; then +-if test "$libexecdir" = '${exec_prefix}/libexec' && +- test "$localstatedir" = '${prefix}/var'; then - libexecdir='${bindir}' - localstatedir='${prefix}' - -fi - case "$host_os" in - cygwin32) - exec_suffix=".exe" + cygwin32|os2) + exec_suffix=".exe" |