update to 2.2.4

changes:
-misc fixes and improvements
-added selftest

5 files changed, 74 insertions, 51 deletions

diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index ab0533ec1fd..ca021357a5c 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2009/12/10 21:13:07 abs Exp $
+# $NetBSD: Makefile,v 1.21 2011/05/06 18:02:06 drochner Exp $
 
-DISTNAME=	figlet222
-PKGNAME=	figlet-2.2.2
-PKGREVISION=	1
+DISTNAME=	figlet-2.2.4
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.figlet.org/pub/figlet/program/unix/
 
@@ -17,4 +15,6 @@ MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}/man6
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
+TEST_TARGET=	check
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/figlet/PLIST b/misc/figlet/PLIST
index 69f4a3165a5..cd3a36d342c 100644
--- a/misc/figlet/PLIST
+++ b/misc/figlet/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:07:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/05/06 18:02:06 drochner Exp $
 bin/chkfont
 bin/figlet
 bin/figlist
 bin/showfigfonts
+man/man6/chkfont.6
 man/man6/figlet.6
+man/man6/figlist.6
+man/man6/showfigfonts.6
 share/figlet/646-ca.flc
 share/figlet/646-ca2.flc
 share/figlet/646-cn.flc
diff --git a/misc/figlet/distinfo b/misc/figlet/distinfo
index 1d976910caa..59347b150b9 100644
--- a/misc/figlet/distinfo
+++ b/misc/figlet/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2009/12/10 21:13:07 abs Exp $
+$NetBSD: distinfo,v 1.9 2011/05/06 18:02:06 drochner Exp $
 
-SHA1 (figlet222.tar.gz) = 138aa027f90c0d68429c7b71af4e51c176bab92b
-RMD160 (figlet222.tar.gz) = fc39809b1f5d5e498d722d49ae88132528633d9f
-Size (figlet222.tar.gz) = 166727 bytes
-SHA1 (patch-aa) = a12ec7c8374eff78a12340cfea2664bfd3ecd262
+SHA1 (figlet-2.2.4.tar.gz) = 365f1fce8525c0ff23631661f96534f06822e423
+RMD160 (figlet-2.2.4.tar.gz) = 158c833e7176f32b1f702482c4cb51dbfe2a4002
+Size (figlet-2.2.4.tar.gz) = 229245 bytes
+SHA1 (patch-aa) = 7ff721d16e0bbc61dae8d397944cb518e6330325
+SHA1 (patch-ab) = e798522fd5842afb2686a5265973f94c4b5a366b
diff --git a/misc/figlet/patches/patch-aa b/misc/figlet/patches/patch-aa
index da213fed80f..65d17cf0bc0 100644
--- a/misc/figlet/patches/patch-aa
+++ b/misc/figlet/patches/patch-aa
@@ -1,58 +1,55 @@
-$NetBSD: patch-aa,v 1.7 2009/12/10 21:13:07 abs Exp $
+$NetBSD: patch-aa,v 1.8 2011/05/06 18:02:06 drochner Exp $
 
---- Makefile.orig	2005-07-05 09:57:46.000000000 +0000
+--- Makefile.orig	2011-01-26 10:36:21.000000000 +0000
 +++ Makefile
-@@ -4,26 +4,26 @@
- # Copyright 1996, 1997, 1998, 1999, 2000, 2001 John Cowan
- # Copyright 2002 Christiaan Keet
+@@ -19,8 +19,8 @@
+ SHELL = /bin/sh
  
--# Please make sure DESTDIR, MANDIR, DEFAULTFONTDIR and
-+# Please make sure BINDIR, MANDIR, DEFAULTFONTDIR and
- #   DEFAULTFONTFILE are defined to reflect the situation
- #   on your computer.  See README for details.
+ # The C compiler and linker to use
+-CC	= gcc
+-CFLAGS	= -g -O2 -Wall
++CC	?= gcc
++CFLAGS	?= -g -O2 -Wall
+ LD	= gcc
+ LDFLAGS =
  
- # Don't change this even if your shell is different. The only reason
- # for changing this is if sh is not in the same place.
- SHELL = /bin/sh
--CC = gcc
--CFLAGS = -g
-+CC ?= gcc
-+CFLAGS ?= -g
+@@ -29,13 +29,13 @@ LDFLAGS =
+ XCFLAGS	= -DTLF_FONTS
+ 
+ # Where to install files
+-prefix	= /usr/local
++prefix	= ${PREFIX}
  
  # Where the executables should be put
--DESTDIR = /usr/local/bin
-+BINDIR = ${PREFIX}/bin
+ BINDIR	= $(prefix)/bin
  
  # Where the man page should be put
--MANDIR = /usr/local/man/man6
-+MANDIR = ${PREFIX}/man/man6
+-MANDIR	= $(prefix)/man
++#MANDIR	= $(prefix)/man
  
  # Where figlet will search first for fonts (the ".flf" files).
--DEFAULTFONTDIR = /usr/local/share/figlet
-+DEFAULTFONTDIR = ${PREFIX}/share/figlet
- # Use this definition if you can't put things in /usr/local/share/figlet
--DEFAULTFONTDIR = fonts
-+#DEFAULTFONTDIR = fonts
- 
- # The filename of the font to be used if no other is specified
- #   (standard.flf is recommended, but any other can be used).
-@@ -52,11 +52,11 @@ clean:
- 	rm -f *.o figlet chkfont
- 
- install: figlet chkfont
--	mkdir -p $(DEFAULTFONTDIR)
--	cp figlet $(DESTDIR)
--	cp figlet.6 $(MANDIR)
--	cp chkfont $(DESTDIR)
--	cp figlist $(DESTDIR)
--	cp showfigfonts $(DESTDIR)
--	cp fonts/*.flf $(DEFAULTFONTDIR)
--	cp fonts/*.flc $(DEFAULTFONTDIR)
+ DEFAULTFONTDIR = $(prefix)/share/figlet
+@@ -77,13 +77,16 @@ clean:
+ 	rm -f *.o *~ core figlet chkfont
+ 
+ install: all
+-	mkdir -p $(DESTDIR)$(BINDIR)
+-	mkdir -p $(DESTDIR)$(MANDIR)/man6
+-	mkdir -p $(DESTDIR)$(DEFAULTFONTDIR)
+-	cp $(BINS) $(DESTDIR)$(BINDIR)
+-	cp $(MANUAL) $(DESTDIR)$(MANDIR)/man6
+-	cp fonts/*.flf $(DESTDIR)$(DEFAULTFONTDIR)
+-	cp fonts/*.flc $(DESTDIR)$(DEFAULTFONTDIR)
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(BINDIR)
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(MANDIR)
 +	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(DEFAULTFONTDIR)
 +	${BSD_INSTALL_PROGRAM} figlet $(DESTDIR)$(BINDIR)
-+	${BSD_INSTALL_DATA} figlet.6 $(DESTDIR)$(MANDIR)
 +	${BSD_INSTALL_PROGRAM} chkfont $(DESTDIR)$(BINDIR)
 +	${BSD_INSTALL_SCRIPT} figlist $(DESTDIR)$(BINDIR)
 +	${BSD_INSTALL_SCRIPT} showfigfonts $(DESTDIR)$(BINDIR)
++	${BSD_INSTALL_DATA} $(MANUAL) $(DESTDIR)$(MANDIR)
 +	${BSD_INSTALL_DATA} fonts/*.flf $(DESTDIR)$(DEFAULTFONTDIR)
 +	${BSD_INSTALL_DATA} fonts/*.flc $(DESTDIR)$(DEFAULTFONTDIR)
+ 
+ dist:
+ 	rm -Rf $(DIST) $(DIST).tar.gz
diff --git a/misc/figlet/patches/patch-ab b/misc/figlet/patches/patch-ab
new file mode 100644
index 00000000000..3f2c178eb10
--- /dev/null
+++ b/misc/figlet/patches/patch-ab
@@ -0,0 +1,22 @@
+$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"