View | Details | Raw Unified | Return to bug 200540 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-19 / +2 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mosquitto
4
PORTNAME=	mosquitto
5
PORTVERSION=	1.3.5
5
PORTVERSION=	1.4.2
6
PORTREVISION=	1
7
CATEGORIES=	net
6
CATEGORIES=	net
8
MASTER_SITES=	http://mosquitto.org/files/source/
7
MASTER_SITES=	http://mosquitto.org/files/source/
9
8
Lines 15-40 Link Here
15
LIB_DEPENDS=	libcares.so:${PORTSDIR}/dns/c-ares
14
LIB_DEPENDS=	libcares.so:${PORTSDIR}/dns/c-ares
16
BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
15
BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
17
16
18
OPTIONS_DEFAULT=PYTHON
19
OPTIONS_DEFINE=	PYTHON
20
21
PYTHON_DESC=	Build python driver
22
23
USES=		cmake python:2
17
USES=		cmake python:2
24
NOCONFIGURE=	yes
18
NOCONFIGURE=	yes
25
USE_RC_SUBR=	mosquitto
19
USE_RC_SUBR=	mosquitto
26
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
21
PLIST_SUB+=	PORTVERSION=${PORTVERSION}
27
22
28
USERS=		nobody
23
USERS=		nobody
29
24
30
.include <bsd.port.options.mk>
31
32
.if ${PORT_OPTIONS:MPYTHON}
33
PLIST_SUB=	PYTHON_VER=${PYTHON_VER} NOPYTHON="" PORTVERSION=${PORTVERSION}
34
.else
35
PLIST_SUB=	NOPYTHON="@comment " PORTVERSION=${PORTVERSION}
36
.endif
37
38
post-patch:
25
post-patch:
39
# do not run ldconfig in stage dir
26
# do not run ldconfig in stage dir
40
	${REINPLACE_CMD} -e '/ldconfig/d' ${WRKSRC}/src/CMakeLists.txt \
27
	${REINPLACE_CMD} -e '/ldconfig/d' ${WRKSRC}/src/CMakeLists.txt \
Lines 41-50 Link Here
41
		${WRKSRC}/lib/CMakeLists.txt ${WRKSRC}/lib/cpp/CMakeLists.txt
28
		${WRKSRC}/lib/CMakeLists.txt ${WRKSRC}/lib/cpp/CMakeLists.txt
42
29
43
post-stage:
30
post-stage:
44
.if ${PORT_OPTIONS:MPYTHON}
45
	(cd ${WRKSRC}/lib/python && \
46
	${PYTHON_CMD} ${WRKSRC}/lib/python/setup.py build install --prefix=${PREFIX} --root=${STAGEDIR})
47
.endif
48
# Adjust configuration files
31
# Adjust configuration files
49
	${MV} ${STAGEDIR}${ETCDIR}/mosquitto.conf ${STAGEDIR}${ETCDIR}/mosquitto.conf.sample
32
	${MV} ${STAGEDIR}${ETCDIR}/mosquitto.conf ${STAGEDIR}${ETCDIR}/mosquitto.conf.sample
50
	${MV} ${STAGEDIR}${ETCDIR}/pwfile.example ${STAGEDIR}${ETCDIR}/pwfile.sample
33
	${MV} ${STAGEDIR}${ETCDIR}/pwfile.example ${STAGEDIR}${ETCDIR}/pwfile.sample
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (mosquitto-1.3.5.tar.gz) = 16eb3dbef183827665feee9288362c7352cd016ba04ca0402a0ccf857d1c2ab2
1
SHA256 (mosquitto-1.4.2.tar.gz) = 5ebc3800a0018bfbec62dcc3748fb29f628df068acd39c62c4ef651d9276647e
2
SIZE (mosquitto-1.3.5.tar.gz) = 352231
2
SIZE (mosquitto-1.4.2.tar.gz) = 323815
(-)files/patch-CMakeLists.txt (-5 / +5 lines)
Lines 1-8 Link Here
1
--- CMakeLists.txt.orig	2014-10-08 21:50:07 UTC
1
--- CMakeLists.txt.orig	2015-05-07 13:21:22 UTC
2
+++ CMakeLists.txt
2
+++ CMakeLists.txt
3
@@ -8,6 +8,9 @@ cmake_minimum_required(VERSION 2.6)
3
@@ -13,6 +13,9 @@ cmake_minimum_required(VERSION 2.8)
4
 
4
 
5
 set (VERSION 1.3.5)
5
 set (VERSION 1.4.2)
6
 
6
 
7
+include_directories(/usr/local/include)
7
+include_directories(/usr/local/include)
8
+link_directories(/usr/local/lib)
8
+link_directories(/usr/local/lib)
Lines 10-17 Link Here
10
 if (WIN32)
10
 if (WIN32)
11
 	execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP
11
 	execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP
