diff options
| author | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2005-05-22 13:49:22 +0000 |
|---|---|---|
| committer | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2005-05-22 13:49:22 +0000 |
| commit | 0561518b0cf271efbbcf7c1788bbf94c3448a980 (patch) | |
| tree | cd12afe95d8d573e6c258f91e0a4b27e066dea3a /www/squid | |
| parent | 1bf7bcbc11cba9d986a70da108d24c1319051d3d (diff) | |
- Read cachemgr.conf rather than cachemgr.conf.default
- Add a missing %SUBDIR% in MASTER_SITES
PR: ports/81319
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=135854
Diffstat (limited to 'www/squid')
| -rw-r--r-- | www/squid/Makefile | 7 | ||||
| -rw-r--r-- | www/squid/files/patch-src-Makefile.in | 11 |
2 files changed, 6 insertions, 12 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index 7b8e614d9362..56ffa6dc9465 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -66,12 +66,13 @@ PORTNAME= squid PORTVERSION= 2.5.10 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= \ ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ ftp://ftp.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \ ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \ - ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/ \ + 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.STABLE10 @@ -373,6 +374,10 @@ pre-su-install: PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: +# Create cachemgr.conf.default manually since squid's install routine +# unfortunately fails to do so: + ${INSTALL_DATA} ${WRKSRC}/src/cachemgr.conf \ + ${PREFIX}/etc/squid/cachemgr.conf.default .if defined(WITH_SQUID_PINGER) ${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \ ${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger diff --git a/www/squid/files/patch-src-Makefile.in b/www/squid/files/patch-src-Makefile.in deleted file mode 100644 index e9b57d95dd2f..000000000000 --- a/www/squid/files/patch-src-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Tue May 17 22:06:43 2005 -+++ src/Makefile.in Tue May 17 22:05:39 2005 -@@ -377,7 +377,7 @@ - - DEFAULT_PREFIX = $(prefix) - DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf --DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf -+DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf.default - DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf - DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_LOG_PREFIX = $(localstatedir)/logs |