diff options
| author | miwi <miwi@FreeBSD.org> | 2008-05-16 20:27:17 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-05-16 20:27:17 +0800 |
| commit | ef937400faeaeb1b0d1e633494df691fed3d0357 (patch) | |
| tree | 9841489ed8b5915c3fd641e2e219cbfd672c5eac /www | |
| parent | a6e10ddb764b79c038006f677333565b64a5cdc4 (diff) | |
| download | freebsd-ports-gnome-ef937400faeaeb1b0d1e633494df691fed3d0357.tar.gz freebsd-ports-gnome-ef937400faeaeb1b0d1e633494df691fed3d0357.tar.zst freebsd-ports-gnome-ef937400faeaeb1b0d1e633494df691fed3d0357.zip | |
- Fix a mistake I (the maintainer) had introduced regarding the
installation of the cachemgr.conf.default file: instead of explicitly
installing it I thought it would be enough to change an automake
variable that served an entirely different purpose, namely
hardcoding the path to the configuration in the cachemgr.cgi
binary.
- While at it: remove a no longer needed .sh reference from
files/pkg-message.in.
- Set PORTREVISION to 1 because the hardcoded name of the default
configuration file has changed within cachemgr.cgi.
PR: 123573
Submitted by: Thomas-Martin Seck <tmseck@web.de> (maintainer)
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid/Makefile | 1 | ||||
| -rw-r--r-- | www/squid/files/patch-tools-Makefile.in | 20 | ||||
| -rw-r--r-- | www/squid/files/pkg-message.in | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index 9a62b0b5deee..b97141331204 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -76,6 +76,7 @@ PORTNAME= squid PORTVERSION= 2.6.20 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \ ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \ diff --git a/www/squid/files/patch-tools-Makefile.in b/www/squid/files/patch-tools-Makefile.in index 3daee0c17c82..99d44ccfe172 100644 --- a/www/squid/files/patch-tools-Makefile.in +++ b/www/squid/files/patch-tools-Makefile.in @@ -1,11 +1,11 @@ ---- tools/Makefile.in.orig Sun May 14 18:30:04 2006 -+++ tools/Makefile.in Sun May 14 18:31:02 2006 -@@ -297,7 +297,7 @@ - EXTRA_DIST = \ - cachemgr.conf +--- tools/Makefile.in.orig 2008-05-10 18:39:20.000000000 +0200 ++++ tools/Makefile.in 2008-05-10 18:40:02.000000000 +0200 +@@ -791,6 +791,8 @@ + $(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h --DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf -+DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf.default - - # Don't automatically uninstall config files - # @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ + install-data-local: ++ @echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default"; \ ++ $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default; + @if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \ + else \ diff --git a/www/squid/files/pkg-message.in b/www/squid/files/pkg-message.in index 9e7d814cda25..d395f293e8a3 100644 --- a/www/squid/files/pkg-message.in +++ b/www/squid/files/pkg-message.in @@ -20,7 +20,7 @@ To enable Squid, set squid_enable=yes in either /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid - Please see %%PREFIX%%/etc/rc.d/squid(.sh) for further details. + Please see %%PREFIX%%/etc/rc.d/squid for further details. Note: If you just updated your Squid installation from 2.5 or earlier, |