Attachment 157290 Details for Bug 200540 – mosquitto-1.4.2 update

[patch] mosquitto-1.4.2 update

mosquitto-1.4.2.diff (text/plain), 5.29 KB, created by Olli Hauer on 2015-05-30 19:29:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2015-05-30 19:29:36 UTC

Size: 5.29 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 387979)
>+++ Makefile	(working copy)
>@@ -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,26 +14,14 @@
> 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 <bsd.port.options.mk>
>-
>-.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 \
>@@ -41,10 +28,6 @@
> 		${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
>Index: distinfo
>===================================================================
>--- distinfo	(revision 387979)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(revision 387979)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -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)
>Index: files/patch-config.mk
>===================================================================
>--- files/patch-config.mk	(revision 387979)
>+++ files/patch-config.mk	(working copy)
>@@ -1,8 +1,8 @@
>---- 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
> -mandir=${prefix}/share/man
>Index: files/patch-lib_tls__mosq.h
>===================================================================
>--- files/patch-lib_tls__mosq.h	(revision 387979)
>+++ files/patch-lib_tls__mosq.h	(working copy)
>@@ -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 <openssl/ssl.h>
>Index: files/patch-mosquitto.conf
>===================================================================
>--- files/patch-mosquitto.conf	(revision 387979)
>+++ files/patch-mosquitto.conf	(working copy)
>@@ -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
>Index: files/patch-src_CMakeLists.txt
>===================================================================
>--- files/patch-src_CMakeLists.txt	(revision 387979)
>+++ files/patch-src_CMakeLists.txt	(working copy)
>@@ -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)
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 387979)
>+++ pkg-plist	(working copy)
>@@ -14,9 +14,6 @@
> 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

Actions: View | Diff

Attachments on bug 200540: 157290 | 157291