From 5ccfa068d73b4f63c566b858f55061f1c1bc671c Mon Sep 17 00:00:00 2001
From: Christoph Willing <c.willing@uq.edu.au>
Date: Fri, 28 Sep 2012 19:20:06 +1000
Subject: misc/mosquitto: Updated for version 1.0.3.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 misc/mosquitto/01_config.mk.diff       | 11 -----------
 misc/mosquitto/02_client_Makefile.diff | 11 -----------
 misc/mosquitto/mosquitto.SlackBuild    | 22 +++++++++++-----------
 misc/mosquitto/mosquitto.info          |  6 +++---
 4 files changed, 14 insertions(+), 36 deletions(-)
 delete mode 100644 misc/mosquitto/01_config.mk.diff
 delete mode 100644 misc/mosquitto/02_client_Makefile.diff

diff --git a/misc/mosquitto/01_config.mk.diff b/misc/mosquitto/01_config.mk.diff
deleted file mode 100644
index 8877a45bee..0000000000
--- a/misc/mosquitto/01_config.mk.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.mk.orig	2011-11-30 20:56:02.857640514 +1000
-+++ config.mk	2011-11-30 20:57:48.844357296 +1000
-@@ -23,6 +23,6 @@
- MSGFMT=msgfmt
- DOCBOOK2MAN=docbook2man.pl
- 
--prefix=/usr/local
--mandir=${prefix}/share/man
-+prefix=/usr
-+mandir=${prefix}/man
- localedir=${prefix}/share/locale
diff --git a/misc/mosquitto/02_client_Makefile.diff b/misc/mosquitto/02_client_Makefile.diff
deleted file mode 100644
index 85a53a650e..0000000000
--- a/misc/mosquitto/02_client_Makefile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- client/Makefile.orig	2010-12-03 20:58:19.000000000 +1000
-+++ client/Makefile	2011-01-29 23:09:18.768655710 +1000
-@@ -2,7 +2,7 @@
- CFLAGS=-I../lib -Wall -ggdb
- LDFLAGS=-L../lib ../lib/libmosquitto.so.0
- INSTALL=install
--prefix=/usr/local
-+prefix=/usr
- 
- .PHONY: all install uninstall clean
- 
diff --git a/misc/mosquitto/mosquitto.SlackBuild b/misc/mosquitto/mosquitto.SlackBuild
index 4a55abdab9..3d78bbfa5c 100644
--- a/misc/mosquitto/mosquitto.SlackBuild
+++ b/misc/mosquitto/mosquitto.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mosquitto
-VERSION=${VERSION:-0.14.2}
+VERSION=${VERSION:-1.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,16 +69,15 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Patches for correct build/install on Slackware
-cat $CWD/01_config.mk.diff | patch -p0
-cat $CWD/02_client_Makefile.diff | patch -p0
+mkdir build
+cd build
+cmake ../ \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DLIB_SUFFIX=64 \
 
-# patch config.mk to respect CFLAGS
-sed -i "s/CFLAGS=/CFLAGS+=/" config.mk
-
-CFLAGS="$SLKCFLAGS" \
-  make
-LIB_SUFFIX=$LIBDIRSUFFIX make install DESTDIR=$PKG
+make
+make install DESTDIR=$PKG
+cd  -
 
 # Preserve existing mosquitto.conf during package installation
 mv $PKG/etc/mosquitto/mosquitto.conf $PKG/etc/mosquitto/mosquitto.conf.new
@@ -86,12 +85,13 @@ mv $PKG/etc/mosquitto/mosquitto.conf $PKG/etc/mosquitto/mosquitto.conf.new
 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
 
+mv $PKG/usr/share/man $PKG/usr/ && rmdir $PKG/usr/share
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING ChangeLog.txt Makefile compiling.txt mosquitto.conf readme.txt \
+  LICENSE.txt LICENSE-3rd-party.txt compiling.txt mosquitto.conf *.example readme.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/misc/mosquitto/mosquitto.info b/misc/mosquitto/mosquitto.info
index e7f619b2aa..22b48c7890 100644
--- a/misc/mosquitto/mosquitto.info
+++ b/misc/mosquitto/mosquitto.info
@@ -1,8 +1,8 @@
 PRGNAM="mosquitto"
-VERSION="0.14.2"
+VERSION="1.0.3"
 HOMEPAGE="http://mosquitto.org/"
-DOWNLOAD="http://mosquitto.org/files/source/mosquitto-0.14.2.tar.gz"
-MD5SUM="2476068e23f378e70f7264f5ece40a32"
+DOWNLOAD="http://mosquitto.org/files/source/mosquitto-1.0.3.tar.gz"
+MD5SUM="9c9e06c57fcca80d76068c53ad140186"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3