Update mail/faces to 1.6.1nb1. Changes from version 1.6.1 are moving the

package under ${X11PREFIX} instead of trying to dual-install under both
${LOCALBASE} and ${X11BASE}, and strongly buildlink'fiying.

12 files changed, 348 insertions, 630 deletions

diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index ec7cb8edf6f..045b2c910d4 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2001/11/29 18:00:31 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2001/11/30 16:29:28 jlam Exp $
 
 DISTNAME=	faces-1.6.1
+PKGREVISION=	1
+WRKSRC=		${WRKDIR}/faces
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/faces/
 EXTRACT_SUFX=	.tar.Z
@@ -11,37 +13,39 @@ COMMENT=	visual mail, user and print face server
 LICENSE=	limited-redistribution
 RESTRICTED=	"Distribution not allowed if money exchanged"
 
-USE_X11=	yes
-
-MAKE_ENV+=	MKLINT=no
-WRKSRC=		${WRKDIR}/faces
-
-PLIST_SUBST+=	LOCALBASE="${LOCALBASE}" X11PREFIX="${X11PREFIX}"
+USE_BUILDLINK_ONLY=	YES
+USE_X11BASE=		YES
+USE_LIBTOOL=		YES
 
-do-configure:
-	@cd ${WRKSRC}; \
-	for f in Makefile faces.h x11.c compface/Makefile 		\
-		scripts/addxface scripts/facesall scripts/mkfacesindex; do \
-		${MV} $$f $$f.in;					\
-		${SED} -e 's|@localbase@|'${LOCALBASE}'|g' 		\
-			-e 's|@x11prefix@|'${X11PREFIX}'|g'		\
-			-e 's|@x11base@|'${X11BASE}'|g' < $$f.in > $$f;	\
-	done
+MAKE_FLAGS+=	PREFIX="${PREFIX}"
+MAKE_FLAGS+=	CCOMP="${CFLAGS}"
 
-# for OBJECT_FMT and OPSYS
 .include "../../mk/bsd.prefs.mk"
 
-post-install:
-	${LN} -f ${PREFIX}/man/man1/compface.1 ${PREFIX}/man/man1/uncompface.1
-	${LN} -f ${PREFIX}/man/man3/compface.3 ${PREFIX}/man/man3/uncompface.3
-.if (${OBJECT_FMT} == "ELF")
-	${LN} -fs ${LOCALBASE}/lib/libcompface.so.1.0 ${LOCALBASE}/lib/libcompface.so.1
-	${LN} -fs ${LOCALBASE}/lib/libcompface.so.1.0 ${LOCALBASE}/lib/libcompface.so
-.endif
-
 .if ${OPSYS} == "SunOS"
-MAKE_ENV+=	SVR4LIBS="-lnsl -lsocket -lgen" SYSV=-DSYSV32 CC=gcc CPPFLAGS=
-PATH:=		/usr/ucb:${PATH}
+MAKE_ENV+=	SVR4LIBS="-lnsl -lsocket -lgen"
+MAKE_ENV+=	SYSV=-DSYSV32
+MAKE_ENV+=	CC=gcc
+MAKE_ENV+=	CPPFLAGS=
 .endif
 
+do-configure:
+	${LN} -sf Makefile.dist ${WRKSRC}/${MAKEFILE}
+	cd ${WRKSRC};							\
+	files="								\
+		x11.c							\
+		scripts/addxface					\
+		scripts/facesall					\
+		scripts/mkfacesindex					\
+	";								\
+	for file in $${files}; do					\
+		${SED}	-e "s|@PREFIX@|${PREFIX}|g"			\
+			$${file} > $${file}.fixed;			\
+		if [ -x $${file} ]; then				\
+			${CHMOD} +x $${file}.fixed;			\
+		fi;							\
+		${MV} -f $${file}.fixed $${file};			\
+	done
+
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/faces/PLIST b/mail/faces/PLIST
index 3fa957ccede..a9f1c5c65ec 100644
--- a/mail/faces/PLIST
+++ b/mail/faces/PLIST
@@ -1,42 +1,41 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/29 18:00:31 wiz Exp $
-@cwd ${LOCALBASE}
-share/faces/machine.tab
-share/faces/people.tab
-@dirrm share/faces
+@comment $NetBSD: PLIST,v 1.3 2001/11/30 16:29:28 jlam Exp $
+bin/addxface
 bin/compface
-bin/uncompface
-man/man1/compface.1
-man/man1/uncompface.1
-lib/libcompface.a
-lib/libcompface.so
-lib/libcompface.so.1
-lib/libcompface.so.1.0
-include/compface.h
-man/man3/compface.3
-man/man3/uncompface.3
-bin/icon2ikon
-bin/ikon2icon
-bin/rs2icon
+bin/face_update
+bin/faces
+bin/faces.sendmail
+bin/facesaddr
+bin/facesall
+bin/from.faces
 bin/fs2ikon
 bin/fs2xbm
+bin/icon2ikon
+bin/ikon2icon
 bin/ikon2xbm
-bin/xbm2ikon
-bin/xbmcut48
-bin/xbmsize48
-bin/addxface
-bin/mailq.faces
-bin/from.faces
 bin/lpqall.faces
-bin/rotary.faces
-bin/facesaddr
-bin/facesall
+bin/mailq.faces
 bin/mkfacesindex
 bin/newscheck.faces
 bin/newsfrom.faces
-bin/faces
-bin/face_update
-bin/faces.sendmail
-man/man1/faces.1.gz
-man/man1/face_update.1.gz
-@cwd ${X11PREFIX}
+bin/rotary.faces
+bin/rs2icon
+bin/uncompface
+bin/xbm2ikon
+bin/xbmcut48
+bin/xbmsize48
+include/compface.h
 lib/X11/app-defaults/Faces
+lib/libcompface.a
+lib/libcompface.la
+lib/libcompface.so
+lib/libcompface.so.1
+lib/libcompface.so.1.0
+man/man1/compface.1
+man/man1/face_update.1
+man/man1/faces.1
+man/man1/uncompface.1
+man/man3/compface.3
+man/man3/uncompface.3
+share/faces/machine.tab
+share/faces/people.tab
+@dirrm share/faces
diff --git a/mail/faces/buildlink.mk b/mail/faces/buildlink.mk
index abea015d0a4..67fd6329acf 100644
--- a/mail/faces/buildlink.mk
+++ b/mail/faces/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/09/14 02:17:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/11/30 16:29:28 jlam Exp $
 #
 # This Makefile fragment is included by packages that use faces.
 #
@@ -17,11 +17,11 @@ FACES_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.faces?=	faces>=1.6.1
+BUILDLINK_DEPENDS.faces?=	faces>=1.6.1nb1
 DEPENDS+=	${BUILDLINK_DEPENDS.faces}:../../mail/faces
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.faces=faces
-BUILDLINK_PREFIX.faces_DEFAULT=	${LOCALBASE}
+BUILDLINK_PREFIX.faces_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.faces=		include/compface.h
 BUILDLINK_FILES.faces+=		lib/libcompface.*
 
diff --git a/mail/faces/distinfo b/mail/faces/distinfo
index 81aa4d007d9..3497b612cc6 100644
--- a/mail/faces/distinfo
+++ b/mail/faces/distinfo
@@ -1,26 +1,26 @@
-$NetBSD: distinfo,v 1.3 2001/11/29 18:00:31 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/11/30 16:29:28 jlam Exp $
 
 SHA1 (faces-1.6.1.tar.Z) = 8402a74e43e78345c23a975a417c2407322db65f
 Size (faces-1.6.1.tar.Z) = 249469 bytes
 SHA1 (patch-aa) = 99012a91d3ac39bdd0ad8b5ab454812ace346dbb
