network/privoxy: Updated for version 3.0.18.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

1 files changed, 34 insertions, 30 deletions

diff --git a/network/privoxy/privoxy.SlackBuild b/network/privoxy/privoxy.SlackBuild
index 4bf223cc26..27e440467b 100644
--- a/network/privoxy/privoxy.SlackBuild
+++ b/network/privoxy/privoxy.SlackBuild
@@ -27,7 +27,7 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=privoxy
-VERSION=${VERSION:-3.0.17}
+VERSION=${VERSION:-3.0.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,56 +86,60 @@ cd $PRGNAM-$VERSION-stable
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Put the docs where we tell them to go.
+# Also fix their permissions.
+sed -i \
+  -e "/^DOC_DEST/s/= .*/= @docdir@/" \
+  -e "/^RA_MODE/s/0664/0644/" \
+  GNUmakefile.in
+
 autoheader
 autoconf
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=$PKG/usr \
-  --libdir=$PKG/usr/lib${LIBDIRSUFFIX} \
-  --sbindir=$PKG/usr/bin \
-  --sysconfdir=$PKG/etc/$PRGNAM \
-  --localstatedir=$PKG/var \
-  --datadir=$PKG/usr \
-  --mandir=$PKG/usr/man \
-  --docdir=$PKG/usr/doc/$PRGNAM-$VERSION \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc/$PRGNAM \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux \
   --with-docbook=no \
   --with-user=$PRIVOXY_USER \
   --with-group=$PRIVOXY_GROUP \
-  --build=$ARCH-slackware-linux
+  --enable-no-gifs \
+  --enable-compression
 
 make
-make install-strip
+make install-strip DESTDIR=$PKG
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
-find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 mkdir $PKG/etc/rc.d
 cat slackware/rc.privoxy.orig > $PKG/etc/rc.d/rc.$PRGNAM.new
-sed -i "	s/%PROGRAM%/$PRGNAM/
-		s,%SBIN_DEST%,/usr/bin,
-		s,%CONF_DEST%,/etc/$PRGNAM,
-		s/%USER%/$PRGNAM/
-		s/%GROUP%/$PRGNAM/
-" $PKG/etc/rc.d/rc.$PRGNAM.new 
-
-# Fix Path within the configuration files (thanks to h4kteur)
-sed -i "s#$PKG##g" $PKG/etc/$PRGNAM/config
-# Fix Path with the config file to point to right usermanual (thanks to BP{k})
+chmod +x $PKG/etc/rc.d/rc.$PRGNAM.new
 sed -i \
-  "s#user-manual /usr/doc/$PRGNAM#user-manual /usr/doc/$PRGNAM-$VERSION#" \
-    $PKG/etc/privoxy/config
-
-# Make .new files so we dont clobber existing configuration
-find $PKG/etc/privoxy -type f -exec mv {} {}.new \;
-# Don't clobber the logfile either
+  -e "s/%PROGRAM%/$PRGNAM/" \
+  -e "s,%SBIN_DEST%,/usr/sbin," \
+  -e "s,%CONF_DEST%,/etc/$PRGNAM," \
+  -e "s/%USER%/$PRIVOXY_USER/" \
+  -e "s/%GROUP%/$PRIVOXY_GROUP/" \
+  $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 some files,
+# perhaps those are the only ones that are meant to be edited?
+find $PKG/etc/privoxy -name '*.new' -prune -o -type f -exec mv {} {}.new \;
+# Don't clobber the logfile either.
 mv $PKG/var/log/privoxy/logfile $PKG/var/log/privoxy/logfile.new
  
-# Remove this directory since it's empty and part of Slackware base 
+# Remove empty directories that are part of Slackware base.
+rmdir $PKG/usr/share
 rmdir $PKG/var/run
 
 mkdir -p $PKG/install