[pkgsrc/trunk]: pkgsrc/www/privoxy Make this work with GNU make 3.81: contin...

[kim <kim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e2d0f19eccfa
branches:  trunk
changeset: 511881:e2d0f19eccfa
user:      kim <kim%pkgsrc.org@localhost>
date:      Tue Apr 25 07:42:06 2006 +0000

description:
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:

 www/privoxy/distinfo         |   4 ++--
 www/privoxy/patches/patch-ab |  23 ++++++++---------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diffs (60 lines):

diff -r 79501314b869 -r e2d0f19eccfa www/privoxy/distinfo
--- a/www/privoxy/distinfo      Tue Apr 25 06:34:34 2006 +0000
+++ b/www/privoxy/distinfo      Tue Apr 25 07:42:06 2006 +0000
@@ -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 -r 79501314b869 -r e2d0f19eccfa www/privoxy/patches/patch-ab
--- a/www/privoxy/patches/patch-ab      Tue Apr 25 06:34:34 2006 +0000
+++ b/www/privoxy/patches/patch-ab      Tue Apr 25 07:42:06 2006 +0000
@@ -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 @@
  
  
  #############################################################################
-@@ -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 @@
 -      $(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.