From 4f2900ec78f914ff55cc41b26d7bcf4248521a6f Mon Sep 17 00:00:00 2001
From: marcm <marcm@openbsd.org>
Date: Sat, 23 Aug 2003 19:51:44 +0000
Subject: [PATCH] @extra and friends for Gnome 2

---
 x11/gnome/applets2/pkg/DEINSTALL-battstat | 56 +++++++++++++++-------
 x11/gnome/applets2/pkg/DESCR              |  4 --
 x11/gnome/applets2/pkg/DESCR-battstat     |  2 -
 x11/gnome/applets2/pkg/PLIST-battstat     |  7 ++-
 x11/gnome/bonobo-activation/pkg/DEINSTALL | 58 ++++++++++++++++-------
 x11/gnome/bonobo-activation/pkg/PLIST     |  6 ++-
 x11/gnome/libgnome/pkg/DEINSTALL          | 58 ++++++++++++++++-------
 x11/gnome/libgnome/pkg/DESCR              |  4 --
 x11/gnome/libgnome/pkg/PLIST              | 11 ++++-
 x11/gnome/mime-data/pkg/DEINSTALL         | 58 ++++++++++++++++-------
 x11/gnome/mime-data/pkg/DESCR             |  4 --
 x11/gnome/mime-data/pkg/PLIST             |  5 +-
 x11/gnome/nautilus/pkg/DEINSTALL          | 58 ++++++++++++++++-------
 x11/gnome/nautilus/pkg/DESCR              |  4 --
 x11/gnome/nautilus/pkg/PLIST              | 15 +++++-
 x11/gnome/panel/pkg/DEINSTALL             | 56 +++++++++++++++-------
 x11/gnome/panel/pkg/DESCR                 |  4 --
 x11/gnome/panel/pkg/PLIST                 |  7 ++-
 x11/gnome/vfs2/pkg/DEINSTALL              | 57 +++++++++++++++-------
 x11/gnome/vfs2/pkg/DESCR                  |  2 -
 x11/gnome/vfs2/pkg/PLIST                  | 16 ++++++-
 21 files changed, 345 insertions(+), 147 deletions(-)

diff --git a/x11/gnome/applets2/pkg/DEINSTALL-battstat b/x11/gnome/applets2/pkg/DEINSTALL-battstat
index 8cd1a5cae2d..fdc3f66d623 100644
--- a/x11/gnome/applets2/pkg/DEINSTALL-battstat
+++ b/x11/gnome/applets2/pkg/DEINSTALL-battstat
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: DEINSTALL-battstat,v 1.2 2003/06/12 20:12:55 marcm Exp $
+# $OpenBSD: DEINSTALL-battstat,v 1.3 2003/08/23 19:51:44 marcm Exp $
 #
 
 set -e
@@ -10,20 +10,44 @@ FILES='
 sound/events/battstat_applet.soundlist
 '
 
-echo
-echo "+--------------- $1"
-echo "| To really remove $1 from your system you should also"
-echo "| remove the configuration files from the ${CONFDIR} directory."
-echo "| Remove the directories in which the files reside as well if empty."
-echo "| If you are planning on installing $1 again in the future"
-echo "| you can leave it as it is."
-echo "|"
-echo "| FYI, the following configuration files belongs to this package:"
-echo "|"
-for f in ${FILES}; do
-  echo "| ${SYSCONFDIR}/$f"
-done
-echo "+--------------- $1"
-echo
+do_notice()
+{
+	echo
+	echo "+--------------- $1"
+	echo "| To really remove $1 from your system you should also"
+	echo "| remove the configuration files from the ${CONFDIR} directory."
+	echo "| Remove the directories in which the files reside as well if empty."
+	echo "| If you are planning on installing $1 again in the future"
+	echo "| you can leave it as it is."
+	echo "|"
+	echo "| FYI, the following configuration files belongs to this package:"
+	echo "|"
+	for f in ${FILES}; do
+		echo "| ${SYSCONFDIR}/$f"
+	done
+	echo "+--------------- $1"
+	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 ]; then
+	    do_notice "$1"
+	fi
+	;;
+    *)
+	echo "usage: $0 distname DEINSTALL" >&2
+	exit 1
+	;;
+esac
 
 exit 0
