CVS commit: pkgsrc/print/advi

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Dec 24 10:17:50 UTC 2016

Modified Files:
        pkgsrc/print/advi: Makefile distinfo
Added Files:
        pkgsrc/print/advi/patches: patch-doc_pngs_Makefile.in

Log Message:
Depend on Vera to prevent montage from barfing.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/print/advi/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/print/advi/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/print/advi/patches/patch-doc_pngs_Makefile.in

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

Modified files:

Index: pkgsrc/print/advi/Makefile
diff -u pkgsrc/print/advi/Makefile:1.95 pkgsrc/print/advi/Makefile:1.96
--- pkgsrc/print/advi/Makefile:1.95     Sun Dec  4 05:17:39 2016
+++ pkgsrc/print/advi/Makefile  Sat Dec 24 10:17:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2016/12/04 05:17:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.96 2016/12/24 10:17:50 joerg Exp $
 
 DISTNAME=              advi-1.10.2
 PKGREVISION=           12
@@ -22,6 +22,7 @@ DEPENDS+=             tex-fontinst>=1.933:../../fon
 DEPENDS+=              tex-pstools>=1.68:../../graphics/tex-pstools
 DEPENDS+=              tex-cyrillic-bin>=2013:../../print/tex-cyrillic-bin
 DEPENDS+=              hevea-[0-9]*:../../textproc/hevea
+BUILD_DEPENDS+=                vera-ttf-[0-9]*:../../fonts/vera-ttf
 
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes

Index: pkgsrc/print/advi/distinfo
diff -u pkgsrc/print/advi/distinfo:1.10 pkgsrc/print/advi/distinfo:1.11
--- pkgsrc/print/advi/distinfo:1.10     Wed Nov  4 01:01:31 2015
+++ pkgsrc/print/advi/distinfo  Sat Dec 24 10:17:50 2016
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 01:01:31 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/12/24 10:17:50 joerg Exp $
 
 SHA1 (advi-1.10.2.tar.gz) = b9a239ccdfccb3a8f726d140e703aa33c9afd350
 RMD160 (advi-1.10.2.tar.gz) = 7609b68e1a05b1057bb8f5c9e5c413c5d8111263
 SHA512 (advi-1.10.2.tar.gz) = 93479e22261019b571bc331604a659e4e58200284bcdd63929b2c7ab07f8e9fabbd120f8876081a36e7e09e08286eeba9a45f3b077b545a9e404060622ec45c8
 Size (advi-1.10.2.tar.gz) = 9772060 bytes
+SHA1 (patch-doc_pngs_Makefile.in) = 3141938a6433d4dab8d7247ae89ad3381d902372
 SHA1 (patch-src_Makefile.in) = 3f9be7ac0c4a98b3e36c383ed2489b0d71e73f8a

Added files:

Index: pkgsrc/print/advi/patches/patch-doc_pngs_Makefile.in
diff -u /dev/null pkgsrc/print/advi/patches/patch-doc_pngs_Makefile.in:1.1
--- /dev/null   Sat Dec 24 10:17:50 2016
+++ pkgsrc/print/advi/patches/patch-doc_pngs_Makefile.in        Sat Dec 24 10:17:50 2016
@@ -0,0 +1,16 @@
+$NetBSD: patch-doc_pngs_Makefile.in,v 1.1 2016/12/24 10:17:50 joerg Exp $
+
+montage errors out without some font, even if it doesn't actually end up
+using it.
+
+--- doc/pngs/Makefile.in.orig  2016-12-24 09:37:47.381222017 +0000
++++ doc/pngs/Makefile.in
+@@ -489,7 +489,7 @@ f.png: bigf.png
+ @HAVE_CONVERT_FALSE@  @exit 1
+ 
+ bigf.png: $(STATICIMAGES:.png=.tiny.png)
+-      $(MONTAGE) -tile x3 \
++      $(MONTAGE) -tile x3 -font ${PREFIX}/share/fonts/X11/TTF/Vera.ttf \
+               -mode Concatenate -background white -adjoin \
+               `find . -regex '.*/.*\.tiny\.png'` \
+       bigf.png