-SHA1 (patch-ab) = 9b8c07c284e387dbccb32e0fee684497d481b20f
-SHA1 (patch-ac) = 42c14c50e46d2310ba3d1003606b4afe06c19bca
+SHA1 (patch-ab) = d134a61c7f6f470780c0ed27a20db0ca11cb85d5
+SHA1 (patch-ac) = adb2718262027b4ba68425ffd4bef37192ff6d0c
 SHA1 (patch-ad) = 8383d81ea922122c5fc1fa23fd44c4a45b376c68
 SHA1 (patch-ae) = 0a7e57277e0e8133c81997258ef7f7a656834088
 SHA1 (patch-af) = 676c018ecf02ccdd103b113dfde77875cededf7c
 SHA1 (patch-ag) = df1e715582dd8f76fabed97ceb994d77d6d14ab7
-SHA1 (patch-ah) = 9f9bd8bb75197ac8a6d5d5797c53062a420a64ff
+SHA1 (patch-ah) = 0333bb755c9fb3f71bc17c963eaa9c0b1322a6d6
 SHA1 (patch-ai) = 37ac5631b842794f5f6d24f33fad44573a186114
-SHA1 (patch-aj) = e4ab45e54fcfd7136cd697fd4a4cf0736d09c174
+SHA1 (patch-aj) = 77386cbb0fc62300d61205d68bfb795125cd0ca6
 SHA1 (patch-ak) = 17d2781ad02394ed148ba654bf553f0f46a3db99
 SHA1 (patch-al) = 4cda3f50c6071137abde13f9f1afd7a1d80aa8d4
 SHA1 (patch-am) = 47121da4ec605ef24474ec830615643972b864ab
 SHA1 (patch-an) = 2d85ed93fd2031a21158ff2cf11ecefed312f4ec
 SHA1 (patch-ao) = 386fd23a51cf4c8bcca0f50f1bbb599c7ab23b84
-SHA1 (patch-ap) = 620cd43e7f4b72371794bed1b701344d8bc41f56
-SHA1 (patch-aq) = 617c7d139198678b6e2e73dcd957ae66a01df80b
-SHA1 (patch-ar) = 09ef44371c76e24a10fb2f467c897a2a454d56d0
-SHA1 (patch-as) = fba3db3a03990af2a8091781e7e9ee52c570c646
+SHA1 (patch-ap) = 200bf4c20bc36d5f08505af69084a4de2283e07f
+SHA1 (patch-aq) = 57d3f14ae8229cc4d879fdca5f87f04bb5398edc
+SHA1 (patch-ar) = 0a21b5fa5e8f200e8873286a128aed62e1edd5b9
+SHA1 (patch-as) = 3751bb0603637db885263d49a50769c7d6c39377
 SHA1 (patch-at) = abef0f35020fb8246ecef0dbe148f77da841ec44
 SHA1 (patch-au) = 582e9ad10b44e2e8af10c5c5e8682a7bfe508318
 SHA1 (patch-av) = 1ef88ca0a9b72d783f318242d152d23510f7949a
diff --git a/mail/faces/patches/patch-ab b/mail/faces/patches/patch-ab
index 3d29b182a34..b8a0de88ed6 100644
--- a/mail/faces/patches/patch-ab
+++ b/mail/faces/patches/patch-ab
@@ -1,481 +1,225 @@
-$NetBSD: patch-ab,v 1.9 2001/11/29 18:00:32 wiz Exp $
+$NetBSD: patch-ab,v 1.10 2001/11/30 16:29:28 jlam Exp $
 
---- Makefile.orig	Mon Sep  4 10:37:54 2000
-+++ Makefile	Mon Sep  4 10:55:54 2000
-@@ -0,0 +1,476 @@
-+#
-+#  Makefile for faces, an icon face server, plus associated software.
-+#
-+#  Graphical versions for NeWS, SunView, X11 and XView.
-+#
-+#  @(#)Makefile.dist 1.10 91/11/19
-+#
-+#  Copyright (c) Rich Burridge.
-+#                Sun Microsystems, Australia - All rights reserved.
-+#
-+#  Permission is given to distribute these sources, as long as the
-+#  copyright messages are not removed, and no monies are exchanged. 
-+#
-+#  No responsibility is taken for any errors inherent either
-+#  to the comments or the code of this program, but if reported
-+#  to me then an attempt will be made to fix them.
-+#
-+#========================================================================
-+#
-+#  There are various small changes needed when compiling faces on
-+#  different systems.  These have been isolated here, and should be
-+#  uncommented and set accordingly, if needed.
-+#
-+#========================================================================
+--- Makefile.dist.orig	Sun Nov 24 18:55:28 1991
++++ Makefile.dist
+@@ -22,15 +22,18 @@
+ #  uncommented and set accordingly, if needed.
+ #
+ #========================================================================
 +# Installation prefix.
 +#PREFIX           ?=/usr/local
 +#------------------------------------------------------------------------
-+#  If you want audio support, then the following line should be uncommented.
-+#
+ #  If you want audio support, then the following line should be uncommented.
+ #
+-#AUDIO_SUPPORT     = -DAUDIO_SUPPORT
 +AUDIO_SUPPORT     = -DAUDIO_SUPPORT
-+#========================================================================
-+#  There is a default command (/usr/demo/SOUND/play), which is used to
-+#  play audio files. Alternatively you can specify your own custom
-+#  command here. Uncomment the following line and set appropriately.
-+#
-+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
-+#  in with the background. By default, this is a root gray color, but you
-+#  can specify the name of a file containing an alternate pattern to use.
-+#  Uncomment the next two lines and set appropriately.
-+#
+ #========================================================================
+ #  There is a default command (/usr/demo/SOUND/play), which is used to
+ #  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/play\"
++AUDIO_CMD         = -DAUDIO_CMD=\"$(LOCALBASE)/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
+@@ -38,7 +41,7 @@
+ #  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 
-+#  attempt to convert unqualified hostnames, or hostnames with partial
-+#  domains to fully qualified domain names.
-+#
-+#  When used with NISLOOKUP, DNSLOOKUP will take precedance.
-+#
-+#  NOTE that the domain name returned by DNS will be converted to lower
-+#  case before attempting a machines.tab match, or constructing an icon
-+#  file name.
-+#
-+#  NOTE that for this to work you must have at least a minimal
-+#  /etc/resolv.conf file containing a valid nameserver entry.
-+#
+ #BACKGROUND        = -DBACKGROUND=\"$(BACKNAME)\"
+ #------------------------------------------------------------------------
+ #  Uncomment the following two lines to use the Domain Name Service to 
+@@ -54,8 +57,8 @@
+ #  NOTE that for this to work you must have at least a minimal
+ #  /etc/resolv.conf file containing a valid nameserver entry.
+ #
+-#DNSLOOKUP	= -DDNSLOOKUP
+-#DNSLIB		= -lresolv
 +DNSLOOKUP	= -DDNSLOOKUP
 +DNSLIB		=
-+#------------------------------------------------------------------------
-+#  If you do not want to show the number of messages on the face icon,
-+#  then uncomment the next line.
-+# 
-+#DONTSHOWNO       = -DDONTSHOWNO
-+#------------------------------------------------------------------------
-+#  If you do not want to show the timestamp on the face icon, then
-+#  uncomment the next line.
-+#
-+#DONTSHOWTIME     = -DDONTSHOWTIME
-+#------------------------------------------------------------------------
-+#  If you do not want to show the username on the face icon, then
-+#  uncomment the next line.
-+#
-+#DONTSHOWUSER     = -DDONTSHOWUSER
-+#------------------------------------------------------------------------
+ #------------------------------------------------------------------------
+ #  If you do not want to show the number of messages on the face icon,
+ #  then uncomment the next line.
+@@ -72,12 +75,12 @@
+ #
+ #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.
-+#               
+ #  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/faces
 +FACEDIR           = $(PREFIX)/share/faces
