diff --git a/x11/kde/libs3/Makefile b/x11/kde/libs3/Makefile
index b3b6d9b26c1..162238c21e8 100644
--- a/x11/kde/libs3/Makefile
+++ b/x11/kde/libs3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2004/07/24 12:47:15 espie Exp $
+# $OpenBSD: Makefile,v 1.39 2004/08/10 22:08:03 espie Exp $
 
 COMMENT=		"K Desktop Environment, libraries"
 CATEGORIES=		x11 x11/kde
@@ -21,7 +21,6 @@ CONFIGURE_ARGS+= --disable-cups
 SEPARATE_BUILD=	flavored
 SAMPLECONFDIR=${TRUEPREFIX}/share/apps/kde-conf-sample
 EXTRA_CONFIG=xdg/menus/applications.menu
-SUBST_VARS=EXTRA_CONFIG SAMPLECONFDIR
 
 FAKE_FLAGS=DESTDIR=${WRKINST} sysconfdir=${SAMPLECONFDIR}
 	
diff --git a/x11/kde/libs3/pkg/INSTALL b/x11/kde/libs3/pkg/INSTALL
deleted file mode 100644
index 3b9406ef40d..00000000000
--- a/x11/kde/libs3/pkg/INSTALL
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.1 2004/02/03 21:25:50 espie Exp $
-#
-# Pre/post-installation setup of screen
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
-SAMPLE_CONFIG_DIR=${SAMPLECONFDIR}
-
-do_notice()
-{
-    echo
-    echo "+---------------"
-    echo "| The existing $1 configuration file, $2/$4,"
-    echo "| has NOT been changed.  You may want to compare it to the"
-    echo "| current sample file, $3/$4,"
-    echo "| and update your configuration as needed."
-    echo "+---------------"
-    echo
-}
-
-do_install()
-{
-    install -o root -g wheel -m 644 $3/$4 $2/$4
-    echo
-    echo "+---------------"
-    echo "| The $1 configuration file, $2/$4,"
-    echo "| has been installed.  Please view this file and change"
-    echo "| the configuration to meet your needs."
-    echo "+---------------"
-    echo
-}
-
-# 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)
-    	for i in ${EXTRA_CONFIG}
-	    do
-	    if [ -f ${CONFIG_DIR}/$i ]; then
-		do_notice $1 ${CONFIG_DIR} ${SAMPLE_CONFIG_DIR} $i
-	    else
-		mkdir -p `dirname ${CONFIG_DIR}/$i`
-		do_install $1 ${CONFIG_DIR} ${SAMPLE_CONFIG_DIR} $i
-	    fi
-	done
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/x11/kde/libs3/pkg/PFRAG.shared b/x11/kde/libs3/pkg/PFRAG.shared
deleted file mode 100644
index 532a390ccd2..00000000000
--- a/x11/kde/libs3/pkg/PFRAG.shared
+++ /dev/null
@@ -1,103 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.12 2004/07/24 12:47:15 espie Exp $
-${KDE}/dcopserver.so
-${KDE}/kabc_dir.so
-${KDE}/kabc_file.so
-${KDE}/kabc_ldapkio.so
-${KDE}/kabc_net.so
-${KDE}/kabcformat_binary.so
-${KDE}/kaddprinterwizard.so
-${KDE}/kbuildsycoca.so
-${KDE}/kbzip2filter.so
-${KDE}/kcm_kresources.so
-${KDE}/kconf_update.so
-${KDE}/kcookiejar.so
-${KDE}/kded.so
-${KDE}/kded_kcookiejar.so
-${KDE}/kded_kdeprintd.so
-${KDE}/kded_kpasswdserver.so
-${KDE}/kded_kssld.so
-${KDE}/kded_kwalletd.so
-${KDE}/kded_proxyscout.so
-${KDE}/kdeprint_ext.so
-${KDE}/kdeprint_lpdunix.so
-${KDE}/kdeprint_lpr.so
-${KDE}/kdeprint_rlpr.so
-${KDE}/kdeprint_tool_escputil.so
-${KDE}/kfileaudiopreview.so
-${KDE}/kgzipfilter.so
-${KDE}/khtmlimagepart.so
-${KDE}/kimg_eps.so
-${KDE}/kimg_ico.so
-${KDE}/kimg_jp2.so
-${KDE}/kimg_pcx.so
-${KDE}/kimg_tga.so
-${KDE}/kimg_tiff.so
-${KDE}/kimg_xview.so
-${KDE}/kio_file.so
-${KDE}/kio_ftp.so
-${KDE}/kio_ghelp.so
-${KDE}/kio_help.so
-${KDE}/kio_http.so
-${KDE}/kio_http_cache_cleaner.so
-${KDE}/kio_metainfo.so
-${KDE}/kio_uiserver.so
-${KDE}/kjavaappletviewer.so
-${KDE}/klauncher.so
-${KDE}/knotify.so
-${KDE}/ktexteditor_insertfile.so
-${KDE}/ktexteditor_isearch.so
-${KDE}/ktexteditor_kdatatool.so
-${KDE}/libkatepart.so
-${KDE}/libkcertpart.so
-${KDE}/libkdeprint_management_module.so
-${KDE}/libkhtmlpart.so
-${KDE}/libkmultipart.so
-${KDE}/libshellscript.so
-${KDE}/plugins/designer/kdewidgets.so
-${KDE}/plugins/styles/highcolor.so
-${KDE}/plugins/styles/keramik.so
-${KDE}/plugins/styles/kthemestyle.so
-${KDE}/plugins/styles/light.so
-lib/libDCOP.so.6.0
-lib/libartskde.so.3.0
-lib/libkabc.so.3.0
-lib/libkabc_dir.so.1.0
-lib/libkabc_file.so.1.0
-lib/libkabc_ldapkio.so.1.0
-lib/libkabc_net.so.1.0
-lib/libkatepartinterfaces.so.0.0
-lib/libkdecore.so.6.0
-lib/libkdefakes.so.6.0
-lib/libkdefx.so.6.0
-lib/libkdeinit_dcopserver.so
-lib/libkdeinit_kaddprinterwizard.so
-lib/libkdeinit_kbuildsycoca.so
-lib/libkdeinit_kconf_update.so
-lib/libkdeinit_kcookiejar.so
-lib/libkdeinit_kded.so
-lib/libkdeinit_kio_http_cache_cleaner.so
-lib/libkdeinit_kio_uiserver.so
-lib/libkdeinit_klauncher.so
-lib/libkdeprint.so.6.0
-lib/libkdeprint_management.so.6.0
-lib/libkdesasl.so.3.0
-lib/libkdesu.so.6.0
-lib/libkdeui.so.6.0
-lib/libkhtml.so.6.0
-lib/libkio.so.6.0
-lib/libkjava.so.1.0
-lib/libkjs.so.3.0
-lib/libkmdi.so.1.0
-lib/libkmediaplayer.so.0.0
-lib/libkmid.so.0.95
-lib/libkparts.so.3.0
-lib/libkresources.so.3.0
-lib/libkscreensaver.so.6.0
-lib/libkscript.so.0.0
-lib/libkspell.so.6.0
-lib/libktexteditor.so.0.0
-lib/libkutils.so.3.0
-lib/libkwalletbackend.so.1.0
-lib/libkwalletclient.so.1.0
-lib/libvcard.so.0.0
-DYNLIBDIR(%D/lib)
diff --git a/x11/kde/libs3/pkg/PLIST b/x11/kde/libs3/pkg/PLIST
index b68d64a3577..ce913bd5f36 100644
--- a/x11/kde/libs3/pkg/PLIST
+++ b/x11/kde/libs3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.21 2004/07/24 12:47:15 espie Exp $
+@comment $OpenBSD: PLIST,v 1.22 2004/08/10 22:08:03 espie Exp $
 bin/artsmessage
 bin/checkXML
 bin/dcop
