Replace "/usr/local" by "${LOCALBASE}". Fixes PR pkg/10360, pkg/10465

and pkg/10529.

23 files changed, 121 insertions, 122 deletions

diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index dff7f9ef002..ae7c3ec8cd1 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/05/24 09:15:57 agc Exp $
+# $NetBSD: Makefile,v 1.15 2000/07/08 12:47:02 tron Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/17 18:47:53 max Exp
 #
 
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/faces/ \
 		ftp://odie.physik2.uni-rostock.de/pub/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
+MAINTAINER=	packages@netbsd.org
 
 WRKSRC=		${WRKDIR}/faces
 
@@ -17,7 +17,9 @@ USE_X11=	yes
 MAKE_ENV+=	MKLINT=no
 
 post-configure:
-	@for f in ${WRKSRC}/Makefile ${WRKSRC}/faces.h ${WRKSRC}/x11.c; do \
+	@cd ${WRKSRC}; \
+	for f in Makefile faces.h x11.c scripts/addxface scripts/facesall \
+	          scripts/mkfacesindex; do \
 		${MV} $$f $$f.in;					\
 		${SED} -e 's|@localbase@|'${LOCALBASE}'|g' 		\
 			-e 's|@x11base@|'${X11BASE}'|g' < $$f.in > $$f;	\
diff --git a/mail/faces/files/patch-sum b/mail/faces/files/patch-sum
index 2b1a1fb8876..3b869bb5f1c 100644
--- a/mail/faces/files/patch-sum
+++ b/mail/faces/files/patch-sum
@@ -1,23 +1,23 @@
-$NetBSD: patch-sum,v 1.4 2000/05/24 09:15:57 agc Exp $
+$NetBSD: patch-sum,v 1.5 2000/07/08 12:47:04 tron Exp $
 
-MD5 (patch-aa) = 04f786ec57e4d3a11393072483e1c4ba
-MD5 (patch-ab) = 623cfc9d0dd80a572a2c616154707fca
-MD5 (patch-ac) = ccce922aaf0dd4f0e00f64f4183c3977
-MD5 (patch-ad) = e5b37b52b8a19ff7cadc6bdb996b0ab2
-MD5 (patch-ae) = 99849ef6139164b7236a762c5f637a59
-MD5 (patch-af) = 3c8d019b110858654bca6b1d9c858297
-MD5 (patch-ag) = 071d0cb4307a6cd1647e045438a4fcc5
-MD5 (patch-ah) = 997a29d10f66acbade6853a18ec6aa52
-MD5 (patch-ai) = 1d024890def667f537f8b0bdc7184810
-MD5 (patch-aj) = 3c9d859a47994b61ab38bd4d627133ee
-MD5 (patch-ak) = 80cda147934f2da4c62e36a7ef4773c2
-MD5 (patch-al) = d98bdd0b496f2750787438462ea9bb83
-MD5 (patch-am) = 1aa1ab77ec3edaf68eaeca85e29e9fc6
-MD5 (patch-an) = 7a187e019867b8b5e3417ab73358b9ff
-MD5 (patch-ao) = 2c613570360b905ac4da6c98412bae52
-MD5 (patch-ap) = cc3d201a559cb11bb38462c94cf3351f
-MD5 (patch-aq) = 6b0a98154438125c324b7720d3da4c20
-MD5 (patch-ar) = dde31242d096a81b2c35f0f3c3014ae0
-MD5 (patch-as) = d9e9328ca07da4241db0ea8f498e80ab
-MD5 (patch-at) = bbd8a0edab657789e9b4cc0596e9d696
-MD5 (patch-au) = cb378ac6dcd075c712ffc3df7f3eb34c
+MD5 (patch-aa) = 052e47d7ef63e511fcd5d2d1cc306ba1
+MD5 (patch-ab) = a06f919cdbc0400653139d2978fb1445
+MD5 (patch-ac) = 36f893a6e4d333e2b0bde29078ffa755
+MD5 (patch-ad) = 8c46ea454eaf308aaa2940b051974dfd
+MD5 (patch-ae) = f56893cac29f4610d535974407a47fa5
+MD5 (patch-af) = 23e22d4fcbd94ef7f89cb6f87739489e
+MD5 (patch-ag) = 90af4d1d52cbba989a41178b987662dc
+MD5 (patch-ah) = 0222f2df5bf77e662da4e13a672e4461
+MD5 (patch-ai) = 434b15d197e77379bb420c9fb0fff138
+MD5 (patch-aj) = ebdd5903ef340077e6e486080dc0e97a
+MD5 (patch-ak) = 0b663201f39a8728094210e17d6645f0
+MD5 (patch-al) = ec5499ed1a1f71d484284f45f5ec5081
+MD5 (patch-am) = 0996c2b2f6ee59b9c292f2510d24bcb2
+MD5 (patch-an) = cacfe44402e0f773a9c7fea116a4a16a
+MD5 (patch-ao) = 39d6d7a910da6d64ae35a0aa717cd759
+MD5 (patch-ap) = d7f82cf8262109362d432d9d92c7b281
+MD5 (patch-aq) = 09927d545bbbda20b3198dfdd0c308a3
+MD5 (patch-ar) = 1f692c496ff98cac060c3f560ef9b2f3
+MD5 (patch-as) = a43e19748e3bef604d57900618e48895
+MD5 (patch-at) = 09190a1be51620a034ee326cc3befd74
+MD5 (patch-au) = 17557ea50fc9fbc20faa3fbf8c1d4c6b
diff --git a/mail/faces/patches/patch-aa b/mail/faces/patches/patch-aa
index 4ef9290ebd9..80f74bc14e7 100644
--- a/mail/faces/patches/patch-aa
+++ b/mail/faces/patches/patch-aa
@@ -1,8 +1,7 @@
-$NetBSD: patch-aa,v 1.5 1999/10/01 07:49:19 simonb Exp $
+$NetBSD: patch-aa,v 1.6 2000/07/08 12:47:04 tron Exp $
 
-diff -ur ../faces-DIST/Faces.ad ./Faces.ad
---- ../faces-DIST/Faces.ad	Mon Jul  1 11:25:46 1991
-+++ ./Faces.ad	Fri Oct  1 14:32:02 1999
+--- Faces.ad.orig	Mon Jul  1 03:25:46 1991
++++ Faces.ad	Sat Jul  8 14:25:27 2000
 @@ -13,5 +13,5 @@
  faces.displayHostname:		false
  
diff --git a/mail/faces/patches/patch-ab b/mail/faces/patches/patch-ab
index bf26961785f..3a467a20051 100644
--- a/mail/faces/patches/patch-ab
+++ b/mail/faces/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2000/05/24 09:15:58 agc Exp $
+$NetBSD: patch-ab,v 1.6 2000/07/08 12:47:04 tron Exp $
 
---- /dev/null	Wed May 24 10:07:55 2000
-+++ Makefile	Wed May 24 10:11:02 2000
+--- Makefile.orig	Sat Jul  8 14:25:27 2000
++++ Makefile	Sat Jul  8 14:28:16 2000
 @@ -0,0 +1,475 @@
 +#
 +#  Makefile for faces, an icon face server, plus associated software.
@@ -28,7 +28,7 @@ $NetBSD: patch-ab,v 1.5 2000/05/24 09:15:58 agc Exp $
 +#
 +#========================================================================
 +# Installation prefix.
-+PREFIX           ?=/usr/local
++#PREFIX           ?=/usr/local
 +#------------------------------------------------------------------------
 +#  If you want audio support, then the following line should be uncommented.
 +#
@@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.5 2000/05/24 09:15:58 agc Exp $
 +#  play audio files. Alternatively you can specify your own custom
 +#  command here. Uncomment the following line and set appropriately.
 +#
-+AUDIO_CMD         = -DAUDIO_CMD=\"/usr/local/bin/rplay\"
++AUDIO_CMD         = -DAUDIO_CMD=\"$(PREFIX)/bin/rplay\"
 +#========================================================================
 +#  Faces displays a background pattern in its' window. When the window
 +#  is not completely full, this gives the appearance of trying to blend
@@ -46,7 +46,7 @@ $NetBSD: patch-ab,v 1.5 2000/05/24 09:15:58 agc Exp $
 +#  can specify the name of a file containing an alternate pattern to use.
 +#  Uncomment the next two lines and set appropriately.
 +#
-+#BACKNAME          = /usr/local/sample-background
++#BACKNAME          = $(PREFIX)/sample-background
 +#BACKGROUND        = -DBACKGROUND=\"$(BACKNAME)\"
 +#------------------------------------------------------------------------
 +#  Uncomment the following two lines to use the Domain Name Service to 
@@ -80,12 +80,12 @@ $NetBSD: patch-ab,v 1.5 2000/05/24 09:15:58 agc Exp $
 +#
 +#DONTSHOWUSER     = -DDONTSHOWUSER
 +#------------------------------------------------------------------------
-+#  By default, faces looks for the face images in /usr/local/faces. If
++#  By default, faces looks for the face images in $(PREFIX)/faces. If
 +#  you wish to specify an alternate location, then these two lines should
 +#  be uncommented and set appropriately. Note that the value must be
 +#  a single directory name, not a colon separated list of paths.
 +#               
-+FACEDIR           = /usr/local/share/faces
++FACEDIR           = $(PREFIX)/share/faces
 +CFACEDIR	= -DFACEDIR=\"$(FACEDIR)\"
 +#------------------------------------------------------------------------
 +#  It is possible to determine what type of monitoring faces does at
diff --git a/mail/faces/patches/patch-ac b/mail/faces/patches/patch-ac
index 1b7c741a084..48a9113afb6 100644
--- a/mail/faces/patches/patch-ac
+++ b/mail/faces/patches/patch-ac
@@ -1,8 +1,7 @@
-$NetBSD: patch-ac,v 1.6 1999/12/05 22:06:22 bouyer Exp $
+$NetBSD: patch-ac,v 1.7 2000/07/08 12:47:05 tron Exp $
 
-diff -ur ../faces-DIST/compface/Makefile ./compface/Makefile
---- ../faces-DIST/compface/Makefile	Thu Oct 24 12:28:06 1991
-+++ ./compface/Makefile	Fri Oct  1 14:32:06 1999
+--- compface/Makefile.orig	Thu Oct 24 03:28:06 1991
++++ compface/Makefile	Sat Jul  8 14:28:58 2000
 @@ -19,62 +19,64 @@
  #
  #SYSV           = -DSYSV32
@@ -11,11 +10,13 @@ diff -ur ../faces-DIST/compface/Makefile ./compface/Makefile
 +# BINDIR, LIBDIR, INCDIR and MANDIR are expected to be overridden by the
  # calling Makefile
  
- BINDIR		= /usr/local/bin
- LIBDIR		= /usr/local/lib
+-BINDIR		= /usr/local/bin
+-LIBDIR		= /usr/local/lib
 -MANDIR		= /usr/manl
-+INCDIR		= /usr/local/include
-+MANDIR		= /usr/local/man
++BINDIR		= $(PREFIX)/bin
++LIBDIR		= $(PREFIX)/lib
++INCDIR		= $(PREFIX)/include
++MANDIR		= $(PREFIX)/man
  
  NAME		= compface
  UNNAME		= uncompface
diff --git a/mail/faces/patches/patch-ad b/mail/faces/patches/patch-ad
index e65f7b19431..2116c85d15c 100644
--- a/mail/faces/patches/patch-ad
+++ b/mail/faces/patches/patch-ad
@@ -1,8 +1,7 @@
-$NetBSD: patch-ad,v 1.4 1999/10/01 07:49:20 simonb Exp $
+$NetBSD: patch-ad,v 1.5 2000/07/08 12:47:05 tron Exp $
 
-diff -ur ../faces-DIST/compface/compface.1 ./compface/compface.1
---- ../faces-DIST/compface/compface.1	Fri Mar 15 15:10:29 1991
-+++ ./compface/compface.1	Fri Oct  1 14:32:06 1999
+--- compface/compface.1.orig	Fri Mar 15 06:10:29 1991
++++ compface/compface.1	Sat Jul  8 14:25:27 2000
 @@ -12,6 +12,8 @@
  .LP
  .B uncompface
diff --git a/mail/faces/patches/patch-ae b/mail/faces/patches/patch-ae
index 333389a558f..d69328d5840 100644
--- a/mail/faces/patches/patch-ae
+++ b/mail/faces/patches/patch-ae
@@ -1,8 +1,7 @@
-$NetBSD: patch-ae,v 1.4 1999/10/01 07:49:20 simonb Exp $
+$NetBSD: patch-ae,v 1.5 2000/07/08 12:47:05 tron Exp $
 
-diff -ur ../faces-DIST/compface/file.c ./compface/file.c
---- ../faces-DIST/compface/file.c	Wed Jun 19 16:29:13 1991
-+++ ./compface/file.c	Fri Oct  1 14:32:06 1999
+--- compface/file.c.orig	Wed Jun 19 08:29:13 1991
++++ compface/file.c	Sat Jul  8 14:25:27 2000
 @@ -15,6 +15,8 @@
  
  #include "compface.h"