-+CFACEDIR	= -DFACEDIR=\"$(FACEDIR)\"
-+#------------------------------------------------------------------------
-+#  It is possible to determine what type of monitoring faces does at
-+#  run time with different command line options, but it is also possible
-+#  to define it at compile time.
-+#
-+#  Monitor type (0 = mail (new),  1 = mail (all), 2 = print queue).
-+#                3 = custom prog, 4 = users).
-+#
-+#FMONTYPE         = -DFMONTYPE=0
-+#------------------------------------------------------------------------
-+#  If you have the poll(2) system call, then uncomment the following
-+#  definition. Note that you will also have to uncomment the NOSELECT
-+#  definition. This is needed for SVR4 machines.
-+#
-+#HASPOLL         = -DHASPOLL
-+#------------------------------------------------------------------------
-+#  Some users on monochrome screens display everything in reverse video.
-+#  If you would like faces to do the same, then this line needs to be
-+#  uncommented.
-+#
-+#INVERT           = -DINVERT
-+#------------------------------------------------------------------------
-+#  When no icon is found for a given user, the unknown icon may be displayed
-+#  either with the user name, or labeled as `unknown'.  The former case
-+#  provides the most information, the latter allows all unknown users
-+#  within a given community to be lumped into a single image.  To select
-+#  the latter case uncomment the following line.
-+#
-+#NAMEUNKNOWN	= -DNAMEUNKNOWN
-+#------------------------------------------------------------------------
-+#  If you are compiling the NeWS version, then the following two lines
-+#  should be uncommented, and set appropriately.
-+#
-+#NEWSINCDIR	= -I$(OPENWINHOME)/include
-+#NEWSLIBDIR	= -L$(OPENWINHOME)/lib
-+#------------------------------------------------------------------------
-+#  Uncomment the following line to use the Sun Network Information
-+#  Services (NIS, formerly YP) to look for hosts which do not explicitly
-+#  appear in the machines.tab file. When used with DNSLOOKUP, DNSLOOKUP
-+#  takes precedance.
-+#
-+#  Note that the domain name will be converted to lower case before
-+#  attempting to match in the machines file, or create an icon filename.
-+#
+ CFACEDIR	= -DFACEDIR=\"$(FACEDIR)\"
+ #------------------------------------------------------------------------
+ #  It is possible to determine what type of monitoring faces does at
+@@ -123,7 +126,7 @@
+ #  Note that the domain name will be converted to lower case before
+ #  attempting to match in the machines file, or create an icon filename.
+ #
+-#NISLOOKUP	= -DNISLOOKUP
 +NISLOOKUP	= -DNISLOOKUP
-+#------------------------------------------------------------------------
-+#  If you don't want faces to use full domain names for extracting face
-+#  icons, then you should uncomment the NODOMAINS definition below.
-+#
-+#NODOMAINS	= -DNODOMAINS
-+#------------------------------------------------------------------------
-+#  If your system doesn't have the gethostname() system call, then this
-+#  might be a useful alternative. This is needed for SVR4 machines.
-+#
-+#NOGETHOSTNAME  = -DNOGETHOSTNAME
-+#------------------------------------------------------------------------
-+#  By default, faces will check the "From " line first for username and
-+#  hostname, and then the "From:" line. 
-+#  Not all machines have the index() string library function. If you
-+#  don't have this function then you should uncomment the NOINDEX
-+#  definition below.
-+#
-+#NOINDEX         = -DNOINDEX
-+#--------------------------------------------------------------------------
-+#  It appears that not every Unix system defines MAXPATHLEN, which indicates
-+#  the maximum length of a Unix pathname. If your system doesn't, then
-+#  you need to uncomment this definition.
-+#
-+#NOMAXPATHLEN    = -DNOMAXPATHLEN
-+#--------------------------------------------------------------------------
-+#  Not every version of Unix (in particular System V derivitives) has the
-+#  select() system call. If your machine doesn't have this call, then you
-+#  need to uncomment the following definition.
-+#
-+#NOSELECT        = -DNOSELECT
-+#--------------------------------------------------------------------------
-+#  If your system lacks the utime() library call and definition, then
-+#  uncomment the following definition.
-+#
-+#NOUTIME         = -DNOUTIME
-+#--------------------------------------------------------------------------
-+#  By default, faces rechecks for new mail or print jobs every sixty
-+#  seconds. If you would like to specify an alternate period, then uncomment
-+#  the following line and set appropriately.
-+#
-+#PERIOD           = -DPERIOD=30
-+#------------------------------------------------------------------------
-+#  By default, faces will examine printer queues a la Berkeley Style.
-+#  Alternatively, if you have the PLP printer spooling system running, then
-+#  uncomment the next line.
-+#
-+#PLP              = -DPLP
-+#-------------------------------------------------------------------------
-+#  If you are using the RAND mailer which uses four ^A characters to mark
-+#  the beginning and end of messages, then you will need to uncomment the
-+#  following line.
-+#
-+#RAND             = -DRAND
-+#-------------------------------------------------------------------------
-+#  Faces is designed to work on a big-endian machine by default. If you
-+#  are compiling for a little-endian machine (such as the Sun 386i), then
-+#  you need to uncomment the following line.
-+#
-+#REVORDER	  = -DREVORDER
-+#------------------------------------------------------------------------
-+#  If you not running under a BSD4.3 derived system, the parameters
-+#  to the select call are different, and this definition should be
-+#  uncommented. You need to uncomment this for SunOS v3.x.
-+#
+ #------------------------------------------------------------------------
+ #  If you don't want faces to use full domain names for extracting face
+ #  icons, then you should uncomment the NODOMAINS definition below.
+@@ -188,7 +191,7 @@
+ #  to the select call are different, and this definition should be
+ #  uncommented. You need to uncomment this for SunOS v3.x.
+ #
+-#SELTYPE        = -DNO_43SELECT
 +SELTYPE        = -DNO_43SELECT
-+#------------------------------------------------------------------------
-+#  If you are building faces on a Silicon Graphics machine, then you will
-+#  need to uncomment the following two definitions.
-+#
-+#SGIDEF		= -Umips
-+#SGILIBS	= -lsun -lc_s
-+#------------------------------------------------------------------------
-+#  If the pending mail for users is in a different directory than
-+#  /usr/spool/mail, uncomment the following and set appropriately.
-+#
+ #------------------------------------------------------------------------
+ #  If you are building faces on a Silicon Graphics machine, then you will
+ #  need to uncomment the following two definitions.
+@@ -199,7 +202,7 @@
+ #  If the pending mail for users is in a different directory than
+ #  /usr/spool/mail, uncomment the following and set appropriately.
+ #
+-#SPOOLDIR	= -DSPOOLDIR=\"/usr/mail\"
 +SPOOLDIR	= -DSPOOLDIR=\"/var/mail\"