@@ -678,110 +678,211 @@ include/scriptinterface.h
 include/scriptmanager.h
 ${KDE}/
 ${KDE}/dcopserver.la
+${KDE}/dcopserver.so
 ${KDE}/kabc_dir.la
+${KDE}/kabc_dir.so
 ${KDE}/kabc_file.la
+${KDE}/kabc_file.so
 ${KDE}/kabc_ldapkio.la
+${KDE}/kabc_ldapkio.so
 ${KDE}/kabc_net.la
+${KDE}/kabc_net.so
 ${KDE}/kabcformat_binary.la
+${KDE}/kabcformat_binary.so
 ${KDE}/kaddprinterwizard.la
+${KDE}/kaddprinterwizard.so
 ${KDE}/kbuildsycoca.la
+${KDE}/kbuildsycoca.so
 ${KDE}/kbzip2filter.la
+${KDE}/kbzip2filter.so
 ${KDE}/kcm_kresources.la
+${KDE}/kcm_kresources.so
 ${KDE}/kconf_update.la
+${KDE}/kconf_update.so
 ${KDE}/kcookiejar.la
+${KDE}/kcookiejar.so
 ${KDE}/kded.la
+${KDE}/kded.so
 ${KDE}/kded_kcookiejar.la
+${KDE}/kded_kcookiejar.so
 ${KDE}/kded_kdeprintd.la
