From owner-svn-ports-all@freebsd.org Sun Jul 5 00:32:09 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 618D3A171; Sun, 5 Jul 2015 00:32:09 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pd0-x234.google.com (mail-pd0-x234.google.com [IPv6:2607:f8b0:400e:c02::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2CDDE1962; Sun, 5 Jul 2015 00:32:09 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by pdbep18 with SMTP id ep18so84323577pdb.1; Sat, 04 Jul 2015 17:32:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:reply-to:subject:references:to:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=hHZpTEhePvnMNbqWLJN6b6fyCE5FBmqyWI5ebb6BdwU=; b=ZLpIFE965VhUmYg74hAMe23Z4Cc+r310bHr5gXxujuoUXGYEb3DXJkJrEq9ir8OQwj VehmSj6TU1HTjslYxWCoasjfqnssoC3oWYf43kP8669AV3GO6fylHOhlVHUAj5iokRtN 9YwdMRgZI1n+bU6BxwXBDNLdUHClSFtouGwzWGlbvqHrieBOdF1ySOrwlKrO9DMicsjX 3kIansmCa8WRNYrISZ2Hth0j+8BK9f8UKpJsU4mvpHQ8vZAf1EekArPwF+ncNjOxiT+6 GrB3Fz1IlO+EhbYdHnnSiMITK/HNtusV+t8qJvbLRE8gvhZqXLXJmrNWz2QiH+DGDWnu t0vA== X-Received: by 10.70.126.33 with SMTP id mv1mr33462904pdb.64.1436056328677; Sat, 04 Jul 2015 17:32:08 -0700 (PDT) Received: from ?IPv6:2001:44b8:31ae:7b01::2? (2001-44b8-31ae-7b01-0000-0000-0000-0002.static.ipv6.internode.on.net. [2001:44b8:31ae:7b01::2]) by mx.google.com with ESMTPSA id fp3sm13406620pdb.52.2015.07.04.17.32.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Jul 2015 17:32:08 -0700 (PDT) Sender: Kubilay Kocak Reply-To: koobs@FreeBSD.org Subject: Re: svn commit: r391297 - in head/net/mosquitto: . files References: <201507040914.t649E7VU078684@repo.freebsd.org> To: Olli Hauer , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org From: Kubilay Kocak Message-ID: <55987AFB.2080802@FreeBSD.org> Date: Sun, 5 Jul 2015 10:31:55 +1000 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.0 MIME-Version: 1.0 In-Reply-To: <201507040914.t649E7VU078684@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jul 2015 00:32:09 -0000 On 4/07/2015 7:14 PM, Olli Hauer wrote: > Author: ohauer > Date: Sat Jul 4 09:14:06 2015 > New Revision: 391297 > URL: https://svnweb.freebsd.org/changeset/ports/391297 > > Log: > - update to 1.4.2 > > The Python driver is now provided by net/py-paho-mqtt! > > More drivers can be found at http://eclipse.org/paho > > PR: 200540 > Submitted by: ohauer > Approved by: Joseph Benden (maintainer, via PM) > > Added: > head/net/mosquitto/pkg-message (contents, props changed) > Modified: > head/net/mosquitto/Makefile > head/net/mosquitto/distinfo > head/net/mosquitto/files/patch-CMakeLists.txt > head/net/mosquitto/files/patch-config.mk > head/net/mosquitto/files/patch-lib_tls__mosq.h > head/net/mosquitto/files/patch-mosquitto.conf > head/net/mosquitto/files/patch-src_CMakeLists.txt > head/net/mosquitto/pkg-descr > head/net/mosquitto/pkg-plist > > Modified: head/net/mosquitto/Makefile > ============================================================================== > --- head/net/mosquitto/Makefile Sat Jul 4 09:09:32 2015 (r391296) > +++ head/net/mosquitto/Makefile Sat Jul 4 09:14:06 2015 (r391297) > @@ -2,8 +2,7 @@ > # $FreeBSD$ > > PORTNAME= mosquitto > -PORTVERSION= 1.3.5 > -PORTREVISION= 1 > +PORTVERSION= 1.4.2 > CATEGORIES= net > MASTER_SITES= http://mosquitto.org/files/source/ > > @@ -15,36 +14,20 @@ 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 python:2 > NOCONFIGURE= yes > USE_RC_SUBR= mosquitto > USE_LDCONFIG= yes > +PLIST_SUB= PORTVERSION=${PORTVERSION} > > USERS= nobody > > -.include > - > -.if ${PORT_OPTIONS:MPYTHON} > -PLIST_SUB= PYTHON_VER=${PYTHON_VER} NOPYTHON="" PORTVERSION=${PORTVERSION} > -.else > -PLIST_SUB= NOPYTHON="@comment " PORTVERSION=${PORTVERSION} > -.endif > - > 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 > > post-stage: > -.if ${PORT_OPTIONS:MPYTHON} > - (cd ${WRKSRC}/lib/python && \ > - ${PYTHON_CMD} ${WRKSRC}/lib/python/setup.py build install --prefix=${PREFIX} --root=${STAGEDIR}) > -.endif > # Adjust configuration files > ${MV} ${STAGEDIR}${ETCDIR}/mosquitto.conf ${STAGEDIR}${ETCDIR}/mosquitto.conf.sample > ${MV} ${STAGEDIR}${ETCDIR}/pwfile.example ${STAGEDIR}${ETCDIR}/pwfile.sample > > Modified: head/net/mosquitto/distinfo > ============================================================================== > --- head/net/mosquitto/distinfo Sat Jul 4 09:09:32 2015 (r391296) > +++ head/net/mosquitto/distinfo Sat Jul 4 09:14:06 2015 (r391297) > @@ -1,2 +1,2 @@ > -SHA256 (mosquitto-1.3.5.tar.gz) = 16eb3dbef183827665feee9288362c7352cd016ba04ca0402a0ccf857d1c2ab2 > -SIZE (mosquitto-1.3.5.tar.gz) = 352231 > +SHA256 (mosquitto-1.4.2.tar.gz) = 5ebc3800a0018bfbec62dcc3748fb29f628df068acd39c62c4ef651d9276647e > +SIZE (mosquitto-1.4.2.tar.gz) = 323815 > > Modified: head/net/mosquitto/files/patch-CMakeLists.txt > ============================================================================== > --- head/net/mosquitto/files/patch-CMakeLists.txt Sat Jul 4 09:09:32 2015 (r391296) > +++ head/net/mosquitto/files/patch-CMakeLists.txt Sat Jul 4 09:14:06 2015 (r391297) > @@ -1,8 +1,8 @@ > ---- CMakeLists.txt.orig 2014-10-08 21:50:07 UTC > +--- CMakeLists.txt.orig 2015-05-07 13:21:22 UTC > +++ CMakeLists.txt > -@@ -8,6 +8,9 @@ cmake_minimum_required(VERSION 2.6) > +@@ -13,6 +13,9 @@ cmake_minimum_required(VERSION 2.8) > > - set (VERSION 1.3.5) > + set (VERSION 1.4.2) > > +include_directories(/usr/local/include) > +link_directories(/usr/local/lib) > @@ -10,8 +10,8 @@ > if (WIN32) > execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP > OUTPUT_STRIP_TRAILING_WHITESPACE) > -@@ -40,7 +43,7 @@ else (WIN32) > - set (LIBDIR lib${LIB_SUFFIX}) > +@@ -47,7 +50,7 @@ else (WIN32) > + set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}") > set (INCLUDEDIR include) > set (DATAROOTDIR share) > - set (MANDIR ${DATAROOTDIR}/man) > > Modified: head/net/mosquitto/files/patch-config.mk > ============================================================================== > --- head/net/mosquitto/files/patch-config.mk Sat Jul 4 09:09:32 2015 (r391296) > +++ head/net/mosquitto/files/patch-config.mk Sat Jul 4 09:14:06 2015 (r391297) > @@ -1,7 +1,7 @@ > ---- config.mk.orig 2014-10-08 21:50:07 UTC > +--- config.mk.orig 2015-05-07 13:21:22 UTC > +++ config.mk > -@@ -213,7 +213,7 @@ endif > - > +@@ -241,7 +241,7 @@ ifeq ($(WITH_DOCS),yes) > + endif > > INSTALL?=install > -prefix=/usr/local > > Modified: head/net/mosquitto/files/patch-lib_tls__mosq.h > ============================================================================== > --- head/net/mosquitto/files/patch-lib_tls__mosq.h Sat Jul 4 09:09:32 2015 (r391296) > +++ head/net/mosquitto/files/patch-lib_tls__mosq.h Sat Jul 4 09:14:06 2015 (r391297) > @@ -1,6 +1,6 @@ > ---- lib/tls_mosq.h.orig 2014-10-08 21:50:07 UTC > +--- lib/tls_mosq.h.orig 2015-05-07 13:21:22 UTC > +++ lib/tls_mosq.h > -@@ -33,8 +33,9 @@ POSSIBILITY OF SUCH DAMAGE. > +@@ -20,8 +20,9 @@ Contributors: > #ifdef WITH_TLS > > #include > > Modified: head/net/mosquitto/files/patch-mosquitto.conf > ============================================================================== > --- head/net/mosquitto/files/patch-mosquitto.conf Sat Jul 4 09:09:32 2015 (r391296) > +++ head/net/mosquitto/files/patch-mosquitto.conf Sat Jul 4 09:14:06 2015 (r391297) > @@ -1,4 +1,4 @@ > ---- mosquitto.conf.orig 2014-10-08 21:50:07 UTC > +--- mosquitto.conf.orig 2015-05-07 13:21:22 UTC > +++ mosquitto.conf > @@ -32,7 +32,7 @@ > # This should be set to /var/run/mosquitto.pid if mosquitto is > > Modified: head/net/mosquitto/files/patch-src_CMakeLists.txt > ============================================================================== > --- head/net/mosquitto/files/patch-src_CMakeLists.txt Sat Jul 4 09:09:32 2015 (r391296) > +++ head/net/mosquitto/files/patch-src_CMakeLists.txt Sat Jul 4 09:14:06 2015 (r391297) > @@ -1,6 +1,6 @@ > ---- src/CMakeLists.txt.orig 2014-10-08 21:50:07 UTC > +--- src/CMakeLists.txt.orig 2015-05-07 13:21:22 UTC > +++ src/CMakeLists.txt > -@@ -79,7 +79,7 @@ if (UNIX) > +@@ -86,7 +86,7 @@ if (UNIX) > if (APPLE) > set (MOSQ_LIBS ${MOSQ_LIBS} dl m) > else (APPLE) > @@ -9,7 +9,7 @@ > endif (APPLE) > endif (UNIX) > > -@@ -100,6 +100,5 @@ if (${WITH_TLS} STREQUAL ON) > +@@ -127,6 +127,5 @@ if (${WITH_TLS} STREQUAL ON) > endif (${WITH_TLS} STREQUAL ON) > > if (UNIX) > > Modified: head/net/mosquitto/pkg-descr > ============================================================================== > --- head/net/mosquitto/pkg-descr Sat Jul 4 09:09:32 2015 (r391296) > +++ head/net/mosquitto/pkg-descr Sat Jul 4 09:14:06 2015 (r391297) > @@ -1,4 +1,8 @@ > -Mosquitto is an open source implementation of a server for version 3.1 of the > -MQTT protocol. > +Mosquitto is an open source (BSD licensed) message broker that implements > +the MQ Telemetry Transport protocol versions 3.1 and 3.1.1. MQTT provides > +a lightweight method of carrying out messaging using a publish/subscribe > +model. This makes it suitable for "machine to machine" messaging such as > +with low power sensors or mobile devices such as phones, embedded > +computers or microcontrollers like the Arduino. > > WWW: http://mosquitto.org/ > > Added: head/net/mosquitto/pkg-message > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/net/mosquitto/pkg-message Sat Jul 4 09:14:06 2015 (r391297) > @@ -0,0 +1 @@ > +The mosquitto MQTT Python driver is now provided by net/py-paho-mqtt > > Modified: head/net/mosquitto/pkg-plist > ============================================================================== > --- head/net/mosquitto/pkg-plist Sat Jul 4 09:09:32 2015 (r391296) > +++ head/net/mosquitto/pkg-plist Sat Jul 4 09:14:06 2015 (r391297) > @@ -14,9 +14,6 @@ lib/libmosquitto.so.%%PORTVERSION%% > lib/libmosquittopp.so > lib/libmosquittopp.so.1 > lib/libmosquittopp.so.%%PORTVERSION%% > -%%NOPYTHON%%%%PYTHON_SITELIBDIR%%/mosquitto-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info > -%%NOPYTHON%%%%PYTHON_SITELIBDIR%%/mosquitto.py > -%%NOPYTHON%%%%PYTHON_SITELIBDIR%%/mosquitto.pyc > man/man1/mosquitto_passwd.1.gz > man/man1/mosquitto_pub.1.gz > man/man1/mosquitto_sub.1.gz > We should port py-mosquitto separately and have mosquitto depend on it: https://pypi.python.org/pypi/mosquitto Has been on the Wishlist for a while :) https://wiki.freebsd.org/action/info/Python/PortsWishlist