3 files changed, 59 insertions, 1 deletions

diff --git a/mail/xfaces/Makefile b/mail/xfaces/Makefile
index 8b25a14426c3..281d2edf3c2c 100644
--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xfaces
 PORTVERSION=	3.3
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/xfaces/ \
 		http://www.mavetju.org/download/adopted/xfaces/
@@ -13,7 +14,7 @@ EXTRACT_SUFX=	.tar.Z
 DIST_SUBDIR=	${PORTNAME}
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES= patch-charnier patch-faber patch-graaff patch-kinzler3
+PATCHFILES=	patch-charnier patch-faber patch-graaff patch-kinzler3
 # patch-graff above has a partial pathname in there that none of the others
 # do.  The default value for PATCH_DIST_STRIP [-p0] fails on that, this empty
 # value keeps any -p option from the patch command and works.
@@ -31,4 +32,8 @@ USE_IMAKE=yes
 
 MAN1=		xfaces.1
 
+post-install:
+	${MKDIR} ${DATADIR}/images
+	${INSTALL_DATA} ${WRKSRC}/images/* ${DATADIR}/images
+
 .include <bsd.port.mk>
diff --git a/mail/xfaces/files/patch-XFaces.ad b/mail/xfaces/files/patch-XFaces.ad
new file mode 100644
index 000000000000..a3e3aaaa9b92
--- /dev/null
+++ b/mail/xfaces/files/patch-XFaces.ad
@@ -0,0 +1,11 @@
+--- XFaces.ad.orig	Sat Mar 12 16:38:54 1994
++++ XFaces.ad	Fri Jun 10 08:59:11 2005
+@@ -72,7 +72,7 @@
+ !
+ 
+ XFaces.soundPath:	/usr/sounds:/usr/demo/SOUND/sounds
+-XFaces.imagePath:	/usr/images
++XFaces.imagePath:	/usr/X11R6/share/xfaces/images
+ 
+ !
+ !  This is where we look for sounds/images in the "faces" format.
diff --git a/mail/xfaces/pkg-plist b/mail/xfaces/pkg-plist
index 9d95e9e7bc50..70b08ebd5368 100644
--- a/mail/xfaces/pkg-plist
+++ b/mail/xfaces/pkg-plist
@@ -1,2 +1,44 @@
 bin/xfaces
 lib/X11/app-defaults/XFaces
+%%DATADIR%%/images/andrew-shape.xpm
+%%DATADIR%%/images/andrew.xpm
+%%DATADIR%%/images/asterix.xpm
+%%DATADIR%%/images/backup-shape.xpm
+%%DATADIR%%/images/bart-shape.xpm
+%%DATADIR%%/images/bart.xpm
+%%DATADIR%%/images/bill-shape.xpm
+%%DATADIR%%/images/bill.xpm
+%%DATADIR%%/images/crab.xpm
+%%DATADIR%%/images/ctuna.xpm
+%%DATADIR%%/images/ddts.xpm
+%%DATADIR%%/images/dpanic-shape.xpm
+%%DATADIR%%/images/dpanic.xpm
+%%DATADIR%%/images/hobbes-shape.xpm
+%%DATADIR%%/images/hobbes.xpm
+%%DATADIR%%/images/lbolt-shape.xpm
+%%DATADIR%%/images/lbolt.xpm
+%%DATADIR%%/images/mailer-daemon.xpm
+%%DATADIR%%/images/news-shape.xpm
+%%DATADIR%%/images/nomail-shape.xpm
+%%DATADIR%%/images/nomail.xbm
+%%DATADIR%%/images/nomail.xpm
+%%DATADIR%%/images/planet-shape.xpm
+%%DATADIR%%/images/planet.xpm
+%%DATADIR%%/images/root-shape.xpm
+%%DATADIR%%/images/root.xpm
+%%DATADIR%%/images/schoolbus.xpm
+%%DATADIR%%/images/sun-shape.xpm
+%%DATADIR%%/images/sun.xpm
+%%DATADIR%%/images/sunflash.xpm
+%%DATADIR%%/images/taz.xpm
+%%DATADIR%%/images/texas-shape.xpm
+%%DATADIR%%/images/texas.xpm
+%%DATADIR%%/images/unido-shape.xpm
+%%DATADIR%%/images/uucp-shape.xpm
+%%DATADIR%%/images/uucp.xpm
+%%DATADIR%%/images/window.xpm
+%%DATADIR%%/images/www-shape.xpm
+%%DATADIR%%/images/x.xpm
+%%DATADIR%%/images/xconq.xpm
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%