mosquitto: Use SUBST_SED to remove non-portable strip in install

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Sep 3 21:03:41 2018 -0400
Changeset:	22bb2785a8ebd1d8716b2079b4492fa76aeeca80

Modified Files:
	mosquitto/Makefile
Removed Files:
	mosquitto/patches/patch-ak
	mosquitto/patches/patch-al
	mosquitto/patches/patch-am
	mosquitto/patches/patch-an

Log Message:
mosquitto: Use SUBST_SED to remove non-portable strip in install

Uptream passes a --strip-program argument to install, but this is
apparently a GNU extension.  Remove it with sed to avoid 4 patches
that may have conflicts.

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

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

diffstat:
 mosquitto/Makefile         | 11 ++++++++++-
 mosquitto/patches/patch-ak | 19 -------------------
 mosquitto/patches/patch-al | 21 ---------------------
 mosquitto/patches/patch-am | 15 ---------------
 mosquitto/patches/patch-an | 17 -----------------
 5 files changed, 10 insertions(+), 73 deletions(-)

diffs:
diff --git a/mosquitto/Makefile b/mosquitto/Makefile
index ec1aecc24a..1f311123f7 100644
--- a/mosquitto/Makefile
+++ b/mosquitto/Makefile
@@ -21,7 +21,8 @@ CONF_FILES=	share/examples/mosquitto/pskfile.example \
 		share/examples/mosquitto/mosquitto.conf \
 		share/examples/mosquitto/aclfile.example
 
-SUBST_CLASSES+=			ldconfig
+SUBST_CLASSES+=			ldconfig strip
+
 SUBST_STAGE.ldconfig=		post-extract
 SUBST_MESSAGE.ldconfig=		Removing non-portable ldconfig invocations
 SUBST_FILES.ldconfig=		lib/CMakeLists.txt \
@@ -29,6 +30,14 @@ SUBST_FILES.ldconfig=		lib/CMakeLists.txt \
 				src/CMakeLists.txt
 SUBST_SED.ldconfig=		-E -e '/EXEC_PROGRAM\(\/sbin\/ldconfig/d'
 
+SUBST_STAGE.strip=		post-extract
+SUBST_MESSAGE.strip=		removing unportable cross strip
+SUBST_FILES.strip=		lib/Makefile src/Makefile lib/cpp/Makefile client/Makefile
+SUBST_SED.strip=		-E -e '/--strip-program=\$${CROSS_COMPILE}\$${STRIP}/d'
+
+-strip-program=${CROSS_COMPILE}${STRIP}
+
+
 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/patches/patch-ak b/mosquitto/patches/patch-ak
deleted file mode 100644
index e4a4c419a0..0000000000
--- a/mosquitto/patches/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Don't use unportable --strip-program with install.  This is
-unnecessary because$(INSTALL) should be the cross install which knows
-how to strip anyway.
-
-Not yet filed upstream.
-
---- lib/Makefile.orig	2016-08-29 21:51:21.897719218 +0000
-+++ lib/Makefile	2016-08-29 21:51:43.349422011 +0000
-@@ -25,7 +25,7 @@
- 
- install : all
- 	$(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/
--	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION}
-+	$(INSTALL) -s libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION}
- 	ln -sf libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so
- 	$(INSTALL) -d ${DESTDIR}${prefix}/include/
- 	$(INSTALL) mosquitto.h ${DESTDIR}${prefix}/include/mosquitto.h
diff --git a/mosquitto/patches/patch-al b/mosquitto/patches/patch-al
deleted file mode 100644
index fd2a76ee2b..0000000000
--- a/mosquitto/patches/patch-al
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-See patch-ak.
-
---- src/Makefile.orig	2016-08-29 21:52:55.923491416 +0000
-+++ src/Makefile	2016-08-29 21:53:27.614743795 +0000
-@@ -103,12 +103,12 @@
- 
- install : all
- 	$(INSTALL) -d ${DESTDIR}$(prefix)/sbin
--	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
-+	$(INSTALL) -s mosquitto ${DESTDIR}${prefix}/sbin/mosquitto
- 	$(INSTALL) -d ${DESTDIR}$(prefix)/include
- 	$(INSTALL) mosquitto_plugin.h ${DESTDIR}${prefix}/include/mosquitto_plugin.h
- ifeq ($(WITH_TLS),yes)
- 	$(INSTALL) -d ${DESTDIR}$(prefix)/bin
--	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
-+	$(INSTALL) -s mosquitto_passwd ${DESTDIR}${prefix}/bin/mosquitto_passwd
- endif
- 
- uninstall :
diff --git a/mosquitto/patches/patch-am b/mosquitto/patches/patch-am
deleted file mode 100644
index edbdac76ec..0000000000
--- a/mosquitto/patches/patch-am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-See patch-ak.
-
---- lib/cpp/Makefile.orig	2016-08-29 21:50:11.282837830 +0000
-+++ lib/cpp/Makefile	2016-08-29 21:50:41.337564781 +0000
-@@ -10,7 +10,7 @@
- 
- install : all
- 	$(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/
--	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION}
-+	$(INSTALL) -s libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION}
- 	ln -sf libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so
- 	$(INSTALL) -d ${DESTDIR}${prefix}/include/
- 	$(INSTALL) mosquittopp.h ${DESTDIR}${prefix}/include/mosquittopp.h
diff --git a/mosquitto/patches/patch-an b/mosquitto/patches/patch-an
deleted file mode 100644
index ee3db38eff..0000000000
--- a/mosquitto/patches/patch-an
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-See patch-ak.
-
---- client/Makefile.orig	2016-08-29 21:52:12.870263205 +0000
-+++ client/Makefile	2016-08-29 21:52:39.329840759 +0000
-@@ -24,8 +24,8 @@
- 
- install : all
- 	$(INSTALL) -d ${DESTDIR}$(prefix)/bin
--	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub
--	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} mosquitto_sub ${DESTDIR}${prefix}/bin/mosquitto_sub
-+	$(INSTALL) -s mosquitto_pub ${DESTDIR}${prefix}/bin/mosquitto_pub
-+	$(INSTALL) -s mosquitto_sub ${DESTDIR}${prefix}/bin/mosquitto_sub
- 
- uninstall :
- 	-rm -f ${DESTDIR}${prefix}/bin/mosquitto_pub