mosquitto: rename packages to modern mkpatches-created names

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: mosquitto: rename packages to modern mkpatches-created names
From: Greg Troxel <gdt%lexort.com@localhost>
Date: Tue, 04 Sep 2018 17:00:08 +0000
Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Tue Sep 4 13:00:08 2018 -0400
Changeset:	8318370f8a05ac26e925eedff6ee0872b609298d

Modified Files:
	mosquitto/distinfo
Added Files:
	mosquitto/patches/patch-CMakeLists.txt
	mosquitto/patches/patch-lib_CMakeLists.txt
	mosquitto/patches/patch-mosquitto.conf
	mosquitto/patches/patch-src_CMakeLists.txt
Removed Files:
	mosquitto/patches/patch-aa
	mosquitto/patches/patch-ab
	mosquitto/patches/patch-ad
	mosquitto/patches/patch-ae

Log Message:
mosquitto: rename packages to modern mkpatches-created names

(No functional change.)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8318370f8a05ac26e925eedff6ee0872b609298d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mosquitto/distinfo                         |  8 +++----
 mosquitto/patches/patch-CMakeLists.txt     | 26 +++++++++++++++++++++++
 mosquitto/patches/patch-aa                 | 26 -----------------------
 mosquitto/patches/patch-ab                 | 21 ------------------
 mosquitto/patches/patch-ad                 | 34 ------------------------------
 mosquitto/patches/patch-ae                 | 32 ----------------------------
 mosquitto/patches/patch-lib_CMakeLists.txt | 21 ++++++++++++++++++
 mosquitto/patches/patch-mosquitto.conf     | 34 ++++++++++++++++++++++++++++++
 mosquitto/patches/patch-src_CMakeLists.txt | 32 ++++++++++++++++++++++++++++
 9 files changed, 117 insertions(+), 117 deletions(-)

diffs:
diff --git a/mosquitto/distinfo b/mosquitto/distinfo
index e1e9707e6c..b303f1d5bd 100644
--- a/mosquitto/distinfo
+++ b/mosquitto/distinfo
@@ -4,7 +4,7 @@ SHA1 (mosquitto-1.5.1.tar.gz) = 3931d0a6a2884ea010f6ed3a0a0d752e2322a8fe
 RMD160 (mosquitto-1.5.1.tar.gz) = c29581d6154627ecb9f8fdea3fd2851c4b72f6a4
 SHA512 (mosquitto-1.5.1.tar.gz) = 7b076a977778ca87f9fa4579eb4a6b62b171df746920719e9bd6efce0a4815c15edc9da177669819509184d2b01ed0756be8259adba344df690efe0547fd6741
 Size (mosquitto-1.5.1.tar.gz) = 430066 bytes
