Fri May 6 18:02:06 2011 UTC ()
update to 2.2.4
changes:
-misc fixes and improvements
-added selftest


(drochner)
diff -r1.20 -r1.21 pkgsrc/misc/figlet/Makefile
diff -r1.3 -r1.4 pkgsrc/misc/figlet/PLIST
diff -r1.8 -r1.9 pkgsrc/misc/figlet/distinfo
diff -r1.7 -r1.8 pkgsrc/misc/figlet/patches/patch-aa
diff -r0 -r1.1 pkgsrc/misc/figlet/patches/patch-ab
cvs diff -r1.20 -r1.21 pkgsrc/misc/figlet/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/figlet/Makefile 2009/12/10 21:13:07 1.20
+++ pkgsrc/misc/figlet/Makefile 2011/05/06 18:02:06 1.21
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.20 2009/12/10 21:13:07 abs Exp $ 1# $NetBSD: Makefile,v 1.21 2011/05/06 18:02:06 drochner Exp $
2 2
3DISTNAME= figlet222 3DISTNAME= figlet-2.2.4
4PKGNAME= figlet-2.2.2 
5PKGREVISION= 1 
6CATEGORIES= misc 4CATEGORIES= misc
7MASTER_SITES= ftp://ftp.figlet.org/pub/figlet/program/unix/ 5MASTER_SITES= ftp://ftp.figlet.org/pub/figlet/program/unix/
8 6
9MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.figlet.org/ 8HOMEPAGE= http://www.figlet.org/
11COMMENT= Print text banners in fancy ASCII art characters 9COMMENT= Print text banners in fancy ASCII art characters
12 10
13PKG_INSTALLATION_TYPES= overwrite pkgviews 11PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
15 13
16MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man6 14MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man6
17 15
18INSTALLATION_DIRS= bin ${PKGMANDIR}/man6 16INSTALLATION_DIRS= bin ${PKGMANDIR}/man6
19 17
 18TEST_TARGET= check
 19
20.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/misc/figlet/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/figlet/PLIST 2009/06/14 18:07:21 1.3
+++ pkgsrc/misc/figlet/PLIST 2011/05/06 18:02:06 1.4
@@ -1,19 +1,22 @@ @@ -1,19 +1,22 @@
1@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:07:21 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.4 2011/05/06 18:02:06 drochner Exp $
2bin/chkfont 2bin/chkfont
3bin/figlet 3bin/figlet
4bin/figlist 4bin/figlist
5bin/showfigfonts 5bin/showfigfonts
 6man/man6/chkfont.6
6man/man6/figlet.6 7man/man6/figlet.6
 8man/man6/figlist.6
 9man/man6/showfigfonts.6
7share/figlet/646-ca.flc 10share/figlet/646-ca.flc
8share/figlet/646-ca2.flc 11share/figlet/646-ca2.flc
9share/figlet/646-cn.flc 12share/figlet/646-cn.flc
10share/figlet/646-cu.flc 13share/figlet/646-cu.flc
11share/figlet/646-de.flc 14share/figlet/646-de.flc
12share/figlet/646-dk.flc 15share/figlet/646-dk.flc
13share/figlet/646-es.flc 16share/figlet/646-es.flc
14share/figlet/646-es2.flc 17share/figlet/646-es2.flc
15share/figlet/646-fr.flc 18share/figlet/646-fr.flc
16share/figlet/646-gb.flc 19share/figlet/646-gb.flc
17share/figlet/646-hu.flc 20share/figlet/646-hu.flc
18share/figlet/646-irv.flc 21share/figlet/646-irv.flc
19share/figlet/646-it.flc 22share/figlet/646-it.flc
cvs diff -r1.8 -r1.9 pkgsrc/misc/figlet/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/figlet/distinfo 2009/12/10 21:13:07 1.8
+++ pkgsrc/misc/figlet/distinfo 2011/05/06 18:02:06 1.9
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.8 2009/12/10 21:13:07 abs Exp $ 1$NetBSD: distinfo,v 1.9 2011/05/06 18:02:06 drochner Exp $
2 2
3SHA1 (figlet222.tar.gz) = 138aa027f90c0d68429c7b71af4e51c176bab92b 3SHA1 (figlet-2.2.4.tar.gz) = 365f1fce8525c0ff23631661f96534f06822e423
4RMD160 (figlet222.tar.gz) = fc39809b1f5d5e498d722d49ae88132528633d9f 4RMD160 (figlet-2.2.4.tar.gz) = 158c833e7176f32b1f702482c4cb51dbfe2a4002
5Size (figlet222.tar.gz) = 166727 bytes 5Size (figlet-2.2.4.tar.gz) = 229245 bytes
6SHA1 (patch-aa) = a12ec7c8374eff78a12340cfea2664bfd3ecd262 6SHA1 (patch-aa) = 7ff721d16e0bbc61dae8d397944cb518e6330325
 7SHA1 (patch-ab) = e798522fd5842afb2686a5265973f94c4b5a366b
