Index: head/net/mosquitto/Makefile
===================================================================
--- head/net/mosquitto/Makefile	(revision 370962)
+++ head/net/mosquitto/Makefile	(revision 370963)
@@ -1,63 +1,61 @@
 # Created by: Joseph Benden <joe@thrallingpenguin.com>
 # $FreeBSD$
 
 PORTNAME=	mosquitto
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.3.5
 CATEGORIES=	net
 MASTER_SITES=	http://mosquitto.org/files/source/
 
 MAINTAINER=	joe@thrallingpenguin.com
 COMMENT=	Open-Source MQTT Broker
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libcares.so:${PORTSDIR}/dns/c-ares
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 
 OPTIONS_DEFAULT=PYTHON
 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
 
 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:
 	${MV} ${WRKSRC}/mosquitto.conf ${WRKSRC}/mosquitto.conf.example
 
 post-install:
 .if ${PORT_OPTIONS:MPYTHON}
 	cd ${WRKSRC}/lib/python ; \
 	${PYTHON_CMD} ${WRKSRC}/lib/python/setup.py build ; \
 	${PYTHON_CMD} ${WRKSRC}/lib/python/setup.py install --prefix=${PREFIX} --root=${STAGEDIR}
 .endif
 	# Compress Man Pages
 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man8/mosquitto.8
 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man7/mqtt.7
 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man7/mosquitto-tls.7
 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man5/mosquitto.conf.5
 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man3/libmosquitto.3
 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man1/mosquitto_sub.1
 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man1/mosquitto_pub.1
 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man1/mosquitto_passwd.1
 	# Adjust configuration files
 	${MV} ${STAGEDIR}${PREFIX}/etc/mosquitto/mosquitto.conf.example ${STAGEDIR}${PREFIX}/etc/mosquitto/mosquitto.conf.sample
 	${MV} ${STAGEDIR}${PREFIX}/etc/mosquitto/pwfile.example ${STAGEDIR}${PREFIX}/etc/mosquitto/pwfile.sample
 	${MV} ${STAGEDIR}${PREFIX}/etc/mosquitto/pskfile.example ${STAGEDIR}${PREFIX}/etc/mosquitto/pskfile.sample
 	${MV} ${STAGEDIR}${PREFIX}/etc/mosquitto/aclfile.example ${STAGEDIR}${PREFIX}/etc/mosquitto/aclfile.sample
 
 .include <bsd.port.mk>
Index: head/net/mosquitto/distinfo
===================================================================
--- head/net/mosquitto/distinfo	(revision 370962)
+++ head/net/mosquitto/distinfo	(revision 370963)
@@ -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
Index: head/net/mosquitto/pkg-plist
===================================================================
--- head/net/mosquitto/pkg-plist	(revision 370962)
+++ head/net/mosquitto/pkg-plist	(revision 370963)
@@ -1,35 +1,28 @@
 share/man/man8/mosquitto.8.gz
 share/man/man7/mqtt.7.gz
 share/man/man7/mosquitto-tls.7.gz
 share/man/man5/mosquitto.conf.5.gz
 share/man/man3/libmosquitto.3.gz
 share/man/man1/mosquitto_sub.1.gz
 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
 bin/mosquitto_sub
 bin/mosquitto_pub
 bin/mosquitto_passwd
 sbin/mosquitto
 @sample etc/mosquitto/pwfile.sample
 @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