Sat Aug 19 00:22:12 2017 UTC ()
devel/libstash: Install manpages in ${PKGMANDIR}.

Modify the Makefile patch to install manpages under
"${PREFIX}/${PKGMANDIR}" instead of "${PREFIX}/man".


(jlam)
diff -r1.5 -r1.6 pkgsrc/devel/libstash/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/libstash/patches/patch-aa
cvs diff -r1.5 -r1.6 pkgsrc/devel/libstash/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libstash/distinfo 2015/11/03 03:27:45 1.5
+++ pkgsrc/devel/libstash/distinfo 2017/08/19 00:22:11 1.6
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.5 2015/11/03 03:27:45 agc Exp $ 1$NetBSD: distinfo,v 1.6 2017/08/19 00:22:11 jlam Exp $
2 2
3SHA1 (libstash_s19990912a.tar.gz) = ff9ffb3bd421be2652dced2dabfa503d7e3bbca1 3SHA1 (libstash_s19990912a.tar.gz) = ff9ffb3bd421be2652dced2dabfa503d7e3bbca1
4RMD160 (libstash_s19990912a.tar.gz) = fa7058a9da42b27a1094cd9ae3af204167ad093f 4RMD160 (libstash_s19990912a.tar.gz) = fa7058a9da42b27a1094cd9ae3af204167ad093f
5SHA512 (libstash_s19990912a.tar.gz) = d3acc0ea4348c2e02c686d07e0d2fc3d85357ae3b804b9aa3ac9d065e011527159fb0adf02b0be3a417cb095766fd5e8a361db794f4183dfc7842d0cbcbc4dd3 5SHA512 (libstash_s19990912a.tar.gz) = d3acc0ea4348c2e02c686d07e0d2fc3d85357ae3b804b9aa3ac9d065e011527159fb0adf02b0be3a417cb095766fd5e8a361db794f4183dfc7842d0cbcbc4dd3
6Size (libstash_s19990912a.tar.gz) = 159195 bytes 6Size (libstash_s19990912a.tar.gz) = 159195 bytes
7SHA1 (patch-aa) = f10654a8a95c375bf1b3af13683fe85660c4faae 7SHA1 (patch-aa) = 554d624564a1b736e7b0759724429a4f4cd7f4ec
8SHA1 (patch-ab) = 3c8f3932b176b4ee4730125581569c1bb3aa85f4 8SHA1 (patch-ab) = 3c8f3932b176b4ee4730125581569c1bb3aa85f4
9SHA1 (patch-ac) = 2a2626a8df20e2dd62c565ba76b2b3fd8496c8e3 9SHA1 (patch-ac) = 2a2626a8df20e2dd62c565ba76b2b3fd8496c8e3
cvs diff -r1.3 -r1.4 pkgsrc/devel/libstash/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/libstash/patches/patch-aa 2009/07/08 16:09:00 1.3
+++ pkgsrc/devel/libstash/patches/patch-aa 2017/08/19 00:22:12 1.4
@@ -1,46 +1,47 @@ @@ -1,46 +1,47 @@
1$NetBSD: patch-aa,v 1.3 2009/07/08 16:09:00 joerg Exp $ 1$NetBSD: patch-aa,v 1.4 2017/08/19 00:22:12 jlam Exp $
2 2
3--- Makefile.bsd.in.orig 2009-07-08 18:05:44.000000000 +0200 3--- Makefile.bsd.in.orig 1999-09-13 06:32:44.000000000 +0000
4+++ Makefile.bsd.in 4+++ Makefile.bsd.in
5@@ -101,11 +101,11 @@ 5@@ -101,11 +101,11 @@ CPPFLAGS := -Iinclude @CPPFLAGS@
6  6
7 ST_CPPFLAGS :=  7 ST_CPPFLAGS :=
8 SH_CPPFLAGS :=  8 SH_CPPFLAGS :=
9-D_CPPFLAGS := -D_LIBSTASH_DBG 9-D_CPPFLAGS := -D_LIBSTASH_DBG
10+D_CPPFLAGS :=  10+D_CPPFLAGS :=
11 O_CPPFLAGS :=  11 O_CPPFLAGS :=
12 P_CPPFLAGS :=  12 P_CPPFLAGS :=
13 R_CPPFLAGS := -D_CW_REENTRANT 13 R_CPPFLAGS := -D_CW_REENTRANT
14-TEST_CPPFLAGS := -D_LIBSTASH_DEBUG 14-TEST_CPPFLAGS := -D_LIBSTASH_DEBUG
15+TEST_CPPFLAGS :=  15+TEST_CPPFLAGS :=
16  16
17 CFLAGS := -Wall -pipe @CFLAGS@ 17 CFLAGS := -Wall -pipe @CFLAGS@
18 ST_CFLAGS :=  18 ST_CFLAGS :=
19@@ -290,47 +290,47 @@ install_r : install_stat_dbg_r install_s 19@@ -290,47 +290,48 @@ install_r : install_stat_dbg_r install_s
20  20
21 install_common : all 21 install_common : all
22 $(SHELL) -c \ 22 $(SHELL) -c \
23- '@INSTALL@ -d @prefix@/include/libstash; \ 23- '@INSTALL@ -d @prefix@/include/libstash; \
24+ '@INSTALL@ -d ${DESTDIR}@prefix@/include/libstash; \ 24+ '@INSTALL@ -d ${DESTDIR}@prefix@/include/libstash; \
25 for i in $(INCS); do \ 25 for i in $(INCS); do \
26- @INSTALL@ -m 0644 $$i @prefix@/include/libstash/; \ 26- @INSTALL@ -m 0644 $$i @prefix@/include/libstash/; \
27+ @INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/include/libstash/; \ 27+ @INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/include/libstash/; \
28 done; \ 28 done; \
29- @INSTALL@ -d @prefix@/man/man3; \ 29- @INSTALL@ -d @prefix@/man/man3; \
30+ @INSTALL@ -d ${DESTDIR}@prefix@/man/man3; \ 30+ @INSTALL@ -d ${DESTDIR}@prefix@/${PKGMANDIR}/man3; \
31 for i in $(MANPAGES); do \ 31 for i in $(MANPAGES); do \
32- @INSTALL@ -m 0644 $$i @prefix@/man/man3/; \ 32- @INSTALL@ -m 0644 $$i @prefix@/man/man3/; \
33+ @INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/$${i%s}; \ 33+ f=$${i#man/}; \
 34+ @INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/${PKGMANDIR}/$${f%s}; \
34 done; \ 35 done; \
35- @INSTALL@ -d @prefix@/lib; \ 36- @INSTALL@ -d @prefix@/lib; \
36+ @INSTALL@ -d ${DESTDIR}@prefix@/lib; \ 37+ @INSTALL@ -d ${DESTDIR}@prefix@/lib; \
37 ' 38 '
38  39
39 install_common_r : install_common 40 install_common_r : install_common
40 $(SHELL) -c \ 41 $(SHELL) -c \
41 'for i in $(INCS_R); do \ 42 'for i in $(INCS_R); do \
42- @INSTALL@ -m 0644 $$i @prefix@/include/libstash/; \ 43- @INSTALL@ -m 0644 $$i @prefix@/include/libstash/; \
43+ @INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/include/libstash/; \ 44+ @INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/include/libstash/; \
44 done; \ 45 done; \
45 ' 46 '
46  47