diff --git a/devel/pango/pkg/DEINSTALL b/devel/pango/pkg/DEINSTALL
index 5303953ee22..9e86d4bb628 100644
--- a/devel/pango/pkg/DEINSTALL
+++ b/devel/pango/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2002/07/25 09:20:01 nino Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/08/23 19:52:47 marcm Exp $
 #
 
 set -e
@@ -11,20 +11,45 @@ pango/pango.modules
 pango/pangox.aliases
 '
 
-echo
-echo "+--------------- $1"
-echo "| To really remove $1 from your system you should also"
-echo "| remove the configuration files from the ${SYSCONFDIR} directory."
-echo "| Remove the directory 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 ${SYSCONFDIR} directory."
+	echo "| Remove the directory 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 "| ${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/devel/pango/pkg/DESCR b/devel/pango/pkg/DESCR
index 051c1ab4d68..c6e72b536e5 100644
--- a/devel/pango/pkg/DESCR
+++ b/devel/pango/pkg/DESCR
@@ -3,5 +3,3 @@ on internationalization. Pango can be used anywhere that text layout
 is needed; however, most of the work on Pango-1.0 was done using the
 GTK+ widget toolkit as a test platform. Pango forms the core of text
 and font handling for GTK+-2.0.
-
-WWW: ${HOMEPAGE}
\ No newline at end of file
diff --git a/devel/pango/pkg/PLIST b/devel/pango/pkg/PLIST
index 769e7a65a53..775b3861af8 100644
--- a/devel/pango/pkg/PLIST
+++ b/devel/pango/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2003/06/30 03:57:38 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.5 2003/08/23 19:52:47 marcm Exp $
 bin/pango-querymodules
 include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-break.h
@@ -120,3 +120,7 @@ share/gtk-doc/html/pango/up.png
 @dirrm lib/pango
 @dirrm include/pango-1.0/pango
 @dirrm include/pango-1.0
+@cwd ${SYSCONFDIR}
+@extra pango/pango.modules
+@extra pango/pangox.aliases
+@extra pango/
diff --git a/x11/gtk+2/pkg/DEINSTALL b/x11/gtk+2/pkg/DEINSTALL
index e4d550e2b75..d1a224722ec 100644
--- a/x11/gtk+2/pkg/DEINSTALL
+++ b/x11/gtk+2/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: DEINSTALL,v 1.2 2003/06/12 19:26:36 marcm Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2003/08/23 19:52:47 marcm Exp $
 #
 
 set -e
@@ -11,21 +11,45 @@ gtk-2.0/gtk.immodules
 gtk-2.0/gdk-pixbuf.loaders
 '
 
-echo
-echo "+--------------- $1"
-echo "| To really remove $1 from your system you should also"
-echo "| remove the configuration files from the ${SYSCONFDIR}/gtk-2.0 directory."
-echo "| Remove the directory 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 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 ${SYSCONFDIR} directory."
+	echo "| Remove the directory 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 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/gtk+2/pkg/DESCR b/x11/gtk+2/pkg/DESCR
index 4698dcf41e9..bbd83beb88d 100644
--- a/x11/gtk+2/pkg/DESCR
+++ b/x11/gtk+2/pkg/DESCR
@@ -1,5 +1,3 @@
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
 Offering a complete set of widgets, GTK+ is suitable for projects ranging
 from small one-off projects to complete application suites.
-
-WWW: ${HOMEPAGE}
diff --git a/x11/gtk+2/pkg/PLIST b/x11/gtk+2/pkg/PLIST
index 96b20710513..43c9ab31dff 100644
--- a/x11/gtk+2/pkg/PLIST
+++ b/x11/gtk+2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2003/08/15 21:07:05 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.10 2003/08/23 19:52:47 marcm Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 bin/gtk-demo
@@ -451,3 +451,7 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
 @dirrm include/gtk-2.0/gdk-pixbuf
 @dirrm include/gtk-2.0/gdk
 @dirrm include/gtk-2.0
+@cwd ${SYSCONFDIR}
+@extra gtk-2.0/gtk.immodules
+@extra gtk-2.0/gdk-pixbuf.loaders
+@extra gtk-2.0/