-SHA1 (patch-aa) = c23d6f014f64603dc0120ef74694fec6ee161215
-SHA1 (patch-ab) = e2f884df3a35e12bf48b22cca88ac870237626ac
-SHA1 (patch-ad) = ed13ec2fdcc58082c4c27f63dd5afaa3805adff6
-SHA1 (patch-ae) = 270fc5ca435f3f51abef7d69f82b38f9907525b1
+SHA1 (patch-CMakeLists.txt) = c23d6f014f64603dc0120ef74694fec6ee161215
+SHA1 (patch-lib_CMakeLists.txt) = 9ab510e09f5099e595129b8bacf1a348b0868271
+SHA1 (patch-mosquitto.conf) = faa7e77c30a58105bd678d510f1f545345f6ce0b
+SHA1 (patch-src_CMakeLists.txt) = 908f439f7e04d31f5e7ab7ab2ee5b6e5ff23145d
diff --git a/mosquitto/patches/patch-CMakeLists.txt b/mosquitto/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..a50fb405c4
--- /dev/null
+++ b/mosquitto/patches/patch-CMakeLists.txt
@@ -0,0 +1,26 @@
+$NetBSD$
+
+In cmake build, adjust paths to pkgsrc norms.  (From OpenBSD.)
+
+--- CMakeLists.txt.orig	2018-08-16 16:05:26.000000000 +0000
++++ CMakeLists.txt
+@@ -30,17 +30,12 @@ if (WIN32)
+ else (WIN32)
+ 	set (BINDIR bin)
+ 	set (SBINDIR sbin)
+-	if ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
+-		set (SYSCONFDIR /etc/mosquitto)
+-	else ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
+-		set (SYSCONFDIR etc/mosquitto)
+-	endif ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
++	set (SYSCONFDIR "${DATAROOTDIR}/examples/mosquitto")
+ 	
+ 	set (LIBDIR lib${LIB_SUFFIX})
+-	set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}")
+ 	set (INCLUDEDIR include)
+ 	set (DATAROOTDIR share)
+-	set (MANDIR "${DATAROOTDIR}/man")
++	set (MANDIR "man")
+ 	set (SHAREDIR "${DATAROOTDIR}/mosquitto")
+ 	set (PKGCONFIGDIR "${LIBDIR}/pkgconfig")
+ endif (WIN32)
diff --git a/mosquitto/patches/patch-aa b/mosquitto/patches/patch-aa
deleted file mode 100644
index a50fb405c4..0000000000
--- a/mosquitto/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-In cmake build, adjust paths to pkgsrc norms.  (From OpenBSD.)
-
---- CMakeLists.txt.orig	2018-08-16 16:05:26.000000000 +0000
-+++ CMakeLists.txt
-@@ -30,17 +30,12 @@ if (WIN32)
- else (WIN32)
- 	set (BINDIR bin)
- 	set (SBINDIR sbin)
--	if ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
--		set (SYSCONFDIR /etc/mosquitto)
--	else ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
--		set (SYSCONFDIR etc/mosquitto)
--	endif ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
-+	set (SYSCONFDIR "${DATAROOTDIR}/examples/mosquitto")
- 	
- 	set (LIBDIR lib${LIB_SUFFIX})
--	set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}")
- 	set (INCLUDEDIR include)
- 	set (DATAROOTDIR share)
--	set (MANDIR "${DATAROOTDIR}/man")
-+	set (MANDIR "man")
- 	set (SHAREDIR "${DATAROOTDIR}/mosquitto")
- 	set (PKGCONFIGDIR "${LIBDIR}/pkgconfig")
- endif (WIN32)
diff --git a/mosquitto/patches/patch-ab b/mosquitto/patches/patch-ab
deleted file mode 100644
index cde4defed8..0000000000
--- a/mosquitto/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-On NetBSD, do not include librt.  (Why?  All other "UNIX" does, except Mac.)
-
---- lib/CMakeLists.txt.orig	2017-02-20 22:06:57.000000000 +0000
-+++ lib/CMakeLists.txt	2017-02-25 12:06:08.924946745 +0000
-@@ -48,12 +48,12 @@
- 
- set (LIBRARIES ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES})
- 
--if (UNIX AND NOT APPLE)
-+if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
- 	find_library(LIBRT rt)
- 	if (LIBRT)
- 		set (LIBRARIES ${LIBRARIES} rt)
- 	endif (LIBRT)
--endif (UNIX AND NOT APPLE)
-+endif (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
- 
- if (WIN32)
- 	set (LIBRARIES ${LIBRARIES} ws2_32)
diff --git a/mosquitto/patches/patch-ad b/mosquitto/patches/patch-ad
deleted file mode 100644
index 4bb39f335b..0000000000
--- a/mosquitto/patches/patch-ad
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-Better defaults for configuration, inspired by FreeBSD.
-\todo Rethink if we should be deviating from upstream.
-
---- mosquitto.conf.orig	2016-06-02 21:20:22.000000000 +0000
-+++ mosquitto.conf	2016-08-28 15:28:28.495612360 +0000
-@@ -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 
- # start-stop-daemon or similar.
--#pid_file
-+#pid_file /var/run/mosquitto.pid
- 
- # When run as root, drop privileges to this user and its primary 
- # group.
-@@ -133,7 +133,7 @@
- #bind_address
- 
- # Port to use for the default listener.
--#port 1883
-+port 1883
- 
- # The maximum number of client connections to allow. This is 
- # a per listener setting.
-@@ -461,7 +461,7 @@
- # Note that if the broker is running as a Windows service it will default to
- # "log_dest none" and neither stdout nor stderr logging is available.
- # Use "log_dest none" if you wish to disable logging.
--#log_dest stderr
-+log_dest syslog
- 
- # If using syslog logging (not on Windows), messages will be logged to the
- # "daemon" facility by default. Use the log_facility option to choose which of
diff --git a/mosquitto/patches/patch-ae b/mosquitto/patches/patch-ae
deleted file mode 100644
index c99b0be55f..0000000000
--- a/mosquitto/patches/patch-ae
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-On NetBSD, don't use -ldl (why?).
-
-For uuid, insist on library, not just header (why?).
-
---- src/CMakeLists.txt.orig	2018-09-04 01:33:51.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -125,6 +125,8 @@ endif (HAVE_GETADDRINFO_A)
- if (UNIX)
- 	if (APPLE)
- 		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
-+	elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-+		set (MOSQ_LIBS ${MOSQ_LIBS} m)
- 	else (APPLE)
- 		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
- 		find_library(LIBRT rt)
-@@ -153,10 +155,11 @@ endif (${WITH_WEBSOCKETS} STREQUAL ON)
- # Simple detect libuuid
- if(NOT APPLE)
- 	FIND_PATH(UUID_HEADER uuid/uuid.h)
--	if (UUID_HEADER)
-+	FIND_LIBRARY(UUID_LIBRARY NAMES uuid)
-+	IF (UUID_HEADER AND UUID_LIBRARY)
- 		add_definitions(-DWITH_UUID)
--		set (MOSQ_LIBS ${MOSQ_LIBS} uuid)
--	endif (UUID_HEADER)
-+		set (MOSQ_LIBS ${MOSQ_LIBS} ${UUID_LIBRARY})
-+	endif (UUID_HEADER AND UUID_LIBRARY)
- endif(NOT APPLE)
- 
- add_executable(mosquitto ${MOSQ_SRCS})
diff --git a/mosquitto/patches/patch-lib_CMakeLists.txt b/mosquitto/patches/patch-lib_CMakeLists.txt
new file mode 100644
index 0000000000..721d04e69f
--- /dev/null
+++ b/mosquitto/patches/patch-lib_CMakeLists.txt
@@ -0,0 +1,21 @@
+$NetBSD$
+
+On NetBSD, do not include librt.  (Why?  All other "UNIX" does, except Mac.)
+
+--- lib/CMakeLists.txt.orig	2018-09-04 16:57:17.000000000 +0000
++++ lib/CMakeLists.txt
+@@ -73,12 +73,12 @@ set(C_SRC
+ 
+ set (LIBRARIES ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES})
+ 
+-if (UNIX AND NOT APPLE)
++if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+ 	find_library(LIBRT rt)
+ 	if (LIBRT)
+ 		set (LIBRARIES ${LIBRARIES} rt)
+ 	endif (LIBRT)
+-endif (UNIX AND NOT APPLE)
++endif (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+ 
+ if (WIN32)
+ 	set (LIBRARIES ${LIBRARIES} ws2_32)
diff --git a/mosquitto/patches/patch-mosquitto.conf b/mosquitto/patches/patch-mosquitto.conf
new file mode 100644
index 0000000000..a2e26d2810
--- /dev/null
+++ b/mosquitto/patches/patch-mosquitto.conf
@@ -0,0 +1,34 @@
+$NetBSD$
+
+Better defaults for configuration, inspired by FreeBSD.
+\todo Rethink if we should be deviating from upstream.
+
+--- mosquitto.conf.orig	2018-08-16 16:05:26.000000000 +0000
++++ mosquitto.conf
+@@ -28,7 +28,7 @@
+ # This should be set to /var/run/mosquitto.pid if mosquitto is
+ # being run automatically on boot with an init script and 
+ # start-stop-daemon or similar.
+-#pid_file
++#pid_file /var/run/mosquitto.pid
+ 
+ # When run as root, drop privileges to this user and its primary 
+ # group.
+@@ -160,7 +160,7 @@
+ #bind_address
+ 
+ # Port to use for the default listener.
+-#port 1883
++port 1883
+ 
+ # The maximum number of client connections to allow. This is 
+ # a per listener setting.
+@@ -494,7 +494,7 @@
+ # Note that if the broker is running as a Windows service it will default to
+ # "log_dest none" and neither stdout nor stderr logging is available.
+ # Use "log_dest none" if you wish to disable logging.
+-#log_dest stderr
++log_dest syslog
+ 
+ # If using syslog logging (not on Windows), messages will be logged to the
+ # "daemon" facility by default. Use the log_facility option to choose which of
diff --git a/mosquitto/patches/patch-src_CMakeLists.txt b/mosquitto/patches/patch-src_CMakeLists.txt
new file mode 100644
index 0000000000..843c409c3a
--- /dev/null
+++ b/mosquitto/patches/patch-src_CMakeLists.txt
@@ -0,0 +1,32 @@
+$NetBSD$
+
+On NetBSD, don't use -ldl (why?).
+
+For uuid, insist on library, not just header (why?).
+
+--- src/CMakeLists.txt.orig	2018-09-04 16:57:17.000000000 +0000
++++ src/CMakeLists.txt
+@@ -125,6 +125,8 @@ endif (HAVE_GETADDRINFO_A)
+ if (UNIX)
+ 	if (APPLE)
+ 		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
++	elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
++		set (MOSQ_LIBS ${MOSQ_LIBS} m)
+ 	else (APPLE)
+ 		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
+ 		find_library(LIBRT rt)
+@@ -153,10 +155,11 @@ endif (${WITH_WEBSOCKETS} STREQUAL ON)
+ # Simple detect libuuid
+ if(NOT APPLE)
+ 	FIND_PATH(UUID_HEADER uuid/uuid.h)
+-	if (UUID_HEADER)
++	FIND_LIBRARY(UUID_LIBRARY NAMES uuid)
++	IF (UUID_HEADER AND UUID_LIBRARY)
+ 		add_definitions(-DWITH_UUID)
+-		set (MOSQ_LIBS ${MOSQ_LIBS} uuid)
+-	endif (UUID_HEADER)
++		set (MOSQ_LIBS ${MOSQ_LIBS} ${UUID_LIBRARY})
++	endif (UUID_HEADER AND UUID_LIBRARY)
+ endif(NOT APPLE)
+ 
+ add_executable(mosquitto ${MOSQ_SRCS})
Prev by Date: mosquitto: trim no-longer-valid comments from patchfiles
Next by Date: mosquitto: Update TODO.
Previous by Thread: mosquitto: trim no-longer-valid comments from patchfiles
Next by Thread: mosquitto: Update TODO.
Indexes:
Home | Main Index | Thread Index | Old Index