diff options
Diffstat (limited to 'www/squid/patches/patch-aa')
| -rw-r--r-- | www/squid/patches/patch-aa | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa index 3d86f8815c6..0c1b7e20c1c 100644 --- a/www/squid/patches/patch-aa +++ b/www/squid/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $ +$NetBSD: patch-aa,v 1.17 2005/08/09 15:48:30 taca Exp $ ---- src/Makefile.in.orig 2005-04-25 23:25:05.000000000 +0900 +--- src/Makefile.in.orig 2005-04-24 09:12:08.000000000 +0900 +++ src/Makefile.in -@@ -383,14 +383,15 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo +@@ -384,14 +384,14 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log @@ -18,11 +18,10 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $ +DEFAULT_ICON_DIR = $(datadir)/squid/icons +DEFAULT_ERROR_DIR = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@ +DEFAULT_MIB_PATH = $(datadir)/squid/mib.txt -+EXAMPLES_DIR = $(datadir)/examples/squid DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" -@@ -855,20 +856,20 @@ CCDEPMODE = @CCDEPMODE@ +@@ -856,20 +856,20 @@ CCDEPMODE = @CCDEPMODE@ uninstall-info-am: install-dataDATA: $(data_DATA) @$(NORMAL_INSTALL) @@ -48,7 +47,7 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $ done install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) -@@ -1067,7 +1068,7 @@ info-am: +@@ -1068,7 +1068,7 @@ info-am: install-data-am: install-data-local install-dataDATA install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \ @@ -57,7 +56,7 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $ install-info: install-info-recursive -@@ -1085,7 +1086,7 @@ mostlyclean-am: mostlyclean-compile most +@@ -1086,7 +1086,7 @@ mostlyclean-am: mostlyclean-compile most uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \ uninstall-libexecPROGRAMS uninstall-local \ @@ -66,7 +65,7 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $ uninstall-info: uninstall-info-recursive -@@ -1168,26 +1169,12 @@ repl_modules.c: repl_modules.sh Makefile +@@ -1169,26 +1169,7 @@ repl_modules.c: repl_modules.sh Makefile auth_modules.c: auth_modules.sh Makefile @$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c @@ -91,11 +90,6 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $ - fi - $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) +install-data-local: install-dataDATA -+ @mkdir -p $(DESTDIR)$(EXAMPLES_DIR) -+ @echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf" ;\ -+ $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf -+ @echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/suqid.conf"; \ -+ $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/squid.conf uninstall-local: @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \ |