o) Update to nearly complete rewritten faces-1.7.7 port

o) This port now includes xfaces functionality -> remove xfaces port
o) Support for different audio systems when building the port

PR:		ports/35578, ports/35617
Submitted by:	Alan Eldridge <ports@geeksrus.net>

25 files changed, 229 insertions, 997 deletions

diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index bcfbfd15754b..b7950c47c92e 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -7,60 +7,101 @@
 #
 
 PORTNAME=	faces
-PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTVERSION=	1.7.7
+#PORTREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/faces/faces-1.6.1/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/faces/
 
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 
-# Define USE_NAS for NAS audio support
+LIB_DEPENDS=    intl.1:${PORTSDIR}/devel/gettext
+
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS= --prefix=${PREFIX} --enable-imap --enable-pop \
+		--enable-name-unknown --with-spooldir=/var/mail \
+		--with-facedir=${PREFIX}/share/faces
+
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=--without-x
+PLIST_SUB+=     APPDEF="@comment "
+.else # with X11
+PLIST_SUB+=     APPDEF=""
+USE_GTK=yes
+# NAS is only possible with X11
+.if !defined(WITHOUT_AUDIO)
 .if defined(USE_NAS)
+CONFIGURE_ARGS+=--enable-audio --with-audio-cmd=${X11BASE}/bin/auplay
 RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas
-SED_REPL=auplay
+PLAY_COMMAND=	auplay
+.endif # USE_NAS
+.endif # WITHOUT_AUDIO
+.endif # WITHOUT_X11
+
+.if !defined(WITHOUT_AUDIO)
+.if defined(USE_SOX)
+CONFIGURE_ARGS+=--enable-audio --with-audio-cmd=${LOCALBASE}/bin/play
+RUN_DEPENDS=	play:${PORTSDIR}/audio/sox
+PLAY_COMMAND=	play
 .else
+CONFIGURE_ARGS+=--enable-audio --with-audio-cmd=${LOCALBASE}/bin/rplay
 RUN_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
-SED_REPL=rplay
+PLAY_COMMAND=	rplay
+.endif # USE_SOX
+.endif # WITHOUT_AUDIO
+
+CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include -I../compface" \
+		CFLAGS="-I${LOCALBASE}/include -I../compface" \
+		LIBS="-L${LOCALBASE}/lib -L../compface"
+
+.if defined(USE_GTK)
+CONFIGURE_ENV+= GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 .endif
 
-USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
-WRKSRC=		${WRKDIR}/faces
-MAN1=		compface.1 faces.1 face_update.1
+MAN1=		compface.1 faces.1
 MAN3=		compface.3
 MLINKS=		compface.1 uncompface.1 \
 		compface.3 uncompface.3
 
-pre-patch:
-	@${CP} ${WRKSRC}/Makefile.dist ${WRKSRC}/Makefile
+pre-everything:
+	@${ECHO_MSG} "***"
+	@${ECHO_MSG} "*** Note: You can use the following options:"
+	@${ECHO_MSG} "***       -DWITHOUT_AUDIO build without audio support!"
+	@${ECHO_MSG} "***       -DWITHOUT_X11   build without X11/GTK support!"
+	@${ECHO_MSG} "***       -DWITH_NAS      build with NAS audio support. Needs X11!"
+	@${ECHO_MSG} "***       -DWITH_SOX      build with SOX audio support!"
+	@${ECHO_MSG} "*** The default is X11/GTK with rplay audio support!"
+	@${ECHO_MSG} "***"
 
-post-patch:
-	for na in $$(find ${WRKSRC}/scripts -type f) \
-		${WRKSRC}/faces.man ${WRKSRC}/face_update.1 ; do \
-	    ${CP} $$na $$na.orig; \
-	    ${SED} "s%/usr/local%${PREFIX}%" $$na.orig > $$na; \
-	done; \
-	for na in ${WRKSRC}/Makefile ${WRKSRC}/Faces.ad; do \
-	    ${CP} $$na $$na.orig; \
-	    ${SED} "s%rplay%${SED_REPL}%" $$na.orig > $$na; \
-	done; \
-	for na in ${WRKSRC}/Makefile ${WRKSRC}/x11.c; do \
-	    ${CP} $$na $$na.orig2; \
-	    ${SED} "s%/usr/X11R6%${X11BASE}%" $$na.orig2 > $$na; \
-	done
+# I have no better idea up to now
+# Insall the working Makefile for compface from the old faces port
+# This was much less complex an builds the shared libs, too
+post-configure:
+	${CP} ${FILESDIR}/Makefile.compface ${WRKSRC}/compface/Makefile
+	${CP} -pf ${WRKSRC}/faces/faces.man ${WRKSRC}/faces/faces.man.orig
+	${SED} -e "s%/usr/local/faces%${PREFIX}/share/faces%" \
+	       -e "s%/var/spool/mail%/var/mail%" < ${WRKSRC}/faces/faces.man.orig > ${WRKSRC}/faces/faces.man
+	${CP} -pf ${WRKSRC}/faces/Faces.ad ${WRKSRC}/faces/Faces.ad.orig
+.if !defined(WITHOUT_AUDIO)
+.if defined(USE_NAS)
+	${SED} -e "s%rplay%auplay%" < ${WRKSRC}/faces/Faces.ad.orig > ${WRKSRC}/faces/Faces.ad
+.endif
+.if defined(USE_SOX)
+	${SED} -e "s%rplay%play%" < ${WRKSRC}/faces/Faces.ad.orig > ${WRKSRC}/faces/Faces.ad
+.endif
+# For rplay we have nothing to do!
+.else # WITHOUT_AUDIO
+	${SED} -e "s%^faces.audioSupport.*%faces.audioSupport:		false%" < ${WRKSRC}/faces/Faces.ad.orig > ${WRKSRC}/faces/Faces.ad
+.endif # WITHOUT_AUDIO
 
-.if !defined(NOPORTDOCS)
 post-install:
+.if !defined(WITHOUT_X11)
+	${CP} -f ${WRKSRC}/faces/Faces.ad ${PREFIX}/lib/X11/app-defaults/Faces
+.endif
+.if !defined(NOPORTDOCS)
 	if [ ! -e ${PREFIX}/share/doc/${PORTNAME} ]; then \