cvs diff -r1.7 -r1.8 pkgsrc/misc/figlet/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/misc/figlet/patches/patch-aa 2009/12/10 21:13:07 1.7
+++ pkgsrc/misc/figlet/patches/patch-aa 2011/05/06 18:02:06 1.8
@@ -1,58 +1,55 @@ @@ -1,58 +1,55 @@
1$NetBSD: patch-aa,v 1.7 2009/12/10 21:13:07 abs Exp $ 1$NetBSD: patch-aa,v 1.8 2011/05/06 18:02:06 drochner Exp $
2 2
3--- Makefile.orig 2005-07-05 09:57:46.000000000 +0000 3--- Makefile.orig 2011-01-26 10:36:21.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -4,26 +4,26 @@ 5@@ -19,8 +19,8 @@
6 # Copyright 1996, 1997, 1998, 1999, 2000, 2001 John Cowan 
7 # Copyright 2002 Christiaan Keet 
8  
9-# Please make sure DESTDIR, MANDIR, DEFAULTFONTDIR and 
10+# Please make sure BINDIR, MANDIR, DEFAULTFONTDIR and 
11 # DEFAULTFONTFILE are defined to reflect the situation 
12 # on your computer. See README for details. 
13  
14 # Don't change this even if your shell is different. The only reason 
15 # for changing this is if sh is not in the same place. 
16 SHELL = /bin/sh 6 SHELL = /bin/sh
17-CC = gcc 7
18-CFLAGS = -g 8 # The C compiler and linker to use
19+CC ?= gcc 9-CC = gcc
20+CFLAGS ?= -g 10-CFLAGS = -g -O2 -Wall
 11+CC ?= gcc
 12+CFLAGS ?= -g -O2 -Wall
 13 LD = gcc
 14 LDFLAGS =
 15
 16@@ -29,13 +29,13 @@ LDFLAGS =
 17 XCFLAGS = -DTLF_FONTS
 18
 19 # Where to install files
 20-prefix = /usr/local
 21+prefix = ${PREFIX}
