3 files changed, 23 insertions, 7 deletions
diff --git a/network/haproxy/doinst.sh b/network/haproxy/doinst.sh
index 3560e24e37e5b..ead1b65ea4346 100644
--- a/network/haproxy/doinst.sh
+++ b/network/haproxy/doinst.sh
@@ -11,4 +11,11 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
+# Keep same perms on rc.haproxy.new:
+if [ -e etc/rc.d/rc.haproxy ]; then
+  cp -a etc/rc.d/rc.haproxy etc/rc.d/rc.haproxy.new.incoming
+  cat etc/rc.d/rc.haproxy.new > etc/rc.d/rc.haproxy.new.incoming
+  mv etc/rc.d/rc.haproxy.new.incoming etc/rc.d/rc.haproxy.new
+fi
+
 config etc/rc.d/rc.haproxy.new
diff --git a/network/haproxy/haproxy.SlackBuild b/network/haproxy/haproxy.SlackBuild
index c8550300ab12b..5377c90691f9e 100644
--- a/network/haproxy/haproxy.SlackBuild
+++ b/network/haproxy/haproxy.SlackBuild
@@ -51,11 +51,14 @@ else
 fi
 
 if [ "$ARCH" = "i486" ]; then
-   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-   SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -89,7 +92,9 @@ cat $CWD/rc.haproxy > $PKG/etc/rc.d/rc.haproxy.new
 cat ./examples/haproxy.cfg > $PKG/etc/haproxy/haproxy.cfg.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG CONTRIB LICENSE README ROADMAP SUBVERS TODO VERDATE VERSION doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG CONTRIB LICENSE README \
+  ROADMAP SUBVERS TODO VERDATE VERSION doc/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/haproxy.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/haproxy.SlackBuild
 
 mv $PKG/usr/share/man $PKG/usr/
@@ -101,8 +106,10 @@ rm -rf $PKG/usr/{share,/doc/haproxy}
 )
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/install
@@ -110,4 +117,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/haproxy/haproxy.info b/network/haproxy/haproxy.info
index c45ac13512867..9caa3ef8c5097 100644
--- a/network/haproxy/haproxy.info
+++ b/network/haproxy/haproxy.info
@@ -2,7 +2,9 @@ PRGNAM="haproxy"
 VERSION="1.3.15.7"
 HOMEPAGE="http://haproxy.1wt.eu/"
 DOWNLOAD="http://haproxy.1wt.eu/download/1.3/src/haproxy-1.3.15.7.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="6c1978071139c5cc27563232c2a488da"
+MD5SUM_x86_64=""
 MAINTAINER="Cherife Li"
 EMAIL="cherife-#-dotimes.com"
 APPROVED="dsomero"