+${KDE}/kded_kdeprintd.so
 ${KDE}/kded_kpasswdserver.la
+${KDE}/kded_kpasswdserver.so
 ${KDE}/kded_kssld.la
+${KDE}/kded_kssld.so
 ${KDE}/kded_kwalletd.la
+${KDE}/kded_kwalletd.so
 ${KDE}/kded_proxyscout.la
+${KDE}/kded_proxyscout.so
 ${KDE}/kdeprint_ext.la
+${KDE}/kdeprint_ext.so
 ${KDE}/kdeprint_lpdunix.la
+${KDE}/kdeprint_lpdunix.so
 ${KDE}/kdeprint_lpr.la
+${KDE}/kdeprint_lpr.so
 ${KDE}/kdeprint_rlpr.la
+${KDE}/kdeprint_rlpr.so
 ${KDE}/kdeprint_tool_escputil.la
+${KDE}/kdeprint_tool_escputil.so
 ${KDE}/kfileaudiopreview.la
+${KDE}/kfileaudiopreview.so
 ${KDE}/kgzipfilter.la
+${KDE}/kgzipfilter.so
 ${KDE}/khtmlimagepart.la
+${KDE}/khtmlimagepart.so
 ${KDE}/kimg_eps.la
+${KDE}/kimg_eps.so
 ${KDE}/kimg_ico.la
+${KDE}/kimg_ico.so
 ${KDE}/kimg_jp2.la
+${KDE}/kimg_jp2.so
 ${KDE}/kimg_pcx.la
+${KDE}/kimg_pcx.so
 ${KDE}/kimg_tga.la
+${KDE}/kimg_tga.so
 ${KDE}/kimg_tiff.la
+${KDE}/kimg_tiff.so
 ${KDE}/kimg_xview.la
+${KDE}/kimg_xview.so
 ${KDE}/kio_file.la
+${KDE}/kio_file.so
 ${KDE}/kio_ftp.la
+${KDE}/kio_ftp.so
 ${KDE}/kio_ghelp.la
+${KDE}/kio_ghelp.so
 ${KDE}/kio_help.la
+${KDE}/kio_help.so
 ${KDE}/kio_http.la
+${KDE}/kio_http.so
 ${KDE}/kio_http_cache_cleaner.la
+${KDE}/kio_http_cache_cleaner.so
 ${KDE}/kio_metainfo.la
+${KDE}/kio_metainfo.so
 ${KDE}/kio_uiserver.la
+${KDE}/kio_uiserver.so
 ${KDE}/kjavaappletviewer.la
+${KDE}/kjavaappletviewer.so
 ${KDE}/klauncher.la
+${KDE}/klauncher.so
 ${KDE}/knotify.la
+${KDE}/knotify.so
 ${KDE}/ktexteditor_insertfile.la
+${KDE}/ktexteditor_insertfile.so
 ${KDE}/ktexteditor_isearch.la
+${KDE}/ktexteditor_isearch.so
 ${KDE}/ktexteditor_kdatatool.la
+${KDE}/ktexteditor_kdatatool.so
 ${KDE}/libkatepart.la
+${KDE}/libkatepart.so
 ${KDE}/libkcertpart.la
+${KDE}/libkcertpart.so
 ${KDE}/libkdeprint_management_module.la
+${KDE}/libkdeprint_management_module.so
 ${KDE}/libkhtmlpart.la
+${KDE}/libkhtmlpart.so
 ${KDE}/libkmultipart.la
+${KDE}/libkmultipart.so
 ${KDE}/libshellscript.la
+${KDE}/libshellscript.so
 ${KDE}/plugins/
 ${KDE}/plugins/designer/
 ${KDE}/plugins/designer/kdewidgets.la
+${KDE}/plugins/designer/kdewidgets.so
 ${KDE}/plugins/styles/
 ${KDE}/plugins/styles/highcolor.la
+${KDE}/plugins/styles/highcolor.so
 ${KDE}/plugins/styles/keramik.la
+${KDE}/plugins/styles/keramik.so
 ${KDE}/plugins/styles/kthemestyle.la
+${KDE}/plugins/styles/kthemestyle.so
 ${KDE}/plugins/styles/light.la
+${KDE}/plugins/styles/light.so
 lib/libDCOP.la
+@lib lib/libDCOP.so.6.0
 lib/libartskde.la
+@lib lib/libartskde.so.3.0
 lib/libkabc.la
+@lib lib/libkabc.so.3.0
 lib/libkabc_dir.la
+@lib lib/libkabc_dir.so.1.0
 lib/libkabc_file.la
