From 7350c1c9e68dad556fae1e982c5919ff774e9cfa Mon Sep 17 00:00:00 2001 From: edwin Date: Fri, 2 Jan 2004 00:28:12 +0000 Subject: More patches for squid, to keep up to date with the squid distribution. Submitted by: Thomas-Martin Seck (privately) Approved by: maintainer timeout (still) --- www/squid/Makefile | 22 +++++++++++++--------- www/squid/distinfo | 2 -- www/squid25/Makefile | 22 +++++++++++++--------- www/squid25/distinfo | 2 -- www/squid26/Makefile | 22 +++++++++++++--------- www/squid26/distinfo | 2 -- www/squid27/Makefile | 22 +++++++++++++--------- www/squid27/distinfo | 2 -- www/squid30/Makefile | 22 +++++++++++++--------- www/squid30/distinfo | 2 -- www/squid31/Makefile | 22 +++++++++++++--------- www/squid31/distinfo | 2 -- 12 files changed, 78 insertions(+), 66 deletions(-) (limited to 'www') diff --git a/www/squid/Makefile b/www/squid/Makefile index 156fe3a39bc..84806c61683 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -7,14 +7,14 @@ PORTNAME= squid PORTVERSION= 2.5.4 -PORTREVISION= 2 +PORTREVISION= 3 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/&,} + 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.STABLE4 EXTRACT_SUFX= .tar.bz2 @@ -27,7 +27,6 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ squid-2.5.STABLE4-fqdnnegcache.patch \ pam_auth-2.2.patch \ squid-2.5.STABLE4_auth_param_doc.patch \ - squid-2.5.STABLE4-errorpages.patch \ squid-2.5.STABLE4-error_load_text.patch \ squid-2.5.STABLE4-xpi_mime.patch \ squid-2.5.STABLE4-size_overflow.patch \ @@ -47,7 +46,12 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ squid-2.5.STABLE4-pconn-lifo.patch \ squid-2.5.STABLE4-cache_peer_maxconn.patch \ squid-2.5.STABLE4-pid_filename_none.patch \ - squid-2.5.STABLE4-dns_namelength.patch + squid-2.5.STABLE4-dns_namelength.patch \ + squid-2.5.STABLE4-urllogin_acl.patch \ + squid-2.5.STABLE4-russian.patch \ + squid-2.5.STABLE4-redirlog.patch \ + squid-2.5.STABLE4-pinger.patch \ + squid-2.5.STABLE4-partial_reload.patch PATCH_DIST_STRIP= -p1 MAINTAINER= adrian@freebsd.org @@ -134,7 +138,7 @@ MAN8= pam_auth.8 squid_unix_group.8 squid.8 post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/doc/squid.8 - # Prevent installation of .orig files by deleting them. +# Prevent installation of .orig files by deleting them. @${FIND} ${WRKSRC} -name '*.bak' -delete @${FIND} ${WRKSRC} -name '*.orig' -delete diff --git a/www/squid/distinfo b/www/squid/distinfo index abd55b09710..a39321e1cdf 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -5,7 +5,6 @@ MD5 (squid2.5/squid-2.5.STABLE4-redirect_login_space.patch) = 2374ed6dae7ef57c00 MD5 (squid2.5/squid-2.5.STABLE4-fqdnnegcache.patch) = ae1b7cce41ca403ebd7115d4506b0c25 MD5 (squid2.5/pam_auth-2.2.patch) = 3037a67d8f4b85cd7d51cb2dd5b4e8b8 MD5 (squid2.5/squid-2.5.STABLE4_auth_param_doc.patch) = 3b35c424db58c71c541563cd5ae39d15 -MD5 (squid2.5/squid-2.5.STABLE4-errorpages.patch) = cd2afde3f233df8ab8015e045f304ee7 MD5 (squid2.5/squid-2.5.STABLE4-error_load_text.patch) = 3935a3005d125f55cd78b228eba20647 MD5 (squid2.5/squid-2.5.STABLE4-xpi_mime.patch) = 1143fb9244690a24450c3c9ce6105da4 MD5 (squid2.5/squid-2.5.STABLE4-size_overflow.patch) = 7cd2d6b1ebbd86aa143fa5a57156d6ce @@ -31,4 +30,3 @@ MD5 (squid2.5/squid-2.5.STABLE4-russian.patch) = 5a4357bd56134fc6578c435314c1a83 MD5 (squid2.5/squid-2.5.STABLE4-redirlog.patch) = 8a2cc15f2bde6fa263a9e40aae807f82 MD5 (squid2.5/squid-2.5.STABLE4-pinger.patch) = 0902849d051873aaf5f54584d0536bb5 MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a0b6eea34 - diff --git a/www/squid25/Makefile b/www/squid25/Makefile index 156fe3a39bc..84806c61683 100644 --- a/www/squid25/Makefile +++ b/www/squid25/Makefile @@ -7,14 +7,14 @@ PORTNAME= squid PORTVERSION= 2.5.4 -PORTREVISION= 2 +PORTREVISION= 3 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/&,} + 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.STABLE4 EXTRACT_SUFX= .tar.bz2 @@ -27,7 +27,6 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ squid-2.5.STABLE4-fqdnnegcache.patch \ pam_auth-2.2.patch \ squid-2.5.STABLE4_auth_param_doc.patch \ - squid-2.5.STABLE4-errorpages.patch \ squid-2.5.STABLE4-error_load_text.patch \ squid-2.5.STABLE4-xpi_mime.patch \ squid-2.5.STABLE4-size_overflow.patch \ @@ -47,7 +46,12 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ squid-2.5.STABLE4-pconn-lifo.patch \ squid-2.5.STABLE4-cache_peer_maxconn.patch \ squid-2.5.STABLE4-pid_filename_none.patch \ - squid-2.5.STABLE4-dns_namelength.patch + squid-2.5.STABLE4-dns_namelength.patch \ + squid-2.5.STABLE4-urllogin_acl.patch \ + squid-2.5.STABLE4-russian.patch \ + squid-2.5.STABLE4-redirlog.patch \ + squid-2.5.STABLE4-pinger.patch \ + squid-2.5.STABLE4-partial_reload.patch PATCH_DIST_STRIP= -p1 MAINTAINER= adrian@freebsd.org @@ -134,7 +138,7 @@ MAN8= pam_auth.8 squid_unix_group.8 squid.8 post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/doc/squid.8 - # Prevent installation of .orig files by deleting them. +# Prevent installation of .orig files by deleting them. @${FIND} ${WRKSRC} -name '*.bak' -delete @${FIND} ${WRKSRC} -name '*.orig' -delete diff --git a/www/squid25/distinfo b/www/squid25/distinfo index abd55b09710..a39321e1cdf 100644 --- a/www/squid25/distinfo +++ b/www/squid25/distinfo @@ -5,7 +5,6 @@ MD5 (squid2.5/squid-2.5.STABLE4-redirect_login_space.patch) = 2374ed6dae7ef57c00 MD5 (squid2.5/squid-2.5.STABLE4-fqdnnegcache.patch) = ae1b7cce41ca403ebd7115d4506b0c25 MD5 (squid2.5/pam_auth-2.2.patch) = 3037a67d8f4b85cd7d51cb2dd5b4e8b8 MD5 (squid2.5/squid-2.5.STABLE4_auth_param_doc.patch) = 3b35c424db58c71c541563cd5ae39d15 -MD5 (squid2.5/squid-2.5.STABLE4-errorpages.patch) = cd2afde3f233df8ab8015e045f304ee7 MD5 (squid2.5/squid-2.5.STABLE4-error_load_text.patch) = 3935a3005d125f55cd78b228eba20647 MD5 (squid2.5/squid-2.5.STABLE4-xpi_mime.patch) = 1143fb9244690a24450c3c9ce6105da4 MD5 (squid2.5/squid-2.5.STABLE4-size_overflow.patch) = 7cd2d6b1ebbd86aa143fa5a57156d6ce @@ -31,4 +30,3 @@ MD5 (squid2.5/squid-2.5.STABLE4-russian.patch) = 5a4357bd56134fc6578c435314c1a83 MD5 (squid2.5/squid-2.5.STABLE4-redirlog.patch) = 8a2cc15f2bde6fa263a9e40aae807f82 MD5 (squid2.5/squid-2.5.STABLE4-pinger.patch) = 0902849d051873aaf5f54584d0536bb5 MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a0b6eea34 - diff --git a/www/squid26/Makefile b/www/squid26/Makefile index 156fe3a39bc..84806c61683 100644 --- a/www/squid26/Makefile +++ b/www/squid26/Makefile @@ -7,14 +7,14 @@ PORTNAME= squid PORTVERSION= 2.5.4 -PORTREVISION= 2 +PORTREVISION= 3 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/&,} + 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.STABLE4 EXTRACT_SUFX= .tar.bz2 @@ -27,7 +27,6 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ squid-2.5.STABLE4-fqdnnegcache.patch \ pam_auth-2.2.patch \ squid-2.5.STABLE4_auth_param_doc.patch \ - squid-2.5.STABLE4-errorpages.patch \ squid-2.5.STABLE4-error_load_text.patch \ squid-2.5.STABLE4-xpi_mime.patch \ squid-2.5.STABLE4-size_overflow.patch \ @@ -47,7 +46,12 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ squid-2.5.STABLE4-pconn-lifo.patch \ squid-2.5.STABLE4-cache_peer_maxconn.patch \ squid-2.5.STABLE4-pid_filename_none.patch \ - squid-2.5.STABLE4-dns_namelength.patch + squid-2.5.STABLE4-dns_namelength.patch \ + squid-2.5.STABLE4-urllogin_acl.patch \ + squid-2.5.STABLE4-russian.patch \ + squid-2.5.STABLE4-redirlog.patch \ + squid-2.5.STABLE4-pinger.patch \ + squid-2.5.STABLE4-partial_reload.patch PATCH_DIST_STRIP= -p1 MAINTAINER= adrian@freebsd.org @@ -134,7 +138,7 @@ MAN8= pam_auth.8 squid_unix_group.8 squid.8 post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/doc/squid.8 - # Prevent installation of .orig files by deleting them. +# Prevent installation of .orig files by deleting them. @${FIND} ${WRKSRC} -name '*.bak' -delete @${FIND} ${WRKSRC} -name '*.orig' -delete diff --git a/www/squid26/distinfo b/www/squid26/distinfo index abd55b09710..a39321e1cdf 100644 --- a/www/squid26/distinfo +++ b/www/squid26/distinfo @@ -5,7 +5,6 @@ MD5 (squid2.5/squid-2.5.STABLE4-redirect_login_space.patch) = 2374ed6dae7ef57c00 MD5 (squid2.5/squid-2.5.STABLE4-fqdnnegcache.patch) = ae1b7cce41ca403ebd7115d4506b0c25 MD5 (squid2.5/pam_auth-2.2.patch) = 3037a67d8f4b85cd7d51cb2dd5b4e8b8 MD5 (squid2.5/squid-2.5.STABLE4_auth_param_doc.patch) = 3b35c424db58c71c541563cd5ae39d15 -MD5 (squid2.5/squid-2.5.STABLE4-errorpages.patch) = cd2afde3f233df8ab8015e045f304ee7 MD5 (squid2.5/squid-2.5.STABLE4-error_load_text.patch) = 3935a3005d125f55cd78b228eba20647 MD5 (squid2.5/squid-2.5.STABLE4-xpi_mime.patch) = 1143fb9244690a24450c3c9ce6105da4 MD5 (squid2.5/squid-2.5.STABLE4-size_overflow.patch) = 7cd2d6b1ebbd86aa143fa5a57156d6ce @@ -31,4 +30,3 @@ MD5 (squid2.5/squid-2.5.STABLE4-russian.patch) = 5a4357bd56134fc6578c435314c1a83 MD5 (squid2.5/squid-2.5.STABLE4-redirlog.patch) = 8a2cc15f2bde6fa263a9e40aae807f82 MD5 (squid2.5/squid-2.5.STABLE4-pinger.patch) = 0902849d051873aaf5f54584d0536bb5 MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a0b6eea34 - diff --git a/www/squid27/Makefile b/www/squid27/Makefile index 156fe3a39bc..84806c61683 100644 --- a/www/squid27/Makefile +++ b/www/squid27/Makefile @@ -7,14 +7,14 @@ PORTNAME= squid PORTVERSION= 2.5.4 -PORTREVISION= 2 +PORTREVISION= 3 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/&,} + 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.STABLE4 EXTRACT_SUFX= .tar.bz2 @@ -27,7 +27,6 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ squid-2.5.STABLE4-fqdnnegcache.patch \ pam_auth-2.2.patch \ squid-2.5.STABLE4_auth_param_doc.patch \ - squid-2.5.STABLE4-errorpages.patch \ squid-2.5.STABLE4-error_load_text.patch \ squid-2.5.STABLE4-xpi_mime.patch \ squid-2.5.STABLE4-size_overflow.patch \ @@ -47,7 +46,12 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ squid-2.5.STABLE4-pconn-lifo.patch \ squid-2.5.STABLE4-cache_peer_maxconn.patch \ squid-2.5.STABLE4-pid_filename_none.patch \ - squid-2.5.STABLE4-dns_namelength.patch + squid-2.5.STABLE4-dns_namelength.patch \ + squid-2.5.STABLE4-urllogin_acl.patch \ + squid-2.5.STABLE4-russian.patch \ + squid-2.5.STABLE4-redirlog.patch \ + squid-2.5.STABLE4-pinger.patch \ + squid-2.5.STABLE4-partial_reload.patch PATCH_DIST_STRIP= -p1 MAINTAINER= adrian@freebsd.org @@ -134,7 +138,7 @@ MAN8= pam_auth.8 squid_unix_group.8 squid.8 post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/doc/squid.8 - # Prevent installation of .orig files by deleting them. +# Prevent installation of .orig files by deleting them. @${FIND} ${WRKSRC} -name '*.bak' -delete @${FIND} ${WRKSRC} -name '*.orig' -delete diff --git a/www/squid27/distinfo b/www/squid27/distinfo index abd55b09710..a39321e1cdf 100644 --- a/www/squid27/distinfo +++ b/www/squid27/distinfo @@ -5,7 +5,6 @@ MD5 (squid2.5/squid-2.5.STABLE4-redirect_login_space.patch) = 2374ed6dae7ef57c00 MD5 (squid2.5/squid-2.5.STABLE4-fqdnnegcache.patch) = ae1b7cce41ca403ebd7115d4506b0c25 MD5 (squid2.5/pam_auth-2.2.patch) = 3037a67d8f4b85cd7d51cb2dd5b4e8b8 MD5 (squid2.5/squid-2.5.STABLE4_auth_param_doc.patch) = 3b35c424db58c71c541563cd5ae39d15 -MD5 (squid2.5/squid-2.5.STABLE4-errorpages.patch) = cd2afde3f233df8ab8015e045f304ee7 MD5 (squid2.5/squid-2.5.STABLE4-error_load_text.patch) = 3935a3005d125f55cd78b228eba20647 MD5 (squid2.5/squid-2.5.STABLE4-xpi_mime.patch) = 1143fb9244690a24450c3c9ce6105da4 MD5 (squid2.5/squid-2.5.STABLE4-size_overflow.patch) = 7cd2d6b1ebbd86aa143fa5a57156d6ce @@ -31,4 +30,3 @@ MD5 (squid2.5/squid-2.5.STABLE4-russian.patch) = 5a4357bd56134fc6578c435314c1a83 MD5 (squid2.5/squid-2.5.STABLE4-redirlog.patch) = 8a2cc15f2bde6fa263a9e40aae807f82 MD5 (squid2.5/squid-2.5.STABLE4-pinger.patch) = 0902849d051873aaf5f54584d0536bb5 MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a0b6eea34 - diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 156fe3a39bc..84806c61683 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -7,14 +7,14 @@ PORTNAME= squid PORTVERSION= 2.5.4 -PORTREVISION= 2 +PORTREVISION= 3 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/&,} + 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.STABLE4 EXTRACT_SUFX= .tar.bz2 @@ -27,7 +27,6 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ squid-2.5.STABLE4-fqdnnegcache.patch \ pam_auth-2.2.patch \ squid-2.5.STABLE4_auth_param_doc.patch \ - squid-2.5.STABLE4-errorpages.patch \ squid-2.5.STABLE4-error_load_text.patch \ squid-2.5.STABLE4-xpi_mime.patch \ squid-2.5.STABLE4-size_overflow.patch \ @@ -47,7 +46,12 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ squid-2.5.STABLE4-pconn-lifo.patch \ squid-2.5.STABLE4-cache_peer_maxconn.patch \ squid-2.5.STABLE4-pid_filename_none.patch \ - squid-2.5.STABLE4-dns_namelength.patch + squid-2.5.STABLE4-dns_namelength.patch \ + squid-2.5.STABLE4-urllogin_acl.patch \ + squid-2.5.STABLE4-russian.patch \ + squid-2.5.STABLE4-redirlog.patch \ + squid-2.5.STABLE4-pinger.patch \ + squid-2.5.STABLE4-partial_reload.patch PATCH_DIST_STRIP= -p1 MAINTAINER= adrian@freebsd.org @@ -134,7 +138,7 @@ MAN8= pam_auth.8 squid_unix_group.8 squid.8 post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/doc/squid.8 - # Prevent installation of .orig files by deleting them. +# Prevent installation of .orig files by deleting them. @${FIND} ${WRKSRC} -name '*.bak' -delete @${FIND} ${WRKSRC} -name '*.orig' -delete diff --git a/www/squid30/distinfo b/www/squid30/distinfo index abd55b09710..a39321e1cdf 100644 --- a/www/squid30/distinfo +++ b/www/squid30/distinfo @@ -5,7 +5,6 @@ MD5 (squid2.5/squid-2.5.STABLE4-redirect_login_space.patch) = 2374ed6dae7ef57c00 MD5 (squid2.5/squid-2.5.STABLE4-fqdnnegcache.patch) = ae1b7cce41ca403ebd7115d4506b0c25 MD5 (squid2.5/pam_auth-2.2.patch) = 3037a67d8f4b85cd7d51cb2dd5b4e8b8 MD5 (squid2.5/squid-2.5.STABLE4_auth_param_doc.patch) = 3b35c424db58c71c541563cd5ae39d15 -MD5 (squid2.5/squid-2.5.STABLE4-errorpages.patch) = cd2afde3f233df8ab8015e045f304ee7 MD5 (squid2.5/squid-2.5.STABLE4-error_load_text.patch) = 3935a3005d125f55cd78b228eba20647 MD5 (squid2.5/squid-2.5.STABLE4-xpi_mime.patch) = 1143fb9244690a24450c3c9ce6105da4 MD5 (squid2.5/squid-2.5.STABLE4-size_overflow.patch) = 7cd2d6b1ebbd86aa143fa5a57156d6ce @@ -31,4 +30,3 @@ MD5 (squid2.5/squid-2.5.STABLE4-russian.patch) = 5a4357bd56134fc6578c435314c1a83 MD5 (squid2.5/squid-2.5.STABLE4-redirlog.patch) = 8a2cc15f2bde6fa263a9e40aae807f82 MD5 (squid2.5/squid-2.5.STABLE4-pinger.patch) = 0902849d051873aaf5f54584d0536bb5 MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a0b6eea34 - diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 156fe3a39bc..84806c61683 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -7,14 +7,14 @@ PORTNAME= squid PORTVERSION= 2.5.4 -PORTREVISION= 2 +PORTREVISION= 3 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/&,} + 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.STABLE4 EXTRACT_SUFX= .tar.bz2 @@ -27,7 +27,6 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ squid-2.5.STABLE4-fqdnnegcache.patch \ pam_auth-2.2.patch \ squid-2.5.STABLE4_auth_param_doc.patch \ - squid-2.5.STABLE4-errorpages.patch \ squid-2.5.STABLE4-error_load_text.patch \ squid-2.5.STABLE4-xpi_mime.patch \ squid-2.5.STABLE4-size_overflow.patch \ @@ -47,7 +46,12 @@ PATCHFILES= squid-2.5.STABLE4-reconfigure_message.patch \ squid-2.5.STABLE4-pconn-lifo.patch \ squid-2.5.STABLE4-cache_peer_maxconn.patch \ squid-2.5.STABLE4-pid_filename_none.patch \ - squid-2.5.STABLE4-dns_namelength.patch + squid-2.5.STABLE4-dns_namelength.patch \ + squid-2.5.STABLE4-urllogin_acl.patch \ + squid-2.5.STABLE4-russian.patch \ + squid-2.5.STABLE4-redirlog.patch \ + squid-2.5.STABLE4-pinger.patch \ + squid-2.5.STABLE4-partial_reload.patch PATCH_DIST_STRIP= -p1 MAINTAINER= adrian@freebsd.org @@ -134,7 +138,7 @@ MAN8= pam_auth.8 squid_unix_group.8 squid.8 post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/doc/squid.8 - # Prevent installation of .orig files by deleting them. +# Prevent installation of .orig files by deleting them. @${FIND} ${WRKSRC} -name '*.bak' -delete @${FIND} ${WRKSRC} -name '*.orig' -delete diff --git a/www/squid31/distinfo b/www/squid31/distinfo index abd55b09710..a39321e1cdf 100644 --- a/www/squid31/distinfo +++ b/www/squid31/distinfo @@ -5,7 +5,6 @@ MD5 (squid2.5/squid-2.5.STABLE4-redirect_login_space.patch) = 2374ed6dae7ef57c00 MD5 (squid2.5/squid-2.5.STABLE4-fqdnnegcache.patch) = ae1b7cce41ca403ebd7115d4506b0c25 MD5 (squid2.5/pam_auth-2.2.patch) = 3037a67d8f4b85cd7d51cb2dd5b4e8b8 MD5 (squid2.5/squid-2.5.STABLE4_auth_param_doc.patch) = 3b35c424db58c71c541563cd5ae39d15 -MD5 (squid2.5/squid-2.5.STABLE4-errorpages.patch) = cd2afde3f233df8ab8015e045f304ee7 MD5 (squid2.5/squid-2.5.STABLE4-error_load_text.patch) = 3935a3005d125f55cd78b228eba20647 MD5 (squid2.5/squid-2.5.STABLE4-xpi_mime.patch) = 1143fb9244690a24450c3c9ce6105da4 MD5 (squid2.5/squid-2.5.STABLE4-size_overflow.patch) = 7cd2d6b1ebbd86aa143fa5a57156d6ce @@ -31,4 +30,3 @@ MD5 (squid2.5/squid-2.5.STABLE4-russian.patch) = 5a4357bd56134fc6578c435314c1a83 MD5 (squid2.5/squid-2.5.STABLE4-redirlog.patch) = 8a2cc15f2bde6fa263a9e40aae807f82 MD5 (squid2.5/squid-2.5.STABLE4-pinger.patch) = 0902849d051873aaf5f54584d0536bb5 MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a0b6eea34 - -- cgit