diff --git a/x11/gnome/applets2/pkg/DESCR b/x11/gnome/applets2/pkg/DESCR
index 2b219c05d49..c83dfa07f43 100644
--- a/x11/gnome/applets2/pkg/DESCR
+++ b/x11/gnome/applets2/pkg/DESCR
@@ -1,6 +1,2 @@
 The gnome-applets package provides panel applets which enhance your
 GNOME experience.
-
-For more information about the gnome project, visit:
-
-WWW: ${HOMEPAGE}
diff --git a/x11/gnome/applets2/pkg/DESCR-battstat b/x11/gnome/applets2/pkg/DESCR-battstat
index 83f21111651..f4da32ed32b 100644
--- a/x11/gnome/applets2/pkg/DESCR-battstat
+++ b/x11/gnome/applets2/pkg/DESCR-battstat
@@ -1,3 +1 @@
 An applet that monitors battery levels using the APM subsystem.
-
-WWW: ${HOMEPAGE}
diff --git a/x11/gnome/applets2/pkg/PLIST-battstat b/x11/gnome/applets2/pkg/PLIST-battstat
index b16ff8a940a..e549ab31fec 100644
--- a/x11/gnome/applets2/pkg/PLIST-battstat
+++ b/x11/gnome/applets2/pkg/PLIST-battstat
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-battstat,v 1.3 2003/07/06 15:35:19 sturm Exp $
+@comment $OpenBSD: PLIST-battstat,v 1.4 2003/08/23 19:51:44 marcm Exp $
 libexec/battstat-applet-2
 share/battstat_applet/battstat_applet.glade
 share/examples/gnome-applets2/sound/events/battstat_applet.soundlist
