CVS commit: pkgsrc/devel/libstash

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Sat Aug 19 00:22:12 UTC 2017

Modified Files:
        pkgsrc/devel/libstash: distinfo
        pkgsrc/devel/libstash/patches: patch-aa

Log Message:
devel/libstash: Install manpages in ${PKGMANDIR}.

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


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/libstash/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libstash/patches/patch-aa

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

Modified files:

Index: pkgsrc/devel/libstash/distinfo
diff -u pkgsrc/devel/libstash/distinfo:1.5 pkgsrc/devel/libstash/distinfo:1.6
--- pkgsrc/devel/libstash/distinfo:1.5  Tue Nov  3 03:27:45 2015
+++ pkgsrc/devel/libstash/distinfo      Sat Aug 19 00:22:11 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 03:27:45 agc Exp $
+$NetBSD: distinfo,v 1.6 2017/08/19 00:22:11 jlam Exp $
 
 SHA1 (libstash_s19990912a.tar.gz) = ff9ffb3bd421be2652dced2dabfa503d7e3bbca1
 RMD160 (libstash_s19990912a.tar.gz) = fa7058a9da42b27a1094cd9ae3af204167ad093f
 SHA512 (libstash_s19990912a.tar.gz) = d3acc0ea4348c2e02c686d07e0d2fc3d85357ae3b804b9aa3ac9d065e011527159fb0adf02b0be3a417cb095766fd5e8a361db794f4183dfc7842d0cbcbc4dd3
 Size (libstash_s19990912a.tar.gz) = 159195 bytes
-SHA1 (patch-aa) = f10654a8a95c375bf1b3af13683fe85660c4faae
+SHA1 (patch-aa) = 554d624564a1b736e7b0759724429a4f4cd7f4ec
 SHA1 (patch-ab) = 3c8f3932b176b4ee4730125581569c1bb3aa85f4
 SHA1 (patch-ac) = 2a2626a8df20e2dd62c565ba76b2b3fd8496c8e3

Index: pkgsrc/devel/libstash/patches/patch-aa
diff -u pkgsrc/devel/libstash/patches/patch-aa:1.3 pkgsrc/devel/libstash/patches/patch-aa:1.4
--- pkgsrc/devel/libstash/patches/patch-aa:1.3  Wed Jul  8 16:09:00 2009
+++ pkgsrc/devel/libstash/patches/patch-aa      Sat Aug 19 00:22:12 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2009/07/08 16:09:00 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2017/08/19 00:22:12 jlam Exp $
 
---- Makefile.bsd.in.orig       2009-07-08 18:05:44.000000000 +0200
+--- Makefile.bsd.in.orig       1999-09-13 06:32:44.000000000 +0000
 +++ Makefile.bsd.in
-@@ -101,11 +101,11 @@
+@@ -101,11 +101,11 @@ CPPFLAGS := -Iinclude @CPPFLAGS@
  
  ST_CPPFLAGS := 
  SH_CPPFLAGS := 
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.3 2009/07/08 16:09
  
  CFLAGS := -Wall -pipe @CFLAGS@
  ST_CFLAGS := 
-@@ -290,47 +290,47 @@ install_r : install_stat_dbg_r install_s
+@@ -290,47 +290,48 @@ install_r : install_stat_dbg_r install_s
  
  install_common : all
        $(SHELL) -c \
@@ -27,10 +27,11 @@ $NetBSD: patch-aa,v 1.3 2009/07/08 16:09
 +      @INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/include/libstash/; \
        done; \
 -      @INSTALL@ -d @prefix@/man/man3; \
-+      @INSTALL@ -d ${DESTDIR}@prefix@/man/man3; \
++      @INSTALL@ -d ${DESTDIR}@prefix@/${PKGMANDIR}/man3; \
        for i in $(MANPAGES); do \
 -      @INSTALL@ -m 0644 $$i @prefix@/man/man3/; \
-+      @INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/$${i%s}; \
++      f=$${i#man/}; \
++      @INSTALL@ -m 0644 $$i ${DESTDIR}@prefix@/${PKGMANDIR}/$${f%s}; \
        done; \
 -      @INSTALL@ -d @prefix@/lib; \
 +      @INSTALL@ -d ${DESTDIR}@prefix@/lib; \