diff options
| author | kim <kim> | 2006-04-25 07:42:06 +0000 |
|---|---|---|
| committer | kim <kim> | 2006-04-25 07:42:06 +0000 |
| commit | ed2c15ec044c54c805feddd2573c76238df323ff (patch) | |
| tree | 08c14206914cb4f6a6d2eef759b1bcffe2c05d87 /www | |
| parent | 1d7b957cf310fbf46b25fbce7d3e7155d3bac14c (diff) | |
| download | pkgsrc-ed2c15ec044c54c805feddd2573c76238df323ff.tar.gz | |
Make this work with GNU make 3.81: continuation lines for the shell
work differently now, so the @# prefix to comment the lines out no
longer works. (A plain '#' might work, though.)
Diffstat (limited to 'www')
| -rw-r--r-- | www/privoxy/distinfo | 4 | ||||
| -rw-r--r-- | www/privoxy/patches/patch-ab | 23 |
2 files changed, 10 insertions, 17 deletions
diff --git a/www/privoxy/distinfo b/www/privoxy/distinfo index eab32c547ce..e6536b262bc 100644 --- a/www/privoxy/distinfo +++ b/www/privoxy/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 14:08:38 wiz Exp $ +$NetBSD: distinfo,v 1.5 2006/04/25 07:42:06 kim Exp $ SHA1 (privoxy-3.0.3-stable-src.tar.gz) = 8aa5ad21a819c0cd5e5f3aadf24e9fb0d813bdaa RMD160 (privoxy-3.0.3-stable-src.tar.gz) = ae77a87c51ec8685f9352c99a8db820fc95b9202 Size (privoxy-3.0.3-stable-src.tar.gz) = 1561072 bytes SHA1 (patch-aa) = 2bdc980df283f14ac8694f04b07e6d499d46c5c1 -SHA1 (patch-ab) = 548d11ad83cef96c311cb0453cb149b71577631e +SHA1 (patch-ab) = 9c5ac1a916913119345daf8b261229c84d2979a1 SHA1 (patch-ac) = e39ffe694462b952c5ad66ac577a0acbee0a1d9f diff --git a/www/privoxy/patches/patch-ab b/www/privoxy/patches/patch-ab index a5aeb64c40c..da6d3849798 100644 --- a/www/privoxy/patches/patch-ab +++ b/www/privoxy/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/06/16 03:02:04 kim Exp $ +$NetBSD: patch-ab,v 1.2 2006/04/25 07:42:06 kim Exp $ ---- GNUmakefile.in.orig 2002-11-04 02:04:03.000000000 -0500 -+++ GNUmakefile.in 2003-06-15 19:55:34.000000000 -0400 +--- 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 @@ CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \ @STATIC_PCRE_ONLY@ -Ipcre @@ -11,10 +11,11 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/06/16 03:02:04 kim Exp $ ############################################################################# -@@ -1104,15 +1104,15 @@ +@@ -1122,17 +1122,6 @@ + @$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1 -$(INSTALL) $(INSTALL_T) privoxy.1 $(MAN_DEST)/privoxy.1 - @# Change the config file default directories according to the configured ones +- @# Change the config file default directories according to the configured ones - @$(ECHO) Rewriting config for this installation - @if [ -f config.base ] ; then \ - $(CAT) config >config~ ;\ @@ -24,15 +25,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/06/16 03:02:04 kim Exp $ - $(SED) 's+logdir .+logdir $(LOG_DEST)+' >config.updated - $(MV) config config.base - $(MV) config.updated config -+ @#$(ECHO) Rewriting config for this installation -+ @#if [ -f config.base ] ; then \ -+ @# $(CAT) config >config~ ;\ -+ @# $(MV) config.base config ;\ -+ @#fi -+ @#$(SED) 's+confdir .+confdir $(CONF_DEST)+' config | \ -+ @#$(SED) 's+logdir .+logdir $(LOG_DEST)+' >config.updated -+ @#$(MV) config config.base -+ @#$(MV) config.updated config - +- @# Install the config support files. Test for root install, and abort @# if there is no privoxy user, and no other user was enabled during + @# configure. Later, install init script if appropriate. |