aboutsummaryrefslogtreecommitdiffstats
path: root/main/privoxy/privoxy-alpine.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/privoxy/privoxy-alpine.patch')
-rw-r--r--main/privoxy/privoxy-alpine.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/main/privoxy/privoxy-alpine.patch b/main/privoxy/privoxy-alpine.patch
index c04030613c..7f46879d02 100644
--- a/main/privoxy/privoxy-alpine.patch
+++ b/main/privoxy/privoxy-alpine.patch
@@ -2,9 +2,9 @@ diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2593901..c3a681a 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
-@@ -62,8 +62,8 @@ MAN_DIR = @mandir@
- MAN_DEST = $(MAN_DIR)/man1
- MAN_PAGE = privoxy.1
+@@ -62,8 +62,8 @@
+ MAN_DEST = $(MAN_DIR)/man8
+ MAN_PAGE = privoxy.8
SHARE_DEST = @datadir@
-DOC_DEST = $(SHARE_DEST)/doc/privoxy
-VAR_DEST = @localstatedir@
@@ -13,17 +13,17 @@ index 2593901..c3a681a 100644
LOGS_DEST = $(VAR_DEST)/log/privoxy
PIDS_DEST = $(VAR_DEST)/run
-@@ -922,34 +922,8 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T
+@@ -964,34 +964,8 @@
fi ;\
$(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
for i in $(CONFIGS); do \
- if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \
- $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
- $(ECHO) Installing fresh $$i;\
- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
-- elif [ -s "$(CONF_DEST)/$$i" ]; then \
+- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+- elif [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ]; then \
- $(ECHO) Installing $$i as $$i.new ;\
-- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
+ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
- NEW=1;\
- else \
- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
@@ -47,7 +47,7 @@ index 2593901..c3a681a 100644
- $(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\
if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \
- $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \
+ $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.in | \
diff --git a/config b/config
index 8b20f92..25596d6 100644
--- a/config