From ba89a338f5eed02876c9a13543338581623c6d2a Mon Sep 17 00:00:00 2001
From: rodrigo <rodrigo@FreeBSD.org>
Date: Wed, 15 Oct 2014 22:53:29 +0000
Subject: Upgrade mosquitto to version 1.3.4 Fix use and options Remove
 unnecessary dirs from plist

PR:		ports/194246
Submitted by:	joe@thrallingpenguin.com (maintainer)
Approved by:	mentors (implicit)
---
 net/mosquitto/Makefile  | 10 ++++------
 net/mosquitto/distinfo  |  4 ++--
 net/mosquitto/pkg-plist | 13 +++----------
 3 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'net')

diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index 01b2e6c96123..a31e67da0d3c 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mosquitto
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.3.5
 CATEGORIES=	net
 MASTER_SITES=	http://mosquitto.org/files/source/
 
@@ -20,8 +19,7 @@ OPTIONS_DEFINE=	PYTHON
 
 PYTHON_DESC=	Build python driver
 
-USES=		cmake
-USE_PYTHON=	2
+USES=		cmake python:2
 NOCONFIGURE=	yes
 USE_RC_SUBR=	mosquitto
 USE_LDCONFIG=	yes
@@ -31,9 +29,9 @@ USERS=		nobody
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
-PLIST_SUB=	PYTHON_VER=${PYTHON_VER} NOPYTHON=""
+PLIST_SUB=	PYTHON_VER=${PYTHON_VER} NOPYTHON="" PORTVERSION=${PORTVERSION}
 .else
-PLIST_SUB=	NOPYTHON="@comment "
+PLIST_SUB=	NOPYTHON="@comment " PORTVERSION=${PORTVERSION}
 .endif
 
 post-patch:
diff --git a/net/mosquitto/distinfo b/net/mosquitto/distinfo
index dc784e358e89..0ce16a44b26b 100644
--- a/net/mosquitto/distinfo
+++ b/net/mosquitto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mosquitto-1.3.2.tar.gz) = 3ae47d812da6c5a4646d292624a0fc00a00f8930fb19c9c11f1c922e548ca713
-SIZE (mosquitto-1.3.2.tar.gz) = 352143
+SHA256 (mosquitto-1.3.5.tar.gz) = 16eb3dbef183827665feee9288362c7352cd016ba04ca0402a0ccf857d1c2ab2
+SIZE (mosquitto-1.3.5.tar.gz) = 352231
diff --git a/net/mosquitto/pkg-plist b/net/mosquitto/pkg-plist
index e73e40d6bf13..e07df0e6422f 100644
--- a/net/mosquitto/pkg-plist
+++ b/net/mosquitto/pkg-plist
@@ -8,13 +8,13 @@ share/man/man1/mosquitto_pub.1.gz
 share/man/man1/mosquitto_passwd.1.gz
 %%NOPYTHON%%%%PYTHON_LIBDIR%%/site-packages/mosquitto.pyc
 %%NOPYTHON%%%%PYTHON_LIBDIR%%/site-packages/mosquitto.py
-%%NOPYTHON%%%%PYTHON_LIBDIR%%/site-packages/mosquitto-1.3.2-py%%PYTHON_VER%%.egg-info
+%%NOPYTHON%%%%PYTHON_LIBDIR%%/site-packages/mosquitto-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info
 lib/libmosquittopp.so.1
 lib/libmosquittopp.so
 lib/libmosquitto.so.1
 lib/libmosquitto.so
-lib/libmosquitto.so.1.3.2
-lib/libmosquittopp.so.1.3.2
+lib/libmosquitto.so.%%PORTVERSION%%
+lib/libmosquittopp.so.%%PORTVERSION%%
 include/mosquittopp.h
 include/mosquitto_plugin.h
 include/mosquitto.h
@@ -26,10 +26,3 @@ sbin/mosquitto
 @sample etc/mosquitto/pskfile.sample
 @sample etc/mosquitto/mosquitto.conf.sample
 @sample etc/mosquitto/aclfile.sample
-@dirrmtry etc/mosquitto
-@dirrmtry share/man/man8
-@dirrmtry share/man/man7
-@dirrmtry share/man/man5
-@dirrmtry share/man/man3
-@dirrmtry share/man/man1
-@dirrmtry share/man
-- 
cgit