mosquitto: Adjust man installation paths

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

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Oct 8 21:28:09 2018 -0400
Changeset:	1621506e2500b65d547467aaac48a6bbb220db2d

Modified Files:
	mosquitto/Makefile
	mosquitto/distinfo
	mosquitto/patches/patch-CMakeLists.txt

Log Message:
mosquitto: Adjust man installation paths

Use the GNU coding standards module, and use the standard variable.

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

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

diffstat:
 mosquitto/Makefile                     |  8 ++++----
 mosquitto/distinfo                     |  2 +-
 mosquitto/patches/patch-CMakeLists.txt | 18 ++++++++++++++----
 3 files changed, 19 insertions(+), 9 deletions(-)

diffs:
diff --git a/mosquitto/Makefile b/mosquitto/Makefile
index 0d2d2d94d6..b79d19e232 100644
--- a/mosquitto/Makefile
+++ b/mosquitto/Makefile
@@ -22,10 +22,10 @@ USE_TOOLS+=	gmake
 post-extract:
 	${RM} ${WRKSRC}/config.mk
 
-CONF_FILES=	share/examples/mosquitto/pskfile.example \
-		share/examples/mosquitto/pwfile.example \
-		share/examples/mosquitto/mosquitto.conf \
-		share/examples/mosquitto/aclfile.example
+CONF_FILES=	${PREFIX}/share/examples/mosquitto/pskfile.example \
+		${PREFIX}/share/examples/mosquitto/pwfile.example \
+		${PREFIX}/share/examples/mosquitto/mosquitto.conf \
+		${PREFIX}/share/examples/mosquitto/aclfile.example
 
 SUBST_CLASSES+=			ldconfig
 
diff --git a/mosquitto/distinfo b/mosquitto/distinfo
index 97f57cc3ca..94b97b2217 100644
--- a/mosquitto/distinfo
+++ b/mosquitto/distinfo
@@ -4,7 +4,7 @@ SHA1 (mosquitto-1.5.3.tar.gz) = f61a2fcf814c3c1c28320be2a71d04e5dbbe28b1
 RMD160 (mosquitto-1.5.3.tar.gz) = 91b6695d40742db02d6243716e494ae1044dc3ca
 SHA512 (mosquitto-1.5.3.tar.gz) = 8aa4f85914316c2dc08908a649779946ab33b23ea669c6f7eed0d8a1af7ae26381cfe1a50c32d220658f8693ef6a86045690824af4b7ca0271426ff3455e7796
 Size (mosquitto-1.5.3.tar.gz) = 425844 bytes
-SHA1 (patch-CMakeLists.txt) = c23d6f014f64603dc0120ef74694fec6ee161215
+SHA1 (patch-CMakeLists.txt) = b440be07073a7603d8740abece10afd43a541b22
 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
index a50fb405c4..1f955ebf2a 100644
--- a/mosquitto/patches/patch-CMakeLists.txt
+++ b/mosquitto/patches/patch-CMakeLists.txt
@@ -1,10 +1,20 @@
 $NetBSD$
 
-In cmake build, adjust paths to pkgsrc norms.  (From OpenBSD.)
+In cmake build, adjust paths to pkgsrc norms.  (Originally from
+OpenBSD.)
 
---- CMakeLists.txt.orig	2018-08-16 16:05:26.000000000 +0000
+--- CMakeLists.txt.orig	2018-09-25 15:27:43.000000000 +0000
 +++ CMakeLists.txt
-@@ -30,17 +30,12 @@ if (WIN32)
+@@ -15,6 +15,8 @@ set (VERSION 1.5.3)
+ 
+ add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
+ 
++include(GNUInstallDirs)
++
+ if (WIN32)
+ 	set (BINDIR .)
+ 	set (SBINDIR .)
+@@ -30,17 +32,12 @@ if (WIN32)
  else (WIN32)
  	set (BINDIR bin)
  	set (SBINDIR sbin)
@@ -20,7 +30,7 @@ In cmake build, adjust paths to pkgsrc norms.  (From OpenBSD.)
  	set (INCLUDEDIR include)
  	set (DATAROOTDIR share)
 -	set (MANDIR "${DATAROOTDIR}/man")
-+	set (MANDIR "man")
++	set (MANDIR ${CMAKE_INSTALL_MANDIR})
  	set (SHAREDIR "${DATAROOTDIR}/mosquitto")
  	set (PKGCONFIGDIR "${LIBDIR}/pkgconfig")
  endif (WIN32)