From d3a9dc67cb0b516f7e5cc3ea39222872e180171b Mon Sep 17 00:00:00 2001 From: krion Date: Tue, 1 Nov 2005 14:05:59 +0000 Subject: Update to 2.5.STABLE12 PR: ports/88327 Submitted by: maintainer --- www/squid26/Makefile | 23 +++++------------------ www/squid26/distinfo | 26 ++------------------------ www/squid26/pkg-deinstall | 20 ++++++++++++-------- www/squid26/pkg-descr | 4 ++-- www/squid26/pkg-install | 2 +- 5 files changed, 22 insertions(+), 53 deletions(-) (limited to 'www/squid26') diff --git a/www/squid26/Makefile b/www/squid26/Makefile index 1d256113b96c..31916d4cb34e 100644 --- a/www/squid26/Makefile +++ b/www/squid26/Makefile @@ -69,8 +69,7 @@ # PORTNAME= squid -PORTVERSION= 2.5.11 -PORTREVISION= 3 +PORTVERSION= 2.5.12 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ @@ -79,21 +78,10 @@ MASTER_SITES= \ ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,} MASTER_SITE_SUBDIR= squid-2/STABLE -DISTNAME= squid-2.5.STABLE11 +DISTNAME= squid-2.5.STABLE12 DIST_SUBDIR= squid2.5 PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ -PATCHFILES= squid-2.5.STABLE11-delaypools_truncated.patch \ - squid-2.5.STABLE11-tcp_outgoing_xxx.patch \ - squid-2.5.STABLE11-ldap_auth.patch \ - squid-2.5.STABLE11.accel_single_host_pconn.patch \ - squid-2.5.STABLE11-CACHE_HTTP_PORT.patch \ - squid-2.5.STABLE11-CNAME.patch \ - squid-2.5.STABLE11-httpd_accel-internal.patch \ - squid-2.5.STABLE11-IMS-HEAD.patch \ - squid-2.5.STABLE11-redirect-CONNECT.patch \ - squid-2.5.STABLE11-setcookie.patch \ - squid-2.5.STABLE11-rfc1738_do_escape.patch PATCH_DIST_STRIP= -p1 MAINTAINER= tmseck@netcologne.de @@ -110,9 +98,7 @@ SQUID_GID?= squid MAN8= cachemgr.cgi.8 squid.8 docs= QUICKSTART README RELEASENOTES.html doc/debug-sections.txt -.if !defined(NOPORTDOCS) PORTDOCS= ${docs:T} -.endif OPTIONS= SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \ SQUID_DELAY_POOLS "Enable delay pools" off \ @@ -375,8 +361,9 @@ pre-install: >${WRKDIR}/squid.sh pre-su-install: - @${SETENV} squid_user=${SQUID_UID} squid_group=${SQUID_GID} \ - PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \ + squid_user=${SQUID_UID} squid_group=${SQUID_GID} \ + ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: # Create cachemgr.conf.default manually since squid's install routine diff --git a/www/squid26/distinfo b/www/squid26/distinfo index 3bce4bf3504d..5d1b5428ba58 100644 --- a/www/squid26/distinfo +++ b/www/squid26/distinfo @@ -1,24 +1,2 @@ -MD5 (squid2.5/squid-2.5.STABLE11.tar.bz2) = 5e7f13ad95b64b60ddd6cdc2ab800d67 -SIZE (squid2.5/squid-2.5.STABLE11.tar.bz2) = 1075431 -MD5 (squid2.5/squid-2.5.STABLE11-delaypools_truncated.patch) = 73bd15ae4853d9b0f45ac4277b35ed15 -SIZE (squid2.5/squid-2.5.STABLE11-delaypools_truncated.patch) = 588 -MD5 (squid2.5/squid-2.5.STABLE11-tcp_outgoing_xxx.patch) = 18846f871032c4d7c496373c24b9f4d9 -SIZE (squid2.5/squid-2.5.STABLE11-tcp_outgoing_xxx.patch) = 1140 -MD5 (squid2.5/squid-2.5.STABLE11-ldap_auth.patch) = a22867a5be67b3ff2dd35ab338b05d9e -SIZE (squid2.5/squid-2.5.STABLE11-ldap_auth.patch) = 4857 -MD5 (squid2.5/squid-2.5.STABLE11.accel_single_host_pconn.patch) = f6ad18183bb3df2da1c5e6287b7162ea -SIZE (squid2.5/squid-2.5.STABLE11.accel_single_host_pconn.patch) = 944 -MD5 (squid2.5/squid-2.5.STABLE11-CACHE_HTTP_PORT.patch) = a43d8d7bed00dc0caebec7b440625a11 -SIZE (squid2.5/squid-2.5.STABLE11-CACHE_HTTP_PORT.patch) = 4010 -MD5 (squid2.5/squid-2.5.STABLE11-CNAME.patch) = 263c1a76d470ad4553e05e686e422de2 -SIZE (squid2.5/squid-2.5.STABLE11-CNAME.patch) = 3825 -MD5 (squid2.5/squid-2.5.STABLE11-httpd_accel-internal.patch) = fe88ab718a58e484bbf8ce6ce6111dd3 -SIZE (squid2.5/squid-2.5.STABLE11-httpd_accel-internal.patch) = 1736 -MD5 (squid2.5/squid-2.5.STABLE11-IMS-HEAD.patch) = 1e8ddcd080f431c8f3c059366e159765 -SIZE (squid2.5/squid-2.5.STABLE11-IMS-HEAD.patch) = 834 -MD5 (squid2.5/squid-2.5.STABLE11-redirect-CONNECT.patch) = 16e8a386cae25b5b0493adb66d89416f -SIZE (squid2.5/squid-2.5.STABLE11-redirect-CONNECT.patch) = 1282 -MD5 (squid2.5/squid-2.5.STABLE11-setcookie.patch) = 0d1acad61df0ffb5224cb3910f25fb29 -SIZE (squid2.5/squid-2.5.STABLE11-setcookie.patch) = 531 -MD5 (squid2.5/squid-2.5.STABLE11-rfc1738_do_escape.patch) = 43094437e3d66aa1cb141ea4c776df19 -SIZE (squid2.5/squid-2.5.STABLE11-rfc1738_do_escape.patch) = 3302 +MD5 (squid2.5/squid-2.5.STABLE12.tar.bz2) = 7354255015b3772a1e024dfac173e48c +SIZE (squid2.5/squid-2.5.STABLE12.tar.bz2) = 1075111 diff --git a/www/squid26/pkg-deinstall b/www/squid26/pkg-deinstall index d7d6e0452a25..2814161bd6e0 100644 --- a/www/squid26/pkg-deinstall +++ b/www/squid26/pkg-deinstall @@ -15,17 +15,21 @@ DEINSTALL) POST-DEINSTALL) echo "===> post-deinstallation information for $1" echo "" - echo " Please note that squid was not completely removed" - echo " from this system:" + echo " Note:" + echo " squid related user accounts and groups were not removed." + echo "" + echo " To remove the 'squid' user and the 'squid' group which were" + echo " created by a default installation of this package, run" + echo "" + echo " pw userdel -r -n squid -u 100" echo "" - echo " Any squid related user accounts were kept." if [ -d ${PKG_PREFIX}/squid -o -d ${PKG_PREFIX}/etc/squid ] ; then echo "" - echo " Additionally, cache and log directories as well as" - echo " configuration files modified by you were preserved" - echo " too, in case you want to install an updated version" - echo " of squid. You need to remove them manually if you do" - echo " not want to use it any longer." + echo " To ease updates, the cache and log directories and" + echo " all configuration files modified by you were preserved." + echo "" + echo " Please remove them manually if you do not want to use" + echo " squid any longer." fi echo "" ;; diff --git a/www/squid26/pkg-descr b/www/squid26/pkg-descr index 46543b891846..88ba8ba2aff5 100644 --- a/www/squid26/pkg-descr +++ b/www/squid26/pkg-descr @@ -9,7 +9,7 @@ The Harvest home page is http://harvest.cs.colorado.edu/. ARPA funding for the Harvest project has ended, the squid project has continued development of the cache where Harvest finished. -Please see this port's Makefile for a list of compilation options. +This port provides many configuration options, most of which are +available via 'make config'. -You can find further information on the project's website at WWW: http://www.squid-cache.org/ diff --git a/www/squid26/pkg-install b/www/squid26/pkg-install index c6da82449174..19e4a434a409 100644 --- a/www/squid26/pkg-install +++ b/www/squid26/pkg-install @@ -156,7 +156,7 @@ POST-INSTALL) echo " See ${PKG_PREFIX}/etc/rc.d/squid.sh for more" echo " configuration options." echo "" - echo " If you want to install an old style rc script, run" + echo " If you want the port to install an old style rc script, run" echo " 'make config' and deselect the option to install an" echo " rcNG script." echo "" -- cgit