diff --git a/mail/faces/patches/patch-af b/mail/faces/patches/patch-af
index 05b2dfc2377..b7d20674806 100644
--- a/mail/faces/patches/patch-af
+++ b/mail/faces/patches/patch-af
@@ -1,8 +1,7 @@
-$NetBSD: patch-af,v 1.2 1999/10/01 07:49:20 simonb Exp $
+$NetBSD: patch-af,v 1.3 2000/07/08 12:47:05 tron Exp $
 
-diff -ur ../faces-DIST/compface/uncmain.c ./compface/uncmain.c
---- ../faces-DIST/compface/uncmain.c	Thu Oct 24 12:28:07 1991
-+++ ./compface/uncmain.c	Fri Oct  1 14:32:06 1999
+--- compface/uncmain.c.orig	Thu Oct 24 03:28:07 1991
++++ compface/uncmain.c	Sat Jul  8 14:25:27 2000
 @@ -18,6 +18,8 @@
  #include <fcntl.h>
  #include "compface.h"
diff --git a/mail/faces/patches/patch-ag b/mail/faces/patches/patch-ag
index d3c33f2da22..15789cda9f6 100644
--- a/mail/faces/patches/patch-ag
+++ b/mail/faces/patches/patch-ag
@@ -1,8 +1,7 @@
-$NetBSD: patch-ag,v 1.2 1999/10/01 07:49:20 simonb Exp $
+$NetBSD: patch-ag,v 1.3 2000/07/08 12:47:06 tron Exp $
 
-diff -ur ../faces-DIST/extern.h ./extern.h
---- ../faces-DIST/extern.h	Tue Nov 19 15:00:48 1991
-+++ ./extern.h	Fri Oct  1 14:32:02 1999
+--- extern.h.orig	Tue Nov 19 05:00:48 1991
++++ extern.h	Sat Jul  8 14:25:27 2000
 @@ -82,6 +82,7 @@
  extern int facetype ;      /* Type of face file found. */
  extern int firsttime ;     /* Zeroised after first mail/printer check. */
diff --git a/mail/faces/patches/patch-ah b/mail/faces/patches/patch-ah
index cc7ad14bc11..b15cd33437e 100644
--- a/mail/faces/patches/patch-ah
+++ b/mail/faces/patches/patch-ah
@@ -1,8 +1,7 @@
-$NetBSD: patch-ah,v 1.2 1999/10/01 07:49:20 simonb Exp $
+$NetBSD: patch-ah,v 1.3 2000/07/08 12:47:06 tron Exp $
 
-diff -ur ../faces-DIST/faces.h ./faces.h
---- ../faces-DIST/faces.h	Tue Nov 19 15:00:49 1991
-+++ ./faces.h	Fri Oct  1 14:32:03 1999
+--- faces.h.orig	Tue Nov 19 05:00:49 1991
++++ faces.h	Sat Jul  8 14:25:27 2000
 @@ -44,7 +44,7 @@
  #endif  /* STDC */
  
diff --git a/mail/faces/patches/patch-ai b/mail/faces/patches/patch-ai
index 8f1128124d2..b342fe0ae57 100644
--- a/mail/faces/patches/patch-ai
+++ b/mail/faces/patches/patch-ai
@@ -1,8 +1,7 @@
-$NetBSD: patch-ai,v 1.2 1999/10/01 07:49:20 simonb Exp $
+$NetBSD: patch-ai,v 1.3 2000/07/08 12:47:06 tron Exp $
 
-diff -ur ../faces-DIST/faces.sendmail ./faces.sendmail
---- ../faces-DIST/faces.sendmail	Mon Jul  1 11:25:50 1991
-+++ ./faces.sendmail	Fri Oct  1 14:32:02 1999
+--- faces.sendmail.orig	Mon Jul  1 03:25:50 1991
++++ faces.sendmail	Sat Jul  8 14:25:27 2000
 @@ -37,4 +37,4 @@
  	-e ': copy' \
  	-e p \
diff --git a/mail/faces/patches/patch-aj b/mail/faces/patches/patch-aj
index 0a35d65b0cb..0f031429fad 100644
--- a/mail/faces/patches/patch-aj
+++ b/mail/faces/patches/patch-aj
@@ -1,8 +1,7 @@
-$NetBSD: patch-aj,v 1.2 1999/10/01 07:49:20 simonb Exp $
+$NetBSD: patch-aj,v 1.3 2000/07/08 12:47:06 tron Exp $
 
-diff -ur ../faces-DIST/filters/Makefile ./filters/Makefile
---- ../faces-DIST/filters/Makefile	Thu Oct 24 12:26:14 1991
-+++ ./filters/Makefile	Fri Oct  1 14:32:09 1999
+--- filters/Makefile.orig	Thu Oct 24 03:26:14 1991
++++ filters/Makefile	Sat Jul  8 14:25:27 2000
 @@ -34,7 +34,7 @@
  
  CC		= cc
diff --git a/mail/faces/patches/patch-ak b/mail/faces/patches/patch-ak
index ce1e1339305..b357e058e8d 100644
--- a/mail/faces/patches/patch-ak
+++ b/mail/faces/patches/patch-ak
@@ -1,8 +1,7 @@
-$NetBSD: patch-ak,v 1.2 1999/10/01 07:49:20 simonb Exp $
+$NetBSD: patch-ak,v 1.3 2000/07/08 12:47:07 tron Exp $
 
-diff -ur ../faces-DIST/filters/ikon2icon.c ./filters/ikon2icon.c
---- ../faces-DIST/filters/ikon2icon.c	Mon Apr 15 13:40:02 1991
-+++ ./filters/ikon2icon.c	Fri Oct  1 14:32:15 1999
+--- filters/ikon2icon.c.orig	Mon Apr 15 05:40:02 1991
++++ filters/ikon2icon.c	Sat Jul  8 14:25:27 2000
 @@ -13,12 +13,17 @@
   *  either to the comments or the code of this program, but if reported
   *  to me, then an attempt will be made to fix them.
diff --git a/mail/faces/patches/patch-al b/mail/faces/patches/patch-al
index d7724c5fb50..16e3df5b9d0 100644
--- a/mail/faces/patches/patch-al
+++ b/mail/faces/patches/patch-al
@@ -1,8 +1,7 @@
-$NetBSD: patch-al,v 1.2 1999/10/01 07:49:20 simonb Exp $
+$NetBSD: patch-al,v 1.3 2000/07/08 12:47:07 tron Exp $
 
-diff -ur ../faces-DIST/filters/ikon2xbm ./filters/ikon2xbm
---- ../faces-DIST/filters/ikon2xbm	Tue May  7 08:51:50 1991
-+++ ./filters/ikon2xbm	Fri Oct  1 14:32:09 1999
+--- filters/ikon2xbm.orig	Tue May  7 00:51:50 1991
++++ filters/ikon2xbm	Sat Jul  8 14:25:27 2000
 @@ -26,7 +26,7 @@
  \2\
  \3/' > $tmp
diff --git a/mail/faces/patches/patch-am b/mail/faces/patches/patch-am
index 7cbf5b3a12a..d80dd71231f 100644
--- a/mail/faces/patches/patch-am
+++ b/mail/faces/patches/patch-am
@@ -1,8 +1,7 @@
-$NetBSD: patch-am,v 1.2 1999/10/01 07:49:21 simonb Exp $
+$NetBSD: patch-am,v 1.3 2000/07/08 12:47:07 tron Exp $
 
-diff -ur ../faces-DIST/filters/rs2icon.c ./filters/rs2icon.c
---- ../faces-DIST/filters/rs2icon.c	Mon Apr 15 13:40:03 1991
-+++ ./filters/rs2icon.c	Fri Oct  1 14:32:15 1999
+--- filters/rs2icon.c.orig	Mon Apr 15 05:40:03 1991
++++ filters/rs2icon.c	Sat Jul  8 14:25:27 2000
 @@ -21,7 +21,7 @@
   */
  
diff --git a/mail/faces/patches/patch-an b/mail/faces/patches/patch-an
index 7e49c302f5c..57bb996181c 100644
--- a/mail/faces/patches/patch-an
+++ b/mail/faces/patches/patch-an
@@ -1,8 +1,7 @@
-$NetBSD: patch-an,v 1.2 1999/10/01 07:49:21 simonb Exp $
+$NetBSD: patch-an,v 1.3 2000/07/08 12:47:07 tron Exp $
 