12
 			OUTPUT_STRIP_TRAILING_WHITESPACE)
12
 			OUTPUT_STRIP_TRAILING_WHITESPACE)
13
@@ -40,7 +43,7 @@ else (WIN32)
13
@@ -47,7 +50,7 @@ else (WIN32)
14
 	set (LIBDIR lib${LIB_SUFFIX})
14
 	set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}")
15
 	set (INCLUDEDIR include)
15
 	set (INCLUDEDIR include)
16
 	set (DATAROOTDIR share)
16
 	set (DATAROOTDIR share)
17
-	set (MANDIR ${DATAROOTDIR}/man)
17
-	set (MANDIR ${DATAROOTDIR}/man)
(-)files/patch-config.mk (-3 / +3 lines)
Lines 1-8 Link Here
1
--- config.mk.orig	2014-10-08 21:50:07 UTC
1
--- config.mk.orig	2015-05-07 13:21:22 UTC
2
+++ config.mk
2
+++ config.mk
3
@@ -213,7 +213,7 @@ endif
3
@@ -241,7 +241,7 @@ ifeq ($(WITH_DOCS),yes)
4
 endif
4
 
5
 
5
 
6
 INSTALL?=install
6
 INSTALL?=install
7
-prefix=/usr/local
7
-prefix=/usr/local
8
-mandir=${prefix}/share/man
8
-mandir=${prefix}/share/man
(-)files/patch-lib_tls__mosq.h (-2 / +2 lines)
Lines 1-6 Link Here
1
--- lib/tls_mosq.h.orig	2014-10-08 21:50:07 UTC
1
--- lib/tls_mosq.h.orig	2015-05-07 13:21:22 UTC
2
+++ lib/tls_mosq.h
2
+++ lib/tls_mosq.h
3
@@ -33,8 +33,9 @@ POSSIBILITY OF SUCH DAMAGE.
3
@@ -20,8 +20,9 @@ Contributors:
4
 #ifdef WITH_TLS
4
 #ifdef WITH_TLS
5
 
5
 
6
 #include <openssl/ssl.h>
6
 #include <openssl/ssl.h>
(-)files/patch-mosquitto.conf (-1 / +1 lines)
Lines 1-4 Link Here
1
--- mosquitto.conf.orig	2014-10-08 21:50:07 UTC
1
--- mosquitto.conf.orig	2015-05-07 13:21:22 UTC
2
+++ mosquitto.conf
2
+++ mosquitto.conf
3
@@ -32,7 +32,7 @@
3
@@ -32,7 +32,7 @@
4
 # This should be set to /var/run/mosquitto.pid if mosquitto is
4
 # This should be set to /var/run/mosquitto.pid if mosquitto is
(-)files/patch-src_CMakeLists.txt (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/CMakeLists.txt.orig	2014-10-08 21:50:07 UTC
1
--- src/CMakeLists.txt.orig	2015-05-07 13:21:22 UTC
2
+++ src/CMakeLists.txt
2
+++ src/CMakeLists.txt
3
@@ -79,7 +79,7 @@ if (UNIX)
3
@@ -86,7 +86,7 @@ if (UNIX)
4
 	if (APPLE)
4
 	if (APPLE)
5
 		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
5
 		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
6
 	else (APPLE)
6
 	else (APPLE)
Lines 9-15 Link Here
9
 	endif (APPLE)
9
 	endif (APPLE)
10
 endif (UNIX)
10
 endif (UNIX)
11
 
11
 
12
@@ -100,6 +100,5 @@ if (${WITH_TLS} STREQUAL ON)
12
@@ -127,6 +127,5 @@ if (${WITH_TLS} STREQUAL ON)
13
 endif (${WITH_TLS} STREQUAL ON)
13
 endif (${WITH_TLS} STREQUAL ON)
14
 
14
 
15
 if (UNIX)
15
 if (UNIX)
(-)pkg-plist (-3 lines)
Lines 14-22 Link Here
14
lib/libmosquittopp.so
14
lib/libmosquittopp.so
15
lib/libmosquittopp.so.1
15
lib/libmosquittopp.so.1
16
lib/libmosquittopp.so.%%PORTVERSION%%
16
lib/libmosquittopp.so.%%PORTVERSION%%
17
%%NOPYTHON%%%%PYTHON_SITELIBDIR%%/mosquitto-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info
18
%%NOPYTHON%%%%PYTHON_SITELIBDIR%%/mosquitto.py
19
%%NOPYTHON%%%%PYTHON_SITELIBDIR%%/mosquitto.pyc
20
man/man1/mosquitto_passwd.1.gz
17
man/man1/mosquitto_passwd.1.gz
21
man/man1/mosquitto_pub.1.gz
18
man/man1/mosquitto_pub.1.gz
22
man/man1/mosquitto_sub.1.gz
19
man/man1/mosquitto_sub.1.gz

Return to bug 200540