Index: head/net/mosquitto/Makefile
===================================================================
--- head/net/mosquitto/Makefile	(revision 466689)
+++ head/net/mosquitto/Makefile	(revision 466690)
@@ -1,46 +1,46 @@
 # Created by: Joseph Benden <joe@thrallingpenguin.com>
 # $FreeBSD$
 
 PORTNAME=	mosquitto
 PORTVERSION=	1.4.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://mosquitto.org/files/source/
 
 MAINTAINER=	joe@thrallingpenguin.com
 COMMENT=	Open-Source MQTT Broker
 
-LICENSE=	BSD3CLAUSE
+LICENSE=	EPL
 
 LIB_DEPENDS=	libcares.so:dns/c-ares \
 		libuuid.so:misc/e2fsprogs-libuuid
 BUILD_DEPENDS=	xsltproc:textproc/libxslt
 
 USES=		cmake ssl
 NOCONFIGURE=	yes
 USE_RC_SUBR=	mosquitto
 USE_LDCONFIG=	yes
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 USERS=		nobody
 
 OPTIONS_DEFINE=	WS
 
 WS_DESC=	MQTT over Websockets support
 WS_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
 WS_CMAKE_ON=	-DWITH_WEBSOCKETS=ON
 
 post-patch:
 # do not run ldconfig in stage dir
 	@${REINPLACE_CMD} -e '/ldconfig/d' ${WRKSRC}/src/CMakeLists.txt \
 		${WRKSRC}/lib/CMakeLists.txt ${WRKSRC}/lib/cpp/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/CMakeLists.txt
 
 post-install:
 # Adjust configuration files
 	${MV} ${STAGEDIR}${ETCDIR}/mosquitto.conf ${STAGEDIR}${ETCDIR}/mosquitto.conf.sample
 	${MV} ${STAGEDIR}${ETCDIR}/pwfile.example ${STAGEDIR}${ETCDIR}/pwfile.sample
 	${MV} ${STAGEDIR}${ETCDIR}/pskfile.example ${STAGEDIR}${ETCDIR}/pskfile.sample
 	${MV} ${STAGEDIR}${ETCDIR}/aclfile.example ${STAGEDIR}${ETCDIR}/aclfile.sample
 
 .include <bsd.port.mk>
Index: head/net/mosquitto/files/mosquitto.in
===================================================================
--- head/net/mosquitto/files/mosquitto.in	(revision 466689)
+++ head/net/mosquitto/files/mosquitto.in	(revision 466690)
@@ -1,41 +1,41 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: mosquitto
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable mosquitto:
 #
 # mosquitto_enable="YES"
 # mosquitto_flags="<set as needed>"
 #
 # See mosquitto(8) for flags
 #
 
 . /etc/rc.subr
 
 name=mosquitto
 rcvar=mosquitto_enable
 
 mosquitto_enable=${mosquitto_enable:="NO"}
 mosquitto_config=${mosquitto_config:="%%PREFIX%%/etc/mosquitto/mosquitto.conf"}
 
 command=%%PREFIX%%/sbin/mosquitto
 command_args="-c ${mosquitto_config} -d"
-pidfile=$(grep pidfile ${mosquitto_config} | awk '{print($2)}')
+pidfile=$(grep pid_file ${mosquitto_config} | awk '{print($2)}')
 required_files=${mosquitto_config}
 
 extra_commands="reload"
 stop_postcmd=stop_postcmd
 stop_postcmd()
 {
   rm -f $pidfile
 }
 
 load_rc_config $name
 run_rc_command "$1"