-diff -ur ../faces-DIST/main.c ./main.c
---- ../faces-DIST/main.c	Tue Nov 19 15:00:47 1991
-+++ ./main.c	Fri Oct  1 14:32:02 1999
+--- main.c.orig	Tue Nov 19 05:00:47 1991
++++ main.c	Sat Jul  8 14:25:27 2000
 @@ -25,7 +25,7 @@
  #include <sys/param.h>
  #include <sys/types.h>
diff --git a/mail/faces/patches/patch-ao b/mail/faces/patches/patch-ao
index b6cfdd2b6bf..34e159f708c 100644
--- a/mail/faces/patches/patch-ao
+++ b/mail/faces/patches/patch-ao
@@ -1,8 +1,7 @@
-$NetBSD: patch-ao,v 1.2 1999/10/01 07:49:21 simonb Exp $
+$NetBSD: patch-ao,v 1.3 2000/07/08 12:47:08 tron Exp $
 
-diff -ur ../faces-DIST/mon.c ./mon.c
---- ../faces-DIST/mon.c	Tue Nov 19 15:00:48 1991
-+++ ./mon.c	Fri Oct  1 14:32:18 1999
+--- mon.c.orig	Tue Nov 19 05:00:48 1991
++++ mon.c	Sat Jul  8 14:25:27 2000
 @@ -23,7 +23,8 @@
  #endif /* SYSV32 || hpux */
  #include <sys/types.h>
diff --git a/mail/faces/patches/patch-ap b/mail/faces/patches/patch-ap
index 204e7e0a483..846a9dc5747 100644
--- a/mail/faces/patches/patch-ap
+++ b/mail/faces/patches/patch-ap
@@ -1,10 +1,15 @@
-$NetBSD: patch-ap,v 1.2 1999/10/01 07:49:21 simonb Exp $
+$NetBSD: patch-ap,v 1.3 2000/07/08 12:47:08 tron Exp $
 
-diff -ur ../faces-DIST/scripts/Makefile ./scripts/Makefile
---- ../faces-DIST/scripts/Makefile	Tue May  7 08:55:26 1991
-+++ ./scripts/Makefile	Fri Oct  1 14:32:12 1999
-@@ -15,16 +15,16 @@
- BINDIR	= /usr/local/faces/bin
+--- scripts/Makefile.orig	Tue May  7 00:55:26 1991
++++ scripts/Makefile	Sat Jul  8 14:30:16 2000
+@@ -11,20 +11,20 @@
+ #
+ #  BINDIR is expected to be overridden by the calling Makefile
+ 
+-LBINDIR = /usr/local/bin
+-BINDIR	= /usr/local/faces/bin
++LBINDIR = $(PREFIX)/bin
++BINDIR	= $(PREFIX)/faces/bin
  
  install:
 -	install -c -m 755 addxface $(BINDIR)
diff --git a/mail/faces/patches/patch-aq b/mail/faces/patches/patch-aq
index 76f57750df7..0e64d64e218 100644
--- a/mail/faces/patches/patch-aq
+++ b/mail/faces/patches/patch-aq
@@ -1,14 +1,22 @@
-$NetBSD: patch-aq,v 1.2 1999/10/01 07:49:21 simonb Exp $
+$NetBSD: patch-aq,v 1.3 2000/07/08 12:47:08 tron Exp $
 
-diff -ur ../faces-DIST/scripts/addxface ./scripts/addxface
---- ../faces-DIST/scripts/addxface	Tue Nov 19 15:05:58 1991
-+++ ./scripts/addxface	Fri Oct  1 14:32:12 1999
+--- scripts/addxface.orig	Tue Nov 19 05:05:58 1991
++++ scripts/addxface	Sat Jul  8 14:31:35 2000
 @@ -15,7 +15,7 @@
  # than version v1.6.0:
  #$olddb = 1;
  
 -$faces = '/usr/local/faces';
-+$faces = '/usr/local/share/faces';
++$faces = '@localbase@/share/faces';
  $umask = 000;
  
  # addxface - install any X-Face: in the header of the given mail message
+@@ -23,7 +23,7 @@
+ #
+ # Intended as an alternative to "faces -U" and to be used in a .forward file.
+ # For example:
+-#	kinzler,"|/usr/local/faces/bin/addxface"
++#	kinzler,"|@localbase@/faces/bin/addxface"
+ # Overwrites any existing face.  User 'daemon' will need write permissions
+ # in $faces/xface.
+ #
diff --git a/mail/faces/patches/patch-ar b/mail/faces/patches/patch-ar
index 84e83b1cf87..6cc9537d514 100644
--- a/mail/faces/patches/patch-ar
+++ b/mail/faces/patches/patch-ar
@@ -1,14 +1,13 @@
-$NetBSD: patch-ar,v 1.2 1999/10/01 07:49:21 simonb Exp $
+$NetBSD: patch-ar,v 1.3 2000/07/08 12:47:09 tron Exp $
 