21  22
22 # Where the executables should be put 23 # Where the executables should be put
23-DESTDIR = /usr/local/bin 24 BINDIR = $(prefix)/bin
24+BINDIR = ${PREFIX}/bin 
25  25
26 # Where the man page should be put 26 # Where the man page should be put
27-MANDIR = /usr/local/man/man6 27-MANDIR = $(prefix)/man
28+MANDIR = ${PREFIX}/man/man6 28+#MANDIR = $(prefix)/man
29  29
30 # Where figlet will search first for fonts (the ".flf" files). 30 # Where figlet will search first for fonts (the ".flf" files).
31-DEFAULTFONTDIR = /usr/local/share/figlet 31 DEFAULTFONTDIR = $(prefix)/share/figlet
32+DEFAULTFONTDIR = ${PREFIX}/share/figlet 32@@ -77,13 +77,16 @@ clean:
33 # Use this definition if you can't put things in /usr/local/share/figlet 33 rm -f *.o *~ core figlet chkfont
34-DEFAULTFONTDIR = fonts 34
35+#DEFAULTFONTDIR = fonts 35 install: all
36  36- mkdir -p $(DESTDIR)$(BINDIR)
37 # The filename of the font to be used if no other is specified 37- mkdir -p $(DESTDIR)$(MANDIR)/man6
38 # (standard.flf is recommended, but any other can be used). 38- mkdir -p $(DESTDIR)$(DEFAULTFONTDIR)
39@@ -52,11 +52,11 @@ clean: 39- cp $(BINS) $(DESTDIR)$(BINDIR)
40 rm -f *.o figlet chkfont 40- cp $(MANUAL) $(DESTDIR)$(MANDIR)/man6
41  41- cp fonts/*.flf $(DESTDIR)$(DEFAULTFONTDIR)
42 install: figlet chkfont 42- cp fonts/*.flc $(DESTDIR)$(DEFAULTFONTDIR)
43- mkdir -p $(DEFAULTFONTDIR) 43+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(BINDIR)
44- cp figlet $(DESTDIR) 44+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(MANDIR)
45- cp figlet.6 $(MANDIR) 
46- cp chkfont $(DESTDIR) 
47- cp figlist $(DESTDIR) 
48- cp showfigfonts $(DESTDIR) 
49- cp fonts/*.flf $(DEFAULTFONTDIR) 
50- cp fonts/*.flc $(DEFAULTFONTDIR) 
51+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(DEFAULTFONTDIR) 45+ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(DEFAULTFONTDIR)
52+ ${BSD_INSTALL_PROGRAM} figlet $(DESTDIR)$(BINDIR) 46+ ${BSD_INSTALL_PROGRAM} figlet $(DESTDIR)$(BINDIR)
53+ ${BSD_INSTALL_DATA} figlet.6 $(DESTDIR)$(MANDIR) 
54+ ${BSD_INSTALL_PROGRAM} chkfont $(DESTDIR)$(BINDIR) 47+ ${BSD_INSTALL_PROGRAM} chkfont $(DESTDIR)$(BINDIR)
55+ ${BSD_INSTALL_SCRIPT} figlist $(DESTDIR)$(BINDIR) 48+ ${BSD_INSTALL_SCRIPT} figlist $(DESTDIR)$(BINDIR)
56+ ${BSD_INSTALL_SCRIPT} showfigfonts $(DESTDIR)$(BINDIR) 49+ ${BSD_INSTALL_SCRIPT} showfigfonts $(DESTDIR)$(BINDIR)
 50+ ${BSD_INSTALL_DATA} $(MANUAL) $(DESTDIR)$(MANDIR)
57+ ${BSD_INSTALL_DATA} fonts/*.flf $(DESTDIR)$(DEFAULTFONTDIR) 51+ ${BSD_INSTALL_DATA} fonts/*.flf $(DESTDIR)$(DEFAULTFONTDIR)
58+ ${BSD_INSTALL_DATA} fonts/*.flc $(DESTDIR)$(DEFAULTFONTDIR) 52+ ${BSD_INSTALL_DATA} fonts/*.flc $(DESTDIR)$(DEFAULTFONTDIR)
 53
 54 dist:
 55 rm -Rf $(DIST) $(DIST).tar.gz
File Added: pkgsrc/misc/figlet/patches/patch-ab
$NetBSD: patch-ab,v 1.1 2011/05/06 18:02:06 drochner Exp $

--- run-tests.sh.orig	2011-01-26 10:36:21.000000000 +0000
+++ run-tests.sh
@@ -4,7 +4,7 @@ LC_ALL=POSIX
 export LC_ALL
 
 TESTDIR=tests
-OUTPUT=`mktemp`
+OUTPUT=`mktemp output.XXXXXX`
 LOGFILE=tests.log
 CMD=./figlet
 FONTDIR="$1"
@@ -68,7 +68,7 @@ run_test 018 "tlf2 overlap centered mode
 run_test 019 "tlf2 full-width flush-left right-to-left mode" \
   "$cmd -WRl -f tests/emboss"
 run_test 020 "specify font directory" \
-  "X=`mktemp -d`;cp fonts/script.flf \$X/foo.flf;$cmd -d\$X -ffoo;rm -Rf \$X"
+  "X=`mktemp -d fonts.XXXXXX`;cp fonts/script.flf \$X/foo.flf;$cmd -d\$X -ffoo;rm -Rf \$X"
 run_test 021 "paragraph mode long line output" "$cmd -p -w250"
 run_test 022 "short line output" "$cmd -w5"
 run_test 023 "kerning paragraph centered mode (small)" "$cmd -kpc -fsmall"