-+#------------------------------------------------------------------------
-+#  If faces is setup to monitor mail, then the name of the default
-+#  spoolfile is /usr/spool/mail/username. An alternative spoolfile name
-+#  can be given by uncommenting the following line and setting
-+#  appropriately.
-+#
-+#SPOOLFILE       = -DSPOOLFILE=\"/usr/richb/Mail/pending\"
-+#--------------------------------------------------------------------------
-+#  If you are trying to build faces on an SVR4 machine, then you should
-+#  uncomment the following entry, and set SVR4LIBS to the list of SVR4
-+#  specific libraries needed to link reve.
-+#
-+#SVR4LIBS     = -lnsl -lsocket -lgen
-+#--------------------------------------------------------------------------
-+#  If you are running on a Unix System V machine, then you should uncomment
-+#  the next definition.
-+#
-+#SYSV		= -DSYSV32
-+#--------------------------------------------------------------------------
-+#  If you are running SunOS v3.x, then pr_ttext doesn't exist, and
-+#  you must uncomment this definition.
-+#
-+#TTEXT          = -DNO_PR_TTEXT
-+#------------------------------------------------------------------------
-+#  Uncomment if building faces under Sequoia's operating system.
-+#
-+#TOPIX          = -DTOPIX
-+#--------------------------------------------------------------------------
-+#  If the -U command line option is given to faces, then mail is sent to
-+#  a special mail alias. This alias is really a shell script, which will
-+#  take the given information, and try to update the faces database. By
-+#  default that alias is called "facemaker", but it is possible to give an
-+#  alternative alias here. This might be useful if a collection of machines
-+#  were remotely mounting the faces database from a file server.
-+#
-+#UPDATE		= -DUPDATE=\"facemaker@fileserver\"
-+#------------------------------------------------------------------------
-+#  If your system does not have the memset() library call, but instead
-+#  uses the bzero() library call, then the following definition needs to
-+#  be uncommented.
-+#
-+#USE_BZERO      = -DUSE_BZERO
-+#------------------------------------------------------------------------
-+#  If your system does not have the getcwd() library call, but instead
-+#  uses the getwd() library call, then the following definition needs to
-+#  be uncommented.
-+#
-+#USE_GETWD      = -DUSE_GETWD
-+#------------------------------------------------------------------------
-+#  If you are compiling the X11 version under MIT X11R3, you will need to
-+#  uncomment the following definition:
-+#
-+#X11R3		= -DX11R3
-+#------------------------------------------------------------------------
-+#  If you are compiling the X11 version and the X11 include and
-+#  library files are not in a standard place, then the following
-+#  two lines should be uncommented, and set appropriately.
-+#
-+X11INCDIR         = -I$(X11BASE)/include
-+X11LIBDIR         = -L$(X11BASE)/lib
-+#------------------------------------------------------------------------
-+#  If you are compiling the XView version, then the following two lines
-+#  should be uncommented, and set appropriately.
-+#
-+#XVIEWINCDIR      = -I$(OPENWINHOME)/include
-+#XVIEWLIBDIR      = -L$(OPENWINHOME)/lib
-+#
-+#=======================================================================
-+#
-+#  Default locations where faces files will be installed.
-+#  You might wish to alter these values.
-+#
+ #------------------------------------------------------------------------
+ #  If faces is setup to monitor mail, then the name of the default
+ #  spoolfile is /usr/spool/mail/username. An alternative spoolfile name
+@@ -258,8 +261,8 @@
+ #  library files are not in a standard place, then the following
+ #  two lines should be uncommented, and set appropriately.
+ #
+-#X11INCDIR         = -I$(OPENWINHOME)/include
+-#X11LIBDIR         = -L$(OPENWINHOME)/lib
++X11INCDIR         = -I${BUILDLINK_X11_DIR}/include
++X11LIBDIR         = -L${BUILDLINK_X11_DIR}/lib
+ #------------------------------------------------------------------------
+ #  If you are compiling the XView version, then the following two lines
+ #  should be uncommented, and set appropriately.
+@@ -272,17 +275,19 @@
+ #  Default locations where faces files will be installed.
+ #  You might wish to alter these values.
+ #
+-BINDIR		= /usr/local/bin
+-LIBDIR		= /usr/local/lib
+-MANDIR		= /usr/man
+-MANSECT		= l
 +BINDIR		= $(PREFIX)/bin
 +LIBDIR		= $(PREFIX)/lib
 +INCDIR		= $(PREFIX)/include
 +MANDIR		= $(PREFIX)/man
 +MANSECT		= 1
-+
-+#
-+#  Options for submakes
-+#
-+MAKEOPTS	= $(MFLAGS) BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) \
+ 
+ #
+ #  Options for submakes
+ #
+ MAKEOPTS	= $(MFLAGS) BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) \
+-			    MANDIR=$(MANDIR) CC=$(CC) \
+-			    NOINDEX=$(NOINDEX) SYSV=$(SYSV)
 +			    INCDIR=$(INCDIR) MANDIR=$(MANDIR) CC=$(CC) \
