diff options
| -rw-r--r-- | www/squid30/Makefile | 19 | ||||
| -rw-r--r-- | www/squid30/distinfo | 18 | ||||
| -rw-r--r-- | www/squid30/files/squid.in | 4 |
3 files changed, 17 insertions, 24 deletions
diff --git a/www/squid30/Makefile b/www/squid30/Makefile index d6ec5a5431b4..7c8f1163a3b7 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -61,7 +61,6 @@ PORTNAME= squid PORTVERSION= 3.0.${SQUID_STABLE_VER} -PORTREVISION= 4 CATEGORIES= www MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://mirrors.ccs.neu.edu/Squid/ \ @@ -72,13 +71,13 @@ MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ http://mirror.aarnet.edu.au/pub/squid/squid/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid,} \ http://www.squid-cache.org/Versions/v3/3.0/ \ - http://www2.us.squid-cache.org/Versions/v3/3.0/ \ + http://www3.us.squid-cache.org/Versions/v3/3.0/ \ http://www1.at.squid-cache.org/Versions/v3/3.0/ \ http://www2.de.squid-cache.org/Versions/v3/3.0/ \ http://www.eu.squid-cache.org/Versions/v3/3.0/ \ http://www1.ie.squid-cache.org/Versions/v3/3.0/ \ http://www1.jp.squid-cache.org/Versions/v3/3.0/ \ - http://www2.tw.squid-cache.org/Versions/v3/3.0/ + http://www1.za.squid-cache.org/Versions/v3/3.0/ MASTER_SITE_SUBDIR= squid DISTNAME= squid-3.0.STABLE${SQUID_STABLE_VER} DIST_SUBDIR= squid3.0 @@ -92,16 +91,20 @@ PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ http://www1.jp.squid-cache.org/%SUBDIR%/ \ http://www2.tw.squid-cache.org/%SUBDIR%/ PATCH_SITE_SUBDIR= Versions/v3/3.0/changesets -PATCHFILES= squid-3.0-9183.patch squid-3.0-9184.patch squid-3.0-9185.patch \ - squid-3.0-9186.patch squid-3.0-9187.patch squid-3.0-9188.patch \ - squid-3.0-9189.patch +PATCHFILES= #empty MAINTAINER= tmseck@web.de COMMENT= HTTP Caching Proxy +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +DEPRECATED= This version of Squid is no longer actively maintained upstream +EXPIRATION_DATE= 2011-12-31 + LATEST_LINK= squid30 -SQUID_STABLE_VER= 25 +SQUID_STABLE_VER= 26 CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[^0].* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes @@ -383,7 +386,7 @@ CONFIGURE_ARGS+= --enable-err-languages="${SQUID_LANGUAGES}" \ # Finally, add additional user specified configuration options: CONFIGURE_ARGS+= ${SQUID_CONFIGURE_ARGS} -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" PLIST_DIRS= %%ETCDIR%%/icons libexec/squid PLIST_FILES= ${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \ diff --git a/www/squid30/distinfo b/www/squid30/distinfo index d9dfdd89ff8f..ae31f0caccfc 100644 --- a/www/squid30/distinfo +++ b/www/squid30/distinfo @@ -1,16 +1,2 @@ -SHA256 (squid3.0/squid-3.0.STABLE25.tar.bz2) = d1040a17f3c904372c180e1e6a432be798a26c3689831a329bd2a5ab38bbc05e -SIZE (squid3.0/squid-3.0.STABLE25.tar.bz2) = 1758969 -SHA256 (squid3.0/squid-3.0-9183.patch) = 61b6b2d7619705db83b5f66a57b64f7c00b9e02c7707c473f3f1f4ad8abf9b9f -SIZE (squid3.0/squid-3.0-9183.patch) = 1542 -SHA256 (squid3.0/squid-3.0-9184.patch) = a32f91fa85a401039e173458bbb137a7e2d61e4e1ca465fa4857071b906712ca -SIZE (squid3.0/squid-3.0-9184.patch) = 2240 -SHA256 (squid3.0/squid-3.0-9185.patch) = f2fa4d2b0e1d7fbd3bdb85e980d83e0bf60a73c0b362dc148369843f6480ede7 -SIZE (squid3.0/squid-3.0-9185.patch) = 1680 -SHA256 (squid3.0/squid-3.0-9186.patch) = 0d9917539a3fe6075292b5927c61324222cb09a11eeeffc99af5c169f65b31a5 -SIZE (squid3.0/squid-3.0-9186.patch) = 1646 -SHA256 (squid3.0/squid-3.0-9187.patch) = e7c0c1b365413c786ed78fcc6b4113e0783458b4137d3d47d4cb707730ee388b -SIZE (squid3.0/squid-3.0-9187.patch) = 1338 -SHA256 (squid3.0/squid-3.0-9188.patch) = 4fc959e0bd570d4e8e19a0732181836b49086c98e78d1bc37f3fa739763ff753 -SIZE (squid3.0/squid-3.0-9188.patch) = 1455 -SHA256 (squid3.0/squid-3.0-9189.patch) = a5abc0cda7016b00673e0f3bf91a5af2aeece09480bbaae90df34afb0e6fba04 -SIZE (squid3.0/squid-3.0-9189.patch) = 4192 +SHA256 (squid3.0/squid-3.0.STABLE26.tar.bz2) = 3e54ae3ad09870203862f0856c7d0cca16a85f62d5012085009003ee3d5467b4 +SIZE (squid3.0/squid-3.0.STABLE26.tar.bz2) = 1866351 diff --git a/www/squid30/files/squid.in b/www/squid30/files/squid.in index 25ae857ae28e..c38878660b8c 100644 --- a/www/squid30/files/squid.in +++ b/www/squid30/files/squid.in @@ -90,4 +90,8 @@ required_dirs=${squid_chdir} required_files=${squid_conf} +# Now make sure that we invoke squid with "-f ${squid_conf}": + +command_args="-f ${squid_conf}" + run_rc_command "$1" |