diff options
| author | jperkin <jperkin@pkgsrc.org> | 2020-04-16 15:19:11 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2020-04-16 15:19:11 +0000 |
| commit | b6bca2f33d45961f0e9bbefac03e469a34133c7d (patch) | |
| tree | 7e2a95ad59b98ce70ca316be8b3974015b45da0f /net/mosquitto/patches | |
| parent | 449a9418d6f13d9c7560cb3a46678963cd5f60ed (diff) | |
| download | pkgsrc-b6bca2f33d45961f0e9bbefac03e469a34133c7d.tar.gz | |
mosquitto: Various SunOS fixes and improvements.
Includes SMF support. Submitted by Jorge Schrauwen in NetBSD/pkgsrc#59.
While here fix a hardcoded /var.
Diffstat (limited to 'net/mosquitto/patches')
| -rw-r--r-- | net/mosquitto/patches/patch-mosquitto.conf | 4 | ||||
| -rw-r--r-- | net/mosquitto/patches/patch-src_CMakeLists.txt | 18 |
2 files changed, 17 insertions, 5 deletions
diff --git a/net/mosquitto/patches/patch-mosquitto.conf b/net/mosquitto/patches/patch-mosquitto.conf index 451b8f2dac8..44e474a1c4f 100644 --- a/net/mosquitto/patches/patch-mosquitto.conf +++ b/net/mosquitto/patches/patch-mosquitto.conf @@ -1,4 +1,4 @@ -$NetBSD: patch-mosquitto.conf,v 1.1 2019/07/20 23:09:27 gdt Exp $ +$NetBSD: patch-mosquitto.conf,v 1.2 2020/04/16 15:19:11 jperkin Exp $ Log to syslog, instead of (perhaps) not logging. @@ -16,7 +16,7 @@ that seems like it should perhaps be command-line, not config. + +### PKGSRC ADJUSTMENTS FOR TRADITIONAL UNIX NORMS + -+pid_file /var/run/mosquitto/mosquitto.pid ++pid_file @VARBASE@/run/mosquitto/mosquitto.pid + +log_dest syslog + diff --git a/net/mosquitto/patches/patch-src_CMakeLists.txt b/net/mosquitto/patches/patch-src_CMakeLists.txt index 7646d2bc509..f4c3fd0b245 100644 --- a/net/mosquitto/patches/patch-src_CMakeLists.txt +++ b/net/mosquitto/patches/patch-src_CMakeLists.txt @@ -1,12 +1,12 @@ -$NetBSD: patch-src_CMakeLists.txt,v 1.1 2019/07/20 23:09:27 gdt Exp $ +$NetBSD: patch-src_CMakeLists.txt,v 1.2 2020/04/16 15:19:11 jperkin Exp $ On NetBSD, don't use -ldl (why?). Sent upstream via email 20190427. ---- src/CMakeLists.txt.orig 2019-04-17 19:54:00.000000000 +0000 +--- src/CMakeLists.txt.orig 2020-02-27 23:49:51.000000000 +0000 +++ src/CMakeLists.txt -@@ -146,6 +146,8 @@ endif (HAVE_GETADDRINFO_A) +@@ -151,6 +151,8 @@ endif (HAVE_GETADDRINFO_A AND WITH_ADNS) if (UNIX) if (APPLE) set (MOSQ_LIBS ${MOSQ_LIBS} dl m) @@ -15,3 +15,15 @@ Sent upstream via email 20190427. elseif(QNX) set(MOSQ_LIBS ${MOSQ_LIBS} m socket) else(APPLE) +@@ -184,9 +186,9 @@ target_link_libraries(mosquitto ${MOSQ_L + if (UNIX) + if (APPLE) + set_target_properties(mosquitto PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list -Wl,${mosquitto_SOURCE_DIR}/src/linker-macosx.syms") +- else (APPLE) ++ elseif (NOT CMAKE_SYSTEM_NAME STREQUAL SunOS) + set_target_properties(mosquitto PROPERTIES LINK_FLAGS "-Wl,-dynamic-list=${mosquitto_SOURCE_DIR}/src/linker.syms") +- endif (APPLE) ++ endif () + endif (UNIX) + + install(TARGETS mosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_SBINDIR}") |