Date: Sun, 10 May 2015 18:06:00 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385971 - in head/net/mosquitto: . files Message-ID: <201505101806.t4AI61RX072185@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sun May 10 18:06:00 2015 New Revision: 385971 URL: https://svnweb.freebsd.org/changeset/ports/385971 Log: - fix build with LibreSSL [1] - install manpages into correct MANDIR - do not run ldconfig in stagedir! - adjust files/patch names so makepatch can be used in future - bump PORTREVISION PR: 198988 [1] Submitted by: Bernard Spil Approved by: joe _at_ thrallingpenguin.com (maintainer) Added: head/net/mosquitto/files/patch-CMakeLists.txt (contents, props changed) head/net/mosquitto/files/patch-lib_tls__mosq.h - copied, changed from r385968, head/net/mosquitto/files/patch-lib-tls_mosq.h head/net/mosquitto/files/patch-mosquitto.conf - copied, changed from r385968, head/net/mosquitto/files/patch-etc-mosquitto.conf.example head/net/mosquitto/files/patch-src_CMakeLists.txt - copied, changed from r385968, head/net/mosquitto/files/patch-src-CMakeList.txt Deleted: head/net/mosquitto/files/patch-CMakeList.txt head/net/mosquitto/files/patch-etc-mosquitto.conf.example head/net/mosquitto/files/patch-lib-tls_mosq.h head/net/mosquitto/files/patch-src-CMakeList.txt Modified: head/net/mosquitto/Makefile head/net/mosquitto/files/patch-config.mk head/net/mosquitto/pkg-plist Modified: head/net/mosquitto/Makefile ============================================================================== --- head/net/mosquitto/Makefile Sun May 10 17:46:00 2015 (r385970) +++ head/net/mosquitto/Makefile Sun May 10 18:06:00 2015 (r385971) @@ -3,6 +3,7 @@ PORTNAME= mosquitto PORTVERSION= 1.3.5 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://mosquitto.org/files/source/ @@ -35,27 +36,19 @@ PLIST_SUB= NOPYTHON="@comment " PORTVERS .endif post-patch: - ${MV} ${WRKSRC}/mosquitto.conf ${WRKSRC}/mosquitto.conf.example +# 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-install: +post-stage: .if ${PORT_OPTIONS:MPYTHON} - cd ${WRKSRC}/lib/python ; \ - ${PYTHON_CMD} ${WRKSRC}/lib/python/setup.py build ; \ - ${PYTHON_CMD} ${WRKSRC}/lib/python/setup.py install --prefix=${PREFIX} --root=${STAGEDIR} + (cd ${WRKSRC}/lib/python && \ + ${PYTHON_CMD} ${WRKSRC}/lib/python/setup.py build install --prefix=${PREFIX} --root=${STAGEDIR}) .endif - # Compress Man Pages - ${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man8/mosquitto.8 - ${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man7/mqtt.7 - ${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man7/mosquitto-tls.7 - ${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man5/mosquitto.conf.5 - ${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man3/libmosquitto.3 - ${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man1/mosquitto_sub.1 - ${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man1/mosquitto_pub.1 - ${GZIP_CMD} ${STAGEDIR}${PREFIX}/share/man/man1/mosquitto_passwd.1 - # Adjust configuration files - ${MV} ${STAGEDIR}${PREFIX}/etc/mosquitto/mosquitto.conf.example ${STAGEDIR}${PREFIX}/etc/mosquitto/mosquitto.conf.sample - ${MV} ${STAGEDIR}${PREFIX}/etc/mosquitto/pwfile.example ${STAGEDIR}${PREFIX}/etc/mosquitto/pwfile.sample - ${MV} ${STAGEDIR}${PREFIX}/etc/mosquitto/pskfile.example ${STAGEDIR}${PREFIX}/etc/mosquitto/pskfile.sample - ${MV} ${STAGEDIR}${PREFIX}/etc/mosquitto/aclfile.example ${STAGEDIR}${PREFIX}/etc/mosquitto/aclfile.sample +# 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> Added: head/net/mosquitto/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/mosquitto/files/patch-CMakeLists.txt Sun May 10 18:06:00 2015 (r385971) @@ -0,0 +1,21 @@ +--- CMakeLists.txt.orig 2014-10-08 21:50:07 UTC ++++ CMakeLists.txt +@@ -8,6 +8,9 @@ cmake_minimum_required(VERSION 2.6) + + set (VERSION 1.3.5) + ++include_directories(/usr/local/include) ++link_directories(/usr/local/lib) ++ + 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}) + set (INCLUDEDIR include) + set (DATAROOTDIR share) +- set (MANDIR ${DATAROOTDIR}/man) ++ set (MANDIR man) + set (SHAREDIR ${DATAROOTDIR}/mosquitto) + endif (WIN32) + Modified: head/net/mosquitto/files/patch-config.mk ============================================================================== --- head/net/mosquitto/files/patch-config.mk Sun May 10 17:46:00 2015 (r385970) +++ head/net/mosquitto/files/patch-config.mk Sun May 10 18:06:00 2015 (r385971) @@ -1,6 +1,6 @@ ---- config.mk.orig 2014-05-07 17:09:56.000000000 -0700 -+++ config.mk 2014-05-07 17:10:31.000000000 -0700 -@@ -213,6 +213,6 @@ +--- config.mk.orig 2014-10-08 21:50:07 UTC ++++ config.mk +@@ -213,7 +213,7 @@ endif INSTALL?=install @@ -10,3 +10,4 @@ +prefix=${PREFIX} +mandir=${PREFIX}/share/man +localedir=${PREFIX}/share/locale + STRIP?=strip Copied and modified: head/net/mosquitto/files/patch-lib_tls__mosq.h (from r385968, head/net/mosquitto/files/patch-lib-tls_mosq.h) ============================================================================== --- head/net/mosquitto/files/patch-lib-tls_mosq.h Sun May 10 16:56:25 2015 (r385968, copy source) +++ head/net/mosquitto/files/patch-lib_tls__mosq.h Sun May 10 18:06:00 2015 (r385971) @@ -1,10 +1,13 @@ ---- lib/tls_mosq.h.orig 2014-05-07 14:39:22.000000000 -0700 -+++ lib/tls_mosq.h 2014-05-07 14:39:47.000000000 -0700 -@@ -33,6 +33,7 @@ +--- lib/tls_mosq.h.orig 2014-10-08 21:50:07 UTC ++++ lib/tls_mosq.h +@@ -33,8 +33,9 @@ POSSIBILITY OF SUCH DAMAGE. #ifdef WITH_TLS #include <openssl/ssl.h> +#include <sys/socket.h> #ifdef WITH_TLS_PSK - # if OPENSSL_VERSION_NUMBER >= 0x10000000 +-# if OPENSSL_VERSION_NUMBER >= 0x10000000 ++# if OPENSSL_VERSION_NUMBER >= 0x10000000 && !defined(OPENSSL_NO_PSK) # define REAL_WITH_TLS_PSK + # else + # warning "TLS-PSK not supported, openssl too old." Copied and modified: head/net/mosquitto/files/patch-mosquitto.conf (from r385968, head/net/mosquitto/files/patch-etc-mosquitto.conf.example) ============================================================================== --- head/net/mosquitto/files/patch-etc-mosquitto.conf.example Sun May 10 16:56:25 2015 (r385968, copy source) +++ head/net/mosquitto/files/patch-mosquitto.conf Sun May 10 18:06:00 2015 (r385971) @@ -1,5 +1,5 @@ ---- mosquitto.conf 2014-05-07 16:08:10.000000000 -0700 -+++ mosquitto.conf 2014-05-07 16:13:05.000000000 -0700 +--- mosquitto.conf.orig 2014-10-08 21:50:07 UTC ++++ mosquitto.conf @@ -32,7 +32,7 @@ # This should be set to /var/run/mosquitto.pid if mosquitto is # being run automatically on boot with an init script and Copied and modified: head/net/mosquitto/files/patch-src_CMakeLists.txt (from r385968, head/net/mosquitto/files/patch-src-CMakeList.txt) ============================================================================== --- head/net/mosquitto/files/patch-src-CMakeList.txt Sun May 10 16:56:25 2015 (r385968, copy source) +++ head/net/mosquitto/files/patch-src_CMakeLists.txt Sun May 10 18:06:00 2015 (r385971) @@ -1,6 +1,6 @@ ---- src/CMakeLists.txt.orig 2014-05-16 15:17:23.000000000 -0700 -+++ src/CMakeLists.txt 2014-05-16 15:18:03.000000000 -0700 -@@ -79,7 +79,7 @@ +--- src/CMakeLists.txt.orig 2014-10-08 21:50:07 UTC ++++ src/CMakeLists.txt +@@ -79,7 +79,7 @@ if (UNIX) if (APPLE) set (MOSQ_LIBS ${MOSQ_LIBS} dl m) else (APPLE) @@ -9,3 +9,10 @@ endif (APPLE) endif (UNIX) +@@ -100,6 +100,5 @@ if (${WITH_TLS} STREQUAL ON) + endif (${WITH_TLS} STREQUAL ON) + + if (UNIX) +- install(CODE "EXEC_PROGRAM(/sbin/ldconfig)") + endif (UNIX) + Modified: head/net/mosquitto/pkg-plist ============================================================================== --- head/net/mosquitto/pkg-plist Sun May 10 17:46:00 2015 (r385970) +++ head/net/mosquitto/pkg-plist Sun May 10 18:06:00 2015 (r385971) @@ -1,28 +1,28 @@ -share/man/man8/mosquitto.8.gz -share/man/man7/mqtt.7.gz -share/man/man7/mosquitto-tls.7.gz -share/man/man5/mosquitto.conf.5.gz -share/man/man3/libmosquitto.3.gz -share/man/man1/mosquitto_sub.1.gz -share/man/man1/mosquitto_pub.1.gz -share/man/man1/mosquitto_passwd.1.gz -%%NOPYTHON%%%%PYTHON_LIBDIR%%/site-packages/mosquitto.pyc -%%NOPYTHON%%%%PYTHON_LIBDIR%%/site-packages/mosquitto.py -%%NOPYTHON%%%%PYTHON_LIBDIR%%/site-packages/mosquitto-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info -lib/libmosquittopp.so.1 -lib/libmosquittopp.so -lib/libmosquitto.so.1 +bin/mosquitto_passwd +bin/mosquitto_pub +bin/mosquitto_sub +@sample %%ETCDIR%%/aclfile.sample +@sample %%ETCDIR%%/mosquitto.conf.sample +@sample %%ETCDIR%%/pskfile.sample +@sample %%ETCDIR%%/pwfile.sample +include/mosquitto.h +include/mosquitto_plugin.h +include/mosquittopp.h lib/libmosquitto.so +lib/libmosquitto.so.1 lib/libmosquitto.so.%%PORTVERSION%% +lib/libmosquittopp.so +lib/libmosquittopp.so.1 lib/libmosquittopp.so.%%PORTVERSION%% -include/mosquittopp.h -include/mosquitto_plugin.h -include/mosquitto.h -bin/mosquitto_sub -bin/mosquitto_pub -bin/mosquitto_passwd +%%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 +man/man3/libmosquitto.3.gz +man/man5/mosquitto.conf.5.gz +man/man7/mosquitto-tls.7.gz +man/man7/mqtt.7.gz +man/man8/mosquitto.8.gz sbin/mosquitto -@sample etc/mosquitto/pwfile.sample -@sample etc/mosquitto/pskfile.sample -@sample etc/mosquitto/mosquitto.conf.sample -@sample etc/mosquitto/aclfile.sample
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505101806.t4AI61RX072185>