-	    ${MKDIR} ${PREFIX}/share/doc/${PORTNAME}; \
-	    ${CP} -f ${WRKSRC}/README                 ${PREFIX}/share/doc/${PORTNAME}; \
-	    ${CP} -f ${WRKSRC}/scripts/README.kinzler ${PREFIX}/share/doc/${PORTNAME}; \
-	    ${CP} -f ${WRKSRC}/scripts/from.allrc-eg  ${PREFIX}/share/doc/${PORTNAME}; \
-	    ${MKDIR} ${DATADIR}/lib; \
-	    ${ECHO_CMD} ";# See ${PREFIX}/share/doc/${PORTNAME}/from.allrc-eg for an example" \
-		> ${DATADIR}/lib/allrc; \
-	fi
+		${MKDIR} ${PREFIX}/share/doc/${PORTNAME}; \
+	       	${CP} -f ${WRKSRC}/README                 ${PREFIX}/share/doc/${PORTNAME};
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/faces/distinfo b/mail/faces/distinfo
index 819c43f649e8..f90b2b89d1c4 100644
--- a/mail/faces/distinfo
+++ b/mail/faces/distinfo
@@ -1 +1 @@
-MD5 (faces-1.6.1.tar.Z) = 73b1ba54e57bf99f85d3ccf7be95c17d
+MD5 (faces-1.7.7.tar.gz) = 99103a89113432aa1f76d2d32cd79704
diff --git a/mail/faces/files/Makefile.compface b/mail/faces/files/Makefile.compface
new file mode 100644
index 000000000000..684a4cf7fc1e
--- /dev/null
+++ b/mail/faces/files/Makefile.compface
@@ -0,0 +1,99 @@
+#
+#  Compface - 48x48x1 image compression and decompression
+#
+#  Copyright (c) James Ashton - Sydney University - June 1990.
+#
+#  Written 11th November 1989.
+#
+#  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 on inaccuracies 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.
+
+# SYSV is expected to be overridden by the calling Makefile.
+#--------------------------------------------------------------------------
+#  If you are running on a Unix System V machine, then you should uncomment
+#  the next definition.
+#
+#SYSV           = -DSYSV32
+#--------------------------------------------------------------------------
+# BINDIR, LIBDIR, INCDIR and MANDIR are expected to be overridden by the
+# calling Makefile
+
+BINDIR		= ${PREFIX}/bin
+LIBDIR		= ${PREFIX}/lib
+INCDIR		= ${PREFIX}/include
+MANDIR		= ${PREFIX}/man
+
+NAME		= compface
+UNNAME		= uncompface
+EXECUTABLE	= $(BINDIR)/$(NAME)
+UNEXECUTABLE	= $(BINDIR)/$(UNNAME)
+LIBNAME		= lib$(NAME).a
+SHLIB_MAJOR	= 1
+SHLIB_MINOR	= 0
+LIB		= $(NAME)
+.if ${PORTOBJFORMAT} == "elf"
+SOLIB		= lib$(NAME).so.$(SHLIB_MAJOR)
+.else
+SOLIB		= lib$(NAME).so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+.endif
+NOPROFILE	= ''
+LIBRARY		= $(LIBDIR)
+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 \
+		  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)
+CFLAGS		+= $(CDEFS) $(CCOMP)
+
+all:		lib$(NAME).a $(SOLIB) $(NAME) $(UNNAME)
+
+$(NAME) :	cmain.o compface.o
+		$(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o -L./ -lcompface
+
+$(UNNAME) :	uncmain.o $(LIBNAME)
+		$(CC) $(CFLAGS) -o $(UNNAME) uncmain.o -L./ -lcompface
+
+lint :
+		lint -abchx $(SOURCES)
+
+clean :
+		rm -f *.o *po *so *.a *.so.* *.sh core a.out $(NAME) $(UNNAME)
+
+install :	$(NAME) $(UNNAME) $(LIBNAME)
+		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 -fs $(MAN1DIR)/$(NAME).1 $(MAN1DIR)/$(UNNAME).1
+		install -c -o bin -m 444 $(LIBNAME) $(LIBRARY)
+		install -c -o bin -m 444 $(SOLIB) $(LIBRARY)
+		ln -sf $(SOLIB) $(LIBRARY)/lib$(NAME).so
+		install -c -g bin -o bin -m 444 $(NAME).3 $(MAN3DIR)
+		rm -f $(MAN3DIR)/$(UNNAME).3*
+		ln -fs $(MAN3DIR)/$(NAME).3 $(MAN3DIR)/$(UNNAME).3
+		install -m 444 -o bin -g bin -c compface.h $(INCDIR)
+
+shar :
+		shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh
+		compress $(NAME).sh
+
+arith.o:	arith.c compface.h data.h
+cmain.o:	cmain.c compface.h data.h
+compface.o:	compface.c compface.h data.h
+compress.o:	compress.c compface.h data.h
+file.o:		file.c compface.h data.h
+gen.o:		gen.c compface.h data.h
+uncmain.o:	uncmain.c compface.h data.h
+uncompface.o:	uncompface.c compface.h data.h
+
+.include <bsd.lib.mk>
diff --git a/mail/faces/files/patch-aa b/mail/faces/files/patch-aa
index 6024a701f4fd..a8d6ce91cf1b 100644
--- a/mail/faces/files/patch-aa
+++ b/mail/faces/files/patch-aa
@@ -1,16 +1,19 @@
-diff -c -N ../faces/Faces.ad ./Faces.ad
-*** ../faces/Faces.ad	Mon Jul  1 03:25:46 1991
---- ./Faces.ad	Tue Dec 10 19:07:26 1996
+*** faces/Makefile.in.orig	Tue Mar  5 21:07:46 2002
+--- faces/Makefile.in	Tue Mar  5 21:08:06 2002
 ***************
-*** 13,17 ****
-  faces.displayHostname:		false
+*** 116,122 ****
   
-  faces.audioSupport:		false
-! faces.audioCommand:		play
-  faces.bellAudioFile:
---- 13,17 ----
-  faces.displayHostname:		false
+  bin_PROGRAMS = faces
+  
+! @DNSLOOKUP_TRUE@resolv = -lresolv
+  faces_LDADD = @GTK_LIBS@ $(INTLLIBS) @X_LIBS@ \
+  	-lX11 -L../compface -lcompface $(resolv)
+  
+--- 116,122 ----
+  
+  bin_PROGRAMS = faces
+  
+! #@DNSLOOKUP_TRUE@resolv = -lresolv
+  faces_LDADD = @GTK_LIBS@ $(INTLLIBS) @X_LIBS@ \
+  	-lX11 -L../compface -lcompface $(resolv)
   
-  faces.audioSupport:		false
-! faces.audioCommand:		rplay
-  faces.bellAudioFile:
diff --git a/mail/faces/files/patch-ab b/mail/faces/files/patch-ab
deleted file mode 100644
index cebafaaac163..000000000000
--- a/mail/faces/files/patch-ab
+++ /dev/null
@@ -1,169 +0,0 @@
---- Makefile.dist	Sun Nov 24 15:55:28 1991
-+++ Makefile	Sat Mar 10 15:34:48 2001
-@@ -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.
- #
--#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=\"/usr/local/bin/play\"
-+AUDIO_CMD         = -DAUDIO_CMD=\"/usr/local/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
-@@ -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.
-@@ -77,7 +80,7 @@
- #  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
-@@ -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.
-@@ -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.
-@@ -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
-@@ -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$(X11BASE)/include
-+X11LIBDIR         = -L$(X11BASE)/lib
- #------------------------------------------------------------------------
- #  If you are compiling the XView version, then the following two lines
- #  should be uncommented, and set appropriately.
-@@ -272,16 +275,17 @@
- #  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) \
--			    MANDIR=$(MANDIR) CC=$(CC) \
-+			    INCDIR=$(INCDIR) MANDIR=$(MANDIR) CC=$(CC) \
- 			    NOINDEX=$(NOINDEX) SYSV=$(SYSV)
- 
- #
-@@ -302,8 +306,8 @@
- 		  $(SELTYPE) $(SGIDEF) $(SPOOLDIR) $(SPOOLFILE) $(SYSV) \
- 		  $(TTEXT) $(TOPIX) $(UPDATE) $(USE_BZERO) $(USE_GETWD) \
- 		  $(X11R3) $(X11INCDIR) $(XVIEWINCDIR) $(DEBUG)
--CCOMP		= -O
--CFLAGS		= $(CCOMP) $(CDEFS)
-+CCOMP		= -pipe -fwritable-strings 
-+CFLAGS		+= $(CCOMP) $(CDEFS)
- #
- #=======================================================================
- 
-@@ -311,12 +315,12 @@
- 
- BINARIES	= psfaces svfaces xfaces xvfaces
- 
--CC		= cc
-+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		= -L./compface -lcompface $(DNSLIB) $(SGILIBS)
- 
- COMPFACE	= compface
- FACES		= facedir
-@@ -357,7 +361,7 @@
- #  Dell Unix (Interactive 386/ix): $(X11LIBDIR) -lX11 -linet
- #  AT&T's XWIN:                    $(X11LIBDIR) -lX11_s -lc_s -lnsl_s -lpt
- #
--X11LIBS		= $(X11LIBDIR) -lX11
-+X11LIBS		= -L/usr/X11R6/lib -lX11
- XVIEWLIBS	= $(XVIEWLIBDIR) -lxview -lolgx -lX11
- 
- help:
-@@ -375,7 +379,7 @@
- 		@echo "  make clean"
- 		@echo
- 
--all:		$(BINARIES)
-+all:		x11
- 
- news:		$(STDOBJS) news.o faces_cps.h
- 		(cd compface; $(MAKE) $(MAKEOPTS))
-@@ -411,16 +415,18 @@
- 		-install -c -m 644 people.tab $(FACEDIR)
- 
- install:
-+		make tables
- 		(cd compface; $(MAKE) $(MAKEOPTS) install)
- 		(cd filters; $(MAKE) $(MAKEOPTS) install)
- 		(cd scripts; $(MAKE) $(MAKEOPTS) install)
--		install -s -m 751 faces $(BINDIR)
-+		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 644 face_update.1 \
-+		install -c -m 444 face_update.1 \
- 				$(MANDIR)/man$(MANSECT)/face_update.$(MANSECT)
-+		install -c -m 444 -o bin Faces.ad /usr/X11R6/lib/X11/app-defaults/Faces
- 
- clean:
- 		(cd compface; $(MAKE) $(MAKEOPTS) clean)
diff --git a/mail/faces/files/patch-ac b/mail/faces/files/patch-ac
deleted file mode 100644
index fe9abbdd82c3..000000000000
--- a/mail/faces/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -c -N ../faces/extern.h ./extern.h
-*** ../faces/extern.h	Tue Nov 19 05:00:48 1991
---- ./extern.h	Tue Dec 10 10:49:37 1996
-***************
-*** 82,87 ****
---- 82,88 ----
-  extern int facetype ;      /* Type of face file found. */
-  extern int firsttime ;     /* Zeroised after first mail/printer check. */
-  extern int flashes ;       /* Number of flashes for arrival of new mail. */
-+ extern int border_width ;  /* Border width of window. */
-  extern int fromc_found ;   /* Set if "From:" line found during processing. */
-  extern int froms_found ;   /* Set if "From " line found during processing. */
-  extern int height ;        /* Height in pixels of faces display. */
diff --git a/mail/faces/files/patch-ad b/mail/faces/files/patch-ad
deleted file mode 100644
index e1ec4347ce1c..000000000000
--- a/mail/faces/files/patch-ad
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -c -N ../faces/faces.h ./faces.h
-*** ../faces/faces.h	Tue Nov 19 05:00:49 1991
---- ./faces.h	Tue Dec 10 17:36:10 1996
-***************
-*** 102,110 ****
-  enum mon_type { MONNEW, MONALL, MONPRINTER, MONPROG, MONUSERS } ;
-  
-  /* X resources used by faces. */
-! enum res_type { R_WINGEOM, R_ICONGEOM, R_FGCOLOR, R_BGCOLOR,
-!                 R_FONT,    R_BGICON,   R_PERIOD,  R_BELL,
-!                 R_FLASH,   R_LOWER,    R_RAISE,   R_BUT1CLR, R_DISPHOST,
-  #ifdef AUDIO_SUPPORT
-                  R_AUDIO,   R_AUDIOCMD, R_BELLFILE
-  #endif /*AUDIO_SUPPORT*/
---- 102,111 ----
-  enum mon_type { MONNEW, MONALL, MONPRINTER, MONPROG, MONUSERS } ;
-  
-  /* X resources used by faces. */
-! enum res_type { R_WINGEOM, R_ICONGEOM,    R_FGCOLOR, R_BGCOLOR,
-!                 R_FONT,    R_BGICON,      R_PERIOD,  R_BELL,
-!                 R_FLASH,   R_BORDERWIDTH, R_LOWER,   R_RAISE,
-! 		R_BUT1CLR, R_DISPHOST,
-  #ifdef AUDIO_SUPPORT
-                  R_AUDIO,   R_AUDIOCMD, R_BELLFILE
-  #endif /*AUDIO_SUPPORT*/
-***************
-*** 193,200 ****
-  #endif /*NOUTIME*/
-  
-  extern char *getenv P(()) ;
-- extern char *malloc P(()) ;
-- extern char *realloc P(()) ;
-  extern char *index P(()) ;
-  extern char *rindex P(()) ;
-  extern char *strcpy P(()) ;
---- 194,199 ----
-***************
-*** 217,223 ****
---- 216,226 ----
-  #define  PRINTDEF   "lpq -P %s"
-  
-  /* Updating the faces database:   %s replaced with mail update alias name. */
-+ #ifdef __FreeBSD__
-+ #define  UPDATEDEF  "/usr/sbin/sendmail -oeq -oi %s"
-+ #else
-  #define  UPDATEDEF  "/usr/lib/sendmail -oeq -oi %s"
-+ #endif
-  
-  /* Monitoring users on a machine: %s replaced with hostname. */
-  #define  USERSDEF   "rusers -l %s"
diff --git a/mail/faces/files/patch-ae b/mail/faces/files/patch-ae
deleted file mode 100644
index e4658d8d9db0..000000000000
--- a/mail/faces/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -c -N ../faces/faces.sendmail ./faces.sendmail
-*** ../faces/faces.sendmail	Mon Jul  1 03:25:50 1991
---- ./faces.sendmail	Tue Dec 10 20:19:25 1996
-***************
-*** 37,40 ****
-  	-e ': copy' \
-  	-e p \
-  	-e n \
-! 	-e 'b copy' | /usr/lib/sendmail "$@"
---- 37,40 ----
-  	-e ': copy' \
-  	-e p \
-  	-e n \
-! 	-e 'b copy' | /usr/sbin/sendmail "$@"
diff --git a/mail/faces/files/patch-af b/mail/faces/files/patch-af
deleted file mode 100644
index fc3f996af8e7..000000000000
--- a/mail/faces/files/patch-af
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -c -N ../faces/main.c ./main.c
-*** ../faces/main.c	Tue Nov 19 05:00:47 1991
---- ./main.c	Wed Dec 11 09:26:19 1996
-***************
-*** 63,68 ****
---- 63,69 ----
-    "period",                /* Integer: period in seconds between checks. */
-    "bell",                  /* Integer: number of beeps for new arrival. */
-    "flash",                 /* Integer: number of flashes for new arrival. */
-+   "borderWidth",           /* Integer: border width of window. */
-    "lower",                 /* Boolean: lower window if no mail. */
-    "raise",                 /* Boolean: raise window on update? */
-    "button1clear",          /* Boolean: mouse button 1 clear window? */
-***************
-*** 150,155 ****
---- 151,157 ----
-  int facetype ;          /* Type of face file found. */
-  int firsttime = 1 ;     /* Zeroised after first mail/printer check. */
-  int flashes = 0 ;       /* Number of flashes for arrival of new mail. */
-+ int border_width = 2 ;	/* Border width of window. */
-  int fromc_found = 0 ;   /* Set if "From:" line found during processing. */
-  int froms_found = 0 ;   /* Set if "From " line found during processing. */
-  int height ;            /* Height in pixels of faces display. */
-***************
-*** 743,751 ****
-    if (get_str_resource(R_FONT,      str))      read_str(&fontname,      str) ;
-    if (get_str_resource(R_BGICON,    str))      read_str(&bgicon,        str) ;
-  
-!   if (get_int_resource(R_PERIOD,    &intval))  period       = intval ;
-!   if (get_int_resource(R_BELL,      &intval))  beeps        = intval ;
-!   if (get_int_resource(R_FLASH,     &intval))  flashes      = intval ;
-  
-    if (get_bool_resource(R_LOWER,    &boolval)) lowerwindow  = boolval ;
-    if (get_bool_resource(R_RAISE,    &boolval)) raisewindow  = boolval ;
---- 745,754 ----
-    if (get_str_resource(R_FONT,      str))      read_str(&fontname,      str) ;
-    if (get_str_resource(R_BGICON,    str))      read_str(&bgicon,        str) ;
-  
-!   if (get_int_resource(R_PERIOD,     &intval)) period       = intval ;
-!   if (get_int_resource(R_BELL,       &intval)) beeps        = intval ;
-!   if (get_int_resource(R_FLASH,      &intval)) flashes      = intval ;
-!   if (get_int_resource(R_BORDERWIDTH,&intval)) border_width = intval ;
-  
-    if (get_bool_resource(R_LOWER,    &boolval)) lowerwindow  = boolval ;
-    if (get_bool_resource(R_RAISE,    &boolval)) raisewindow  = boolval ;
diff --git a/mail/faces/files/patch-ag b/mail/faces/files/patch-ag
deleted file mode 100644
index c3293263d870..000000000000
--- a/mail/faces/files/patch-ag
+++ /dev/null
@@ -1,123 +0,0 @@
-*** x11.c.orig	Tue Nov 19 05:00:50 1991
---- x11.c	Mon Feb 26 21:29:24 2001
-***************
-*** 58,64 ****
-  
-  #define  F_ICON              0         /* Icon index to frame array. */
-  #define  F_WINDOW            1         /* Window index to frame array. */
-- #define  FACES_BORDER_WIDTH  2
-  #define  FRAME_MASK          (ButtonPressMask  | ExposureMask | \
-                                ButtonMotionMask | KeyPressMask)
-  #define  ICON_MASK            ExposureMask
---- 58,63 ----
-***************
-*** 364,374 ****
-    init_font() ;
-    gc_mask = GCFont | GCForeground | GCBackground | GCGraphicsExposures ;
-    gc_val.font = sfont->fid ;
-!   gc_val.foreground = foregnd ;
-!   gc_val.background = backgnd ;
-    gc_val.graphics_exposures = False ;
-    gc = XCreateGC(dpy, root, gc_mask, &gc_val) ;
-  
-    tilegc = XCreateGC(dpy, root, gc_mask, &gc_val) ;
-    if (depth == 1) XSetFillStyle(dpy, tilegc, FillOpaqueStippled) ;
-    else            XSetFillStyle(dpy, tilegc, FillTiled) ;
---- 363,375 ----
-    init_font() ;
-    gc_mask = GCFont | GCForeground | GCBackground | GCGraphicsExposures ;
-    gc_val.font = sfont->fid ;
-!   gc_val.foreground = BlackPixel(dpy, screen) ;
-!   gc_val.background = WhitePixel(dpy, screen) ;
-    gc_val.graphics_exposures = False ;
-    gc = XCreateGC(dpy, root, gc_mask, &gc_val) ;
-  
-+   gc_val.foreground = foregnd ;
-+   gc_val.background = backgnd ;
-    tilegc = XCreateGC(dpy, root, gc_mask, &gc_val) ;
-    if (depth == 1) XSetFillStyle(dpy, tilegc, FillOpaqueStippled) ;
-    else            XSetFillStyle(dpy, tilegc, FillTiled) ;
-***************
-*** 459,465 ****
---- 460,470 ----
-  
-    home = getenv("HOME") ;
-    XrmInitialize() ;
-+ #ifdef __FreeBSD__
-+   STRCPY(name, "/usr/X11R6/lib/X11/app-defaults/Faces") ;
-+ #else
-    STRCPY(name, "/usr/lib/X11/app-defaults/Faces") ;
-+ #endif
-   
-  /* Get applications defaults file, if any. */
-   
-***************
-*** 576,589 ****
-    winattrs.event_mask = FRAME_MASK ;
-  
-    frame[F_WINDOW] = XCreateWindow(dpy, root, size.x, size.y,
-!                         size.width, size.height, FACES_BORDER_WIDTH,
-                          CopyFromParent, InputOutput, CopyFromParent,
-                          CWBackPixel | CWBorderPixel | CWEventMask, &winattrs) ;
-  
-    winattrs.event_mask = ICON_MASK ;
-  
-    frame[F_ICON] = XCreateWindow(dpy, root,
-!                         ix, iy, imagewidth, imageheight, FACES_BORDER_WIDTH,
-                          CopyFromParent, InputOutput, CopyFromParent, 
-                          CWBackPixel | CWBorderPixel | CWEventMask, &winattrs) ;
-  
---- 581,594 ----
-    winattrs.event_mask = FRAME_MASK ;
-  
-    frame[F_WINDOW] = XCreateWindow(dpy, root, size.x, size.y,
-!                         size.width, size.height, border_width,
-                          CopyFromParent, InputOutput, CopyFromParent,
-                          CWBackPixel | CWBorderPixel | CWEventMask, &winattrs) ;
-  
-    winattrs.event_mask = ICON_MASK ;
-  
-    frame[F_ICON] = XCreateWindow(dpy, root,
-!                         ix, iy, imagewidth, imageheight, border_width,
-                          CopyFromParent, InputOutput, CopyFromParent, 
-                          CWBackPixel | CWBorderPixel | CWEventMask, &winattrs) ;
-  
-***************
-*** 818,823 ****
---- 823,830 ----
-    int c, r ;         /* Column and row position for this face. */
-    int x, y ;         /* Position of start of this text string. */
-    int textwidth ;
-+   Colormap cmap ;
-+   XColor selcolor ;
-   
-    c = column ;
-    r = row ;
-***************
-*** 852,861 ****
-        case RIGHT : x = (c + 1) * imagewidth - textwidth - 2 ;
-                     y = (r + 1) * imageheight - 5 ;
-      }
-!   XSetFunction(dpy, gc, GXandInverted) ;
-    XFillRectangle(dpy, pr[(int) dtype], gc, x, y-9,
-                   (unsigned int) textwidth+2, 13) ;
-!   XSetFunction(dpy, gc, GXxor) ;
-    XDrawImageString(dpy, pr[(int) dtype], gc, x, y, str, len) ;
-    XSetFunction(dpy, gc, GXcopy) ;
-  }
---- 859,873 ----
-        case RIGHT : x = (c + 1) * imagewidth - textwidth - 2 ;
-                     y = (r + 1) * imageheight - 5 ;
-      }
-!   XSetForeground(dpy, gc, WhitePixel(dpy, screen));
-!   XSetFunction(dpy, gc, GXcopy) ;
-    XFillRectangle(dpy, pr[(int) dtype], gc, x, y-9,
-                   (unsigned int) textwidth+2, 13) ;
-!   XSetFunction(dpy, gc, GXcopy) ;
-!   cmap = DefaultColormap(dpy, screen);
-!   XParseColor(dpy, cmap, "red", &selcolor);
-!   XAllocColor(dpy, cmap, &selcolor) ;
-!   XSetForeground(dpy, gc, selcolor.pixel );
-    XDrawImageString(dpy, pr[(int) dtype], gc, x, y, str, len) ;
-    XSetFunction(dpy, gc, GXcopy) ;
-  }
diff --git a/mail/faces/files/patch-ah b/mail/faces/files/patch-ah
deleted file mode 100644
index a046ebe72f6d..000000000000
--- a/mail/faces/files/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -c -N ../faces/y.tab.h ./y.tab.h
-*** ../faces/y.tab.h	Thu Jan  1 01:00:00 1970
---- ./y.tab.h	Wed Dec 11 09:26:39 1996
-***************
-*** 0 ****
---- 1,11 ----
-+ #define EOL 257
-+ #define ATOM 258
-+ #define LIT_DOMAIN 259
-+ #define QUOTED_STRING 260
-+ typedef union {
-+    char	 yChar;
-+    char	*yString;
-+    Dom	*yDom;
-+    Addr	*yAddr;
-+ } YYSTYPE;
-+ extern YYSTYPE yylval;
diff --git a/mail/faces/files/patch-ba b/mail/faces/files/patch-ba
index 0826f0ff4694..2f32d2cee0de 100644
--- a/mail/faces/files/patch-ba
+++ b/mail/faces/files/patch-ba
@@ -1,104 +1,17 @@
---- compface/Makefile.orig	Wed Oct 23 19:28:06 1991
-+++ compface/Makefile	Sat Mar 10 15:38:13 2001
-@@ -19,62 +19,69 @@
- #
- #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
- # calling Makefile
- 
- BINDIR		= /usr/local/bin
- LIBDIR		= /usr/local/lib
--MANDIR		= /usr/manl
-+INCDIR		= /usr/local/include
-+MANDIR		= /usr/local/man
- 
- NAME		= compface
- UNNAME		= uncompface
- EXECUTABLE	= $(BINDIR)/$(NAME)
- UNEXECUTABLE	= $(BINDIR)/$(UNNAME)
- LIBNAME		= lib$(NAME).a
--LIBRARY		= $(LIBDIR)/$(LIBNAME)
-+SHLIB_MAJOR	= 1
-+SHLIB_MINOR	= 0
-+LIB		= $(NAME)
-+.if ${PORTOBJFORMAT} == "elf"
-+SOLIB		= lib$(NAME).so.$(SHLIB_MAJOR)
-+.else
-+SOLIB		= lib$(NAME).so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
-+.endif
-+NOPROFILE	= ''
-+LIBRARY		= $(LIBDIR)
- 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 \
- 		  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
-+CC		?= cc
- CDEFS		= $(SYSV)
--CCOMP		= -g
--CFLAGS		= $(CDEFS) $(CCOMP)
-+CFLAGS		+= $(CDEFS) $(CCOMP)
- 
--all:		$(NAME) $(UNNAME)
-+all:		lib$(NAME).a $(SOLIB) $(NAME) $(UNNAME) 
- 
--$(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./ -lcompface
- 
- $(UNNAME) :	uncmain.o $(LIBNAME)
--		$(CC) $(CFLAGS) -o $(UNNAME) uncmain.o $(LIBNAME)
--
--$(LIBNAME) :	$(OBJECTS)
--		ar rc $(LIBNAME) $(OBJECTS)
--		-ranlib $(LIBNAME)
-+		$(CC) $(CFLAGS) -o $(UNNAME) uncmain.o -L./ -lcompface
- 
- 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)
- 
- install :	$(NAME) $(UNNAME) $(LIBNAME)
--		-cp $(NAME) $(EXECUTABLE)
--		strip $(EXECUTABLE)
--		-cp $(UNNAME) $(UNEXECUTABLE)
--		strip $(UNEXECUTABLE)
--		-cp $(NAME).1 $(MAN1DIR)
--		rm -f $(MAN1DIR)/$(UNNAME).1
--		-ln $(MAN1DIR)/$(NAME).1 $(MAN1DIR)/$(UNNAME).1
--		-cp $(LIBNAME) $(LIBRARY)
--		-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 -fs $(MAN1DIR)/$(NAME).1 $(MAN1DIR)/$(UNNAME).1
-+		install -c -o bin -m 444 $(LIBNAME) $(LIBRARY)
-+		install -c -o bin -m 444 $(SOLIB) $(LIBRARY)
-+		ln -sf $(SOLIB) $(LIBRARY)/lib$(NAME).so
-+		install -c -g bin -o bin -m 444 $(NAME).3 $(MAN3DIR)
-+		rm -f $(MAN3DIR)/$(UNNAME).3*
-+		ln -fs $(MAN3DIR)/$(NAME).3 $(MAN3DIR)/$(UNNAME).3
-+		install -m 444 -o bin -g bin -c compface.h $(INCDIR)
- 
- shar :
- 		shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh
-@@ -88,3 +95,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
-+
-+.include <bsd.lib.mk>
+*** faces/Faces.ad.orig	Tue Dec 18 05:11:31 2001
+--- faces/Faces.ad	Sun Mar 17 21:14:05 2002
+***************
+*** 12,17 ****
+  faces.button1clear:		false
+  faces.displayHostname:		false
+  
+! faces.audioSupport:		false
+! faces.audioCommand:		play
+  faces.bellAudioFile:
+--- 12,17 ----
+  faces.button1clear:		false
+  faces.displayHostname:		false
+  
+! faces.audioSupport:		true
+! faces.audioCommand:		rplay
+  faces.bellAudioFile:
diff --git a/mail/faces/files/patch-bb b/mail/faces/files/patch-bb
deleted file mode 100644
index 5c5104777188..000000000000
--- a/mail/faces/files/patch-bb
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -c -N ../faces/compface/compface.1 ./compface/compface.1
-*** ../faces/compface/compface.1	Fri Mar 15 06:10:29 1991
---- ./compface/compface.1	Tue Dec 10 17:28:10 1996
-***************
-*** 12,17 ****
---- 12,19 ----
-  .LP
-  .B uncompface
-  [
-+ .B \-X
-+ ] [
-  .I infile
-  [
-  .I outfile
-***************
-*** 25,31 ****
-  face image files.
-  .I uncompface
-  is an inverse filter which performs an inverse transformation with no
-! loss of data.
-  The algorithm used is highly tuned for its purpose and achieves better
-  than a five to one compression ratio on average.
-  Arguments operate identically for both programmes.
---- 27,33 ----
-  face image files.
-  .I uncompface
-  is an inverse filter which performs an inverse transformation with no
-! loss of data. 
-  The algorithm used is highly tuned for its purpose and achieves better
-  than a five to one compression ratio on average.
-  Arguments operate identically for both programmes.
-***************
-*** 56,61 ****
---- 58,69 ----
-  .I compface
-  averages less than 200 characters.
-  The average number of output lines is three.
-+ .SH OPTIONS
-+ .TP 12
-+ .B \-X
-+ The same as
-+ .I uncompface
-+ | ikon2xbm. Usefull for exmh!
-  .SH DIAGNOSTICS
-  Exit status is normally 0.
-  Possible errors include IO errors when opening, reading or writing
diff --git a/mail/faces/files/patch-bc b/mail/faces/files/patch-bc
deleted file mode 100644
index 5b46e56ac9ff..000000000000
--- a/mail/faces/files/patch-bc
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -c -N ../faces/compface/file.c ./compface/file.c
-*** ../faces/compface/file.c	Wed Jun 19 08:29:13 1991
---- ./compface/file.c	Wed Dec 11 09:25:17 1996
-***************
-*** 15,20 ****
---- 15,22 ----
-  
-  #include "compface.h"
-  
-+ int xbitmap=0;
-+ 
-  void
-  BigRead(fbuf)
-  register char *fbuf;
-***************
-*** 127,136 ****
---- 129,147 ----
-  {
-  	register char *s, *t;
-  	register int i, bits, digits, words;
-+ 	extern int xbitmap;
-+ 	int digsperword = DIGSPERWORD;
-+ 	int wordsperline = WORDSPERLINE;
-  
-  	s = F;
-  	t = fbuf;
-  	bits = digits = words = i = 0;
-+ 	if (xbitmap) {
-+ 		sprintf(t,"#define noname_width 48\n#define noname_height 48\nstatic char noname_bits[] = {\n ");
-+ 		while (*t) t++;
-+ 		digsperword = 2;
-+ 		wordsperline = 15;
-+ 	}
-  	while (s < F + PIXELS)
-  	{
-  		if ((bits == 0) && (digits == 0))
-***************
-*** 138,162 ****
-  			*(t++) = '0';
-  			*(t++) = 'x';
-  		}
-! 		if (*(s++))
-! 			i = i * 2 + 1;
-! 		else
-! 			i *= 2;
-  		if (++bits == BITSPERDIG)
-  		{
-! 			*(t++) = *(i + HexDigits);
-  			bits = i = 0;
-! 			if (++digits == DIGSPERWORD)
-  			{
-  				*(t++) = ',';
-  				digits = 0;
-! 				if (++words == WORDSPERLINE)
-  				{
-  					*(t++) = '\n';
-  					words = 0;
-  				}
-  			}
-  		}
-  	}
-  	*(t++) = '\0';
-  }
---- 149,191 ----
-  			*(t++) = '0';
-  			*(t++) = 'x';
-  		}
-! 		if (xbitmap) {
-! 			if (*(s++))
-! 				i = (i >> 1) | 0x8;
-! 			else
-! 				i >>= 1;
-! 		}
-! 		else {
-! 			if (*(s++))
-! 				i = i * 2 + 1;
-! 			else
-! 				i *= 2;
-! 		}
-  		if (++bits == BITSPERDIG)
-  		{
-! 			if (xbitmap) {
-! 				t++;
-! 				t[-(digits & 1) * 2] = *(i + HexDigits);
-! 			}
-! 			else *(t++) = *(i + HexDigits);
-  			bits = i = 0;
-! 			if (++digits == digsperword)
-  			{
-+ 				if (xbitmap && (s >= F + PIXELS)) break;
-  				*(t++) = ',';
-  				digits = 0;
-! 				if (++words == wordsperline)
-  				{
-  					*(t++) = '\n';
-+ 					if (xbitmap) *(t++) = ' ';
-  					words = 0;
-  				}
-  			}
-  		}
-+ 	}
-+ 	if (xbitmap) {
-+ 		sprintf(t, "}\n");
-+ 		while (*t) t++;
-  	}
-  	*(t++) = '\0';
-  }
diff --git a/mail/faces/files/patch-bd b/mail/faces/files/patch-bd
deleted file mode 100644
index 041b07759908..000000000000
--- a/mail/faces/files/patch-bd
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -c -N ../faces/compface/uncmain.c ./compface/uncmain.c
-*** ../faces/compface/uncmain.c	Thu Oct 24 03:28:07 1991
---- ./compface/uncmain.c	Wed Dec 11 09:27:47 1996
-***************
-*** 18,23 ****
---- 18,25 ----
-  #include <fcntl.h>
-  #include "compface.h"
-  
-+ extern int xbitmap;
-+ 
-  /* the buffer is longer than needed to handle sparse input formats */
-  #define FACEBUFLEN 2048
-  char fbuf[FACEBUFLEN];
-***************
-*** 59,64 ****
---- 61,73 ----
-    while (**argv)
-      if (*((*argv)++) == '/')
-        cmdname = *argv;               /* find the command's basename */
-+ 
-+   if (argc > 1 && !strcmp(argv[1], "-X"))
-+     {
-+       xbitmap++;
-+       argc--;
-+       argv++;
-+     }
-  
-    if (argc > 3)
-      {
diff --git a/mail/faces/files/patch-ca b/mail/faces/files/patch-ca
deleted file mode 100644
index 2491ed818d9b..000000000000
--- a/mail/faces/files/patch-ca
+++ /dev/null
@@ -1,37 +0,0 @@
---- filters/Makefile.orig	Wed Oct 23 19:26:14 1991
-+++ filters/Makefile	Sat Mar 10 15:37:37 2001
-@@ -32,10 +32,9 @@
- 
- BINARIES	= icon2ikon ikon2icon rs2icon
- 
--CC		= cc
-+CC		?= cc
- CDEFS		= $(NOINDEX) $(SYSV)
--CCOMP		= -g
--CFLAGS		= $(CCOMP) $(CDEFS)
-+CFLAGS		+= $(CCOMP) $(CDEFS)
- 
- all:		$(BINARIES)
- 
-@@ -55,12 +54,12 @@
- 		rm -f *.o $(BINARIES)
- 
- install:	$(BINARIES)
--		install -s -m 751 icon2ikon $(BINDIR)
--		install -s -m 751 ikon2icon $(BINDIR)
--		install -s -m 751 rs2icon $(BINDIR)
--		install -c -m 755 fs2ikon $(BINDIR)
--		install -c -m 755 fs2xbm $(BINDIR)
--		install -c -m 755 ikon2xbm $(BINDIR)
--		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)
diff --git a/mail/faces/files/patch-cb b/mail/faces/files/patch-cb
deleted file mode 100644
index 0b09b0f826a3..000000000000
--- a/mail/faces/files/patch-cb
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -c -N ../faces/filters/ikon2xbm ./filters/ikon2xbm
-*** ../faces/filters/ikon2xbm	Tue May  7 00:51:50 1991
---- ./filters/ikon2xbm	Tue Dec 10 19:45:55 1996
-***************
-*** 26,32 ****
-  \2\
-  \3/' > $tmp
-  
-! dim=`wc -l < $tmp | awk '{ print 4 * sqrt }'`
-  
-  pr -l1 -t -8 -s, < $tmp |
-  (cat << EOF
---- 26,32 ----
-  \2\
-  \3/' > $tmp
-  
-! dim=`wc -l < $tmp | awk '{ print 4 * sqrt(144) }'`
-  
-  pr -l1 -t -8 -s, < $tmp |
-  (cat << EOF
diff --git a/mail/faces/files/patch-cc b/mail/faces/files/patch-cc
deleted file mode 100644
index 7757d01f2d78..000000000000
--- a/mail/faces/files/patch-cc
+++ /dev/null
@@ -1,9 +0,0 @@
---- filters/xbm2ikon.orig	Fri Jul  3 16:22:30 1998
-+++ filters/xbm2ikon	Fri Jul  3 16:23:02 1998
-@@ -23,6 +23,5 @@
- sed -e 1,2d -e '$s/$/,/' |
- tr -d '\011\012' |
- tr ',' '\012' |
--sed 's/^/0x/' |
- pr -l1 -t -w22 -3 -s, |
- sed -e 's/$/,/' -e 's/\(0x....\)\(0x....\)\(0x....\),/\1,\2,\3,/'
diff --git a/mail/faces/files/patch-da b/mail/faces/files/patch-da
deleted file mode 100644
index bcc8e8072439..000000000000
--- a/mail/faces/files/patch-da
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -c -N ../faces/scripts/Makefile ./scripts/Makefile
-*** ../faces/scripts/Makefile	Tue May  7 00:55:26 1991
---- ./scripts/Makefile	Wed Dec 11 09:30:23 1996
-***************
-*** 15,30 ****
-  BINDIR	= /usr/local/faces/bin
-  
-  install:
-! 	install -c -m 755 addxface $(BINDIR)
-! 	install -c -m 755 mailq.faces $(BINDIR)
-! 	install -c -m 755 from.faces $(BINDIR)
-! 	install -c -m 755 lpqall.faces $(BINDIR)
-! 	install -c -m 755 rotary.faces $(BINDIR)
-! 	install -c -m 755 facesaddr $(BINDIR)
-! 	install -c -m 755 facesall $(BINDIR)
-! 	install -c -m 755 mkfacesindex $(BINDIR)
-! 	install -c -m 755 newscheck.faces $(BINDIR)
-! 	install -c -m 755 newsfrom.faces $(BINDIR)
-  
-  install2:
-  	install -c -m 755 faces $(LBINDIR)
---- 15,30 ----
-  BINDIR	= /usr/local/faces/bin
-  
-  install:
-! 	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)
-  
-  install2:
-  	install -c -m 755 faces $(LBINDIR)
diff --git a/mail/faces/files/patch-db b/mail/faces/files/patch-db
deleted file mode 100644
index cef13c7f7055..000000000000
--- a/mail/faces/files/patch-db
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -c -N ../faces/scripts/addxface ./scripts/addxface
-*** ../faces/scripts/addxface	Tue Nov 19 05:05:58 1991
---- ./scripts/addxface	Tue Dec 10 17:52:45 1996
-***************
-*** 15,21 ****
-  # than version v1.6.0:
-  #$olddb = 1;
-  
-! $faces = '/usr/local/faces';
-  $umask = 000;
-  
-  # addxface - install any X-Face: in the header of the given mail message
---- 15,21 ----
-  # than version v1.6.0:
-  #$olddb = 1;
-  
-! $faces = '/usr/local/share/faces';
-  $umask = 000;
-  
-  # addxface - install any X-Face: in the header of the given mail message
diff --git a/mail/faces/files/patch-dc b/mail/faces/files/patch-dc
deleted file mode 100644
index 73c2f162744f..000000000000
--- a/mail/faces/files/patch-dc
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -c -N ../faces/scripts/facesall ./scripts/facesall
-*** ../faces/scripts/facesall	Mon Nov 25 01:30:24 1991
---- ./scripts/facesall	Tue Dec 10 17:57:49 1996
-***************
-*** 20,26 ****
-  #$olddb = 1;
-  
-  $cols = 15; $rows = 13;
-! $FACEDIR = '/usr/local/faces';
-  
-  # facesall - show all available faces in the given faces bitmap directory
-  # usage: facesall [ -a ] [ bitmap_directory ]
---- 20,26 ----
-  #$olddb = 1;
-  
-  $cols = 15; $rows = 13;
-! $FACEDIR = '/usr/local/share/faces';
-  
-  # facesall - show all available faces in the given faces bitmap directory
-  # usage: facesall [ -a ] [ bitmap_directory ]
diff --git a/mail/faces/files/patch-dd b/mail/faces/files/patch-dd
deleted file mode 100644
index 9347db003813..000000000000
--- a/mail/faces/files/patch-dd
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -c -N ../faces/scripts/mkfacesindex ./scripts/mkfacesindex
-*** ../faces/scripts/mkfacesindex	Tue Nov 19 05:05:58 1991
---- ./scripts/mkfacesindex	Tue Dec 10 17:58:16 1996
-***************
-*** 15,21 ****
-  # than version v1.6.0:
-  #$olddb = 1;
-  
-! $FACEDIR = '/usr/local/faces';
-  
-  # mkfacesindex - make a .index file at the root of a faces database that
-  #		 facesall can use more speedily instead of tabulating the
---- 15,21 ----
-  # than version v1.6.0:
-  #$olddb = 1;
-  
-! $FACEDIR = '/usr/local/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/files/patch-ea b/mail/faces/files/patch-ea
deleted file mode 100644
index d682b048b3b8..000000000000
--- a/mail/faces/files/patch-ea
+++ /dev/null
@@ -1,20 +0,0 @@
---- scripts/from.faces.orig	Tue Nov 19 05:05:58 1991
-+++ scripts/from.faces	Sun Feb 18 17:57:50 2001
-@@ -17,7 +17,7 @@
- 
- $cols = 7;
- 
--;# from.faces - alternate, experimental faces script to monitor one's mail
-+;# from.faces - alternate, experimental faces script to monitor ones mail
- ;#		spool file
- ;# Steve Kinzler, kinzler@cs.indiana.edu, 28 Jan 1991
- 
-@@ -58,7 +58,7 @@
- 		($from, $wday, $mon, $mday, $time, $year) =
- 		    split(/\s+/, $hdr{'from'});
- 
--#include "/usr/local/faces/lib/allrc";
-+#include "/usr/local/share/faces/lib/allrc";
- 
- 		$from =~ s/.*<([^>]*)>.*/\1/;
- 		$from =~ s/\(.*\)//;
diff --git a/mail/faces/pkg-descr b/mail/faces/pkg-descr
index 8292a7c6fa48..95a026aa33af 100644
--- a/mail/faces/pkg-descr
+++ b/mail/faces/pkg-descr
@@ -1,22 +1,23 @@
-This is the third general release of a "faces" server for monitoring a
-list visually. Typically this is a list of incoming mail messages, jobs
-in the print queue or users on a system.
+This is the fourth general release of a "faces" server for monitoring a
+list visually. Typically this is a list of incoming mail messages.
+
+Faces has three different modes of operation:
+
+ (a) The default will monitor for new mail. By default, only the last ten
+     messages are displayed.
+
+ (b) You can monitor the whole of a mail file. The open window will
+     automatically adjust it's size to correctly show the face icons.
+
+ (c) Custom monitoring. You can specify a program or shell script to run.
+
+     There are lots of good examples that have already been written and
+     these can be downloaded from:
+     ftp://ftp.cs.indiana.edu/pub/faces/picons/src/
 
 Included with this release, is the ability to include a face image with
 your mail message using an X-Face header line (plus continuation lines).
 Faces expects this line to be in a certain compressed format, and
-uncompresses it, and displays that image on-the-fly. There is also an
-option to automatically update the faces database with this new image.
+uncompresses it, and displays that image on-the-fly.
 
 Audio capabilities are also provided as a conditional compilation option.
-
-By default, after every sixty seconds, faces will recheck the mail file or
-the print queue. If the mail spool file has changed size, it will produce a
-chain of records for which it has face icons.
-
-This release contains graphical interfaces for NeWS, SunView, X11 and XView.
-
-Faces is based on the AT&T v8 face server called vismon, but is not derived
-from vismon sources. With the previous version came vismon compatibility.
-Note that resulted in a few changes from the way faces v1.1 worked.
-See the manual pages for more details.
diff --git a/mail/faces/pkg-plist b/mail/faces/pkg-plist
index bdcfdb04245a..ced07c807c06 100644
--- a/mail/faces/pkg-plist
+++ b/mail/faces/pkg-plist
@@ -1,38 +1,11 @@
-bin/addxface
-bin/compface
-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/lpqall.faces
-bin/mailq.faces
-bin/mkfacesindex
-bin/newscheck.faces
-bin/newsfrom.faces
-bin/rotary.faces
-bin/rs2icon
+lib/X11/app-defaults/Faces
+bin/compface
 bin/uncompface
-bin/xbm2ikon
-bin/xbmcut48
-bin/xbmsize48
 include/compface.h
 lib/libcompface.a
 lib/libcompface.so
 lib/libcompface.so.1.0
-lib/X11/app-defaults/Faces
+%%APPDEF%%lib/X11/app-defaults/Faces
 share/doc/faces/README
-share/doc/faces/README.kinzler
-share/doc/faces/from.allrc-eg
-share/faces/lib/allrc
-share/faces/machine.tab
-share/faces/people.tab
 @dirrm share/doc/faces
-@dirrm share/faces/lib
-@dirrm share/faces