@@ -29,3 +29,8 @@ share/schemas/gnome-applets2/battstat.schemas
 @exec XML_CATALOG_FILES=%D/share/xml/catalog.scrollkeeper %D/bin/scrollkeeper-update -q
 @unexec XML_CATALOG_FILES=%D/share/xml/catalog.scrollkeeper %D/bin/scrollkeeper-update -q
 @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gnome-applets2/*.schemas > /dev/null
+@cwd ${SYSCONFDIR}
+@extra gnome/sound/events/battstat_applet.soundlist
+@extraunexec rmdir %D/gnome/sound/events 2>/dev/null || true
+@extraunexec rmdir %D/gnome/sound 2>/dev/null || true
+@extraunexec rmdir %D/gnome 2>/dev/null || true
diff --git a/x11/gnome/bonobo-activation/pkg/DEINSTALL b/x11/gnome/bonobo-activation/pkg/DEINSTALL
index f551831ce05..4857bb94415 100644
--- a/x11/gnome/bonobo-activation/pkg/DEINSTALL
+++ b/x11/gnome/bonobo-activation/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: DEINSTALL,v 1.2 2003/06/12 19:50:10 marcm Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2003/08/23 19:51:44 marcm Exp $
 #
 
 set -e
@@ -10,21 +10,45 @@ FILES='
 bonobo-activation/bonobo-activation-config.xml
 '
 
-echo
-echo "+--------------- $1"
-echo "| To really remove $1 from your system you should also"
-echo "| remove the configuration files from the ${CONFDIR} directory."
-echo "| Remove the directories in which the files reside as well if empty."
-echo "|"
-echo "| If you are planning on installing $1 again in the"
-echo "| future you can leave it as it is."
-echo "|"
-echo "| FYI, the following configuration files belong to this package:"
-echo "|"
-for f in ${FILES}; do
-	echo "| ${CONFDIR}/$f"
-done
-echo "+--------------- $1"
-echo
+do_notice()
+{
+	echo
+	echo "+--------------- $1"
+	echo "| To really remove $1 from your system you should also"
+	echo "| remove the configuration files from the ${CONFDIR} directory."
+	echo "| Remove the directories in which the files reside as well if empty."
+	echo "|"
+	echo "| If you are planning on installing $1 again in the"
+	echo "| future you can leave it as it is."
+	echo "|"
+	echo "| FYI, the following configuration files belong to this package:"
+	echo "|"
+	for f in ${FILES}; do
+		echo "| ${CONFDIR}/$f"
+	done
+	echo "+--------------- $1"
+	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 ]; then
+	    do_notice "$1"
+	fi
+	;;
+    *)
+	echo "usage: $0 distname DEINSTALL" >&2
+	exit 1
+	;;
+esac
 
 exit 0
diff --git a/x11/gnome/bonobo-activation/pkg/PLIST b/x11/gnome/bonobo-activation/pkg/PLIST
index 2921c43e7a6..c156222d548 100644
--- a/x11/gnome/bonobo-activation/pkg/PLIST
+++ b/x11/gnome/bonobo-activation/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2003/08/06 16:09:51 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.5 2003/08/23 19:51:44 marcm Exp $
 bin/activation-client
 bin/bonobo-activation-empty-server
 bin/bonobo-activation-run-query
@@ -240,3 +240,7 @@ share/locale/zh_TW/LC_MESSAGES/bonobo-activation.mo
 @unexec rmdir %D/lib/bonobo 2>/dev/null || true
 @dirrm include/bonobo-activation-2.0/bonobo-activation
 @dirrm include/bonobo-activation-2.0
+@cwd ${SYSCONFDIR}
+@extra gnome/bonobo-activation/bonobo-activation-config.xml
+@extra gnome/bonobo-activation/
+@extraunexec rmdir %D/gnome 2>/dev/null || true
diff --git a/x11/gnome/libgnome/pkg/DEINSTALL b/x11/gnome/libgnome/pkg/DEINSTALL
index 808191f8414..4736448aa69 100644
--- a/x11/gnome/libgnome/pkg/DEINSTALL
+++ b/x11/gnome/libgnome/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: DEINSTALL,v 1.2 2003/06/12 19:55:17 marcm Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2003/08/23 19:51:44 marcm Exp $
 #
 
 set -e
@@ -12,21 +12,45 @@ sound/events/gnome-2.soundlist
 sound/events/gtk-events-2.soundlist
 '
 
-echo
-echo "+--------------- $1"
-echo "| To really remove $1 from your system you should also"
-echo "| remove the configuration files from the ${CONFDIR} directory."
-echo "| Remove the directories in which the files reside as well if empty."
-echo "|"
-echo "| If you are planning on installing $1 again in the future"
-echo "| you can leave it as it is."
-echo "|"
-echo "| FYI, the following configuration files belong to this package:"
-echo "|"
-for f in ${FILES}; do
-	echo "| ${CONFDIR}/$f"
-done
-echo "+--------------- $1"
-echo
+do_notice()
+{
+	echo
+	echo "+--------------- $1"
+	echo "| To really remove $1 from your system you should also"
+	echo "| remove the configuration files from the ${CONFDIR} directory."
+	echo "| Remove the directories in which the files reside as well if empty."
+	echo "|"
+	echo "| If you are planning on installing $1 again in the future"
+	echo "| you can leave it as it is."
+	echo "|"
+	echo "| FYI, the following configuration files belong to this package:"
+	echo "|"
+	for f in ${FILES}; do
+		echo "| ${CONFDIR}/$f"
+	done
+	echo "+--------------- $1"
+	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 ]; then
+	    do_notice "$1"
+	fi
+	;;
+    *)
+	echo "usage: $0 distname DEINSTALL" >&2
+	exit 1
+	;;
+esac
 
 exit 0
diff --git a/x11/gnome/libgnome/pkg/DESCR b/x11/gnome/libgnome/pkg/DESCR
index 9066e4ea47c..34f54e36ebd 100644
--- a/x11/gnome/libgnome/pkg/DESCR
+++ b/x11/gnome/libgnome/pkg/DESCR
@@ -1,6 +1,2 @@
 These are the GNOME libraries, the foundation for most of the
 applications of the GNOME project.
-
-For more information about the GNOME project, visit:
-
-WWW: ${HOMEPAGE}
diff --git a/x11/gnome/libgnome/pkg/PLIST b/x11/gnome/libgnome/pkg/PLIST
index 37a31507463..8d9bfc00376 100644
--- a/x11/gnome/libgnome/pkg/PLIST
+++ b/x11/gnome/libgnome/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/08/06 20:45:04 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/08/23 19:51:44 marcm Exp $
 include/libgnome-2.0/libgnome/gnome-config.h
 include/libgnome-2.0/libgnome/gnome-exec.h
 include/libgnome-2.0/libgnome/gnome-gconf.h
@@ -250,3 +250,12 @@ share/sgml/docbook/gnome-customization-0.1/l10n.xml
 @dirrm include/libgnome-2.0/libgnome
 @dirrm include/libgnome-2.0
 @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/libgnome/*.schemas > /dev/null
+@cwd ${SYSCONFDIR}
+@extra gnome/gnome-vfs-2.0/modules/help-methods.conf
+@extra gnome/sound/events/gnome-2.soundlist
+@extra gnome/sound/events/gtk-events-2.soundlist
+@extra gnome/sound/events/
+@extra gnome/sound/
+@extraunexec rmdir %D/gnome/gnome-vfs-2.0/modules 2>/dev/null || true
+@extraunexec rmdir %D/gnome/gnome-vfs-2.0 2>/dev/null || true
+@extraunexec rmdir %D/gnome 2>/dev/null || true
diff --git a/x11/gnome/mime-data/pkg/DEINSTALL b/x11/gnome/mime-data/pkg/DEINSTALL
index 318ada902ff..1890e44db36 100644
--- a/x11/gnome/mime-data/pkg/DEINSTALL
+++ b/x11/gnome/mime-data/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: DEINSTALL,v 1.2 2003/06/12 19:52:11 marcm Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2003/08/23 19:51:44 marcm Exp $
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
@@ -9,21 +9,45 @@ FILES='
 gnome-vfs-mime-magic
 '
 
-echo
-echo "+--------------- $1"
-echo "| To really remove $1 from your system you should also"
-echo "| remove the configuration files from the ${CONFDIR} directory."
-echo "| Remove the directories in which the files reside as well if empty."
-echo "|"
-echo "| If you are planning on installing $1 again in the"
-echo "| future you can leave it as it is."
-echo "|"
-echo "| FYI, the following configuration files belong to this package:"
-echo "|"
-for f in ${FILES}; do
-	echo "| ${CONFDIR}/$f"
-done
-echo "+--------------- $1"
-echo
+do_notice()
+{
+	echo
+	echo "+--------------- $1"
+	echo "| To really remove $1 from your system you should also"
+	echo "| remove the configuration files from the ${CONFDIR} directory."
+	echo "| Remove the directories in which the files reside as well if empty."
+	echo "|"
+	echo "| If you are planning on installing $1 again in the"
+	echo "| future you can leave it as it is."
+	echo "|"
+	echo "| FYI, the following configuration files belong to this package:"
+	echo "|"
+	for f in ${FILES}; do
+		echo "| ${CONFDIR}/$f"
+	done
+	echo "+--------------- $1"
+	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 ]; then
+	    do_notice "$1"
+	fi
+	;;
+    *)
+	echo "usage: $0 distname DEINSTALL" >&2
+	exit 1
+	;;
+esac
 
 exit 0
diff --git a/x11/gnome/mime-data/pkg/DESCR b/x11/gnome/mime-data/pkg/DESCR
index e336bec552e..c528260f705 100644
--- a/x11/gnome/mime-data/pkg/DESCR
+++ b/x11/gnome/mime-data/pkg/DESCR
@@ -1,6 +1,2 @@
 This module contains the base MIME and Application database for GNOME.
 It is meant to be accessed through the MIME functions in GnomeVFS.
-
-For more information about the GNOME project, visit:
-
-WWW: ${HOMEPAGE}
diff --git a/x11/gnome/mime-data/pkg/PLIST b/x11/gnome/mime-data/pkg/PLIST
index 79a385c8a64..baa0656c4de 100644
--- a/x11/gnome/mime-data/pkg/PLIST
+++ b/x11/gnome/mime-data/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/06/12 19:52:11 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/08/23 19:51:44 marcm Exp $
 lib/pkgconfig/gnome-mime-data-2.0.pc
 @comment man/man5/gnome-vfs-mime.5
 share/application-registry/gnome-vfs.applications
@@ -184,3 +184,6 @@ share/pixmaps/document-icons/i-zipdisk.png
 @dirrm share/examples/gnome-mime-data
 @comment @dirrm share/application-registry
 @comment @dirrm lib/pkgconfig
+@cwd ${SYSCONFDIR}
+@extra gnome/gnome-vfs-mime-magic
+@extraunexec rmdir %D/gnome 2>/dev/null || true
diff --git a/x11/gnome/nautilus/pkg/DEINSTALL b/x11/gnome/nautilus/pkg/DEINSTALL
index 14d2d8b80b1..02a95febddb 100644
--- a/x11/gnome/nautilus/pkg/DEINSTALL
+++ b/x11/gnome/nautilus/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: DEINSTALL,v 1.2 2003/06/12 20:19:38 marcm Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2003/08/23 19:51:44 marcm Exp $
 #
 
 set -e
@@ -16,21 +16,45 @@ X11/starthere/sysconfig.desktop
 X11/sysconfig/.directory
 '
 
-echo
-echo "+--------------- $1"
-echo "| To really remove $1 from your system you should also"
-echo "| remove the configuration files from the ${CONFDIR} directory."
-echo "| Remove the directories in which the files reside as well if empty."
-echo "|"
-echo "| If you are planning on installing $1 again in the future"
-echo "| you can leave it as it is."
-echo "|"
-echo "| FYI, the following configuration files belong to this package:"
-echo "|"
-for f in ${FILES}; do
-	echo "| ${CONFDIR}/$f"
-done
-echo "+--------------- $1"
-echo
+do_notice()
+{
+	echo
+	echo "+--------------- $1"
+	echo "| To really remove $1 from your system you should also"
+	echo "| remove the configuration files from the ${CONFDIR} directory."
+	echo "| Remove the directories in which the files reside as well if empty."
+	echo "|"
+	echo "| If you are planning on installing $1 again in the future"
+	echo "| you can leave it as it is."
+	echo "|"
+	echo "| FYI, the following configuration files belong to this package:"
+	echo "|"
+	for f in ${FILES}; do
+		echo "| ${CONFDIR}/$f"
+	done
+	echo "+--------------- $1"
+	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 ]; then
+	    do_notice "$1"
+	fi
+	;;
+    *)
+	echo "usage: $0 distname DEINSTALL" >&2
+	exit 1
+	;;
+esac
 
 exit 0
diff --git a/x11/gnome/nautilus/pkg/DESCR b/x11/gnome/nautilus/pkg/DESCR
index 560b581c756..feeea43f9b3 100644
--- a/x11/gnome/nautilus/pkg/DESCR
+++ b/x11/gnome/nautilus/pkg/DESCR
@@ -1,7 +1,3 @@
 Nautilus is the  official file manager for the GNOME desktop.
 It is designed to be primarly a file manager, but there are
 support for web and file viewing too.
-
-For more information about nautilus, visit:
-
-WWW: ${HOMEPAGE}
diff --git a/x11/gnome/nautilus/pkg/PLIST b/x11/gnome/nautilus/pkg/PLIST
index 80ecad56b33..369d8240c96 100644
--- a/x11/gnome/nautilus/pkg/PLIST
+++ b/x11/gnome/nautilus/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/08/06 20:45:05 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.4 2003/08/23 19:51:44 marcm Exp $
 bin/nautilus
 bin/nautilus-file-management-properties
 bin/nautilus-server-connect
@@ -455,3 +455,16 @@ share/schemas/nautilus/apps_nautilus_preferences.schemas
 @comment @dirrm lib/bonobo
 @dirrm include/libnautilus
 @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/nautilus/*.schemas > /dev/null
+@cwd ${SYSCONFDIR}
+@extra gnome/X11/serverconfig/.directory
+@extra gnome/X11/serverconfig/
+@extra gnome/X11/starthere/.directory
+@extra gnome/X11/starthere/applications.desktop
+@extra gnome/X11/starthere/preferences.desktop
+@extra gnome/X11/starthere/serverconfig.desktop
+@extra gnome/X11/starthere/sysconfig.desktop
+@extra gnome/X11/starthere/
+@extra gnome/X11/sysconfig/.directory
+@extra gnome/X11/sysconfig/
+@extra gnome/X11/
+@extraunexec rmdir %D/gnome 2>/dev/null || true
diff --git a/x11/gnome/panel/pkg/DEINSTALL b/x11/gnome/panel/pkg/DEINSTALL
index d622230d04a..67a7486afbf 100644
--- a/x11/gnome/panel/pkg/DEINSTALL
+++ b/x11/gnome/panel/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: DEINSTALL,v 1.2 2003/06/12 20:09:35 marcm Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2003/08/23 19:51:44 marcm Exp $
 #
 
 set -e
@@ -10,20 +10,44 @@ FILES='
 sound/events/mailcheck.soundlist
 '
 
-echo
-echo "+--------------- $1"
-echo "| To really remove $1 from your system you should also"
-echo "| remove the configuration files from the ${CONFDIR} directory."
-echo "| Remove the directories in which the files reside as well if empty."
-echo "| If you are planning on installing $1 again in the future"
-echo "| you can leave it as it is."
-echo "|"
-echo "| FYI, the following configuration files belongs to this package:"
-echo "|"
-for f in ${FILES}; do
-  echo "| ${CONFDIR}/$f"
-done
-echo "+--------------- $1"
-echo
+do_notice()
+{
+	echo
+	echo "+--------------- $1"
+	echo "| To really remove $1 from your system you should also"
+	echo "| remove the configuration files from the ${CONFDIR} directory."
+	echo "| Remove the directories in which the files reside as well if empty."
+	echo "| If you are planning on installing $1 again in the future"
+	echo "| you can leave it as it is."
+	echo "|"
+	echo "| FYI, the following configuration files belongs to this package:"
+	echo "|"
+	for f in ${FILES}; do
+		echo "| ${CONFDIR}/$f"
+	done
+	echo "+--------------- $1"
+	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 ]; then
+	    do_notice "$1"
+	fi
+	;;
+    *)
+	echo "usage: $0 distname DEINSTALL" >&2
+	exit 1
+	;;
+esac
 
 exit 0
diff --git a/x11/gnome/panel/pkg/DESCR b/x11/gnome/panel/pkg/DESCR
index 369d81fbf01..0210c320877 100644
--- a/x11/gnome/panel/pkg/DESCR
+++ b/x11/gnome/panel/pkg/DESCR
@@ -7,7 +7,3 @@ one to develop small applications which may be embedded in the panel.
 These are called applets. Several applets are also supplied - the
 Workspace Switcher, the Window List, the Inbox Monitor, the Clock and
 the infamous 'Wanda the Fish'.
-
-For more information about the gnome project, visit:
-
-WWW: ${HOMEPAGE}
diff --git a/x11/gnome/panel/pkg/PLIST b/x11/gnome/panel/pkg/PLIST
index c520effe3f4..568766fce02 100644
--- a/x11/gnome/panel/pkg/PLIST
+++ b/x11/gnome/panel/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2003/08/06 20:45:05 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.5 2003/08/23 19:51:44 marcm Exp $
 @pkgcfl gnome-core-*
 bin/gnome-desktop-item-edit
 bin/gnome-panel
@@ -643,3 +643,8 @@ share/schemas/gnome-panel/tasklist.schemas
 @exec %D/bin/scrollkeeper-update -q
 @unexec %D/bin/scrollkeeper-update -q
 @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gnome-panel/*.schemas > /dev/null
+@cwd ${SYSCONFDIR}
+@extra gnome/sound/events/mailcheck.soundlist
+@extraunexec rmdir %D/gnome/sound/events 2>/dev/null || true
+@extraunexec rmdir %D/gnome/sound 2>/dev/null || true
+@extraunexec rmdir %D/gnome 2>/dev/null || true
diff --git a/x11/gnome/vfs2/pkg/DEINSTALL b/x11/gnome/vfs2/pkg/DEINSTALL
index 42f724ceb6a..2e1c19d2d13 100644
--- a/x11/gnome/vfs2/pkg/DEINSTALL
+++ b/x11/gnome/vfs2/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: DEINSTALL,v 1.2 2003/06/12 19:53:49 marcm Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2003/08/23 19:51:44 marcm Exp $
 #
 
 set -e
@@ -18,20 +18,45 @@ gnome-vfs-2.0/vfolders/start-here.vfolder-info
 gnome-vfs-2.0/vfolders/system-settings.vfolder-info
 '
 
-echo
-echo "+--------------- $1"
-echo "| To really remove $1 from your system you should also"
-echo "| remove the configuration files from the ${CONFDIR} directory."
-echo "| Remove the directories in which the files reside as well if empty."
-echo "| If you are planning on installing $1 again in the future"
-echo "| you can leave it as it is."
-echo "|"
-echo "| FYI, the following configuration files belongs to this package:"
-echo "|"
-for f in ${FILES}; do
-  echo "| ${CONFDIR}/$f"
-done
-echo "+--------------- $1"
-echo
+do_notice()
+{
+	echo
+	echo "+--------------- $1"
+	echo "| To really remove $1 from your system you should also"
+	echo "| remove the configuration files from the ${CONFDIR} directory."
+	echo "| Remove the directories in which the files reside as well if empty."
+	echo "|"
+	echo "| If you are planning on installing $1 again in the future"
+	echo "| you can leave it as it is."
+	echo "|"
+	echo "| FYI, the following configuration files belongs to this package:"
+	echo "|"
+	for f in ${FILES}; do
+		echo "| ${CONFDIR}/$f"
+	done
+	echo "+--------------- $1"
+	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 ]; then
+	    do_notice "$1"
+	fi
+	;;
+    *)
+	echo "usage: $0 distname DEINSTALL" >&2
+	exit 1
+	;;
+esac
 
 exit 0
diff --git a/x11/gnome/vfs2/pkg/DESCR b/x11/gnome/vfs2/pkg/DESCR
index 61fd7e2d5a0..266fc7e43d0 100644
--- a/x11/gnome/vfs2/pkg/DESCR
+++ b/x11/gnome/vfs2/pkg/DESCR
@@ -4,5 +4,3 @@ GNOME VFS is currently used as one of the foundations of the Nautilus
 file manager.
 
 For more information about the GNOME project, visit:
-
-WWW: ${HOMEPAGE}
diff --git a/x11/gnome/vfs2/pkg/PLIST b/x11/gnome/vfs2/pkg/PLIST
index f996fe34f5e..ee9c4d33fed 100644
--- a/x11/gnome/vfs2/pkg/PLIST
+++ b/x11/gnome/vfs2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2003/08/06 20:45:06 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.5 2003/08/23 19:51:44 marcm Exp $
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h
@@ -340,3 +340,17 @@ share/schemas/gnome-vfs2/system_http_proxy.schemas
 @comment @exec mkdir -p %D/doc
 @comment @dirrm doc
 @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/gnome-vfs2/*.schemas > /dev/null
+@cwd ${SYSCONFDIR}
+@extra gnome/gnome-vfs-2.0/modules/default-modules.conf
+@extra gnome/gnome-vfs-2.0/modules/cdda-module.conf
+@extra gnome/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
+@extra gnome/gnome-vfs-2.0/vfolders/favorites.vfolder-info
+@extra gnome/gnome-vfs-2.0/vfolders/network.vfolder-info
+@extra gnome/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info
+@extra gnome/gnome-vfs-2.0/vfolders/server-settings.vfolder-info
+@extra gnome/gnome-vfs-2.0/vfolders/start-here.vfolder-info
+@extra gnome/gnome-vfs-2.0/vfolders/system-settings.vfolder-info
+@extra gnome/gnome-vfs-2.0/modules/
+@extra gnome/gnome-vfs-2.0/vfolders/
+@extra gnome/gnome-vfs-2.0/
+@extraunexec rmdir %D/gnome 2>/dev/null || true