From owner-svn-ports-all@freebsd.org  Fri Apr  6 20:50:16 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0549DF8555C;
 Fri,  6 Apr 2018 20:50:16 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id ABB1075BF9;
 Fri,  6 Apr 2018 20:50:15 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A696716F3E;
 Fri,  6 Apr 2018 20:50:15 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w36KoFnS069678;
 Fri, 6 Apr 2018 20:50:15 GMT (envelope-from yuri@FreeBSD.org)
Received: (from yuri@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w36KoF6Y069676;
 Fri, 6 Apr 2018 20:50:15 GMT (envelope-from yuri@FreeBSD.org)
Message-Id: <201804062050.w36KoF6Y069676@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: yuri set sender to
 yuri@FreeBSD.org using -f
From: Yuri Victorovich <yuri@FreeBSD.org>
Date: Fri, 6 Apr 2018 20:50:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r466690 - in head/net/mosquitto: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: yuri
X-SVN-Commit-Paths: in head/net/mosquitto: . files
X-SVN-Commit-Revision: 466690
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2018 20:50:16 -0000

Author: yuri
Date: Fri Apr  6 20:50:15 2018
New Revision: 466690
URL: https://svnweb.freebsd.org/changeset/ports/466690

Log:
  net/mosquitto: Unbreak the rc script; Fix the license
  
  The rc script had the 'pidfile' token, when the code references 'pid_file'.
  While here, fixed the license. It is actually EPL, not BSD.
  
  Reported by:	David BOYER <david.boyer59@gmail.com> (the pidfile issue in a private communication)
  Approved by:	portmgr blanket

Modified:
  head/net/mosquitto/Makefile
  head/net/mosquitto/files/mosquitto.in

Modified: head/net/mosquitto/Makefile
==============================================================================
--- head/net/mosquitto/Makefile	Fri Apr  6 20:37:04 2018	(r466689)
+++ head/net/mosquitto/Makefile	Fri Apr  6 20:50:15 2018	(r466690)
@@ -3,14 +3,14 @@
 
 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

Modified: head/net/mosquitto/files/mosquitto.in
==============================================================================
--- head/net/mosquitto/files/mosquitto.in	Fri Apr  6 20:37:04 2018	(r466689)
+++ head/net/mosquitto/files/mosquitto.in	Fri Apr  6 20:50:15 2018	(r466690)
@@ -27,7 +27,7 @@ mosquitto_config=${mosquitto_config:="%%PREFIX%%/etc/m
 
 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"