Adapt include conversion scripts to recent versions of "netpbm" and add

the missing dependence on "netpbm" package. This fixes PR pkg/16416
by Greg A. Woods. Bump the package revision to 2 after these fixes.

5 files changed, 62 insertions, 4 deletions

diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index eac32cd9c68..ba50f427418 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2002/07/07 14:14:14 tron Exp $
+# $NetBSD: Makefile,v 1.26 2002/07/07 14:25:52 tron Exp $
 
 DISTNAME=	faces-1.6.1
-PKGREVISION=	1
+PKGREVISION=	2
 WRKSRC=		${WRKDIR}/faces
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/faces/
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	packages@netbsd.org
 COMMENT=	visual mail, user and print face server
 
-DEPENDS+=	netpbm>=9.25:../../graphics/netpbm
+DEPENDS+=	netpbm>=9.2:../../graphics/netpbm
 
 LICENSE=	limited-redistribution
 RESTRICTED=	"Distribution not allowed if money exchanged"
diff --git a/mail/faces/distinfo b/mail/faces/distinfo
index 3497b612cc6..7a21f5c9102 100644
--- a/mail/faces/distinfo
+++ b/mail/faces/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/11/30 16:29:28 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/07/07 14:25:52 tron Exp $
 
 SHA1 (faces-1.6.1.tar.Z) = 8402a74e43e78345c23a975a417c2407322db65f
 Size (faces-1.6.1.tar.Z) = 249469 bytes
@@ -25,3 +25,6 @@ SHA1 (patch-at) = abef0f35020fb8246ecef0dbe148f77da841ec44
 SHA1 (patch-au) = 582e9ad10b44e2e8af10c5c5e8682a7bfe508318
 SHA1 (patch-av) = 1ef88ca0a9b72d783f318242d152d23510f7949a
 SHA1 (patch-aw) = a53df4bc5b1eb696bc9416f7109d152d735b76f7
+SHA1 (patch-ax) = d815d247fbbfe9a0553bd3c2187d842269d36000
+SHA1 (patch-ay) = 47cfbfb581fcfb9a781c76dd9dfdcd410ce39a93
+SHA1 (patch-az) = 1d753d201e2c4790a027b0ccad1da3ce02e20085
diff --git a/mail/faces/patches/patch-ax b/mail/faces/patches/patch-ax
new file mode 100644
index 00000000000..8108a858db8
--- /dev/null
+++ b/mail/faces/patches/patch-ax
@@ -0,0 +1,21 @@
+$NetBSD: patch-ax,v 1.1 2002/07/07 14:25:53 tron Exp $
+
+--- filters/fs2ikon.orig	Thu Oct 24 03:26:14 1991
++++ filters/fs2ikon	Sun Jul  7 16:18:17 2002
+@@ -26,14 +26,14 @@
+     y=$2
+     if [ $x -ge $y ]
+     then
+-	ppmscale -width 48 $file.pgm | ppmtopgm | pgmtopbm > $file.pbm
++	pnmscale -width 48 $file.pgm | ppmtopgm | pgmtopbm > $file.pbm
+ 	set `sed -n -e 2p -e 2q $file.pbm`
+ 	yo=`expr '(' 48 - $2 ')' / 2`
+ 	pbmmake 48 48 |
+ 	    pnmpaste $file.pbm 0 $yo |
+ 	    pbmtoicon 
+     else
+-	ppmscale -height 48 $file.pgm | ppmtopgm | pgmtopbm > $file.pbm
++	pnmscale -height 48 $file.pgm | ppmtopgm | pgmtopbm > $file.pbm
+ 	set `sed -n -e 2p -e 2q $file.pbm`
+ 	xo=`expr '(' 48 - $1 ')' / 2`
+ 	pbmmake 48 48 |
diff --git a/mail/faces/patches/patch-ay b/mail/faces/patches/patch-ay
new file mode 100644
index 00000000000..d46d955b459
--- /dev/null
+++ b/mail/faces/patches/patch-ay
@@ -0,0 +1,21 @@
+$NetBSD: patch-ay,v 1.1 2002/07/07 14:25:53 tron Exp $
+
+--- filters/fs2xbm.orig	Tue Nov 19 05:02:32 1991
++++ filters/fs2xbm	Sun Jul  7 16:19:16 2002
+@@ -35,14 +35,14 @@
+ 
+ if test $x -ge $y
+ then
+-	ppmscale -width 48 $tmp1 | ppmtopgm | pgmtopbm > $tmp2
++	pnmscale -width 48 $tmp1 | ppmtopgm | pgmtopbm > $tmp2
+ 	set `sed -n -e 2p -e 2q $tmp2`
+ 	yo=`expr '(' 48 - $2 ')' / 2`
+ 	pbmmake 48 48 |
+ 	    pnmpaste $tmp2 0 $yo |
+ 	    pbmtoxbm 
+ else
+-	ppmscale -height 48 $tmp1 | ppmtopgm | pgmtopbm > $tmp2
++	pnmscale -height 48 $tmp1 | ppmtopgm | pgmtopbm > $tmp2
+ 	set `sed -n -e 2p -e 2q $tmp2`
+ 	xo=`expr '(' 48 - $1 ')' / 2`
+ 	pbmmake 48 48 |
diff --git a/mail/faces/patches/patch-az b/mail/faces/patches/patch-az
new file mode 100644
index 00000000000..4cd065b27b1
--- /dev/null
+++ b/mail/faces/patches/patch-az
@@ -0,0 +1,13 @@
+$NetBSD: patch-az,v 1.1 2002/07/07 14:25:53 tron Exp $
+
+--- filters/xbmsize48.orig	Tue Nov 19 05:02:32 1991
++++ filters/xbmsize48	Sun Jul  7 16:19:23 2002
+@@ -43,7 +43,7 @@
+ 	else	dim=ysize
+ 	fi
+ 
+-	xbmtopbm < $tmp | ppmscale -$dim $size |
++	xbmtopbm < $tmp | pnmscale -$dim $size |
+ 	ppmtopgm | pgmtopbm | pbmtoxbm > $tmp2
+ 	mv $tmp2 $tmp
+ fi