From 0875eae33248f171fbe6a9a6bac66904882fcf0d Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sun, 28 Sep 2003 00:35:10 +0000
Subject: [PATCH] @extra support

---
 audio/tosha/pkg/DEINSTALL        | 4 ++--
 audio/tosha/pkg/PLIST            | 4 +++-
 games/connect4/pkg/DEINSTALL     | 4 ++--
 games/connect4/pkg/PLIST         | 4 +++-
 games/pathological/pkg/DEINSTALL | 4 ++--
 games/pathological/pkg/PLIST     | 4 +++-
 games/xbill/pkg/DEINSTALL        | 4 ++--
 games/xbill/pkg/PLIST            | 4 +++-
 games/xjewel/pkg/DEINSTALL       | 4 ++--
 games/xjewel/pkg/PLIST           | 4 +++-
 games/xpat2/pkg/DEINSTALL        | 4 ++--
 games/xpat2/pkg/PLIST            | 4 +++-
 games/xscrabble/pkg/DEINSTALL    | 4 ++--
 games/xscrabble/pkg/PLIST        | 4 +++-
 games/xsoldier/pkg/DEINSTALL     | 4 ++--
 games/xsoldier/pkg/PLIST         | 4 +++-
 16 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/audio/tosha/pkg/DEINSTALL b/audio/tosha/pkg/DEINSTALL
index 26acf2ca9a7..e1b79e2a76c 100644
--- a/audio/tosha/pkg/DEINSTALL
+++ b/audio/tosha/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2001/03/14 15:04:12 naddy Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/09/28 00:35:11 naddy Exp $
 #
 # De-installation setup of tosha
 
@@ -38,7 +38,7 @@ fi
 #
 case $2 in
     DEINSTALL)
-	if [ -f ${CONFIG_FILE} ]; then
+	if [ "$PKG_DELETE_EXTRA" != Yes -a -f ${CONFIG_FILE} ]; then
 	    do_notice "$1"
 	fi
 	;;
diff --git a/audio/tosha/pkg/PLIST b/audio/tosha/pkg/PLIST
index 530309fc6ba..117afc9fd0b 100644
--- a/audio/tosha/pkg/PLIST
+++ b/audio/tosha/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2001/03/14 15:04:13 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.7 2003/09/28 00:35:11 naddy Exp $
 bin/tosha
 bin/pcmplay
 bin/pcmfade
@@ -7,3 +7,5 @@ man/man1/pcmplay.1
 man/man1/pcmfade.1
 share/examples/tosha/tosharc.sample
 @dirrm share/examples/tosha
+@cwd ${SYSCONFDIR}
+@extra tosharc
diff --git a/games/connect4/pkg/DEINSTALL b/games/connect4/pkg/DEINSTALL
index b3814b2acd4..1d49a67be2b 100644
--- a/games/connect4/pkg/DEINSTALL
+++ b/games/connect4/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2001/08/11 03:17:12 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/09/28 00:35:10 naddy Exp $
 #
 # connect4 de-installation
 
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 SCORE_FILE=/var/games/connect4.scores
 
