summaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorKyle Guinn <elyk03@gmail.com>2013-11-12 00:05:17 -0600
committerRobby Workman <rworkman@slackbuilds.org>2013-11-12 01:25:04 -0600
commit56877006d5afc3ff6136de7ce335497c188adf9c (patch)
tree71e371c2e59720ef922a730187feb962962a13ba /network
parent8cfeaf7080712aafce532d12af4e1ee2b8e100b5 (diff)
downloadslackbuilds-56877006d5afc3ff6136de7ce335497c188adf9c.tar.gz
network/privoxy: Fix .new file creation
Signed-off-by: Kyle Guinn <elyk03@gmail.com> Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r--network/privoxy/privoxy.SlackBuild10
1 files changed, 8 insertions, 2 deletions
diff --git a/network/privoxy/privoxy.SlackBuild b/network/privoxy/privoxy.SlackBuild
index fdea19131d..48b42c4279 100644
--- a/network/privoxy/privoxy.SlackBuild
+++ b/network/privoxy/privoxy.SlackBuild
@@ -28,7 +28,7 @@
PRGNAM=privoxy
VERSION=${VERSION:-3.0.21}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -89,6 +89,10 @@ chmod -R u+w,go-w,a+rX-st .
# Put the docs where we tell them to go.
sed -i "/^DOC_DEST/s/= .*/= @docdir@/" GNUmakefile.in
+# The Makefile checks if certain config files exist, and if so, adds a
+# .new suffix. Turn this behavior off. We will do it below.
+sed -i "s/\[ -s \"\$(CONF_DEST)\/\$\$i\" \]/false/" GNUmakefile.in
+
autoheader
autoconf
CFLAGS="$SLKCFLAGS" \
@@ -127,7 +131,9 @@ sed -i \
$PKG/etc/rc.d/rc.$PRGNAM.new
# Make .new files so we don't clobber the existing configuration.
-# The makefile already adds the .new extension to the user-editable files.
+for i in config match-all.action trust user.action user.filter; do
+ mv $PKG/etc/privoxy/$i $PKG/etc/privoxy/$i.new
+done
# Others are not intended to be user-editable and will be overwritten.
# To disregard, uncomment this and the corresponding lines in doinst.sh.
#find $PKG/etc/privoxy -name '*.new' -prune -o -type f -exec mv {} {}.new \;