-+			    NOINDEX=$(NOINDEX) SYSV=$(SYSV)
-+
-+#
-+# Override DEBUG on the command line as `DEBUG=-DDEBUG' to enable various
-+# additional checking diagnostic output options.
-+#
-+DEBUG		=
-+
-+#
-+#  Compilation flags and standard macro definitions.
-+#
-+CDEFS		= $(AUDIO_SUPPORT) $(AUDIO_CMD) $(BACKGROUND) \
-+		  $(DNSLOOKUP) $(DONTSHOWNO) $(DONTSHOWTIME) $(DONTSHOWUSER) \
-+		  $(CFACEDIR) $(FMONTYPE) $(HASPOLL) $(INVERT) \
-+		  $(NAMEUNKNOWN) $(NEWSINCDIR) $(NISLOOKUP) $(NODOMAINS) \
-+		  $(NOGETHOSTNAME) $(NOINDEX) $(NOMAXPATHLEN) $(NOSELECT) \
-+		  $(NOUTIME) $(PERIOD) $(PLP) $(RAND) $(REVORDER) \
-+		  $(SELTYPE) $(SGIDEF) $(SPOOLDIR) $(SPOOLFILE) $(SYSV) \
-+		  $(TTEXT) $(TOPIX) $(UPDATE) $(USE_BZERO) $(USE_GETWD) \
-+		  $(X11R3) $(X11INCDIR) $(XVIEWINCDIR) $(DEBUG)
-+CCOMP		= -pipe -O2
-+CFLAGS		= $(CCOMP) $(CDEFS)
-+#
-+#=======================================================================
-+
-+.KEEP_STATE:
-+
-+BINARIES	= psfaces svfaces xfaces xvfaces
-+
-+STDSRCS		= address.c get.c main.c mon.c parsefrom.c rec.c
-+STDOBJS		= address.o get.o main.o mon.o parsefrom.o rec.o
-+STDLIBS		= -L./compface -Wl,-R@localbase@/lib -lcompface $(DNSLIB) $(SGILIBS)
-+
-+COMPFACE	= compface
-+FACES		= facedir
-+FILTERS		= filters
-+SCRIPTS         = scripts
-+GSRCS		= news.c sunview.c x11.c xview.c
-+HDRS		= addr.h extern.h faces.h patchlevel.h
-+IMAGES		= noface.xbm nomail.xbm noprint.xbm \
-+		  nopaper.xbm nothing.xbm nousers.xbm
-+OTHERS		= CHANGES CHANGES-v1.4 README TODO MANIFEST FILES \
-+		  faces.man.text faces.man face_update.1 faces_cps.cps \
-+		  Faces.ad Makefile.dist face_update
-+XFACE		= xface
-+
-+SFILES1		= mon.c rec.c
-+SFILES2		= main.c parsefrom.c
-+SFILES3		= get.c news.c sunview.c
-+SFILES4		= x11.c $(HDRS)
-+SFILES5		= xview.c
-+SFILES6		= CHANGES-v1.4
-+SFILES7		= CHANGES README TODO
-+SFILES8		= MANIFEST FILES Makefile.dist faces_cps.cps face_update \
-+		  faces.sendmail
-+SFILES9		= faces.man face_update.1 $(IMAGES)
-+SFILES10	= faces.man.text Faces.ad
-+SFILES11	= $(FACES)
-+SFILES12	= $(COMPFACE)
-+SFILES13	= $(FILTERS)
-+SFILES14	= $(SCRIPTS)
-+SFILES15	= address.y $(XFACE)
-+
-+NEWSLIBS	= $(NEWSLIBDIR) -lcps
-+SVIEWLIBS	= -lsuntool -lsunwindow -lpixrect
-+#
-+#  The following definition can vary. Here are a few examples:
-+#
-+#  Sun/MIT X11R4:                  $(X11LIBDIR) -lX11
-+#  Dell Unix (Interactive 386/ix): $(X11LIBDIR) -lX11 -linet
-+#  AT&T's XWIN:                    $(X11LIBDIR) -lX11_s -lc_s -lnsl_s -lpt
-+#
-+X11LIBS		= -L@x11base@/lib -Wl,-R@x11base@/lib -lX11
-+XVIEWLIBS	= $(XVIEWLIBDIR) -lxview -lolgx -lX11
-+
-+help:
-+		@echo
-+		@echo "You need to specify one of the following options:"
-+		@echo
++			    NOINDEX=$(NOINDEX) SYSV=$(SYSV) PREFIX=$(PREFIX) \
++			    CCOMP="$(CCOMP)"
+ 
+ #
+ # Override DEBUG on the command line as `DEBUG=-DDEBUG' to enable various
+@@ -302,7 +307,7 @@
+ 		  $(SELTYPE) $(SGIDEF) $(SPOOLDIR) $(SPOOLFILE) $(SYSV) \
+ 		  $(TTEXT) $(TOPIX) $(UPDATE) $(USE_BZERO) $(USE_GETWD) \
+ 		  $(X11R3) $(X11INCDIR) $(XVIEWINCDIR) $(DEBUG)
+-CCOMP		= -O
++CCOMP		= -g
+ CFLAGS		= $(CCOMP) $(CDEFS)
+ #
+ #=======================================================================
+@@ -311,12 +316,9 @@
+ 
+ BINARIES	= psfaces svfaces xfaces xvfaces
+ 
+-CC		= cc
+-MAKE		= make
+-
+ STDSRCS		= address.c get.c main.c mon.c parsefrom.c rec.c
+ STDOBJS		= address.o get.o main.o mon.o parsefrom.o rec.o
+-STDLIBS		= compface/libcompface.a $(DNSLIB) $(SGILIBS)
++STDLIBS		= $(LDFLAGS) compface/libcompface.la $(DNSLIB) $(SGILIBS)
+ 
+ COMPFACE	= compface
+ FACES		= facedir
+@@ -357,25 +359,25 @@
+ #  Dell Unix (Interactive 386/ix): $(X11LIBDIR) -lX11 -linet
+ #  AT&T's XWIN:                    $(X11LIBDIR) -lX11_s -lc_s -lnsl_s -lpt
+ #
+-X11LIBS		= $(X11LIBDIR) -lX11
++X11LIBS		= -lX11
+ XVIEWLIBS	= $(XVIEWLIBDIR) -lxview -lolgx -lX11
+ 
+ help:
+ 		@echo
+ 		@echo "You need to specify one of the following options:"
+ 		@echo
+-		@echo "  make sunview    - to make the SunView version."
+-		@echo "  make news       - to make the NeWS version."
+-		@echo "  make x11        - to make the X11 version."
+-		@echo "  make xview      - to make the XView version."
 +		@echo "  ${MAKE} sunview    - to make the SunView version."
 +		@echo "  ${MAKE} news       - to make the NeWS version."
 +		@echo "  ${MAKE} x11        - to make the X11 version."
 +		@echo "  ${MAKE} xview      - to make the XView version."
-+		@echo
-+		@echo "This should be followed by:"
-+		@echo
+ 		@echo
+ 		@echo "This should be followed by:"
+ 		@echo
+-		@echo "  make install"
+-		@echo "  make clean"
 +		@echo "  ${MAKE} install"
 +		@echo "  ${MAKE} clean"
-+		@echo
-+
+ 		@echo
+ 
+-all:		$(BINARIES)
 +all:		x11
-+
-+news:		$(STDOBJS) news.o faces_cps.h
-+		(cd compface; $(MAKE) $(MAKEOPTS))
-+		(cd filters; $(MAKE) $(MAKEOPTS))
-+		$(CC) -o psfaces $(CFLAGS) $(STDOBJS) news.o \
-+						$(STDLIBS) $(NEWSLIBS)
-+		-cp psfaces faces
-+
-+sunview:	$(STDOBJS) sunview.o
-+		(cd compface; $(MAKE) $(MAKEOPTS))
-+		(cd filters; $(MAKE) $(MAKEOPTS))
-+		$(CC) -o svfaces $(CFLAGS) $(STDOBJS) sunview.o \
-+						$(STDLIBS) $(SVIEWLIBS)
-+		-cp svfaces faces
-+
-+x11:		$(STDOBJS) x11.o
-+		(cd compface; $(MAKE) $(MAKEOPTS))
-+		(cd filters; $(MAKE) $(MAKEOPTS))
-+		$(CC) -o xfaces $(CFLAGS) $(STDOBJS) x11.o \
-+					$(STDLIBS) $(X11LIBS) $(SVR4LIBS)
-+		-cp xfaces faces
-+
-+xview:		$(STDOBJS) xview.o
-+		(cd compface; $(MAKE) $(MAKEOPTS))
-+		(cd filters; $(MAKE) $(MAKEOPTS))
-+		$(CC) -o xvfaces $(CFLAGS) $(STDOBJS) xview.o \
-+					$(STDLIBS) $(XVIEWLIBS) $(SVR4LIBS)
-+		-cp xvfaces faces
-+
-+tables:
-+		-mkdir $(FACEDIR)
-+		-install -c -m 644 machine.tab $(FACEDIR)
-+		-install -c -m 644 people.tab $(FACEDIR)
-+
-+install:
+ 
+ news:		$(STDOBJS) news.o faces_cps.h
+ 		(cd compface; $(MAKE) $(MAKEOPTS))
+@@ -394,9 +396,8 @@
+ x11:		$(STDOBJS) x11.o
+ 		(cd compface; $(MAKE) $(MAKEOPTS))
+ 		(cd filters; $(MAKE) $(MAKEOPTS))
+-		$(CC) -o xfaces $(CFLAGS) $(STDOBJS) x11.o \
++		$(LIBTOOL) $(CC) -o faces $(CFLAGS) $(STDOBJS) x11.o \
+ 					$(STDLIBS) $(X11LIBS) $(SVR4LIBS)
+-		-cp xfaces faces
+ 
+ xview:		$(STDOBJS) xview.o
+ 		(cd compface; $(MAKE) $(MAKEOPTS))
+@@ -406,21 +407,24 @@
+ 		-cp xvfaces faces
+ 
+ tables:
+-		-mkdir $(FACEDIR)
+-		-install -c -m 644 machine.tab $(FACEDIR)
+-		-install -c -m 644 people.tab $(FACEDIR)
++		${BSD_INSTALL_DATA_DIR} $(FACEDIR)
++		${BSD_INSTALL_DATA} machine.tab $(FACEDIR)
++		${BSD_INSTALL_DATA} people.tab $(FACEDIR)
+ 
+ install:
 +		${MAKE} tables