-if [ -f $SCORE_FILE ]; then
+if [ "$PKG_DELETE_EXTRA" != Yes -a -f $SCORE_FILE ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
diff --git a/games/connect4/pkg/PLIST b/games/connect4/pkg/PLIST
index 64f326e3e3f..5428631a602 100644
--- a/games/connect4/pkg/PLIST
+++ b/games/connect4/pkg/PLIST
@@ -1,3 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2001/08/11 03:17:12 brad Exp $
+@comment $OpenBSD: PLIST,v 1.5 2003/09/28 00:35:10 naddy Exp $
 bin/connect4
 man/man6/connect4.6
+@cwd /var/games
+@extra connect4.scores
diff --git a/games/pathological/pkg/DEINSTALL b/games/pathological/pkg/DEINSTALL
index 8d1d0438552..6ddc15c8e29 100644
--- a/games/pathological/pkg/DEINSTALL
+++ b/games/pathological/pkg/DEINSTALL
@@ -1,11 +1,11 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2003/08/08 22:01:36 jolan Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/09/28 00:35:10 naddy Exp $
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 SCORE_FILE=/var/games/pathological_scores
 
-if [ -f $SCORE_FILE ]; then
+if [ "$PKG_DELETE_EXTRA" != Yes -a -f $SCORE_FILE ]; then
 	echo
 	echo "+---------------"
 	echo "| To completely deinstall the $1 package you need to perform"
diff --git a/games/pathological/pkg/PLIST b/games/pathological/pkg/PLIST
index 24461a73129..3354924f5c8 100644
--- a/games/pathological/pkg/PLIST
+++ b/games/pathological/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/08/08 22:01:36 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.2 2003/09/28 00:35:10 naddy Exp $
 bin/pathological
 bin/write-highscores
 man/man6/pathological.6
@@ -169,3 +169,5 @@ share/pixmaps/pathological.xpm
 @dirrm share/pathological
 @dirrm share/doc/pathological/html
 @dirrm share/doc/pathological
+@cwd /var/games
+@extra pathological_scores
diff --git a/games/xbill/pkg/DEINSTALL b/games/xbill/pkg/DEINSTALL
index 2b8cf58f008..1eb48e7fb22 100644
--- a/games/xbill/pkg/DEINSTALL
+++ b/games/xbill/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2003/04/15 12:41:25 wilfried Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/09/28 00:35:11 naddy Exp $
 #
 # xbill de-installation
 
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 SCORE_FILE=/var/games/xbill.scores
 
-if [ -f $SCORE_FILE ]; then
+if [ "$PKG_DELETE_EXTRA" != Yes -a -f $SCORE_FILE ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
diff --git a/games/xbill/pkg/PLIST b/games/xbill/pkg/PLIST
index 97e81fac36b..01fc4d514a8 100644
--- a/games/xbill/pkg/PLIST
+++ b/games/xbill/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2003/04/15 12:41:25 wilfried Exp $
+@comment $OpenBSD: PLIST,v 1.5 2003/09/28 00:35:11 naddy Exp $
 @group games
 @mode 2555
 bin/xbill
@@ -70,3 +70,5 @@ share/xbill/pixmaps/wingdows.xpm
 @dirrm share/xbill/pixmaps
 @dirrm share/xbill/bitmaps
 @dirrm share/xbill
+@cwd /var/games
+@extra xbill.scores
diff --git a/games/xjewel/pkg/DEINSTALL b/games/xjewel/pkg/DEINSTALL
index 0511df44445..587888005d9 100644
--- a/games/xjewel/pkg/DEINSTALL
+++ b/games/xjewel/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2003/04/15 12:41:51 wilfried Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/09/28 00:35:11 naddy Exp $
 #
 # xjewel de-installation
 
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 SCORE_FILE=/var/games/xjewel.scores
 
-if [ -f $SCORE_FILE ]; then
+if [ "$PKG_DELETE_EXTRA" != Yes -a -f $SCORE_FILE ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
diff --git a/games/xjewel/pkg/PLIST b/games/xjewel/pkg/PLIST
index f30878484ad..58a9299ed6c 100644
--- a/games/xjewel/pkg/PLIST
+++ b/games/xjewel/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2003/04/15 12:41:51 wilfried Exp $
+@comment $OpenBSD: PLIST,v 1.5 2003/09/28 00:35:11 naddy Exp $
 bin/xjewel
 @group games
 @mode 2555
@@ -9,3 +9,5 @@ lib/xjewel.font/fonts.dir
 lib/xjewel.font/seven_seg.pcf.gz
 man/cat6/xjewel.0
 @dirrm lib/xjewel.font
+@cwd /var/games
+@extra xjewel.scores
diff --git a/games/xpat2/pkg/DEINSTALL b/games/xpat2/pkg/DEINSTALL
index 31ec60d7146..6195a379c54 100644
--- a/games/xpat2/pkg/DEINSTALL
+++ b/games/xpat2/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2002/09/19 07:00:42 pvalchev Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/09/28 00:35:11 naddy Exp $
 #
 # xpat2 de-installation script
 
@@ -34,7 +34,7 @@ fi
 #
 case $2 in
     DEINSTALL)
-	if [ -f $SCORE_FILE ]; then
+	if [ "$PKG_DELETE_EXTRA" != Yes -a -f $SCORE_FILE ]; then
 	    do_notice "$1"
 	fi
 	;;
diff --git a/games/xpat2/pkg/PLIST b/games/xpat2/pkg/PLIST
index 6cd44569617..4515a2aff1d 100644
--- a/games/xpat2/pkg/PLIST
+++ b/games/xpat2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2003/03/06 00:24:56 pvalchev Exp $
+@comment $OpenBSD: PLIST,v 1.6 2003/09/28 00:35:11 naddy Exp $
 @group games
 @mode 2755
 bin/xpat2
@@ -95,3 +95,5 @@ man/man6/xpat2.6
 @dirrm lib/X11/xpat/french
 @dirrm lib/X11/xpat/default
 @dirrm lib/X11/xpat
+@cwd /var/games
+@extra xpat.log
diff --git a/games/xscrabble/pkg/DEINSTALL b/games/xscrabble/pkg/DEINSTALL
index dc38cf20b99..1eb838d42b2 100644
--- a/games/xscrabble/pkg/DEINSTALL
+++ b/games/xscrabble/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2003/04/15 12:42:31 wilfried Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/09/28 00:35:11 naddy Exp $
 #
 # xscrabble de-installation
 
@@ -8,7 +8,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 SCORE_FILE=/var/games/xscrabble.scores
 
-if [ -f $SCORE_FILE ]; then
+if [ "$PKG_DELETE_EXTRA" != Yes -a -f $SCORE_FILE ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
diff --git a/games/xscrabble/pkg/PLIST b/games/xscrabble/pkg/PLIST
index 8b5f4515e6f..92b52f54318 100644
--- a/games/xscrabble/pkg/PLIST
+++ b/games/xscrabble/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/04/15 12:42:31 wilfried Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/09/28 00:35:11 naddy Exp $
 @group games
 @mode 2555
 bin/xscrab
@@ -9,3 +9,5 @@ lib/X11/app-defaults/XScrabble
 lib/X11/xscrabble/OSPD3.gz
 lib/X11/xscrabble/scrabble_permutations
 @dirrm lib/X11/xscrabble
+@cwd /var/games
+@extra xscrabble.scores
diff --git a/games/xsoldier/pkg/DEINSTALL b/games/xsoldier/pkg/DEINSTALL
index 1bd0c233938..25c8e4c8ad1 100644
--- a/games/xsoldier/pkg/DEINSTALL
+++ b/games/xsoldier/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.2 2002/09/18 19:27:49 pvalchev Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2003/09/28 00:35:11 naddy Exp $
 #
 # xsoldier de-installation script
 
@@ -34,7 +34,7 @@ fi
 #
 case $2 in
     DEINSTALL)
-	if [ -f $SCORE_FILE ]; then
+	if [ "$PKG_DELETE_EXTRA" != Yes -a -f $SCORE_FILE ]; then
 	    do_notice "$1"
 	fi
 	;;
diff --git a/games/xsoldier/pkg/PLIST b/games/xsoldier/pkg/PLIST
index f14c4a5fcb4..656116796e2 100644
--- a/games/xsoldier/pkg/PLIST
+++ b/games/xsoldier/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2002/09/16 08:18:11 pvalchev Exp $
+@comment $OpenBSD: PLIST,v 1.5 2003/09/28 00:35:11 naddy Exp $
 bin/xsoldier
 lib/X11/xsoldier/Boss1.xpm
 lib/X11/xsoldier/Boss2.xpm
@@ -30,3 +30,5 @@ lib/X11/xsoldier/Star1.xpm
 lib/X11/xsoldier/Star2.xpm
 lib/X11/xsoldier/Title.xpm
 @dirrm lib/X11/xsoldier
+@cwd /var/games
+@extra xsoldier.scores