diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index 2f666386b69..7e1fbba2df3 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2002/12/23 00:37:50 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.20 2004/10/01 07:34:34 xsa Exp $
 
 COMMENT=	"X11 solitaire with 14 variations"
 
@@ -21,4 +21,8 @@ CONFIGURE_STYLE=imake
 
 NO_REGRESS=	Yes
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xpat2
+	${INSTALL_DATA} /dev/null ${PREFIX}/share/examples/xpat2/xpat.log
+
 .include <bsd.port.mk>
diff --git a/games/xpat2/pkg/DEINSTALL b/games/xpat2/pkg/DEINSTALL
deleted file mode 100644
index 6195a379c54..00000000000
--- a/games/xpat2/pkg/DEINSTALL
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.2 2003/09/28 00:35:11 naddy Exp $
-#
-# xpat2 de-installation script
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-SCORE_FILE=/var/games/xpat.log
-
-do_notice()
-{
-    echo
-    echo "+---------------"
-    echo "| To completely deinstall the $1 package you need to perform"
-    echo "| this step as root:"
-    echo "|"
-    echo "|           rm -rf $SCORE_FILE"
-    echo "|"
-    echo "| Do not do this if you plan on re-installing $1"
-    echo "| at some future time."
-    echo "+---------------"
-    echo
-}
-
-# Verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname DEINSTALL" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    DEINSTALL)
-	if [ "$PKG_DELETE_EXTRA" != Yes -a -f $SCORE_FILE ]; then
-	    do_notice "$1"
-	fi
-	;;
-    *)
-	echo "usage: $0 distname DEINSTALL" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/games/xpat2/pkg/INSTALL b/games/xpat2/pkg/INSTALL
deleted file mode 100644
index f27ca6be466..00000000000
--- a/games/xpat2/pkg/INSTALL
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.2 2003/04/14 15:02:09 wilfried Exp $
-#
-# installation score file setup for xpat2
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-SCORE_FILE=/var/games/xpat.log
-
-# Function: tell the user what they need to do to use the port just installed
-#
-do_notice()
-{
-    echo
-    echo "+---------------"
-    echo "| The existing $1 score file,"
-    echo "| $SCORE_FILE,"
-    echo "| has NOT been changed."
-    echo "+---------------"
-    echo
-}
-
-# Function: install a blank file to be used as the icebreaker score file
-#
-do_install()
-{
-    touch $SCORE_FILE
-    chown root:games $SCORE_FILE
-    chmod 664 $SCORE_FILE
-}
-
-# verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-	: nothing to pre-install for this port
-	;;
-    POST-INSTALL)
-	if [ -f $SCORE_FILE ]; then
-	    do_notice $1
-	else
-	    do_install $1
-	fi
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/games/xpat2/pkg/PLIST b/games/xpat2/pkg/PLIST
index a73bd0d9031..4d13c989b2c 100644
--- a/games/xpat2/pkg/PLIST
+++ b/games/xpat2/pkg/PLIST
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.7 2004/09/15 00:46:12 espie Exp $
+@comment $OpenBSD: PLIST,v 1.8 2004/10/01 07:34:34 xsa Exp $
 @mode 2755
 @group games
 bin/xpat2
 @mode
+@group
 lib/X11/app-defaults/XPat
 lib/X11/french/
 lib/X11/french/app-defaults/
@@ -104,4 +105,8 @@ lib/X11/xpat/russian/sq01.bdf
 lib/X11/xpat/small.cards
 @man man/cat1/xpat2.0
 @man man/man6/xpat2.6
-@extra /var/games/xpat.log
+share/examples/xpat2/
+share/examples/xpat2/xpat.log
+@group games
+@mode g+w
+@sample /var/games/xpat.log