-+		(cd compface; $(MAKE) $(MAKEOPTS) install)
-+		(cd filters; $(MAKE) $(MAKEOPTS) install)
-+		(cd scripts; $(MAKE) $(MAKEOPTS) install)
-+		install -c -s -m 751 faces $(BINDIR)
-+		install -c -m 755 face_update $(BINDIR)
-+		install -c -m 755 faces.sendmail $(BINDIR)
-+		install -c -m 644 faces.man \
-+				$(MANDIR)/man$(MANSECT)/faces.$(MANSECT)
-+		install -c -m 444 face_update.1 \
-+				$(MANDIR)/man$(MANSECT)/face_update.$(MANSECT)
-+		install -d -m 444 @x11prefix@/lib/X11/app-defaults
-+		install -c -m 444 -o bin Faces.ad @x11prefix@/lib/X11/app-defaults/Faces
-+
-+clean:
-+		(cd compface; $(MAKE) $(MAKEOPTS) clean)
-+		(cd filters; $(MAKE) $(MAKEOPTS) clean)
-+		rm -f *.o Part* *~ $(BINARIES) faces core
-+
-+saber:
-+		#load $(CDEFS) $(STDSRCS) x11.c $(STDLIBS) $(X11LIBS)
-+
-+lint:		lint-news lint-sunview lint-x11 lint-xview
-+lint-news:;	lint $(CDEFS) $(STDSRCS) news.c $(NEWSLIBS)
-+lint-sunview:;	lint $(CDEFS) $(STDSRCS) sunview.c $(SVIEWLIBS)
-+lint-x11:;	lint $(CDEFS) $(STDSRCS) x11.c
-+lint-xview:;	lint $(CDEFS) $(STDSRCS) xview.c
-+
-+shar:;          shar.script $(SFILES1)  > faces.part1
-+		shar.script $(SFILES2)  > faces.part2
-+		shar.script $(SFILES3)  > faces.part3
-+		shar.script $(SFILES4)  > faces.part4
-+		shar.script $(SFILES5)  > faces.part5
-+		shar.script $(SFILES6)  > faces.part6
-+		shar.script $(SFILES7)  > faces.part7
-+		shar.script $(SFILES8)  > faces.part8
-+		shar.script $(SFILES9)  > faces.part9
-+		shar.script $(SFILES10) > faces.part10
-+		shar.script $(SFILES11) > faces.part11
-+		shar.script $(SFILES12) > faces.part12
-+		shar.script $(SFILES13) > faces.part13
-+		shar.script $(SFILES14) > faces.part14
-+		shar.script $(SFILES15) > faces.part15
-+
-+create:         SCCS
-+		-sccs create $(STDSRCS) $(GSRCS) $(HDRS) $(IMAGES) $(OTHERS)
-+
-+SCCS:
-+		mkdir SCCS
-+		chmod 755 SCCS
-+
-+faces_cps.h:	faces_cps.cps
-+		cps $<
-+
-+get.o:		get.c faces.h extern.h patchlevel.h
-+main.o:		main.c faces.h $(IMAGES)
-+mon.o:		mon.c faces.h extern.h
-+news.o:		news.c faces.h extern.h faces_cps.h
-+rec.o:		rec.c faces.h extern.h
-+sunview.o:	sunview.c faces.h extern.h
-+x11.o:		x11.c faces.h extern.h
-+xview.o:	xview.c faces.h extern.h
+ 		(cd compface; $(MAKE) $(MAKEOPTS) install)
+ 		(cd filters; $(MAKE) $(MAKEOPTS) install)
+ 		(cd scripts; $(MAKE) $(MAKEOPTS) install)
+-		install -s -m 751 faces $(BINDIR)
+-		install -c -m 755 face_update $(BINDIR)
+-		install -c -m 755 faces.sendmail $(BINDIR)
+-		install -c -m 644 faces.man \
++		$(LIBTOOL) ${BSD_INSTALL_PROGRAM} faces $(BINDIR)
++		${BSD_INSTALL_SCRIPT} face_update $(BINDIR)
++		${BSD_INSTALL_SCRIPT} faces.sendmail $(BINDIR)
++		${BSD_INSTALL_MAN} faces.man \
+ 				$(MANDIR)/man$(MANSECT)/faces.$(MANSECT)
+-		install -c -m 644 face_update.1 \
++		${BSD_INSTALL_MAN} face_update.1 \
+ 				$(MANDIR)/man$(MANSECT)/face_update.$(MANSECT)
++		${BSD_INSTALL_DATA_DIR} $(PREFIX)/lib/X11/app-defaults
++		${BSD_INSTALL_DATA} Faces.ad $(PREFIX)/lib/X11/app-defaults/Faces
+ 
+ clean:
+ 		(cd compface; $(MAKE) $(MAKEOPTS) clean)
diff --git a/mail/faces/patches/patch-ac b/mail/faces/patches/patch-ac
index a17ac03e0ab..635d8fd0509 100644
--- a/mail/faces/patches/patch-ac
+++ b/mail/faces/patches/patch-ac
@@ -1,74 +1,60 @@
-$NetBSD: patch-ac,v 1.10 2000/09/06 12:44:38 tron Exp $
+$NetBSD: patch-ac,v 1.11 2001/11/30 16:29:28 jlam Exp $
 
---- compface/Makefile.orig	Thu Oct 24 03:28:06 1991
-+++ compface/Makefile	Wed Sep  6 14:39:35 2000
-@@ -19,62 +19,67 @@
- #
- #SYSV           = -DSYSV32
- #--------------------------------------------------------------------------
--# BINDIR, LIBDIR, and MANDIR are expected to be overridden by the
-+# BINDIR, LIBDIR, INCDIR and MANDIR are expected to be overridden by the
+--- compface/Makefile.orig	Wed Oct 23 22:28:06 1991
++++ compface/Makefile
+@@ -22,20 +22,22 @@
+ # BINDIR, LIBDIR, and MANDIR are expected to be overridden by the
  # calling Makefile
  
 -BINDIR		= /usr/local/bin
 -LIBDIR		= /usr/local/lib
 -MANDIR		= /usr/manl
++PREFIX		?=/usr/local
 +BINDIR		= $(PREFIX)/bin
-+LIBDIR		= $(PREFIX)/lib
 +INCDIR		= $(PREFIX)/include
++LIBDIR		= $(PREFIX)/lib
 +MANDIR		= $(PREFIX)/man
  
  NAME		= compface
  UNNAME		= uncompface
  EXECUTABLE	= $(BINDIR)/$(NAME)
  UNEXECUTABLE	= $(BINDIR)/$(UNNAME)
- LIBNAME		= lib$(NAME).a
--LIBRARY		= $(LIBDIR)/$(LIBNAME)
-+SHLIB_MAJOR	= 1
-+SHLIB_MINOR	= 0
-+SHLIB_FULLVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR)
-+LIB		= $(NAME)
-+NOPROFILE	= ''
-+LIBRARY		= $(LIBDIR)
+-LIBNAME		= lib$(NAME).a
++LIBNAME		= lib$(NAME).la
+ LIBRARY		= $(LIBDIR)/$(LIBNAME)
  MAN1DIR		= $(MANDIR)/man1
  MAN3DIR		= $(MANDIR)/man3
  OBJECTS		= arith.o file.o compress.o gen.o uncompface.o
- SOURCES		= compface.c uncompface.o arith.c file.c compress.c gen.c \
+-SOURCES		= compface.c uncompface.o arith.c file.c compress.c gen.c \
++SOURCES		= compface.c uncompface.c arith.c file.c compress.c gen.c \
  		  cmain.c uncmain.c
