Attachment #87028 for bug #123573

View | Details | Raw Unified | Return to bug 123573
Collapse All | Expand All

Lines 76-81 Link Here

(-)Makefile (+1 lines)
76		76
77	PORTNAME= squid	77	PORTNAME= squid
78	PORTVERSION= 2.6.20	78	PORTVERSION= 2.6.20
		79	PORTREVISION= 1
79	CATEGORIES= www	80	CATEGORIES= www
80	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \	81	MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
81	ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \	82	ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \




--- 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
 	cachemgr.conf
 
 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 \

Lines 20-26 Link Here

(-)files/pkg-message.in (-1 / +1 lines)
20		20
21	To enable Squid, set squid_enable=yes in either	21	To enable Squid, set squid_enable=yes in either
22	/etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid	22	/etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid
23	Please see %%PREFIX%%/etc/rc.d/squid(.sh) for further details.	23	Please see %%PREFIX%%/etc/rc.d/squid for further details.
24		24
25	Note:	25	Note:
26	If you just updated your Squid installation from 2.5 or earlier,	26	If you just updated your Squid installation from 2.5 or earlier,

Return to bug 123573

Lines 1-11 Link Here

(-)files/patch-tools-Makefile.in (-10 / +10 lines)
1	--- tools/Makefile.in.orig Sun May 14 18:30:04 2006	1	--- tools/Makefile.in.orig 2008-05-10 18:39:20.000000000 +0200
2	+++ tools/Makefile.in Sun May 14 18:31:02 2006	2	+++ tools/Makefile.in 2008-05-10 18:40:02.000000000 +0200
3	@@ -297,7 +297,7 @@	3	@@ -791,6 +791,8 @@
4	EXTRA_DIST = \	4	$(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h
5	cachemgr.conf
6		5
7	-DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf	6	install-data-local:
8	+DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf.default	7	+ @echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default"; \
9		8	+ $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default;
10	# Don't automatically uninstall config files	9	@if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \
11	# @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \	10	echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \
		11	else \