From bb333008c20a5b138c6cf23f15f73dc4f7871f98 Mon Sep 17 00:00:00 2001
From: dsomero <xgizzmo@slackbuilds.org>
Date: Sun, 30 Sep 2012 09:58:18 -0400
Subject: network/3proxy: Fixed (Don't clobber configs or libproxy)

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 network/3proxy/3proxy.SlackBuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'network/3proxy/3proxy.SlackBuild')

diff --git a/network/3proxy/3proxy.SlackBuild b/network/3proxy/3proxy.SlackBuild
index 7f93f96034..5c960d9250 100644
--- a/network/3proxy/3proxy.SlackBuild
+++ b/network/3proxy/3proxy.SlackBuild
@@ -24,15 +24,13 @@
 
 PRGNAM=3proxy
 VERSION=${VERSION:-0.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -81,8 +79,15 @@ make install -f Makefile.Linux \
 # I think I fixed all the references to /usr/local/etc and such in the
 # source, but time will tell... :-)  --rworkman
 mv $PKG/usr/etc $PKG
+mv $PKG/etc/3proxy/bandlimiters $PKG/etc/3proxy/bandlimiters.new
+mv $PKG/etc/3proxy/counters $PKG/etc/3proxy/counters.new
+mv $PKG/etc/3proxy/passwd $PKG/etc/3proxy/passwd.new
 cat $CWD/3proxy.cfg.sample > $PKG/etc/3proxy/3proxy.cfg.sample
 
+# /usr/bin/proxy renamed to htproxy to avoid name bump with libproxy.
+mv $PKG/usr/bin/proxy $PKG/usr/bin/htproxy
+mv $PKG/usr/man/man8/proxy.8 $PKG/usr/man/man8/htproxy.8
+
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.3proxy > $PKG/etc/rc.d/rc.3proxy.new
 chmod 0755 $PKG/etc/rc.d/rc.3proxy.new
-- 
cgit v1.2.3