-+SRCS		= arith.c file.c compress.c gen.c uncompface.c
  HDRS		= compface.h data.h
  OTHERS		= README $(NAME).1 $(NAME).3 Makefile
- 
- CC		= cc
- CDEFS		= $(SYSV)
--CCOMP		= -g
-+CCOMP		= -pipe -O2
+@@ -45,17 +47,16 @@
+ CCOMP		= -g
  CFLAGS		= $(CDEFS) $(CCOMP)
  
 -all:		$(NAME) $(UNNAME)
-+all:		lib$(NAME).a lib$(NAME).so.$(SHLIB_MAJOR).$(SHLIB_MINOR) $(NAME) $(UNNAME) 
++all:		$(LIBNAME) $(NAME) $(UNNAME)
  
--$(NAME) :	cmain.o compface.o $(LIBNAME)
+ $(NAME) :	cmain.o compface.o $(LIBNAME)
 -		$(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o $(LIBNAME)
-+$(NAME) :	cmain.o compface.o
-+		$(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o -L. \
-+			-L@localbase@/lib -Wl,-R@localbase@/lib -lcompface
++		$(LIBTOOL) $(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o $(LIBNAME)
  
  $(UNNAME) :	uncmain.o $(LIBNAME)
 -		$(CC) $(CFLAGS) -o $(UNNAME) uncmain.o $(LIBNAME)
--
++		$(LIBTOOL) $(CC) $(CFLAGS) -o $(UNNAME) uncmain.o $(LIBNAME)
+ 
 -$(LIBNAME) :	$(OBJECTS)
 -		ar rc $(LIBNAME) $(OBJECTS)
 -		-ranlib $(LIBNAME)
-+		$(CC) $(CFLAGS) -o $(UNNAME) uncmain.o -L. \
-+			-L@localbase@/lib -Wl,-R@localbase@/lib -lcompface
++$(LIBNAME) :	$(OBJECTS:.o=.lo)
++		$(LIBTOOL) $(CC) -o $(LIBNAME) $(OBJECTS:.o=.lo) -rpath $(LIBDIR) -version-info 1:0
  
  lint :
  		lint -abchx $(SOURCES)
- 
- clean :
--		rm -f *.o *.a *.sh core a.out $(NAME) $(UNNAME)
-+		rm -f *.o *po *so *.a *.so.* *.sh core a.out $(NAME) $(UNNAME)
+@@ -64,21 +65,25 @@
+ 		rm -f *.o *.a *.sh core a.out $(NAME) $(UNNAME)
  
  install :	$(NAME) $(UNNAME) $(LIBNAME)
 -		-cp $(NAME) $(EXECUTABLE)
@@ -82,23 +68,25 @@ $NetBSD: patch-ac,v 1.10 2000/09/06 12:44:38 tron Exp $
 -		-cp $(NAME).3 $(MAN3DIR)
 -		rm -f $(MAN3DIR)/$(UNNAME).3
 -		-ln $(MAN3DIR)/$(NAME).3 $(MAN3DIR)/$(UNNAME).3
-+		install -c -s -o bin -m 755 $(NAME) $(EXECUTABLE)
-+		install -c -s -o bin -m 755 $(UNNAME) $(UNEXECUTABLE)
-+		install -c -g bin -o bin -m 444 $(NAME).1 $(MAN1DIR)
-+		-rm -f $(MAN1DIR)/$(UNNAME).1*
-+		ln -f -s $(MAN1DIR)/$(NAME).1 $(MAN1DIR)/$(UNNAME).1
-+		install -c -o bin -m 444 $(LIBNAME) $(LIBRARY)
-+		install -c -o bin -m 444 lib$(NAME).so.$(SHLIB_MAJOR).$(SHLIB_MINOR) $(LIBRARY)
-+		install -c -g bin -o bin -m 444 $(NAME).3 $(MAN3DIR)
++		$(LIBTOOL) ${BSD_INSTALL_DATA} $(LIBNAME) $(LIBDIR)
++		$(LIBTOOL) ${BSD_INSTALL_PROGRAM} $(NAME) $(EXECUTABLE)
++		$(LIBTOOL) ${BSD_INSTALL_PROGRAM} $(UNNAME) $(UNEXECUTABLE)
++		${BSD_INSTALL_MAN} $(NAME).1 $(MAN1DIR)
++		rm -f $(MAN1DIR)/$(UNNAME).1*
++		-ln -fs $(MAN1DIR)/$(NAME).1 $(MAN1DIR)/$(UNNAME).1
++		${BSD_INSTALL_MAN} $(NAME).3 $(MAN3DIR)
 +		rm -f $(MAN3DIR)/$(UNNAME).3*
-+		ln -f -s $(MAN3DIR)/$(NAME).3 $(MAN3DIR)/$(UNNAME).3
-+		install -m 444 -o bin -g bin -c compface.h $(INCDIR)
++		-ln -fs $(MAN3DIR)/$(NAME).3 $(MAN3DIR)/$(UNNAME).3
++		${BSD_INSTALL_DATA} compface.h $(INCDIR)
  
  shar :
  		shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh
-@@ -88,3 +93,5 @@
- gen.o:		gen.c compface.h data.h
- uncmain.o:	uncmain.c compface.h data.h
- uncompface.o:	uncompface.c compface.h data.h
+ 		compress $(NAME).sh
++
++.SUFFIXES:	.lo
 +
-+.include <bsd.lib.mk>
++.c.lo:
++		$(LIBTOOL) $(CC) $(CFLAGS) -c $<
+ 
+ arith.o:	arith.c compface.h data.h
+ cmain.o:	cmain.c compface.h data.h
diff --git a/mail/faces/patches/patch-ah b/mail/faces/patches/patch-ah
index b15cd33437e..4c3d5a6364d 100644
--- a/mail/faces/patches/patch-ah
+++ b/mail/faces/patches/patch-ah
@@ -1,16 +1,7 @@
-$NetBSD: patch-ah,v 1.3 2000/07/08 12:47:06 tron Exp $
+$NetBSD: patch-ah,v 1.4 2001/11/30 16:29:28 jlam Exp $
 
 --- 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 */
- 
- #ifndef FACEDIR
--#define  FACEDIR  "/usr/local/faces"
-+#define  FACEDIR  "@localbase@/faces"
- #endif /*FACEDIR*/
- 
- #define  CLOSE         (void) close       /* To make line happy. */
 @@ -102,9 +102,10 @@
  enum mon_type { MONNEW, MONALL, MONPRINTER, MONPROG, MONUSERS } ;
  
diff --git a/mail/faces/patches/patch-aj b/mail/faces/patches/patch-aj
index 0f031429fad..f69784cadc4 100644
--- a/mail/faces/patches/patch-aj
+++ b/mail/faces/patches/patch-aj
@@ -1,16 +1,7 @@
-$NetBSD: patch-aj,v 1.3 2000/07/08 12:47:06 tron Exp $
+$NetBSD: patch-aj,v 1.4 2001/11/30 16:29:28 jlam Exp $
 
---- 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
- CDEFS		= $(NOINDEX) $(SYSV)
--CCOMP		= -g
-+CCOMP		= -pipe -O2
- CFLAGS		= $(CCOMP) $(CDEFS)
- 
- all:		$(BINARIES)
+--- filters/Makefile.orig	Wed Oct 23 22:26:14 1991
++++ filters/Makefile
 @@ -55,12 +55,12 @@
  		rm -f *.o $(BINARIES)
  
@@ -24,12 +15,12 @@ $NetBSD: patch-aj,v 1.3 2000/07/08 12:47:06 tron Exp $
 -		install -c -m 755 xbm2ikon $(BINDIR)
 -		install -c -m 755 xbmcut48 $(BINDIR)
 -		install -c -m 755 xbmsize48 $(BINDIR)
-+		install -s -o bin -m 751 icon2ikon $(BINDIR)
-+		install -s -o bin -m 751 ikon2icon $(BINDIR)
-+		install -s -o bin -m 751 rs2icon $(BINDIR)
-+		install -c -o bin -m 755 fs2ikon $(BINDIR)
-+		install -c -o bin -m 755 fs2xbm $(BINDIR)
-+		install -c -o bin -m 755 ikon2xbm $(BINDIR)
-+		install -c -o bin -m 755 xbm2ikon $(BINDIR)
-+		install -c -o bin -m 755 xbmcut48 $(BINDIR)
-+		install -c -o bin -m 755 xbmsize48 $(BINDIR)
++		${BSD_INSTALL_PROGRAM} icon2ikon $(BINDIR)
++		${BSD_INSTALL_PROGRAM} ikon2icon $(BINDIR)
++		${BSD_INSTALL_PROGRAM} rs2icon $(BINDIR)
++		${BSD_INSTALL_SCRIPT} fs2ikon $(BINDIR)
++		${BSD_INSTALL_SCRIPT} fs2xbm $(BINDIR)
++		${BSD_INSTALL_SCRIPT} ikon2xbm $(BINDIR)
++		${BSD_INSTALL_SCRIPT} xbm2ikon $(BINDIR)
++		${BSD_INSTALL_SCRIPT} xbmcut48 $(BINDIR)
++		${BSD_INSTALL_SCRIPT} xbmsize48 $(BINDIR)
diff --git a/mail/faces/patches/patch-ap b/mail/faces/patches/patch-ap
index 846a9dc5747..80b121eac73 100644
--- a/mail/faces/patches/patch-ap
+++ b/mail/faces/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.3 2000/07/08 12:47:08 tron Exp $
+$NetBSD: patch-ap,v 1.4 2001/11/30 16:29:28 jlam Exp $
 
---- scripts/Makefile.orig	Tue May  7 00:55:26 1991
-+++ scripts/Makefile	Sat Jul  8 14:30:16 2000
+--- scripts/Makefile.orig	Mon May  6 18:55:26 1991
++++ scripts/Makefile
 @@ -11,20 +11,20 @@
  #
  #  BINDIR is expected to be overridden by the calling Makefile
@@ -9,7 +9,7 @@ $NetBSD: patch-ap,v 1.3 2000/07/08 12:47:08 tron Exp $
 -LBINDIR = /usr/local/bin
 -BINDIR	= /usr/local/faces/bin
 +LBINDIR = $(PREFIX)/bin
-+BINDIR	= $(PREFIX)/faces/bin
++BINDIR	= $(PREFIX)/bin
  
  install:
 -	install -c -m 755 addxface $(BINDIR)
@@ -22,16 +22,17 @@ $NetBSD: patch-ap,v 1.3 2000/07/08 12:47:08 tron Exp $
 -	install -c -m 755 mkfacesindex $(BINDIR)
 -	install -c -m 755 newscheck.faces $(BINDIR)
 -	install -c -m 755 newsfrom.faces $(BINDIR)
-+	install -c -o bin -m 755 addxface $(BINDIR)
-+	install -c -o bin -m 755 mailq.faces $(BINDIR)
-+	install -c -o bin -m 755 from.faces $(BINDIR)
-+	install -c -o bin -m 755 lpqall.faces $(BINDIR)
-+	install -c -o bin -m 755 rotary.faces $(BINDIR)
-+	install -c -o bin -m 755 facesaddr $(BINDIR)
-+	install -c -o bin -m 755 facesall $(BINDIR)
-+	install -c -o bin -m 755 mkfacesindex $(BINDIR)
-+	install -c -o bin -m 755 newscheck.faces $(BINDIR)
-+	install -c -o bin -m 755 newsfrom.faces $(BINDIR)
++	${BSD_INSTALL_SCRIPT} addxface $(BINDIR)
++	${BSD_INSTALL_SCRIPT} mailq.faces $(BINDIR)
++	${BSD_INSTALL_SCRIPT} from.faces $(BINDIR)
++	${BSD_INSTALL_SCRIPT} lpqall.faces $(BINDIR)
++	${BSD_INSTALL_SCRIPT} rotary.faces $(BINDIR)
++	${BSD_INSTALL_SCRIPT} facesaddr $(BINDIR)
++	${BSD_INSTALL_SCRIPT} facesall $(BINDIR)
++	${BSD_INSTALL_SCRIPT} mkfacesindex $(BINDIR)
++	${BSD_INSTALL_SCRIPT} newscheck.faces $(BINDIR)
++	${BSD_INSTALL_SCRIPT} newsfrom.faces $(BINDIR)
  
  install2:
- 	install -c -m 755 faces $(LBINDIR)
+-	install -c -m 755 faces $(LBINDIR)
++	${BSD_INSTALL_SCRIPT} faces $(LBINDIR)
diff --git a/mail/faces/patches/patch-aq b/mail/faces/patches/patch-aq
index 0e64d64e218..d505025df9b 100644
--- a/mail/faces/patches/patch-aq
+++ b/mail/faces/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.3 2000/07/08 12:47:08 tron Exp $
+$NetBSD: patch-aq,v 1.4 2001/11/30 16:29:29 jlam Exp $
 
 --- scripts/addxface.orig	Tue Nov 19 05:05:58 1991
 +++ scripts/addxface	Sat Jul  8 14:31:35 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-aq,v 1.3 2000/07/08 12:47:08 tron Exp $
  #$olddb = 1;
  
 -$faces = '/usr/local/faces';
-+$faces = '@localbase@/share/faces';
++$faces = '@PREFIX@/share/faces';
  $umask = 000;
  
  # addxface - install any X-Face: in the header of the given mail message
diff --git a/mail/faces/patches/patch-ar b/mail/faces/patches/patch-ar
index 6cc9537d514..a351d55426e 100644
--- a/mail/faces/patches/patch-ar
+++ b/mail/faces/patches/patch-ar
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.3 2000/07/08 12:47:09 tron Exp $
+$NetBSD: patch-ar,v 1.4 2001/11/30 16:29:29 jlam Exp $
 
 --- scripts/facesall.orig	Mon Nov 25 01:30:24 1991
 +++ scripts/facesall	Sat Jul  8 14:36:06 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ar,v 1.3 2000/07/08 12:47:09 tron Exp $
  
  $cols = 15; $rows = 13;
 -$FACEDIR = '/usr/local/faces';
-+$FACEDIR = '@localbase@/share/faces';
++$FACEDIR = '@PREFIX@/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 a156ac4e941..10a7b0e1e6a 100644
--- a/mail/faces/patches/patch-as
+++ b/mail/faces/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.3 2000/07/08 12:47:09 tron Exp $
+$NetBSD: patch-as,v 1.4 2001/11/30 16:29:29 jlam Exp $
 
 --- scripts/mkfacesindex.orig	Tue Nov 19 05:05:58 1991
 +++ scripts/mkfacesindex	Sat Jul  8 14:38:08 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-as,v 1.3 2000/07/08 12:47:09 tron Exp $
  #$olddb = 1;
  
 -$FACEDIR = '/usr/local/faces';
-+$FACEDIR = '@localbase@/share/faces';
++$FACEDIR = '@PREFIX@/share/faces';
  
  # mkfacesindex - make a .index file at the root of a faces database that
  #		 facesall can use more speedily instead of tabulating the