-diff -ur ../faces-DIST/scripts/facesall ./scripts/facesall
---- ../faces-DIST/scripts/facesall	Mon Nov 25 11:30:24 1991
-+++ ./scripts/facesall	Fri Oct  1 14:32:12 1999
+--- scripts/facesall.orig	Mon Nov 25 01:30:24 1991
++++ scripts/facesall	Sat Jul  8 14:36:06 2000
 @@ -20,7 +20,7 @@
  #$olddb = 1;
  
  $cols = 15; $rows = 13;
 -$FACEDIR = '/usr/local/faces';
-+$FACEDIR = '/usr/local/share/faces';
++$FACEDIR = '@localbase@/share/faces';
  
  # facesall - show all available faces in the given faces bitmap directory
  # usage: facesall [ -a ] [ bitmap_directory ]
diff --git a/mail/faces/patches/patch-as b/mail/faces/patches/patch-as
index 09f8a7bb772..a156ac4e941 100644
--- a/mail/faces/patches/patch-as
+++ b/mail/faces/patches/patch-as
@@ -1,14 +1,13 @@
-$NetBSD: patch-as,v 1.2 1999/10/01 07:49:21 simonb Exp $
+$NetBSD: patch-as,v 1.3 2000/07/08 12:47:09 tron Exp $
 
-diff -ur ../faces-DIST/scripts/mkfacesindex ./scripts/mkfacesindex
---- ../faces-DIST/scripts/mkfacesindex	Tue Nov 19 15:05:58 1991
-+++ ./scripts/mkfacesindex	Fri Oct  1 14:32:12 1999
+--- scripts/mkfacesindex.orig	Tue Nov 19 05:05:58 1991
++++ scripts/mkfacesindex	Sat Jul  8 14:38:08 2000
 @@ -15,7 +15,7 @@
  # than version v1.6.0:
  #$olddb = 1;
  
 -$FACEDIR = '/usr/local/faces';
-+$FACEDIR = '/usr/local/share/faces';
++$FACEDIR = '@localbase@/share/faces';
  
  # mkfacesindex - make a .index file at the root of a faces database that
  #		 facesall can use more speedily instead of tabulating the
diff --git a/mail/faces/patches/patch-at b/mail/faces/patches/patch-at
index 75ce7992ddf..3e50e1e35f1 100644
--- a/mail/faces/patches/patch-at
+++ b/mail/faces/patches/patch-at
@@ -1,8 +1,7 @@
-$NetBSD: patch-at,v 1.2 1999/10/01 07:49:21 simonb Exp $
+$NetBSD: patch-at,v 1.3 2000/07/08 12:47:09 tron Exp $
 
-diff -ur ../faces-DIST/x11.c ./x11.c
---- ../faces-DIST/x11.c	Tue Nov 19 15:00:50 1991
-+++ ./x11.c	Fri Oct  1 14:32:03 1999
+--- x11.c.orig	Tue Nov 19 05:00:50 1991
++++ x11.c	Sat Jul  8 14:25:27 2000
 @@ -18,10 +18,10 @@
   
  #include <stdio.h>
diff --git a/mail/faces/patches/patch-au b/mail/faces/patches/patch-au
index ea1936f39de..0e6ae9cb45b 100644
--- a/mail/faces/patches/patch-au
+++ b/mail/faces/patches/patch-au
@@ -1,8 +1,7 @@
-$NetBSD: patch-au,v 1.2 1999/10/01 07:49:21 simonb Exp $
+$NetBSD: patch-au,v 1.3 2000/07/08 12:47:09 tron Exp $
 
-diff -ur ../faces-DIST/y.tab.h ./y.tab.h
---- ../faces-DIST/y.tab.h	Fri Oct  1 14:36:35 1999
-+++ ./y.tab.h	Fri Oct  1 14:32:03 1999
+--- y.tab.h.orig	Sat Jul  8 14:25:27 2000
++++ y.tab.h	Sat Jul  8 14:25:27 2000
 @@ -0,0 +1,11 @@
 +#define EOL 257
 +#define ATOM 258