From b53cfad4043675db94ad01fb54e4e952b34ff07f Mon Sep 17 00:00:00 2001
From: T3slider <t3slider@gmail.com>
Date: Mon, 9 Nov 2015 22:58:26 +0700
Subject: network/haproxy: Updated for version 1.6.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/haproxy/haproxy.SlackBuild | 12 +++++-------
 network/haproxy/haproxy.info       |  6 +++---
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'network/haproxy')

diff --git a/network/haproxy/haproxy.SlackBuild b/network/haproxy/haproxy.SlackBuild
index 743564e879..878709c089 100644
--- a/network/haproxy/haproxy.SlackBuild
+++ b/network/haproxy/haproxy.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=haproxy
-VERSION=${VERSION:-1.6.1}
+VERSION=${VERSION:-1.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -82,13 +82,12 @@ make \
     USE_ZLIB=1 \
     USE_NS=1 \
     EXTRA=""
-make install-man \
+make install \
     PREFIX=/usr \
     MANDIR=/usr/man \
+    DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+    EXTRA="" \
     DESTDIR=$PKG
-# A Makefile bug builds/installs a systemd wrapper during the
-# install/install-bin step even with EXTRA=""...
-install -D -m 0755 haproxy $PKG/usr/sbin/haproxy
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -98,8 +97,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 install -D -m 0644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG CONTRIBUTING LICENSE MAINTAINERS README ROADMAP SUBVERS VERDATE VERSION doc examples \
+cp -a CHANGELOG CONTRIBUTING LICENSE MAINTAINERS README ROADMAP SUBVERS VERDATE VERSION examples \
   $PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKG/etc/haproxy
 mv $PKG/usr/doc/$PRGNAM-$VERSION/examples/errorfiles $PKG/etc/haproxy/errors
diff --git a/network/haproxy/haproxy.info b/network/haproxy/haproxy.info
index 5b36c71829..bce4deb4a1 100644
--- a/network/haproxy/haproxy.info
+++ b/network/haproxy/haproxy.info
@@ -1,8 +1,8 @@
 PRGNAM="haproxy"
-VERSION="1.6.1"
+VERSION="1.6.2"
 HOMEPAGE="http://www.haproxy.org/"
-DOWNLOAD="http://www.haproxy.org/download/1.6/src/haproxy-1.6.1.tar.gz"
-MD5SUM="7343def2af8556ebc8972a9748176094"
+DOWNLOAD="http://www.haproxy.org/download/1.6/src/haproxy-1.6.2.tar.gz"
+MD5SUM="d0ebd3d123191a8136e2e5eb8aaff039"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3