pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mosquitto: Remove ldconfig with SUBST_SED, to reduce update pain.



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Sep 3 20:53:52 2018 -0400
Changeset:	195fcc28f51e75634f56834305398bfe1c8d7846

Modified Files:
	mosquitto/Makefile
	mosquitto/distinfo
	mosquitto/patches/patch-ab
	mosquitto/patches/patch-ae
Removed Files:
	mosquitto/patches/patch-ac

Log Message:
mosquitto: Remove ldconfig with SUBST_SED, to reduce update pain.

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

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

diffstat:
 mosquitto/Makefile         | 10 ++++++++--
 mosquitto/distinfo         |  5 ++---
 mosquitto/patches/patch-ab |  7 -------
 mosquitto/patches/patch-ac | 13 -------------
 mosquitto/patches/patch-ae |  8 --------
 5 files changed, 10 insertions(+), 33 deletions(-)

diffs:
diff --git a/mosquitto/Makefile b/mosquitto/Makefile
index fc196de66d..ec1aecc24a 100644
--- a/mosquitto/Makefile
+++ b/mosquitto/Makefile
@@ -16,13 +16,19 @@ USE_LANGUAGES+=	c c++
 USE_CMAKE=	yes
 USE_TOOLS+=	gmake
 
-TEST_TARGET=	test
-
 CONF_FILES=	share/examples/mosquitto/pskfile.example \
 		share/examples/mosquitto/pwfile.example \
 		share/examples/mosquitto/mosquitto.conf \
 		share/examples/mosquitto/aclfile.example
 
+SUBST_CLASSES+=			ldconfig
+SUBST_STAGE.ldconfig=		post-extract
+SUBST_MESSAGE.ldconfig=		Removing non-portable ldconfig invocations
+SUBST_FILES.ldconfig=		lib/CMakeLists.txt \
+				lib/cpp/CMakeLists.txt \
+				src/CMakeLists.txt
+SUBST_SED.ldconfig=		-E -e '/EXEC_PROGRAM\(\/sbin\/ldconfig/d'
+
 post-install:
 	mkdir ${DESTDIR}${PREFIX}/share/examples/mosquitto
 	${INSTALL_DATA}	${WRKSRC}/pskfile.example ${WRKSRC}/pwfile.example ${WRKSRC}/mosquitto.conf ${WRKSRC}/aclfile.example ${DESTDIR}${PREFIX}/share/examples/mosquitto
diff --git a/mosquitto/distinfo b/mosquitto/distinfo
index fb1fe90d69..2c2e089209 100644
--- a/mosquitto/distinfo
+++ b/mosquitto/distinfo
@@ -5,10 +5,9 @@ RMD160 (mosquitto-1.4.15.tar.gz) = d2438c8c3b2005265def411826961f94c9413b52
 SHA512 (mosquitto-1.4.15.tar.gz) = 36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100
 Size (mosquitto-1.4.15.tar.gz) = 368961 bytes
 SHA1 (patch-aa) = f75af70317c8617cfa3289532231fd4289390894
-SHA1 (patch-ab) = 3d22528fb6cd0f8dc6218c1a3d14dd99e9f27674
-SHA1 (patch-ac) = b2d5ee16e328e0de590a5b92155a50e97ce6fad2
+SHA1 (patch-ab) = ce5571c0d8e86a99d9cb641adfe5f8f66537370a
 SHA1 (patch-ad) = ed13ec2fdcc58082c4c27f63dd5afaa3805adff6
-SHA1 (patch-ae) = 9950d48840a93006ddb9cbeaac9867215e523931
+SHA1 (patch-ae) = 18b8f3648f78b8d1e22d7868456953d7852f2ade
 SHA1 (patch-af) = 910122fbe47526ac149871e23f6d3bed77c9fcb9
 SHA1 (patch-ag) = 63bd84643230a7e8486e3d7708c5503bd2eb8e10
 SHA1 (patch-ah) = b49e6c203695b64052926014b00f7098c4a17e2d
diff --git a/mosquitto/patches/patch-ab b/mosquitto/patches/patch-ab
index d284886b0d..c17aebe646 100644
--- a/mosquitto/patches/patch-ab
+++ b/mosquitto/patches/patch-ab
@@ -23,10 +23,3 @@ expecting it to be part of builds).   (From OpenBSD.)
  
  if (WIN32)
  	set (LIBRARIES ${LIBRARIES} ws2_32)
-@@ -81,6 +81,3 @@
- install(TARGETS libmosquitto RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
- install(FILES mosquitto.h DESTINATION "${INCLUDEDIR}")
- 
--if (UNIX)
--	install(CODE "EXEC_PROGRAM(/sbin/ldconfig)")
--endif (UNIX)
diff --git a/mosquitto/patches/patch-ac b/mosquitto/patches/patch-ac
deleted file mode 100644
index e5bdf4d6a5..0000000000
--- a/mosquitto/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
-Omit ldconfig (from OpenBSD).
-
---- lib/cpp/CMakeLists.txt.orig	2016-06-02 21:20:22.000000000 +0000
-+++ lib/cpp/CMakeLists.txt	2016-08-28 14:01:52.611842007 +0000
-@@ -13,6 +13,3 @@
- install(TARGETS mosquittopp RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
- install(FILES mosquittopp.h DESTINATION "${INCLUDEDIR}")
- 
--if (UNIX)
--	install(CODE "EXEC_PROGRAM(/sbin/ldconfig)")
--endif (UNIX)
diff --git a/mosquitto/patches/patch-ae b/mosquitto/patches/patch-ae
index 5384be7d9f..464a73524d 100644
--- a/mosquitto/patches/patch-ae
+++ b/mosquitto/patches/patch-ae
@@ -32,11 +32,3 @@ Omit ldconfig (from OpenBSD).
  endif(NOT APPLE)
  
  target_link_libraries(mosquitto ${MOSQ_LIBS})
-@@ -140,7 +143,3 @@
- 	install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
- endif (${WITH_TLS} STREQUAL ON)
- 
--if (UNIX)
--	install(CODE "EXEC_PROGRAM(/sbin/ldconfig)")
--endif (UNIX)
--


Home | Main Index | Thread Index | Old Index