diff options
Diffstat (limited to 'www/privoxy/patches')
| -rw-r--r-- | www/privoxy/patches/patch-aa | 24 | ||||
| -rw-r--r-- | www/privoxy/patches/patch-ab | 19 |
2 files changed, 24 insertions, 19 deletions
diff --git a/www/privoxy/patches/patch-aa b/www/privoxy/patches/patch-aa index 38779048a64..15719567766 100644 --- a/www/privoxy/patches/patch-aa +++ b/www/privoxy/patches/patch-aa @@ -1,22 +1,22 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/06/16 03:02:04 kim Exp $ +$NetBSD: patch-aa,v 1.2 2006/11/24 18:26:06 drochner Exp $ ---- config.orig 2003-03-05 11:34:15.000000000 -0500 -+++ config 2003-06-15 19:35:33.000000000 -0400 -@@ -104,7 +104,7 @@ +--- config.orig 2006-11-14 02:54:36.000000000 +0100 ++++ config +@@ -266,7 +266,7 @@ trust-info-url http://www.example.com/w # flat, except for confdir/templates, where the HTML templates # for CGI output reside (e.g. Privoxy's 404 error page). - # + # -confdir . +confdir @PKG_SYSCONFDIR@ - # - # 1.2. logdir -@@ -131,7 +131,7 @@ - # + # + # 2.2. logdir +@@ -293,7 +293,7 @@ confdir . + # # No trailing "/", please - # + # -logdir . +logdir /var/log/privoxy - # - # 1.3. actionsfile + # + # 2.3. actionsfile diff --git a/www/privoxy/patches/patch-ab b/www/privoxy/patches/patch-ab index da6d3849798..8c017b6d732 100644 --- a/www/privoxy/patches/patch-ab +++ b/www/privoxy/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2006/04/25 07:42:06 kim Exp $ +$NetBSD: patch-ab,v 1.3 2006/11/24 18:26:06 drochner Exp $ ---- GNUmakefile.in.orig 2004-01-31 03:15:33.000000000 +0200 -+++ GNUmakefile.in 2006-04-25 10:39:31.000000000 +0300 -@@ -246,7 +246,7 @@ +--- GNUmakefile.in.orig 2006-10-25 13:55:45.000000000 +0200 ++++ GNUmakefile.in +@@ -246,7 +246,7 @@ OTHER_CFLAGS = CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \ @STATIC_PCRE_ONLY@ -Ipcre @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2006/04/25 07:42:06 kim Exp $ ############################################################################# -@@ -1122,17 +1122,6 @@ +@@ -1126,22 +1126,6 @@ install: CONF_DEST LOG_DEST PID_DEST che @$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1 -$(INSTALL) $(INSTALL_T) privoxy.1 $(MAN_DEST)/privoxy.1 @@ -21,8 +21,13 @@ $NetBSD: patch-ab,v 1.2 2006/04/25 07:42:06 kim Exp $ - $(CAT) config >config~ ;\ - $(MV) config.base config ;\ - fi -- $(SED) 's+confdir .+confdir $(CONF_DEST)+' config | \ -- $(SED) 's+logdir .+logdir $(LOG_DEST)+' >config.updated +- $(SED) 's+^confdir \.+confdir $(CONF_DEST)+' config | \ +- $(SED) 's+^logdir \.+logdir $(LOG_DEST)+' >config.tmp +- -@if [ $(check_doc) = 0 ]; then \ +- $(SED) 's+^#\?user-manual .*+user-manual $(DOC_DEST)/user-manual/+' config.tmp >config.updated ;\ +- else \ +- $(SED) 's+^#\?user-manual .*+user-manual $(prefix)/doc/privoxy/user-manual/+' config.tmp >config.updated ;\ +- fi;\ - $(MV) config config.base - $(MV) config.updated config - |