+@lib lib/libkabc_file.so.1.0
 lib/libkabc_ldapkio.la
+@lib lib/libkabc_ldapkio.so.1.0
 lib/libkabc_net.la
+@lib lib/libkabc_net.so.1.0
 lib/libkatepartinterfaces.la
+@lib lib/libkatepartinterfaces.so.0.0
 lib/libkdecore.la
+@lib lib/libkdecore.so.6.0
 lib/libkdefakes.la
+@lib lib/libkdefakes.so.6.0
 lib/libkdefakes_nonpic.a
 lib/libkdefx.la
+@lib lib/libkdefx.so.6.0
 lib/libkdeinit_dcopserver.la
+lib/libkdeinit_dcopserver.so
 lib/libkdeinit_kaddprinterwizard.la
+lib/libkdeinit_kaddprinterwizard.so
 lib/libkdeinit_kbuildsycoca.la
+lib/libkdeinit_kbuildsycoca.so
 lib/libkdeinit_kconf_update.la
+lib/libkdeinit_kconf_update.so
 lib/libkdeinit_kcookiejar.la
+lib/libkdeinit_kcookiejar.so
 lib/libkdeinit_kded.la
+lib/libkdeinit_kded.so
 lib/libkdeinit_kio_http_cache_cleaner.la
+lib/libkdeinit_kio_http_cache_cleaner.so
 lib/libkdeinit_kio_uiserver.la
+lib/libkdeinit_kio_uiserver.so
 lib/libkdeinit_klauncher.la
+lib/libkdeinit_klauncher.so
 lib/libkdeprint.la
+@lib lib/libkdeprint.so.6.0
 lib/libkdeprint_management.la
+@lib lib/libkdeprint_management.so.6.0
 lib/libkdesasl.la
+@lib lib/libkdesasl.so.3.0
 lib/libkdesu.la
+@lib lib/libkdesu.so.6.0
 lib/libkdeui.la
+@lib lib/libkdeui.so.6.0
 lib/libkhtml.la
+@lib lib/libkhtml.so.6.0
 lib/libkio.la
+@lib lib/libkio.so.6.0
 lib/libkjava.la
+@lib lib/libkjava.so.1.0
 lib/libkjs.la
+@lib lib/libkjs.so.3.0
 lib/libkmdi.la
+@lib lib/libkmdi.so.1.0
 lib/libkmediaplayer.la
+@lib lib/libkmediaplayer.so.0.0
 lib/libkmid.la
+@lib lib/libkmid.so.0.95
 lib/libkparts.la
+@lib lib/libkparts.so.3.0
 lib/libkresources.la
+@lib lib/libkresources.so.3.0
 lib/libkscreensaver.la
+@lib lib/libkscreensaver.so.6.0
 lib/libkscript.la
+@lib lib/libkscript.so.0.0
 lib/libkspell.la
+@lib lib/libkspell.so.6.0
 lib/libktexteditor.la
+@lib lib/libktexteditor.so.0.0
 lib/libkutils.la
+@lib lib/libkutils.so.3.0
 lib/libkwalletbackend.la
+@lib lib/libkwalletbackend.so.1.0
 lib/libkwalletclient.la
+@lib lib/libkwalletclient.so.1.0
 lib/libvcard.la
+@lib lib/libvcard.so.0.0
 share/applications/
 share/applications/kde/
 share/applications/kde/kresources.desktop
@@ -899,10 +1000,12 @@ share/apps/kconf_update/kioslave.upd
 share/apps/kconf_update/move_kio_help_cache.sh
 share/apps/kconf_update/proxytype.pl
 share/apps/kconf_update/useragent.pl
+@sample ${SYSCONFDIR}/xdg/
+@sample ${SYSCONFDIR}/xdg/menus/
 share/apps/kde-conf-sample/
 share/apps/kde-conf-sample/xdg/
 share/apps/kde-conf-sample/xdg/menus/
-share/apps/kde-conf-sample/${EXTRA_CONFIG}
+share/apps/kde-conf-sample/xdg/menus/applications.menu
 share/apps/kdeprint/
 share/apps/kdeprint/apsdriver1
 share/apps/kdeprint/apsdriver2
@@ -4557,8 +4660,3 @@ share/servicetypes/ktexteditorplugin.desktop
 share/servicetypes/kurifilterplugin.desktop
 share/servicetypes/renamedlgplugin.desktop
 share/servicetypes/scriptinterface.desktop
-%%SHARED%%
-@cwd ${SYSCONFDIR}
-@extra xdg/menus/applications.menu
-@extra xdg/menus/
-@extra xdg/