CVS commit: pkgsrc/print/abcm2ps

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Sep 30 12:51:47 UTC 2016

Modified Files:
        pkgsrc/print/abcm2ps: Makefile distinfo
        pkgsrc/print/abcm2ps/patches: patch-aa

Log Message:
Adapt patch for better upstreaming.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/print/abcm2ps/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/print/abcm2ps/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/abcm2ps/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/print/abcm2ps/Makefile
diff -u pkgsrc/print/abcm2ps/Makefile:1.30 pkgsrc/print/abcm2ps/Makefile:1.31
--- pkgsrc/print/abcm2ps/Makefile:1.30  Fri Sep 30 12:48:57 2016
+++ pkgsrc/print/abcm2ps/Makefile       Fri Sep 30 12:51:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2016/09/30 12:48:57 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2016/09/30 12:51:47 wiz Exp $
 
 DISTNAME=      abcm2ps-8.12.4
 CATEGORIES=    print
@@ -15,7 +15,7 @@ BUILD_TARGET= abcm2ps
 USE_TOOLS+=    gmake
 
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
-CONFIGURE_ARGS+=       --docdir=${PREFIX}/share/doc/abcm2ps
+CONFIGURE_ARGS+=       --docdir=${PREFIX}/share/doc
 
 .include "../../devel/pango/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/abcm2ps/distinfo
diff -u pkgsrc/print/abcm2ps/distinfo:1.14 pkgsrc/print/abcm2ps/distinfo:1.15
--- pkgsrc/print/abcm2ps/distinfo:1.14  Fri Sep 30 12:48:57 2016
+++ pkgsrc/print/abcm2ps/distinfo       Fri Sep 30 12:51:47 2016
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2016/09/30 12:48:57 wiz Exp $
+$NetBSD: distinfo,v 1.15 2016/09/30 12:51:47 wiz Exp $
 
 SHA1 (abcm2ps-8.12.4.tar.gz) = 74f38c6191d8d3d9321be2086096a07083654276
 RMD160 (abcm2ps-8.12.4.tar.gz) = 2e73a136bc384d8c4d35895d84bb0f1fbe5059f1
 SHA512 (abcm2ps-8.12.4.tar.gz) = 24b468435d724c404fc566891213def9b698abaf768a0fb8db2b03844b20b5fa40ab5fe7ba5e8b05696a615cbf5a9a15659f4e39ed380030db53b748f29a4a77
 Size (abcm2ps-8.12.4.tar.gz) = 238090 bytes
-SHA1 (patch-aa) = b3df74d9fe831c4eb690949e0b3c4082ad26eab3
+SHA1 (patch-aa) = 1dbcc21e9239cef0430038c62e731f3f514d9ec9

Index: pkgsrc/print/abcm2ps/patches/patch-aa
diff -u pkgsrc/print/abcm2ps/patches/patch-aa:1.4 pkgsrc/print/abcm2ps/patches/patch-aa:1.5
--- pkgsrc/print/abcm2ps/patches/patch-aa:1.4   Fri Sep 30 12:48:57 2016
+++ pkgsrc/print/abcm2ps/patches/patch-aa       Fri Sep 30 12:51:47 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2016/09/30 12:48:57 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2016/09/30 12:51:47 wiz Exp $
 
 * support user-destdir.
 
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.4 2016/09/30 12:48
 -      $(INSTALL_PROGRAM) abcm2ps $(bindir)
 +      mkdir -p $(DESTDIR)$(bindir); \
 +      mkdir -p $(DESTDIR)$(datadir)/abcm2ps; \
-+      mkdir -p $(DESTDIR)$(docdir); \
++      mkdir -p $(DESTDIR)$(docdir)/abcm2ps; \
 +      $(INSTALL_PROGRAM) abcm2ps $(DESTDIR)$(bindir)
        for f in $(srcdir)/*.fmt; do \
 -              $(INSTALL_DATA) $$f $(datadir)/abcm2ps; \
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.4 2016/09/30 12:48
        done
        for f in $(DOCFILES); do \
 -              $(INSTALL_DATA) $$f $(docdir)/abcm2ps; \
-+              $(INSTALL_DATA) $$f $(DESTDIR)$(docdir); \
++              $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/abcm2ps; \
        done
  
  uninstall: