Upgrade to 2.2.

PR:		3905
Submitted by:	Brian Handy <handy@lambic.space.lockheed.com>

4 files changed, 64 insertions, 20 deletions

diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index 1927401e16f5..66bbb24a98d9 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -1,17 +1,16 @@
 # New ports collection makefile for:    figlet
-# Version required:     2.1.1
+# Version required:     2.2
 # Date created:         Sat July 20, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.3 1996/11/11 05:49:33 obrien Exp $
+# $Id: Makefile,v 1.4 1996/11/13 12:41:21 asami Exp $
 #
 
-DISTNAME=	figlet2.1.1
-PKGNAME=	figlet-2.1.1
+DISTNAME=	figlet22
+PKGNAME=	figlet-2.2
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.nicoh.com/pub/figlet/program/unix/  \
 		ftp://ftp.wwa.com/pub/Scarecrow/Figlet/Unix/
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=     obrien@cs.ucdavis.edu
 
diff --git a/misc/figlet/distinfo b/misc/figlet/distinfo
index e7c62974882e..97cb0ee004b4 100644
--- a/misc/figlet/distinfo
+++ b/misc/figlet/distinfo
@@ -1 +1 @@
-MD5 (figlet2.1.1.tar.Z) = 840c209cf4c849fa4ae4486bb6d5653a
+MD5 (figlet22.tar.gz) = bf85b4c938e75c39fe4a31dd60626924
diff --git a/misc/figlet/files/patch-aa b/misc/figlet/files/patch-aa
index 4c69356dbdaf..ff8892993e40 100644
--- a/misc/figlet/files/patch-aa
+++ b/misc/figlet/files/patch-aa
@@ -1,32 +1,35 @@
---- Makefile.orig	Fri Apr 28 15:10:36 1995
-+++ Makefile	Sun Jul 21 04:36:14 1996
-@@ -10,14 +10,15 @@
+--- Makefile.orig	Tue Feb 18 22:46:29 1997
++++ Makefile	Fri Jun 20 14:34:48 1997
+@@ -10,18 +10,18 @@
+ # for changing this is if sh is not in the same place.
  SHELL = /bin/sh
+ CC = gcc
+-CFLAGS = -g
++#CFLAGS = -g
  
  # Where the executables should be put
--DESTDIR = /usr/games
-+###DESTDIR = /usr/games
+-DESTDIR = /home_c2/johnson/chai/figlet/bin
 +DESTDIR = $(PREFIX)/bin
  
  # Where the man page should be put
--MANDIR = /usr/man/man6
+-MANDIR = /home_c2/johnson/chai/man/man6
 +MANDIR = $(PREFIX)/man/man6
  
- # Where figlet will search first for fonts (the ".flf" files) and
- #   control files (the ".flc" files).
--DEFAULTFONTDIR = /usr/games/lib/figlet.dir
+ # Where figlet will search first for fonts (the ".flf" files).
+ # DEFAULTFONTDIR = $(DESTDIR)/lib/figlet.dir
+ # Use this definition if you can't put things in /usr/games
+-DEFAULTFONTDIR = /home_c2/johnson/chai/figlet/fonts
 +DEFAULTFONTDIR = $(PREFIX)/share/figlet
  
  # The filename of the font to be used if no other is specified
  #   (standard.flf is recommended, but any other can be used).
-@@ -48,8 +49,10 @@
+@@ -51,7 +51,9 @@
+ 
  install: figlet chkfont
- 	- mkdir $(DEFAULTFONTDIR)
- 	chmod 755 $(DEFAULTFONTDIR)
+ 	mkdir $(DEFAULTFONTDIR)
 +	strip figlet
  	cp figlet $(DESTDIR)
- 	chmod 755 $(DESTDIR)/figlet
 +	strip chkfont
  	cp chkfont $(DESTDIR)
- 	chmod 755 $(DESTDIR)/chkfont
  	cp figlist $(DESTDIR)
+ 	cp showfigfonts $(DESTDIR)
diff --git a/misc/figlet/pkg-plist b/misc/figlet/pkg-plist
index 800013bf9e8a..987c76c8a7d5 100644
--- a/misc/figlet/pkg-plist
+++ b/misc/figlet/pkg-plist
@@ -3,12 +3,50 @@ bin/chkfont
 bin/figlist
 bin/showfigfonts
 man/man6/figlet.6.gz
+share/figlet/646-ca.flc
+share/figlet/646-ca2.flc
+share/figlet/646-cn.flc
+share/figlet/646-cu.flc
+share/figlet/646-de.flc
+share/figlet/646-dk.flc
+share/figlet/646-es.flc
+share/figlet/646-es2.flc
+share/figlet/646-fr.flc
+share/figlet/646-gb.flc
+share/figlet/646-hu.flc
+share/figlet/646-irv.flc
+share/figlet/646-it.flc
+share/figlet/646-jp.flc
+share/figlet/646-kr.flc
+share/figlet/646-no.flc
+share/figlet/646-no2.flc
+share/figlet/646-pt.flc
+share/figlet/646-pt2.flc
+share/figlet/646-se.flc
+share/figlet/646-se2.flc
+share/figlet/646-yu.flc
+share/figlet/8859-2.flc
+share/figlet/8859-3.flc
+share/figlet/8859-4.flc
+share/figlet/8859-5.flc
+share/figlet/8859-7.flc
+share/figlet/8859-8.flc
+share/figlet/8859-9.flc
+share/figlet/banner.flf
 share/figlet/big.flf
 share/figlet/block.flf
 share/figlet/bubble.flf
 share/figlet/digital.flf
+share/figlet/frango.flc
+share/figlet/hz.flc
+share/figlet/ilhebrew.flc
+share/figlet/ivrit.flf
+share/figlet/jis0201.flc
+share/figlet/koi8r.flc
 share/figlet/lean.flf
 share/figlet/mini.flf
+share/figlet/mnemonic.flf
+share/figlet/moscow.flc
 share/figlet/script.flf
 share/figlet/shadow.flf
 share/figlet/slant.flf
@@ -19,3 +57,7 @@ share/figlet/smslant.flf
 share/figlet/standard.flf
 share/figlet/term.flf
 share/figlet/upper.flc
+share/figlet/ushebrew.flc
+share/figlet/uskata.flc
+share/figlet/utf8.flc
+@dirrm share/figlet