diff --git a/x11/kde/addons3/pkg/PFRAG.shared b/x11/kde/addons3/pkg/PFRAG.shared
index 2a19a9bac84..b9dfcf3c5ed 100644
--- a/x11/kde/addons3/pkg/PFRAG.shared
+++ b/x11/kde/addons3/pkg/PFRAG.shared
@@ -1,22 +1,21 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2002/04/04 18:29:21 espie Exp $
-lib/kde3/libbabelfishplugin.so.0.0
-lib/kde3/libdirfilterplugin.so.0.0
-lib/kde3/libdomtreeviewerplugin.so.0.0
-lib/kde3/libkatehtmltoolsplugin.so.0.0
-lib/kde3/libkateinsertcommandplugin.so.0.0
-lib/kde3/libkateopenheaderplugin.so.0.0
-lib/kde3/libkateprojectmanagerplugin.so.0.0
-lib/kde3/libkatetextfilterplugin.so.0.0
-lib/kde3/libkatexmltoolsplugin.so.0.0
-lib/kde3/libkcm_kuick.so.0.0
-lib/kde3/libkhtmlsettingsplugin.so.0.0
-lib/kde3/libkimgallery.so.0.0
-lib/kde3/libkolourpicker_panelapplet.so.0.0
-lib/kde3/libkonqsidebar_mediaplayer.so.0.0
-lib/kde3/libktimemon_panelapplet.so.1.0
-lib/kde3/libkuickplugin.so.0.0
-lib/kde3/libuachangerplugin.so.0.0
-lib/kde3/libvalidatorsplugin.so.0.0
-lib/kde3/libwebarchiverplugin.so.0.0
-lib/kde3/libwebarchivethumbnail.so.0.0
-DYNLIBDIR(%D/lib/kde3)
+@comment $OpenBSD: PFRAG.shared,v 1.5 2002/04/15 06:53:53 espie Exp $
+${KDE}/libbabelfishplugin.so.0.0
+${KDE}/libdirfilterplugin.so.0.0
+${KDE}/libdomtreeviewerplugin.so.0.0
+${KDE}/libkatehtmltoolsplugin.so.0.0
+${KDE}/libkateinsertcommandplugin.so.0.0
+${KDE}/libkateopenheaderplugin.so.0.0
+${KDE}/libkateprojectmanagerplugin.so.0.0
+${KDE}/libkatetextfilterplugin.so.0.0
+${KDE}/libkatexmltoolsplugin.so.0.0
+${KDE}/libkcm_kuick.so.0.0
+${KDE}/libkhtmlsettingsplugin.so.0.0
+${KDE}/libkimgallery.so.0.0
+${KDE}/libkolourpicker_panelapplet.so.0.0
+${KDE}/libkonqsidebar_mediaplayer.so.0.0
+${KDE}/libktimemon_panelapplet.so.1.0
+${KDE}/libkuickplugin.so.0.0
+${KDE}/libuachangerplugin.so.0.0
+${KDE}/libvalidatorsplugin.so.0.0
+${KDE}/libwebarchiverplugin.so.0.0
+${KDE}/libwebarchivethumbnail.so.0.0
diff --git a/x11/kde/addons3/pkg/PLIST b/x11/kde/addons3/pkg/PLIST
index 10828635625..1e4801344ba 100644
--- a/x11/kde/addons3/pkg/PLIST
+++ b/x11/kde/addons3/pkg/PLIST
@@ -1,26 +1,26 @@
-@comment $OpenBSD: PLIST,v 1.6 2002/04/04 18:29:21 espie Exp $
+@comment $OpenBSD: PLIST,v 1.7 2002/04/15 06:53:53 espie Exp $
 bin/dcop_kate
 bin/testor
-lib/kde3/katehtmltoolsplugin.la
-lib/kde3/kateinsertcommandplugin.la
-lib/kde3/kateopenheaderplugin.la
-lib/kde3/kateprojectmanagerplugin.la
-lib/kde3/katetextfilterplugin.la
-lib/kde3/katexmltoolsplugin.la
-lib/kde3/kolourpicker_panelapplet.la
-lib/kde3/konqsidebar_mediaplayer.la
-lib/kde3/ktimemon_panelapplet.la
-lib/kde3/libbabelfishplugin.la
-lib/kde3/libdirfilterplugin.la
-lib/kde3/libdomtreeviewerplugin.la
-lib/kde3/libkcm_kuick.la
-lib/kde3/libkhtmlsettingsplugin.la
-lib/kde3/libkimgallery.la
-lib/kde3/libkuickplugin.la
-lib/kde3/libuachangerplugin.la
-lib/kde3/libvalidatorsplugin.la
-lib/kde3/libwebarchiverplugin.la
-lib/kde3/webarchivethumbnail.la
+${KDE}/katehtmltoolsplugin.la
+${KDE}/kateinsertcommandplugin.la
+${KDE}/kateopenheaderplugin.la
+${KDE}/kateprojectmanagerplugin.la
+${KDE}/katetextfilterplugin.la
+${KDE}/katexmltoolsplugin.la
+${KDE}/kolourpicker_panelapplet.la
+${KDE}/konqsidebar_mediaplayer.la
+${KDE}/ktimemon_panelapplet.la
+${KDE}/libbabelfishplugin.la
+${KDE}/libdirfilterplugin.la
+${KDE}/libdomtreeviewerplugin.la
+${KDE}/libkcm_kuick.la
+${KDE}/libkhtmlsettingsplugin.la
+${KDE}/libkimgallery.la
+${KDE}/libkuickplugin.la
+${KDE}/libuachangerplugin.la
+${KDE}/libvalidatorsplugin.la
+${KDE}/libwebarchiverplugin.la
+${KDE}/webarchivethumbnail.la
 share/applnk/Settings/FileBrowsing/kcmkuick.desktop
 share/apps/kate/plugins/katehtmltools.desktop
 share/apps/kate/plugins/katehtmltools/ui.rc
diff --git a/x11/kde/arts3/pkg/PFRAG.shared b/x11/kde/arts3/pkg/PFRAG.shared
index f21494740ca..c0dfbd85b63 100644
--- a/x11/kde/arts3/pkg/PFRAG.shared
+++ b/x11/kde/arts3/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2002/04/03 16:54:43 espie Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.3 2002/04/15 06:53:53 espie Exp $
 lib/libartsc.so.0.0
 lib/libartscbackend.so.0.0
 lib/libartsdsp.so.0.0
diff --git a/x11/kde/arts3/pkg/PLIST b/x11/kde/arts3/pkg/PLIST
index 78ce24842df..3b20467b202 100644
--- a/x11/kde/arts3/pkg/PLIST
+++ b/x11/kde/arts3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/04/03 16:54:43 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2002/04/15 06:53:53 espie Exp $
 @pkgcfl kdelibs-2.*
 bin/artsc-config
 bin/artscat
diff --git a/x11/kde/base3/pkg/PFRAG.shared b/x11/kde/base3/pkg/PFRAG.shared
index 789c7064d16..20d36efd0cf 100644
--- a/x11/kde/base3/pkg/PFRAG.shared
+++ b/x11/kde/base3/pkg/PFRAG.shared
@@ -1,121 +1,121 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2002/04/10 01:24:39 espie Exp $
-lib/kde3/libchildpanel_panelextension.so.1.0
-lib/kde3/libclock_panelapplet.so.1.0
-lib/kde3/libdockbar_panelextension.so.1.0
-lib/kde3/libgsthumbnail.so.0.0
-lib/kde3/libhtmlthumbnail.so.0.0
-lib/kde3/libimagethumbnail.so.0.0
-lib/kde3/libkasbar_panelextension.so.1.0
-lib/kde3/libkcm_access.so.0.0
-lib/kde3/libkcm_arts.so.0.0
-lib/kde3/libkcm_audiocd.so.0.0
-lib/kde3/libkcm_background.so.0.0
-lib/kde3/libkcm_bell.so.0.0
-lib/kde3/libkcm_clock.so.0.0
-lib/kde3/libkcm_colors.so.0.0
-lib/kde3/libkcm_crypto.so.0.0
-lib/kde3/libkcm_css.so.0.0
-lib/kde3/libkcm_email.so.0.0
-lib/kde3/libkcm_energy.so.0.0
-lib/kde3/libkcm_filetypes.so.0.0
-lib/kde3/libkcm_fontinst.so.0.0
-lib/kde3/libkcm_fonts.so.0.0
-lib/kde3/libkcm_icons.so.0.0
-lib/kde3/libkcm_info.so.0.0
-lib/kde3/libkcm_input.so.0.0
-lib/kde3/libkcm_ioslaveinfo.so.0.0
-lib/kde3/libkcm_kdm.so.0.0
-lib/kde3/libkcm_keyboard.so.0.0
-lib/kde3/libkcm_keys.so.0.0
-lib/kde3/libkcm_khotkeys.so.0.0
-lib/kde3/libkcm_kicker.so.0.0
-lib/kde3/libkcm_kio.so.0.0
-lib/kde3/libkcm_knotify.so.0.0
-lib/kde3/libkcm_konq.so.0.0
-lib/kde3/libkcm_konqhtml.so.0.0
-lib/kde3/libkcm_konsole.so.0.0
-lib/kde3/libkcm_kurifilt.so.0.0
-lib/kde3/libkcm_kwindecoration.so.0.0
-lib/kde3/libkcm_kwinoptions.so.0.0
-lib/kde3/libkcm_launch.so.0.0
-lib/kde3/libkcm_locale.so.0.0
-lib/kde3/libkcm_midi.so.0.0
-lib/kde3/libkcm_nic.so.0.0
-lib/kde3/libkcm_passwords.so.0.0
-lib/kde3/libkcm_printmgr.so.0.0
-lib/kde3/libkcm_samba.so.0.0
-lib/kde3/libkcm_screensaver.so.0.0
-lib/kde3/libkcm_smserver.so.0.0
-lib/kde3/libkcm_socks.so.0.0
-lib/kde3/libkcm_spellchecking.so.0.0
-lib/kde3/libkcm_style.so.0.0
-lib/kde3/libkcm_taskbar.so.0.0
-lib/kde3/libkcm_themes.so.0.0
-lib/kde3/libkcm_usb.so.0.0
-lib/kde3/libkded_favicons.so.0.0
-lib/kde3/libkdeprint_part.so.0.0
-lib/kde3/libkhelpcenter.so.0.0
-lib/kde3/libkhelpcenterpart.so.0.0
-lib/kde3/libkickermenu_kdeprint.so.0.0
-lib/kde3/libkio_audiocd.so.0.0
-lib/kde3/libkio_filter.so.0.0
-lib/kde3/libkio_finger.so.0.0
-lib/kde3/libkio_floppy.so.0.0
-lib/kde3/libkio_imap4.so.0.0
-lib/kde3/libkio_info.so.0.0
-lib/kde3/libkio_ldap.so.0.0
-lib/kde3/libkio_man.so.0.0
-lib/kde3/libkio_nfs.so.0.0
-lib/kde3/libkio_nntp.so.0.0
-lib/kde3/libkio_pop3.so.0.0
-lib/kde3/libkio_print.so.0.0
-lib/kde3/libkio_sftp.so.0.0
-lib/kde3/libkio_smb.so.0.0
-lib/kde3/libkio_smtp.so.0.0
-lib/kde3/libkio_tar.so.0.0
-lib/kde3/libkio_thumbnail.so.0.0
-lib/kde3/libklipper_panelapplet.so.0.0
-lib/kde3/libkonq_aboutpage.so.0.0
-lib/kde3/libkonq_iconview.so.0.0
-lib/kde3/libkonq_listview.so.0.0
-lib/kde3/libkonq_shellcmdplugin.so.0.0
-lib/kde3/libkonq_sidebar.so.0.0
-lib/kde3/libkonq_sidebartree_bookmarks.so.0.0
-lib/kde3/libkonq_sidebartree_dirtree.so.0.0
-lib/kde3/libkonq_sidebartree_history.so.0.0
-lib/kde3/libkonq_sound.so.0.0
-lib/kde3/libkonqsidebar_tree.so.0.0
-lib/kde3/libkshorturifilter.so.0.0
-lib/kde3/libkuriikwsfilter.so.0.0
-lib/kde3/libkurisearchfilter.so.0.0
-lib/kde3/libkwin_b2.so.0.0
-lib/kde3/libkwin_b2_config.so.0.0
-lib/kde3/libkwin_default.so.0.0
-lib/kde3/libkwin_default_config.so.0.0
-lib/kde3/libkwin_icewm.so.0.0
-lib/kde3/libkwin_icewm_config.so.0.0
-lib/kde3/libkwin_kde1.so.0.0
-lib/kde3/libkwin_kstep.so.0.0
-lib/kde3/libkwin_kwmtheme.so.0.0
-lib/kde3/libkwin_laptop.so.0.0
-lib/kde3/libkwin_modernsys.so.0.0
-lib/kde3/libkwin_modernsys_config.so.0.0
-lib/kde3/libkwin_quartz.so.0.0
-lib/kde3/libkwin_quartz_config.so.0.0
-lib/kde3/libkwin_redmond.so.0.0
-lib/kde3/libkwin_riscos.so.0.0
-lib/kde3/libkwin_system.so.0.0
-lib/kde3/libkwin_web.so.0.0
-lib/kde3/liblauncher_panelapplet.so.1.0
-lib/kde3/liblockout_panelapplet.so.0.0
-lib/kde3/libminipager_panelapplet.so.1.0
-lib/kde3/libnaughty_panelapplet.so.1.0
-lib/kde3/librun_panelapplet.so.1.0
-lib/kde3/libsysguard_panelapplet.so.1.0
-lib/kde3/libsystemtray_panelapplet.so.1.0
-lib/kde3/libtaskbar_panelapplet.so.1.0
-lib/kde3/libtaskbar_panelextension.so.1.0
-lib/kde3/libtextthumbnail.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.6 2002/04/15 06:53:53 espie Exp $
+${KDE}/libchildpanel_panelextension.so.1.0
+${KDE}/libclock_panelapplet.so.1.0
+${KDE}/libdockbar_panelextension.so.1.0
+${KDE}/libgsthumbnail.so.0.0
+${KDE}/libhtmlthumbnail.so.0.0
+${KDE}/libimagethumbnail.so.0.0
+${KDE}/libkasbar_panelextension.so.1.0
+${KDE}/libkcm_access.so.0.0
+${KDE}/libkcm_arts.so.0.0
+${KDE}/libkcm_audiocd.so.0.0
+${KDE}/libkcm_background.so.0.0
+${KDE}/libkcm_bell.so.0.0
+${KDE}/libkcm_clock.so.0.0
+${KDE}/libkcm_colors.so.0.0
+${KDE}/libkcm_crypto.so.0.0
+${KDE}/libkcm_css.so.0.0
+${KDE}/libkcm_email.so.0.0
+${KDE}/libkcm_energy.so.0.0
+${KDE}/libkcm_filetypes.so.0.0
+${KDE}/libkcm_fontinst.so.0.0
+${KDE}/libkcm_fonts.so.0.0
+${KDE}/libkcm_icons.so.0.0
+${KDE}/libkcm_info.so.0.0
+${KDE}/libkcm_input.so.0.0
+${KDE}/libkcm_ioslaveinfo.so.0.0
+${KDE}/libkcm_kdm.so.0.0
+${KDE}/libkcm_keyboard.so.0.0
+${KDE}/libkcm_keys.so.0.0
+${KDE}/libkcm_khotkeys.so.0.0
+${KDE}/libkcm_kicker.so.0.0
+${KDE}/libkcm_kio.so.0.0
+${KDE}/libkcm_knotify.so.0.0
+${KDE}/libkcm_konq.so.0.0
+${KDE}/libkcm_konqhtml.so.0.0
+${KDE}/libkcm_konsole.so.0.0
+${KDE}/libkcm_kurifilt.so.0.0
+${KDE}/libkcm_kwindecoration.so.0.0
+${KDE}/libkcm_kwinoptions.so.0.0
+${KDE}/libkcm_launch.so.0.0
+${KDE}/libkcm_locale.so.0.0
+${KDE}/libkcm_midi.so.0.0
+${KDE}/libkcm_nic.so.0.0
+${KDE}/libkcm_passwords.so.0.0
+${KDE}/libkcm_printmgr.so.0.0
+${KDE}/libkcm_samba.so.0.0
+${KDE}/libkcm_screensaver.so.0.0
+${KDE}/libkcm_smserver.so.0.0
+${KDE}/libkcm_socks.so.0.0
+${KDE}/libkcm_spellchecking.so.0.0
+${KDE}/libkcm_style.so.0.0
+${KDE}/libkcm_taskbar.so.0.0
+${KDE}/libkcm_themes.so.0.0
+${KDE}/libkcm_usb.so.0.0
+${KDE}/libkded_favicons.so.0.0
+${KDE}/libkdeprint_part.so.0.0
+${KDE}/libkhelpcenter.so.0.0
+${KDE}/libkhelpcenterpart.so.0.0
+${KDE}/libkickermenu_kdeprint.so.0.0
+${KDE}/libkio_audiocd.so.0.0
+${KDE}/libkio_filter.so.0.0
+${KDE}/libkio_finger.so.0.0
+${KDE}/libkio_floppy.so.0.0
+${KDE}/libkio_imap4.so.0.0
+${KDE}/libkio_info.so.0.0
+${KDE}/libkio_ldap.so.0.0
+${KDE}/libkio_man.so.0.0
+${KDE}/libkio_nfs.so.0.0
+${KDE}/libkio_nntp.so.0.0
+${KDE}/libkio_pop3.so.0.0
+${KDE}/libkio_print.so.0.0
+${KDE}/libkio_sftp.so.0.0
+${KDE}/libkio_smb.so.0.0
+${KDE}/libkio_smtp.so.0.0
+${KDE}/libkio_tar.so.0.0
+${KDE}/libkio_thumbnail.so.0.0
+${KDE}/libklipper_panelapplet.so.0.0
+${KDE}/libkonq_aboutpage.so.0.0
+${KDE}/libkonq_iconview.so.0.0
+${KDE}/libkonq_listview.so.0.0
+${KDE}/libkonq_shellcmdplugin.so.0.0
+${KDE}/libkonq_sidebar.so.0.0
+${KDE}/libkonq_sidebartree_bookmarks.so.0.0
+${KDE}/libkonq_sidebartree_dirtree.so.0.0
+${KDE}/libkonq_sidebartree_history.so.0.0
+${KDE}/libkonq_sound.so.0.0
+${KDE}/libkonqsidebar_tree.so.0.0
+${KDE}/libkshorturifilter.so.0.0
+${KDE}/libkuriikwsfilter.so.0.0
+${KDE}/libkurisearchfilter.so.0.0
+${KDE}/libkwin_b2.so.0.0
+${KDE}/libkwin_b2_config.so.0.0
+${KDE}/libkwin_default.so.0.0
+${KDE}/libkwin_default_config.so.0.0
+${KDE}/libkwin_icewm.so.0.0
+${KDE}/libkwin_icewm_config.so.0.0
+${KDE}/libkwin_kde1.so.0.0
+${KDE}/libkwin_kstep.so.0.0
+${KDE}/libkwin_kwmtheme.so.0.0
+${KDE}/libkwin_laptop.so.0.0
+${KDE}/libkwin_modernsys.so.0.0
+${KDE}/libkwin_modernsys_config.so.0.0
+${KDE}/libkwin_quartz.so.0.0
+${KDE}/libkwin_quartz_config.so.0.0
+${KDE}/libkwin_redmond.so.0.0
+${KDE}/libkwin_riscos.so.0.0
+${KDE}/libkwin_system.so.0.0
+${KDE}/libkwin_web.so.0.0
+${KDE}/liblauncher_panelapplet.so.1.0
+${KDE}/liblockout_panelapplet.so.0.0
+${KDE}/libminipager_panelapplet.so.1.0
+${KDE}/libnaughty_panelapplet.so.1.0
+${KDE}/librun_panelapplet.so.1.0
+${KDE}/libsysguard_panelapplet.so.1.0
+${KDE}/libsystemtray_panelapplet.so.1.0
+${KDE}/libtaskbar_panelapplet.so.1.0
+${KDE}/libtaskbar_panelextension.so.1.0
+${KDE}/libtextthumbnail.so.0.0
 lib/libappletproxy.so.0.0
 lib/libextensionproxy.so.0.0
 lib/libkaccess.so.0.0
@@ -150,4 +150,3 @@ lib/libsensordisplays.so.0.0
 lib/libtaskbar.so.1.0
 lib/libtaskmanager.so.1.0
 DYNLIBDIR(%D/lib)
-DYNLIBDIR(%D/lib/kde3)
diff --git a/x11/kde/base3/pkg/PLIST b/x11/kde/base3/pkg/PLIST
index 7ea343b3dc5..4481d842587 100644
--- a/x11/kde/base3/pkg/PLIST
+++ b/x11/kde/base3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2002/04/09 01:48:51 espie Exp $
+@comment $OpenBSD: PLIST,v 1.8 2002/04/15 06:53:53 espie Exp $
 bin/appletproxy
 bin/chooser
 bin/conttest
@@ -43,10 +43,10 @@ bin/kmenuedit
 bin/konqueror
 bin/konsole
 @owner root
-@chmod u+s
+@mode u+s
 bin/konsole_grantpty
-@mode
 @owner
+@mode
 bin/kpager
 bin/kpersonalizer
 bin/kpm
@@ -119,123 +119,123 @@ lib/kate.la
 lib/kcminit.la
 lib/kcmshell.la
 lib/kcontrol.la
-lib/kde3/childpanel_panelextension.la
-lib/kde3/clock_panelapplet.la
-lib/kde3/dockbar_panelextension.la
-lib/kde3/gsthumbnail.la
-lib/kde3/htmlthumbnail.la
-lib/kde3/imagethumbnail.la
-lib/kde3/kasbar_panelextension.la
-lib/kde3/kcm_access.la
-lib/kde3/kcm_arts.la
-lib/kde3/kcm_background.la
-lib/kde3/kcm_bell.la
-lib/kde3/kcm_clock.la
-lib/kde3/kcm_colors.la
-lib/kde3/kcm_crypto.la
-lib/kde3/kcm_css.la
-lib/kde3/kcm_email.la
-lib/kde3/kcm_energy.la
-lib/kde3/kcm_filetypes.la
-lib/kde3/kcm_fontinst.la
-lib/kde3/kcm_fonts.la
-lib/kde3/kcm_icons.la
-lib/kde3/kcm_info.la
-lib/kde3/kcm_input.la
-lib/kde3/kcm_ioslaveinfo.la
-lib/kde3/kcm_kdm.la
-lib/kde3/kcm_keyboard.la
-lib/kde3/kcm_keys.la
-lib/kde3/kcm_khotkeys.la
-lib/kde3/kcm_kicker.la
-lib/kde3/kcm_kio.la
-lib/kde3/kcm_knotify.la
-lib/kde3/kcm_konq.la
-lib/kde3/kcm_konqhtml.la
-lib/kde3/kcm_konsole.la
-lib/kde3/kcm_kurifilt.la
-lib/kde3/kcm_kwindecoration.la
-lib/kde3/kcm_kwinoptions.la
-lib/kde3/kcm_launch.la
-lib/kde3/kcm_locale.la
-lib/kde3/kcm_midi.la
-lib/kde3/kcm_nic.la
-lib/kde3/kcm_passwords.la
-lib/kde3/kcm_printmgr.la
-lib/kde3/kcm_samba.la
-lib/kde3/kcm_screensaver.la
-lib/kde3/kcm_smserver.la
-lib/kde3/kcm_socks.la
-lib/kde3/kcm_spellchecking.la
-lib/kde3/kcm_style.la
-lib/kde3/kcm_taskbar.la
-lib/kde3/kcm_themes.la
-lib/kde3/kcm_usb.la
-lib/kde3/kded_favicons.la
-lib/kde3/khelpcenter.la
-lib/kde3/kickermenu_kdeprint.la
-lib/kde3/kio_audiocd.la
-lib/kde3/kio_filter.la
-lib/kde3/kio_finger.la
-lib/kde3/kio_floppy.la
-lib/kde3/kio_imap4.la
-lib/kde3/kio_info.la
-lib/kde3/kio_ldap.la
-lib/kde3/kio_man.la
-lib/kde3/kio_nfs.la
-lib/kde3/kio_nntp.la
-lib/kde3/kio_pop3.la
-lib/kde3/kio_print.la
-lib/kde3/kio_sftp.la
-lib/kde3/kio_smb.la
-lib/kde3/kio_smtp.la
-lib/kde3/kio_tar.la
-lib/kde3/kio_thumbnail.la
-lib/kde3/klipper_panelapplet.la
-lib/kde3/konq_aboutpage.la
-lib/kde3/konq_iconview.la
-lib/kde3/konq_listview.la
-lib/kde3/konq_shellcmdplugin.la
-lib/kde3/konq_sidebar.la
-lib/kde3/konq_sidebartree_bookmarks.la
-lib/kde3/konq_sidebartree_dirtree.la
-lib/kde3/konq_sidebartree_history.la
-lib/kde3/konq_sound.la
-lib/kde3/konqsidebar_tree.la
-lib/kde3/kwin_b2.la
-lib/kde3/kwin_b2_config.la
-lib/kde3/kwin_default.la
-lib/kde3/kwin_default_config.la
-lib/kde3/kwin_icewm.la
-lib/kde3/kwin_icewm_config.la
-lib/kde3/kwin_kde1.la
-lib/kde3/kwin_kstep.la
-lib/kde3/kwin_kwmtheme.la
-lib/kde3/kwin_laptop.la
-lib/kde3/kwin_modernsys.la
-lib/kde3/kwin_modernsys_config.la
-lib/kde3/kwin_quartz.la
-lib/kde3/kwin_quartz_config.la
-lib/kde3/kwin_redmond.la
-lib/kde3/kwin_riscos.la
-lib/kde3/kwin_system.la
-lib/kde3/kwin_web.la
-lib/kde3/launcher_panelapplet.la
-lib/kde3/libkcm_audiocd.la
-lib/kde3/libkdeprint_part.la
-lib/kde3/libkhelpcenterpart.la
-lib/kde3/libkshorturifilter.la
-lib/kde3/libkuriikwsfilter.la
-lib/kde3/libkurisearchfilter.la
-lib/kde3/lockout_panelapplet.la
-lib/kde3/minipager_panelapplet.la
-lib/kde3/naughty_panelapplet.la
-lib/kde3/run_panelapplet.la
-lib/kde3/sysguard_panelapplet.la
-lib/kde3/systemtray_panelapplet.la
-lib/kde3/taskbar_panelapplet.la
-lib/kde3/taskbar_panelextension.la
-lib/kde3/textthumbnail.la
+${KDE}/childpanel_panelextension.la
+${KDE}/clock_panelapplet.la
+${KDE}/dockbar_panelextension.la
+${KDE}/gsthumbnail.la
+${KDE}/htmlthumbnail.la
+${KDE}/imagethumbnail.la
+${KDE}/kasbar_panelextension.la
+${KDE}/kcm_access.la
+${KDE}/kcm_arts.la
+${KDE}/kcm_background.la
+${KDE}/kcm_bell.la
+${KDE}/kcm_clock.la
+${KDE}/kcm_colors.la
+${KDE}/kcm_crypto.la
+${KDE}/kcm_css.la
+${KDE}/kcm_email.la
+${KDE}/kcm_energy.la
+${KDE}/kcm_filetypes.la
+${KDE}/kcm_fontinst.la
+${KDE}/kcm_fonts.la
+${KDE}/kcm_icons.la
+${KDE}/kcm_info.la
+${KDE}/kcm_input.la
+${KDE}/kcm_ioslaveinfo.la
+${KDE}/kcm_kdm.la
+${KDE}/kcm_keyboard.la
+${KDE}/kcm_keys.la
+${KDE}/kcm_khotkeys.la
+${KDE}/kcm_kicker.la
+${KDE}/kcm_kio.la
+${KDE}/kcm_knotify.la
+${KDE}/kcm_konq.la
+${KDE}/kcm_konqhtml.la
+${KDE}/kcm_konsole.la
+${KDE}/kcm_kurifilt.la
+${KDE}/kcm_kwindecoration.la
+${KDE}/kcm_kwinoptions.la
+${KDE}/kcm_launch.la
+${KDE}/kcm_locale.la
+${KDE}/kcm_midi.la
+${KDE}/kcm_nic.la
+${KDE}/kcm_passwords.la
+${KDE}/kcm_printmgr.la
+${KDE}/kcm_samba.la
+${KDE}/kcm_screensaver.la
+${KDE}/kcm_smserver.la
+${KDE}/kcm_socks.la
+${KDE}/kcm_spellchecking.la
+${KDE}/kcm_style.la
+${KDE}/kcm_taskbar.la
+${KDE}/kcm_themes.la
+${KDE}/kcm_usb.la
+${KDE}/kded_favicons.la
+${KDE}/khelpcenter.la
+${KDE}/kickermenu_kdeprint.la
+${KDE}/kio_audiocd.la
+${KDE}/kio_filter.la
+${KDE}/kio_finger.la
+${KDE}/kio_floppy.la
+${KDE}/kio_imap4.la
+${KDE}/kio_info.la
+${KDE}/kio_ldap.la
+${KDE}/kio_man.la
+${KDE}/kio_nfs.la
+${KDE}/kio_nntp.la
+${KDE}/kio_pop3.la
+${KDE}/kio_print.la
+${KDE}/kio_sftp.la
+${KDE}/kio_smb.la
+${KDE}/kio_smtp.la
+${KDE}/kio_tar.la
+${KDE}/kio_thumbnail.la
+${KDE}/klipper_panelapplet.la
+${KDE}/konq_aboutpage.la
+${KDE}/konq_iconview.la
+${KDE}/konq_listview.la
+${KDE}/konq_shellcmdplugin.la
+${KDE}/konq_sidebar.la
+${KDE}/konq_sidebartree_bookmarks.la
+${KDE}/konq_sidebartree_dirtree.la
+${KDE}/konq_sidebartree_history.la
+${KDE}/konq_sound.la
+${KDE}/konqsidebar_tree.la
+${KDE}/kwin_b2.la
+${KDE}/kwin_b2_config.la
+${KDE}/kwin_default.la
+${KDE}/kwin_default_config.la
+${KDE}/kwin_icewm.la
+${KDE}/kwin_icewm_config.la
+${KDE}/kwin_kde1.la
+${KDE}/kwin_kstep.la
+${KDE}/kwin_kwmtheme.la
+${KDE}/kwin_laptop.la
+${KDE}/kwin_modernsys.la
+${KDE}/kwin_modernsys_config.la
+${KDE}/kwin_quartz.la
+${KDE}/kwin_quartz_config.la
+${KDE}/kwin_redmond.la
+${KDE}/kwin_riscos.la
+${KDE}/kwin_system.la
+${KDE}/kwin_web.la
+${KDE}/launcher_panelapplet.la
+${KDE}/libkcm_audiocd.la
+${KDE}/libkdeprint_part.la
+${KDE}/libkhelpcenterpart.la
+${KDE}/libkshorturifilter.la
+${KDE}/libkuriikwsfilter.la
+${KDE}/libkurisearchfilter.la
+${KDE}/lockout_panelapplet.la
+${KDE}/minipager_panelapplet.la
+${KDE}/naughty_panelapplet.la
+${KDE}/run_panelapplet.la
+${KDE}/sysguard_panelapplet.la
+${KDE}/systemtray_panelapplet.la
+${KDE}/taskbar_panelapplet.la
+${KDE}/taskbar_panelextension.la
+${KDE}/textthumbnail.la
 lib/kdesktop.la
 lib/keditbookmarks.la
 lib/kfmclient.la
@@ -2357,8 +2357,6 @@ share/wallpapers/triplegears.jpg
 %%SHARED%%
 @exec mkdir -p %D/share/templates/.source/emptydir
 @dirrm share/templates/.source/emptydir
-@dirrm share/templates/.source
-@dirrm share/templates
 @dirrm share/services/useragentstrings
 @dirrm share/services/searchproviders
 @dirrm share/mimelnk/print
@@ -2640,7 +2638,6 @@ share/wallpapers/triplegears.jpg
 @dirrm share/applnk/Settings/Help
 @dirrm share/applnk/Settings/FileBrowsing
 @dirrm share/applnk/Settings/Databases
-@dirrm share/applnk/Office
 @dirrm share/applnk/Multimedia
 @dirrm share/applnk/Internet/Terminal
 @dirrm share/applnk/Internet
diff --git a/x11/kde/games3/pkg/PFRAG.shared b/x11/kde/games3/pkg/PFRAG.shared
index 92d6e8f1cb2..a5255872af9 100644
--- a/x11/kde/games3/pkg/PFRAG.shared
+++ b/x11/kde/games3/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2002/04/04 18:29:21 espie Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.5 2002/04/15 06:53:53 espie Exp $
 lib/libkbackgammon.so.0.0
 lib/libkdegames.so.1.1
 lib/libkdehighscores.so.0.1
diff --git a/x11/kde/games3/pkg/PLIST b/x11/kde/games3/pkg/PLIST
index c5ef0d539c0..165ab49a538 100644
--- a/x11/kde/games3/pkg/PLIST
+++ b/x11/kde/games3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2002/04/04 18:29:21 espie Exp $
+@comment $OpenBSD: PLIST,v 1.5 2002/04/15 06:53:53 espie Exp $
 bin/kasteroids
 bin/katomic
 bin/kbackgammon
diff --git a/x11/kde/graphics3/pkg/PFRAG.shared b/x11/kde/graphics3/pkg/PFRAG.shared
index 59e73db242e..9c3a8607e9e 100644
--- a/x11/kde/graphics3/pkg/PFRAG.shared
+++ b/x11/kde/graphics3/pkg/PFRAG.shared
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2002/04/04 18:29:21 espie Exp $
-lib/kde3/libkfile_pdf.so.0.0
-lib/kde3/libkfile_png.so.0.0
-lib/kde3/libkfile_ps.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.5 2002/04/15 06:53:53 espie Exp $
+${KDE}/libkfile_pdf.so.0.0
+${KDE}/libkfile_png.so.0.0
+${KDE}/libkfile_ps.so.0.0
 lib/libkcolorchooser.so.0.0
 lib/libkdvi.so.0.0
 lib/libkfax.so.0.0
@@ -13,4 +13,3 @@ lib/libkview.so.0.0
 lib/libkviewerpart.so.0.0
 lib/libkviewpart.so.0.0
 DYNLIBDIR(%D/lib)
-DYNLIBDIR(%D/lib/kde3)
diff --git a/x11/kde/graphics3/pkg/PLIST b/x11/kde/graphics3/pkg/PLIST
index c11fe50b44d..791654e2c18 100644
--- a/x11/kde/graphics3/pkg/PLIST
+++ b/x11/kde/graphics3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2002/04/04 18:29:21 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2002/04/15 06:53:53 espie Exp $
 bin/kcolorchooser
 bin/kcoloredit
 bin/kdvi
@@ -14,9 +14,9 @@ bin/kview
 bin/kviewshell
 include/kmultipageInterface.h
 lib/kcolorchooser.la
-lib/kde3/kfile_pdf.la
-lib/kde3/kfile_png.la
-lib/kde3/kfile_ps.la
+${KDE}/kfile_pdf.la
+${KDE}/kfile_png.la
+${KDE}/kfile_ps.la
 lib/kuickshow.la
 lib/kview.la
 lib/libkdvi.la
diff --git a/x11/kde/i18n3/pkg/PLIST.af b/x11/kde/i18n3/pkg/PLIST.af
index aca4da4a9c1..f54e9c8ae45 100644
--- a/x11/kde/i18n3/pkg/PLIST.af
+++ b/x11/kde/i18n3/pkg/PLIST.af
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.af,v 1.1.1.1 2002/04/04 17:41:15 espie Exp $
+@comment $OpenBSD: PLIST.af,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}kicker-applets/kolourpicker.docbook
 ${DOC}kicker-applets/ktimemon.docbook
 ${LOC}aktion.mo
@@ -298,6 +298,5 @@ share/locale/af/entry.desktop
 share/locale/af/flag.png
 @dirrm share/locale/af/LC_MESSAGES
 @dirrm share/locale/af
-@dirrm share/locale
 @dirrm ${DOC}kicker-applets
 @dirrm share/doc/HTML/af
diff --git a/x11/kde/i18n3/pkg/PLIST.ar b/x11/kde/i18n3/pkg/PLIST.ar
index a420d88733b..75d4838ed7c 100644
--- a/x11/kde/i18n3/pkg/PLIST.ar
+++ b/x11/kde/i18n3/pkg/PLIST.ar
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.ar,v 1.1.1.1 2002/04/04 17:41:15 espie Exp $
+@comment $OpenBSD: PLIST.ar,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${LOC}aktion.mo
 ${LOC}amor.mo
 ${LOC}appletproxy.mo
@@ -273,4 +273,3 @@ share/locale/ar/charset
 share/locale/ar/entry.desktop
 @dirrm share/locale/ar/LC_MESSAGES
 @dirrm share/locale/ar
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.az b/x11/kde/i18n3/pkg/PLIST.az
index c0a41a1c2da..594f4a61c2f 100644
--- a/x11/kde/i18n3/pkg/PLIST.az
+++ b/x11/kde/i18n3/pkg/PLIST.az
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.az,v 1.1.1.1 2002/04/04 17:41:15 espie Exp $
+@comment $OpenBSD: PLIST.az,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${LOC}Kiten.mo
 ${LOC}aktion.mo
 ${LOC}amor.mo
@@ -335,4 +335,3 @@ share/locale/az/entry.desktop
 share/locale/az/flag.png
 @dirrm share/locale/az/LC_MESSAGES
 @dirrm share/locale/az
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.bg b/x11/kde/i18n3/pkg/PLIST.bg
index d1b63d99eb0..bfd0d0c66f5 100644
--- a/x11/kde/i18n3/pkg/PLIST.bg
+++ b/x11/kde/i18n3/pkg/PLIST.bg
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.bg,v 1.1.1.1 2002/04/04 17:41:16 espie Exp $
+@comment $OpenBSD: PLIST.bg,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${LOC}aktion.mo
 ${LOC}amor.mo
 ${LOC}appletproxy.mo
@@ -277,4 +277,3 @@ share/locale/bg/entry.desktop
 share/locale/bg/flag.png
 @dirrm share/locale/bg/LC_MESSAGES
 @dirrm share/locale/bg
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.bs b/x11/kde/i18n3/pkg/PLIST.bs
index ede21449bbc..85769db632a 100644
--- a/x11/kde/i18n3/pkg/PLIST.bs
+++ b/x11/kde/i18n3/pkg/PLIST.bs
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.bs,v 1.1.1.1 2002/04/04 17:41:16 espie Exp $
+@comment $OpenBSD: PLIST.bs,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${LOC}appletproxy.mo
 ${LOC}babelfish.mo
 ${LOC}childpanelextension.mo
@@ -166,4 +166,3 @@ share/locale/bs/entry.desktop
 share/locale/bs/flag.png
 @dirrm share/locale/bs/LC_MESSAGES
 @dirrm share/locale/bs
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.ca b/x11/kde/i18n3/pkg/PLIST.ca
index 1b3ccf5804b..ae4d121ed2d 100644
--- a/x11/kde/i18n3/pkg/PLIST.ca
+++ b/x11/kde/i18n3/pkg/PLIST.ca
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.ca,v 1.1.1.1 2002/04/04 17:41:16 espie Exp $
+@comment $OpenBSD: PLIST.ca,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${LOC}aktion.mo
 ${LOC}amor.mo
 ${LOC}appletproxy.mo
@@ -190,4 +190,3 @@ share/locale/ca/entry.desktop
 share/locale/ca/flag.png
 @dirrm share/locale/ca/LC_MESSAGES
 @dirrm share/locale/ca
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.cs b/x11/kde/i18n3/pkg/PLIST.cs
index 84aa14e3d65..b3393c4dd50 100644
--- a/x11/kde/i18n3/pkg/PLIST.cs
+++ b/x11/kde/i18n3/pkg/PLIST.cs
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.cs,v 1.1.1.1 2002/04/04 17:41:16 espie Exp $
+@comment $OpenBSD: PLIST.cs,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}common/1.png
 ${DOC}common/10.png
 ${DOC}common/2.png
@@ -410,7 +410,6 @@ share/locale/cs/entry.desktop
 share/locale/cs/flag.png
 @dirrm share/locale/cs/LC_MESSAGES
 @dirrm share/locale/cs
-@dirrm share/locale
 @dirrm ${DOC}khelpcenter/quickstart
 @dirrm ${DOC}khelpcenter
 @dirrm ${DOC}kcontrol
diff --git a/x11/kde/i18n3/pkg/PLIST.da b/x11/kde/i18n3/pkg/PLIST.da
index ec4d546c251..84e60c383ab 100644
--- a/x11/kde/i18n3/pkg/PLIST.da
+++ b/x11/kde/i18n3/pkg/PLIST.da
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.da,v 1.1.1.1 2002/04/04 17:41:16 espie Exp $
+@comment $OpenBSD: PLIST.da,v 1.2 2002/04/15 06:53:53 espie Exp $
 share/apps/ktuberling/sounds/da/briller.wav
 share/apps/ktuberling/sounds/da/cigar.wav
 share/apps/ktuberling/sounds/da/hat.wav
@@ -1015,7 +1015,6 @@ share/locale/da/entry.desktop
 share/locale/da/flag.png
 @dirrm share/locale/da/LC_MESSAGES
 @dirrm share/locale/da
-@dirrm share/locale
 @dirrm ${DOC}pixie
 @dirrm ${DOC}noatun
 @dirrm ${DOC}lskat
diff --git a/x11/kde/i18n3/pkg/PLIST.de b/x11/kde/i18n3/pkg/PLIST.de
index 2eb17ae7df1..88cbf5baf0b 100644
--- a/x11/kde/i18n3/pkg/PLIST.de
+++ b/x11/kde/i18n3/pkg/PLIST.de
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.de,v 1.1.1.1 2002/04/04 17:41:16 espie Exp $
+@comment $OpenBSD: PLIST.de,v 1.2 2002/04/15 06:53:53 espie Exp $
 share/apps/ktuberling/sounds/de/abzeichen.wav
 share/apps/ktuberling/sounds/de/auge.wav
 share/apps/ktuberling/sounds/de/augenbraue.wav
@@ -1154,7 +1154,6 @@ share/locale/de/entry.desktop
 share/locale/de/flag.png
 @dirrm share/locale/de/LC_MESSAGES
 @dirrm share/locale/de
-@dirrm share/locale
 @dirrm ${DOC}noatun
 @dirrm ${DOC}lskat
 @dirrm ${DOC}lisa
diff --git a/x11/kde/i18n3/pkg/PLIST.el b/x11/kde/i18n3/pkg/PLIST.el
index 057a3be08c0..c12a1520deb 100644
--- a/x11/kde/i18n3/pkg/PLIST.el
+++ b/x11/kde/i18n3/pkg/PLIST.el
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.el,v 1.1.1.1 2002/04/04 17:41:16 espie Exp $
+@comment $OpenBSD: PLIST.el,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${LOC}appletproxy.mo
 ${LOC}ark.mo
 ${LOC}babelfish.mo
@@ -182,4 +182,3 @@ share/locale/el/entry.desktop
 share/locale/el/flag.png
 @dirrm share/locale/el/LC_MESSAGES
 @dirrm share/locale/el
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.en_GB b/x11/kde/i18n3/pkg/PLIST.en_GB
index b305acd22e7..390386ebdc0 100644
--- a/x11/kde/i18n3/pkg/PLIST.en_GB
+++ b/x11/kde/i18n3/pkg/PLIST.en_GB
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.en_GB,v 1.1.1.1 2002/04/04 17:41:16 espie Exp $
+@comment $OpenBSD: PLIST.en_GB,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}kcontrol/kalarmd.docbook
 ${DOC}kcontrol/kcmaccess.docbook
 ${DOC}kcontrol/kcmbell.docbook
@@ -532,7 +532,6 @@ share/locale/en_GB/entry.desktop
 share/locale/en_GB/flag.png
 @dirrm share/locale/en_GB/LC_MESSAGES
 @dirrm share/locale/en_GB
-@dirrm share/locale
 @dirrm ${DOC}kspell
 @dirrm ${DOC}kioslave
 @dirrm ${DOC}khelpcenter/visualdict
diff --git a/x11/kde/i18n3/pkg/PLIST.eo b/x11/kde/i18n3/pkg/PLIST.eo
index eacde31219f..593e22f1831 100644
--- a/x11/kde/i18n3/pkg/PLIST.eo
+++ b/x11/kde/i18n3/pkg/PLIST.eo
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.eo,v 1.1.1.1 2002/04/04 17:41:16 espie Exp $
+@comment $OpenBSD: PLIST.eo,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${LOC}aktion.mo
 ${LOC}amor.mo
 ${LOC}appletproxy.mo
@@ -263,4 +263,3 @@ share/locale/eo/entry.desktop
 share/locale/eo/flag.png
 @dirrm share/locale/eo/LC_MESSAGES
 @dirrm share/locale/eo
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.es b/x11/kde/i18n3/pkg/PLIST.es
index 886e66d03d9..41ca413845d 100644
--- a/x11/kde/i18n3/pkg/PLIST.es
+++ b/x11/kde/i18n3/pkg/PLIST.es
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.es,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.es,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}aktion/common
 ${DOC}aktion/${C}
 ${DOC}aktion/${I}
@@ -991,7 +991,6 @@ share/locale/es/entry.desktop
 share/locale/es/flag.png
 @dirrm share/locale/es/LC_MESSAGES
 @dirrm share/locale/es
-@dirrm share/locale
 @dirrm ${DOC}noatun
 @dirrm ${DOC}kwuftpd
 @dirrm ${DOC}kworldclock
diff --git a/x11/kde/i18n3/pkg/PLIST.et b/x11/kde/i18n3/pkg/PLIST.et
index 76a37a05d5c..ea56ee4a8e7 100644
--- a/x11/kde/i18n3/pkg/PLIST.et
+++ b/x11/kde/i18n3/pkg/PLIST.et
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.et,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.et,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}common/1.png
 ${DOC}common/10.png
 ${DOC}common/2.png
@@ -349,7 +349,6 @@ share/locale/et/entry.desktop
 share/locale/et/flag.png
 @dirrm share/locale/et/LC_MESSAGES
 @dirrm share/locale/et
-@dirrm share/locale
 @dirrm ${DOC}kcontrol
 @dirrm ${DOC}common
 @dirrm share/doc/HTML/et
diff --git a/x11/kde/i18n3/pkg/PLIST.fi b/x11/kde/i18n3/pkg/PLIST.fi
index 16054c79856..2a9d2a9333e 100644
--- a/x11/kde/i18n3/pkg/PLIST.fi
+++ b/x11/kde/i18n3/pkg/PLIST.fi
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.fi,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.fi,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}common/1.png
 ${DOC}common/10.png
 ${DOC}common/2.png
@@ -329,7 +329,6 @@ share/locale/fi/entry.desktop
 share/locale/fi/flag.png
 @dirrm share/locale/fi/LC_MESSAGES
 @dirrm share/locale/fi
-@dirrm share/locale
 @dirrm ${DOC}common
 @dirrm share/doc/HTML/fi
 @dirrm share/doc/HTML
diff --git a/x11/kde/i18n3/pkg/PLIST.fr b/x11/kde/i18n3/pkg/PLIST.fr
index 8dd958252c7..c54a6e4b617 100644
--- a/x11/kde/i18n3/pkg/PLIST.fr
+++ b/x11/kde/i18n3/pkg/PLIST.fr
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.fr,v 1.1.1.1 2002/04/04 17:41:15 espie Exp $
+@comment $OpenBSD: PLIST.fr,v 1.2 2002/04/15 06:53:53 espie Exp $
 share/apps/amor/tips${FLAVOR_EXT}
 share/apps/ktuberling/sounds/fr/bouche.wav
 share/apps/ktuberling/sounds/fr/boucle-d-oreille.wav
@@ -1392,7 +1392,6 @@ share/locale/fr/entry.desktop
 share/locale/fr/flag.png
 @dirrm share/locale/fr/LC_MESSAGES
 @dirrm share/locale/fr
-@dirrm share/locale
 @dirrm ${DOC}noatun
 @dirrm ${DOC}lskat
 @dirrm ${DOC}kwuftpd
diff --git a/x11/kde/i18n3/pkg/PLIST.he b/x11/kde/i18n3/pkg/PLIST.he
index 42e0f63b33b..840347b9f5b 100644
--- a/x11/kde/i18n3/pkg/PLIST.he
+++ b/x11/kde/i18n3/pkg/PLIST.he
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.he,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.he,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}common/1.png
 ${DOC}common/10.png
 ${DOC}common/2.png
@@ -351,7 +351,6 @@ share/locale/he/entry.desktop
 share/locale/he/flag.png
 @dirrm share/locale/he/LC_MESSAGES
 @dirrm share/locale/he
-@dirrm share/locale
 @dirrm ${DOC}khelpcenter
 @dirrm ${DOC}common
 @dirrm share/doc/HTML/he
diff --git a/x11/kde/i18n3/pkg/PLIST.hr b/x11/kde/i18n3/pkg/PLIST.hr
index f43804f6730..6ec3d3b1925 100644
--- a/x11/kde/i18n3/pkg/PLIST.hr
+++ b/x11/kde/i18n3/pkg/PLIST.hr
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.hr,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.hr,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}common/1.png
 ${DOC}common/10.png
 ${DOC}common/2.png
@@ -295,7 +295,6 @@ share/locale/hr/entry.desktop
 share/locale/hr/flag.png
 @dirrm share/locale/hr/LC_MESSAGES
 @dirrm share/locale/hr
-@dirrm share/locale
 @dirrm ${DOC}common
 @dirrm share/doc/HTML/hr
 @dirrm share/doc/HTML
diff --git a/x11/kde/i18n3/pkg/PLIST.hu b/x11/kde/i18n3/pkg/PLIST.hu
index f3eb1cdd3c1..75ed5c6b7e0 100644
--- a/x11/kde/i18n3/pkg/PLIST.hu
+++ b/x11/kde/i18n3/pkg/PLIST.hu
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.hu,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.hu,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}KRegExpEditor/common
 ${DOC}KRegExpEditor/${C}
 ${DOC}KRegExpEditor/${I}
@@ -859,7 +859,6 @@ share/locale/hu/entry.desktop
 share/locale/hu/flag.png
 @dirrm share/locale/hu/LC_MESSAGES
 @dirrm share/locale/hu
-@dirrm share/locale
 @dirrm ${DOC}thesaurus
 @dirrm ${DOC}pixie
 @dirrm ${DOC}noatun
diff --git a/x11/kde/i18n3/pkg/PLIST.id b/x11/kde/i18n3/pkg/PLIST.id
index 14de9f44bf2..02407e4dcc0 100644
--- a/x11/kde/i18n3/pkg/PLIST.id
+++ b/x11/kde/i18n3/pkg/PLIST.id
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.id,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.id,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${LOC}aktion.mo
 ${LOC}amor.mo
 ${LOC}appletproxy.mo
@@ -246,4 +246,3 @@ share/locale/id/charset
 share/locale/id/entry.desktop
 @dirrm share/locale/id/LC_MESSAGES
 @dirrm share/locale/id
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.is b/x11/kde/i18n3/pkg/PLIST.is
index 99397807782..5f27d457db3 100644
--- a/x11/kde/i18n3/pkg/PLIST.is
+++ b/x11/kde/i18n3/pkg/PLIST.is
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.is,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.is,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${LOC}aktion.mo
 ${LOC}amor.mo
 ${LOC}appletproxy.mo
@@ -254,4 +254,3 @@ share/locale/is/entry.desktop
 share/locale/is/flag.png
 @dirrm share/locale/is/LC_MESSAGES
 @dirrm share/locale/is
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.it b/x11/kde/i18n3/pkg/PLIST.it
index 0d31aa4beba..8e6e230d3f4 100644
--- a/x11/kde/i18n3/pkg/PLIST.it
+++ b/x11/kde/i18n3/pkg/PLIST.it
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.it,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.it,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}amor/common
 ${DOC}amor/${C}
 ${DOC}amor/${I}
@@ -594,7 +594,6 @@ share/locale/it/entry.desktop
 share/locale/it/flag.png
 @dirrm share/locale/it/LC_MESSAGES
 @dirrm share/locale/it
-@dirrm share/locale
 @dirrm ${DOC}kworldclock
 @dirrm ${DOC}kwin4
 @dirrm ${DOC}kweather
diff --git a/x11/kde/i18n3/pkg/PLIST.ja b/x11/kde/i18n3/pkg/PLIST.ja
index 87d26b9dcf1..31fb6e8b9ca 100644
--- a/x11/kde/i18n3/pkg/PLIST.ja
+++ b/x11/kde/i18n3/pkg/PLIST.ja
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.ja,v 1.1.1.1 2002/04/04 17:41:15 espie Exp $
+@comment $OpenBSD: PLIST.ja,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}common/1.png
 ${DOC}common/10.png
 ${DOC}common/2.png
@@ -381,7 +381,6 @@ share/locale/ja/entry.desktop
 share/locale/ja/flag.png
 @dirrm share/locale/ja/LC_MESSAGES
 @dirrm share/locale/ja
-@dirrm share/locale
 @dirrm ${DOC}kspell
 @dirrm ${DOC}kmail
 @dirrm ${DOC}khelpcenter/faq
diff --git a/x11/kde/i18n3/pkg/PLIST.ko b/x11/kde/i18n3/pkg/PLIST.ko
index c9f01450bd2..5b4f3e1f9b5 100644
--- a/x11/kde/i18n3/pkg/PLIST.ko
+++ b/x11/kde/i18n3/pkg/PLIST.ko
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.ko,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.ko,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}common/1.png
 ${DOC}common/10.png
 ${DOC}common/2.png
@@ -227,7 +227,6 @@ share/locale/ko/entry.desktop
 share/locale/ko/flag.png
 @dirrm share/locale/ko/LC_MESSAGES
 @dirrm share/locale/ko
-@dirrm share/locale
 @dirrm ${DOC}common
 @dirrm share/doc/HTML/ko
 @dirrm share/doc/HTML
diff --git a/x11/kde/i18n3/pkg/PLIST.lt b/x11/kde/i18n3/pkg/PLIST.lt
index 6701b0dc18a..d37b6492b33 100644
--- a/x11/kde/i18n3/pkg/PLIST.lt
+++ b/x11/kde/i18n3/pkg/PLIST.lt
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.lt,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.lt,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${LOC}aktion.mo
 ${LOC}appletproxy.mo
 ${LOC}ark.mo
@@ -248,4 +248,3 @@ share/locale/lt/entry.desktop
 share/locale/lt/flag.png
 @dirrm share/locale/lt/LC_MESSAGES
 @dirrm share/locale/lt
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.lv b/x11/kde/i18n3/pkg/PLIST.lv
index 3c823674630..62209bf7f5d 100644
--- a/x11/kde/i18n3/pkg/PLIST.lv
+++ b/x11/kde/i18n3/pkg/PLIST.lv
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.lv,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.lv,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${LOC}aktion.mo
 ${LOC}appletproxy.mo
 ${LOC}ark.mo
@@ -311,4 +311,3 @@ share/locale/lv/entry.desktop
 share/locale/lv/flag.png
 @dirrm share/locale/lv/LC_MESSAGES
 @dirrm share/locale/lv
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.mt b/x11/kde/i18n3/pkg/PLIST.mt
index 41738cc98e4..69cbe16c154 100644
--- a/x11/kde/i18n3/pkg/PLIST.mt
+++ b/x11/kde/i18n3/pkg/PLIST.mt
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.mt,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.mt,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${LOC}amor.mo
 ${LOC}appletproxy.mo
 ${LOC}ark.mo
@@ -209,4 +209,3 @@ share/locale/mt/entry.desktop
 share/locale/mt/flag.png
 @dirrm share/locale/mt/LC_MESSAGES
 @dirrm share/locale/mt
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.nb b/x11/kde/i18n3/pkg/PLIST.nb
index 5fc8286b993..9eeb59bc9a2 100644
--- a/x11/kde/i18n3/pkg/PLIST.nb
+++ b/x11/kde/i18n3/pkg/PLIST.nb
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.nb,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.nb,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${LOC}aktion.mo
 ${LOC}amor.mo
 ${LOC}appletproxy.mo
@@ -323,4 +323,3 @@ share/locale/nb/entry.desktop
 share/locale/nb/flag.png
 @dirrm share/locale/nb/LC_MESSAGES
 @dirrm share/locale/nb
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.nl b/x11/kde/i18n3/pkg/PLIST.nl
index 7ee2b64f488..826005315e6 100644
--- a/x11/kde/i18n3/pkg/PLIST.nl
+++ b/x11/kde/i18n3/pkg/PLIST.nl
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.nl,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.nl,v 1.2 2002/04/15 06:53:53 espie Exp $
 share/apps/ktuberling/sounds/nl/aardappelmannetje.wav
 share/apps/ktuberling/sounds/nl/bril.wav
 share/apps/ktuberling/sounds/nl/haar.wav
@@ -654,7 +654,6 @@ share/locale/nl/entry.desktop
 share/locale/nl/flag.png
 @dirrm share/locale/nl/LC_MESSAGES
 @dirrm share/locale/nl
-@dirrm share/locale
 @dirrm ${DOC}ksysguard
 @dirrm ${DOC}kspell
 @dirrm ${DOC}kpager
diff --git a/x11/kde/i18n3/pkg/PLIST.nn b/x11/kde/i18n3/pkg/PLIST.nn
index 4c2b9dfb696..829c384ab90 100644
--- a/x11/kde/i18n3/pkg/PLIST.nn
+++ b/x11/kde/i18n3/pkg/PLIST.nn
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.nn,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.nn,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}kaddressbook/common
 ${DOC}kaddressbook/${C}
 ${DOC}kaddressbook/${I}
@@ -328,7 +328,6 @@ share/locale/nn/entry.desktop
 share/locale/nn/flag.png
 @dirrm share/locale/nn/LC_MESSAGES
 @dirrm share/locale/nn
-@dirrm share/locale
 @dirrm ${DOC}klipper
 @dirrm ${DOC}kaddressbook
 @dirrm share/doc/HTML/nn
diff --git a/x11/kde/i18n3/pkg/PLIST.pl b/x11/kde/i18n3/pkg/PLIST.pl
index ebe1a659748..753646adae0 100644
--- a/x11/kde/i18n3/pkg/PLIST.pl
+++ b/x11/kde/i18n3/pkg/PLIST.pl
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.pl,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.pl,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}kdevelop/tip.database
 ${LOC}aktion.mo
 ${LOC}amor.mo
@@ -253,7 +253,6 @@ share/locale/pl/entry.desktop
 share/locale/pl/flag.png
 @dirrm share/locale/pl/LC_MESSAGES
 @dirrm share/locale/pl
-@dirrm share/locale
 @dirrm ${DOC}kdevelop
 @dirrm share/doc/HTML/pl
 @dirrm share/doc/HTML
diff --git a/x11/kde/i18n3/pkg/PLIST.pt b/x11/kde/i18n3/pkg/PLIST.pt
index e50f2572483..869ecbbf78e 100644
--- a/x11/kde/i18n3/pkg/PLIST.pt
+++ b/x11/kde/i18n3/pkg/PLIST.pt
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.pt,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.pt,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}amor/common
 ${DOC}amor/${C}
 ${DOC}amor/${I}
@@ -665,7 +665,6 @@ share/locale/pt/entry.desktop
 share/locale/pt/flag.png
 @dirrm share/locale/pt/LC_MESSAGES
 @dirrm share/locale/pt
-@dirrm share/locale
 @dirrm ${DOC}kwuftpd
 @dirrm ${DOC}kworldclock
 @dirrm ${DOC}kweather
diff --git a/x11/kde/i18n3/pkg/PLIST.pt_BR b/x11/kde/i18n3/pkg/PLIST.pt_BR
index e3b5269ecfc..d24b962ddd0 100644
--- a/x11/kde/i18n3/pkg/PLIST.pt_BR
+++ b/x11/kde/i18n3/pkg/PLIST.pt_BR
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.pt_BR,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.pt_BR,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}kppp/global-settings.docbook
 ${DOC}kppp/kppp-faq.docbook
 ${LOC}aktion.mo
@@ -286,7 +286,6 @@ share/locale/pt_BR/entry.desktop
 share/locale/pt_BR/flag.png
 @dirrm share/locale/pt_BR/LC_MESSAGES
 @dirrm share/locale/pt_BR
-@dirrm share/locale
 @dirrm ${DOC}kppp
 @dirrm share/doc/HTML/pt_BR
 @dirrm share/doc/HTML
diff --git a/x11/kde/i18n3/pkg/PLIST.ro b/x11/kde/i18n3/pkg/PLIST.ro
index c70840312dc..bb635617d6e 100644
--- a/x11/kde/i18n3/pkg/PLIST.ro
+++ b/x11/kde/i18n3/pkg/PLIST.ro
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.ro,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.ro,v 1.2 2002/04/15 06:53:53 espie Exp $
 share/apps/amor/tips${FLAVOR_EXT}
 share/apps/ktuberling/sounds/ro/ceas.wav
 share/apps/ktuberling/sounds/ro/cercel.wav
@@ -370,7 +370,6 @@ share/locale/ro/entry.desktop
 share/locale/ro/flag.png
 @dirrm share/locale/ro/LC_MESSAGES
 @dirrm share/locale/ro
-@dirrm share/locale
 @dirrm ${DOC}kikbd
 @dirrm ${DOC}khelpcenter
 @dirrm ${DOC}common
diff --git a/x11/kde/i18n3/pkg/PLIST.ru b/x11/kde/i18n3/pkg/PLIST.ru
index 6f99216051e..bc64849f32f 100644
--- a/x11/kde/i18n3/pkg/PLIST.ru
+++ b/x11/kde/i18n3/pkg/PLIST.ru
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.ru,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.ru,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}common/1.png
 ${DOC}common/10.png
 ${DOC}common/2.png
@@ -489,7 +489,6 @@ share/locale/ru/entry.desktop
 share/locale/ru/flag.png
 @dirrm share/locale/ru/LC_MESSAGES
 @dirrm share/locale/ru
-@dirrm share/locale
 @dirrm ${DOC}noatun
 @dirrm ${DOC}kwuftpd
 @dirrm ${DOC}kworldclock
diff --git a/x11/kde/i18n3/pkg/PLIST.sk b/x11/kde/i18n3/pkg/PLIST.sk
index d18307d0c43..818730de6d2 100644
--- a/x11/kde/i18n3/pkg/PLIST.sk
+++ b/x11/kde/i18n3/pkg/PLIST.sk
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.sk,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.sk,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${DOC}amor/common
 ${DOC}amor/${C}
 ${DOC}amor/${I}
@@ -806,7 +806,6 @@ share/locale/sk/entry.desktop
 share/locale/sk/flag.png
 @dirrm share/locale/sk/LC_MESSAGES
 @dirrm share/locale/sk
-@dirrm share/locale
 @dirrm ${DOC}kwrite
 @dirrm ${DOC}kworldclock
 @dirrm ${DOC}kwin4
diff --git a/x11/kde/i18n3/pkg/PLIST.sl b/x11/kde/i18n3/pkg/PLIST.sl
index 3b6c099e282..403eaae8118 100644
--- a/x11/kde/i18n3/pkg/PLIST.sl
+++ b/x11/kde/i18n3/pkg/PLIST.sl
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.sl,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.sl,v 1.2 2002/04/15 06:53:53 espie Exp $
 share/apps/ktuberling/sounds/sl/cigara.wav
 share/apps/ktuberling/sounds/sl/klobuk.wav
 share/apps/ktuberling/sounds/sl/kravata.wav
@@ -708,7 +708,6 @@ share/locale/sl/entry.desktop
 share/locale/sl/flag.png
 @dirrm share/locale/sl/LC_MESSAGES
 @dirrm share/locale/sl
-@dirrm share/locale
 @dirrm ${DOC}noatun
 @dirrm ${DOC}kwrite
 @dirrm ${DOC}kuser
diff --git a/x11/kde/i18n3/pkg/PLIST.sv b/x11/kde/i18n3/pkg/PLIST.sv
index f86ccc8bdab..896347d4038 100644
--- a/x11/kde/i18n3/pkg/PLIST.sv
+++ b/x11/kde/i18n3/pkg/PLIST.sv
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.sv,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.sv,v 1.2 2002/04/15 06:53:53 espie Exp $
 share/apps/ktuberling/sounds/sv/brosch.wav
 share/apps/ktuberling/sounds/sv/cigarr.wav
 share/apps/ktuberling/sounds/sv/fluga.wav
@@ -1530,7 +1530,6 @@ share/locale/sv/entry.desktop
 share/locale/sv/flag.png
 @dirrm share/locale/sv/LC_MESSAGES
 @dirrm share/locale/sv
-@dirrm share/locale
 @dirrm ${DOC}thesaurus
 @dirrm ${DOC}noatun
 @dirrm ${DOC}lskat
diff --git a/x11/kde/i18n3/pkg/PLIST.ta b/x11/kde/i18n3/pkg/PLIST.ta
index f9e9cfd6dcc..daaa0a59bc1 100644
--- a/x11/kde/i18n3/pkg/PLIST.ta
+++ b/x11/kde/i18n3/pkg/PLIST.ta
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.ta,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.ta,v 1.2 2002/04/15 06:53:53 espie Exp $
 ${LOC}aktion.mo
 ${LOC}appletproxy.mo
 ${LOC}ark.mo
@@ -272,4 +272,3 @@ share/locale/ta/entry.desktop
 share/locale/ta/flag.png
 @dirrm share/locale/ta/LC_MESSAGES
 @dirrm share/locale/ta
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.th b/x11/kde/i18n3/pkg/PLIST.th
index 663eebd3151..c771fa52692 100644
--- a/x11/kde/i18n3/pkg/PLIST.th
+++ b/x11/kde/i18n3/pkg/PLIST.th
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.th,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.th,v 1.2 2002/04/15 06:53:54 espie Exp $
 ${LOC}aktion.mo
 ${LOC}amor.mo
 ${LOC}appletproxy.mo
@@ -254,4 +254,3 @@ share/locale/th/entry.desktop
 share/locale/th/flag.png
 @dirrm share/locale/th/LC_MESSAGES
 @dirrm share/locale/th
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.tr b/x11/kde/i18n3/pkg/PLIST.tr
index 23809d23a36..fd03de71943 100644
--- a/x11/kde/i18n3/pkg/PLIST.tr
+++ b/x11/kde/i18n3/pkg/PLIST.tr
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.tr,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.tr,v 1.2 2002/04/15 06:53:54 espie Exp $
 ${DOC}common/1.png
 ${DOC}common/10.png
 ${DOC}common/2.png
@@ -393,7 +393,6 @@ share/locale/tr/entry.desktop
 share/locale/tr/flag.png
 @dirrm share/locale/tr/LC_MESSAGES
 @dirrm share/locale/tr
-@dirrm share/locale
 @dirrm ${DOC}kioslave
 @dirrm ${DOC}khelpcenter
 @dirrm ${DOC}kcontrol
diff --git a/x11/kde/i18n3/pkg/PLIST.uk b/x11/kde/i18n3/pkg/PLIST.uk
index e9ea4f2a1ff..e789274539c 100644
--- a/x11/kde/i18n3/pkg/PLIST.uk
+++ b/x11/kde/i18n3/pkg/PLIST.uk
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.uk,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.uk,v 1.2 2002/04/15 06:53:54 espie Exp $
 ${DOC}common/1.png
 ${DOC}common/10.png
 ${DOC}common/2.png
@@ -396,7 +396,6 @@ share/locale/uk/entry.desktop
 share/locale/uk/flag.png
 @dirrm share/locale/uk/LC_MESSAGES
 @dirrm share/locale/uk
-@dirrm share/locale
 @dirrm ${DOC}kspell
 @dirrm ${DOC}kioslave
 @dirrm ${DOC}khelpcenter
diff --git a/x11/kde/i18n3/pkg/PLIST.ven b/x11/kde/i18n3/pkg/PLIST.ven
index 5ec0d711f90..68f0f829cc1 100644
--- a/x11/kde/i18n3/pkg/PLIST.ven
+++ b/x11/kde/i18n3/pkg/PLIST.ven
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.ven,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.ven,v 1.2 2002/04/15 06:53:54 espie Exp $
 ${LOC}appletproxy.mo
 ${LOC}childpanelextension.mo
 ${LOC}clockapplet.mo
@@ -45,4 +45,3 @@ share/locale/ven/charset
 share/locale/ven/entry.desktop
 @dirrm share/locale/ven/LC_MESSAGES
 @dirrm share/locale/ven
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.vi b/x11/kde/i18n3/pkg/PLIST.vi
index f3e9f80a2c1..ce85305fd1b 100644
--- a/x11/kde/i18n3/pkg/PLIST.vi
+++ b/x11/kde/i18n3/pkg/PLIST.vi
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.vi,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.vi,v 1.2 2002/04/15 06:53:54 espie Exp $
 ${LOC}appletproxy.mo
 ${LOC}babelfish.mo
 ${LOC}clockapplet.mo
@@ -139,4 +139,3 @@ share/locale/vi/entry.desktop
 share/locale/vi/flag.png
 @dirrm share/locale/vi/LC_MESSAGES
 @dirrm share/locale/vi
-@dirrm share/locale
diff --git a/x11/kde/i18n3/pkg/PLIST.xh b/x11/kde/i18n3/pkg/PLIST.xh
index 1d1d8d28c74..b9b4b30cc45 100644
--- a/x11/kde/i18n3/pkg/PLIST.xh
+++ b/x11/kde/i18n3/pkg/PLIST.xh
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.xh,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.xh,v 1.2 2002/04/15 06:53:54 espie Exp $
 ${DOC}amor/common
 ${DOC}amor/${C}
 ${DOC}amor/${I}
@@ -393,7 +393,6 @@ share/locale/xh/charset
 share/locale/xh/entry.desktop
 @dirrm share/locale/xh/LC_MESSAGES
 @dirrm share/locale/xh
-@dirrm share/locale
 @dirrm ${DOC}kword
 @dirrm ${DOC}kugar
 @dirrm ${DOC}kspell
diff --git a/x11/kde/i18n3/pkg/PLIST.zh_CN b/x11/kde/i18n3/pkg/PLIST.zh_CN
index 4d82ea30a57..bb871c892ef 100644
--- a/x11/kde/i18n3/pkg/PLIST.zh_CN
+++ b/x11/kde/i18n3/pkg/PLIST.zh_CN
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.zh_CN,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.zh_CN,v 1.2 2002/04/15 06:53:54 espie Exp $
 ${DOC}common/1.png
 ${DOC}common/10.png
 ${DOC}common/2.png
@@ -335,7 +335,6 @@ share/locale/zh_CN/entry.desktop
 share/locale/zh_CN/flag.png
 @dirrm share/locale/zh_CN/LC_MESSAGES
 @dirrm share/locale/zh_CN
-@dirrm share/locale
 @dirrm ${DOC}kdevelop
 @dirrm ${DOC}common
 @dirrm share/doc/HTML/zh_CN
diff --git a/x11/kde/i18n3/pkg/PLIST.zh_TW b/x11/kde/i18n3/pkg/PLIST.zh_TW
index acad1fb751e..3ca56878f9f 100644
--- a/x11/kde/i18n3/pkg/PLIST.zh_TW
+++ b/x11/kde/i18n3/pkg/PLIST.zh_TW
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.zh_TW,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.zh_TW,v 1.2 2002/04/15 06:53:54 espie Exp $
 ${DOC}common/1.png
 ${DOC}common/10.png
 ${DOC}common/2.png
@@ -354,7 +354,6 @@ share/locale/zh_TW/entry.desktop
 share/locale/zh_TW/flag.png
 @dirrm share/locale/zh_TW/LC_MESSAGES
 @dirrm share/locale/zh_TW
-@dirrm share/locale
 @dirrm ${DOC}khelpcenter
 @dirrm ${DOC}common
 @dirrm share/doc/HTML/zh_TW
diff --git a/x11/kde/i18n3/pkg/PLIST.zu b/x11/kde/i18n3/pkg/PLIST.zu
index f4e4b24f91d..bdc9a8069d5 100644
--- a/x11/kde/i18n3/pkg/PLIST.zu
+++ b/x11/kde/i18n3/pkg/PLIST.zu
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST.zu,v 1.1.1.1 2002/04/04 17:41:18 espie Exp $
+@comment $OpenBSD: PLIST.zu,v 1.2 2002/04/15 06:53:54 espie Exp $
 ${LOC}aktion.mo
 ${LOC}appletproxy.mo
 ${LOC}ark.mo
@@ -209,4 +209,3 @@ share/locale/zu/charset
 share/locale/zu/entry.desktop
 @dirrm share/locale/zu/LC_MESSAGES
 @dirrm share/locale/zu
-@dirrm share/locale
diff --git a/x11/kde/libs3/Makefile b/x11/kde/libs3/Makefile
index 3a85eaeabe3..29bc8bd55e5 100644
--- a/x11/kde/libs3/Makefile
+++ b/x11/kde/libs3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2002/04/10 01:24:39 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2002/04/15 06:53:53 espie Exp $
 
 COMMENT=		"X11 toolkit, libraries"
 CATEGORIES=		x11 x11/kde
@@ -16,6 +16,9 @@ LIB_DEPENDS= 	png.2::graphics/png \
 		bz2::archivers/bzip2 \
 		artsflow.1.0,artsflow_idl.1.0,kmedia2_idl.1.0,mcop.1.0,qtmcop.1.0,soundserver_idl.1.0::x11/kde/arts3
 
+# To investigate
+#CONFIGURE_ARGS=--enable-fast-malloc=full
+
 BUILD_DEPENDS=	:qt3-html-*:x11/qt3,-html
 
 EXTRA_DIRECTORIES= \
@@ -26,6 +29,7 @@ EXTRA_DIRECTORIES= \
 	share/applnk/Games/Card \
 	share/applnk/Games/TacticStrategy \
 	share/applnk/Graphics \
+	share/applnk/Office \
 	share/applnk/Settings/Information \
 	share/applnk/Settings/PowerControl \
 	share/applnk/System/ScreenSavers \
@@ -44,7 +48,9 @@ EXTRA_DIRECTORIES= \
 	share/icons/hicolor/48x48/apps \
 	share/icons/locolor/16x16/apps \
 	share/icons/locolor/32x32/apps \
+	share/locale \
 	share/sounds \
+	share/templates/.source \
 	share/wallpapers
 
 post-install:
diff --git a/x11/kde/libs3/pkg/PFRAG.shared b/x11/kde/libs3/pkg/PFRAG.shared
index 2c1ec994328..0b9c54e0999 100644
--- a/x11/kde/libs3/pkg/PFRAG.shared
+++ b/x11/kde/libs3/pkg/PFRAG.shared
@@ -1,28 +1,28 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2002/04/04 18:29:21 espie Exp $
-lib/kde3/libkbzip2filter.so.0.0
-lib/kde3/libkded_kdeprintd.so.0.0
-lib/kde3/libkded_kssld.so.0.0
-lib/kde3/libkdeprint_ext.so.0.0
-lib/kde3/libkdeprint_lpdunix.so.0.0
-lib/kde3/libkdeprint_lpr.so.0.0
-lib/kde3/libkdeprint_rlpr.so.0.0
-lib/kde3/libkgzipfilter.so.0.0
-lib/kde3/libkimg_eps.so.0.0
-lib/kde3/libkimg_g3.so.0.0
-lib/kde3/libkimg_ico.so.0.0
-lib/kde3/libkimg_krl.so.0.0
-lib/kde3/libkimg_tiff.so.0.0
-lib/kde3/libkimg_xview.so.0.0
-lib/kde3/libkio_file.so.0.0
-lib/kde3/libkio_ftp.so.0.0
-lib/kde3/libkio_help.so.0.0
-lib/kde3/libkio_http.so.0.0
-lib/kde3/libkjs_html.so.0.0
-lib/kde3/libkpac.so.0.0
-lib/kde3/plugins/designer/libkdewidgets.so.0.0
-lib/kde3/plugins/styles/libhighcolor.so.0.0
-lib/kde3/plugins/styles/libkthemestyle.so.0.0
-lib/kde3/plugins/styles/liblight.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.5 2002/04/15 06:53:54 espie Exp $
+${KDE}/libkbzip2filter.so.0.0
+${KDE}/libkded_kdeprintd.so.0.0
+${KDE}/libkded_kssld.so.0.0
+${KDE}/libkdeprint_ext.so.0.0
+${KDE}/libkdeprint_lpdunix.so.0.0
+${KDE}/libkdeprint_lpr.so.0.0
+${KDE}/libkdeprint_rlpr.so.0.0
+${KDE}/libkgzipfilter.so.0.0
+${KDE}/libkimg_eps.so.0.0
+${KDE}/libkimg_g3.so.0.0
+${KDE}/libkimg_ico.so.0.0
+${KDE}/libkimg_krl.so.0.0
+${KDE}/libkimg_tiff.so.0.0
+${KDE}/libkimg_xview.so.0.0
+${KDE}/libkio_file.so.0.0
+${KDE}/libkio_ftp.so.0.0
+${KDE}/libkio_help.so.0.0
+${KDE}/libkio_http.so.0.0
+${KDE}/libkjs_html.so.0.0
+${KDE}/libkpac.so.0.0
+${KDE}/plugins/designer/libkdewidgets.so.0.0
+${KDE}/plugins/styles/libhighcolor.so.0.0
+${KDE}/plugins/styles/libkthemestyle.so.0.0
+${KDE}/plugins/styles/liblight.so.0.0
 lib/libDCOP.so.4.0
 lib/libartskde.so.1.0
 lib/libdcopserver.so.0.0
@@ -61,6 +61,3 @@ lib/libktexteditor.so.0.0
 lib/libshellscript.so.0.0
 lib/libvcard.so.0.0
 DYNLIBDIR(%D/lib)
-NEWDYNLIBDIR(%D/lib/kde3)
-NEWDYNLIBDIR(%D/lib/kde3/plugins/designer)
-NEWDYNLIBDIR(%D/lib/kde3/plugins/styles)
diff --git a/x11/kde/libs3/pkg/PLIST b/x11/kde/libs3/pkg/PLIST
index 3c020c91403..501341fb53c 100644
--- a/x11/kde/libs3/pkg/PLIST
+++ b/x11/kde/libs3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2002/04/04 18:29:21 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2002/04/15 06:53:54 espie Exp $
 bin/artsmessage
 bin/checkXML
 bin/dcop
@@ -507,30 +507,30 @@ lib/kaddprinterwizard.la
 lib/kbuildsycoca.la
 lib/kconf_update.la
 lib/kcookiejar.la
-lib/kde3/kbzip2filter.la
-lib/kde3/kded_kdeprintd.la
-lib/kde3/kded_kssld.la
-lib/kde3/kdeprint_ext.la
-lib/kde3/kdeprint_lpdunix.la
-lib/kde3/kdeprint_lpr.la
-lib/kde3/kdeprint_rlpr.la
-lib/kde3/kgzipfilter.la
-lib/kde3/kimg_eps.la
-lib/kde3/kimg_g3.la
-lib/kde3/kimg_ico.la
-lib/kde3/kimg_krl.la
-lib/kde3/kimg_tiff.la
-lib/kde3/kimg_xview.la
-lib/kde3/kio_file.la
-lib/kde3/kio_ftp.la
-lib/kde3/kio_help.la
-lib/kde3/kio_http.la
-lib/kde3/kjs_html.la
-lib/kde3/libkpac.la
-lib/kde3/plugins/designer/kdewidgets.la
-lib/kde3/plugins/styles/highcolor.la
-lib/kde3/plugins/styles/kthemestyle.la
-lib/kde3/plugins/styles/light.la
+${KDE}/kbzip2filter.la
+${KDE}/kded_kdeprintd.la
+${KDE}/kded_kssld.la
+${KDE}/kdeprint_ext.la
+${KDE}/kdeprint_lpdunix.la
+${KDE}/kdeprint_lpr.la
+${KDE}/kdeprint_rlpr.la
+${KDE}/kgzipfilter.la
+${KDE}/kimg_eps.la
+${KDE}/kimg_g3.la
+${KDE}/kimg_ico.la
+${KDE}/kimg_krl.la
+${KDE}/kimg_tiff.la
+${KDE}/kimg_xview.la
+${KDE}/kio_file.la
+${KDE}/kio_ftp.la
+${KDE}/kio_help.la
+${KDE}/kio_http.la
+${KDE}/kjs_html.la
+${KDE}/libkpac.la
+${KDE}/plugins/designer/kdewidgets.la
+${KDE}/plugins/styles/highcolor.la
+${KDE}/plugins/styles/kthemestyle.la
+${KDE}/plugins/styles/light.la
 lib/kded.la
 lib/kio_http_cache_cleaner.la
 lib/kio_uiserver.la
@@ -3092,6 +3092,9 @@ share/servicetypes/scriptinterface.desktop
 %%SHARED%%
 @exec mkdir -p %D/share/wallpapers
 @dirrm share/wallpapers
+@exec mkdir -p %D/share/templates/.source
+@dirrm share/templates/.source
+@dirrm share/templates
 @exec mkdir -p %D/share/sounds
 @dirrm share/sounds
 @dirrm share/servicetypes
@@ -3107,6 +3110,8 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk/all
 @dirrm share/mimelnk
+@exec mkdir -p %D/share/locale
+@dirrm share/locale
 @exec mkdir -p %D/share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/32x32
@@ -3317,6 +3322,8 @@ share/servicetypes/scriptinterface.desktop
 @exec mkdir -p %D/share/applnk/Settings/Information
 @dirrm share/applnk/Settings/Information
 @dirrm share/applnk/Settings
+@exec mkdir -p %D/share/applnk/Office
+@dirrm share/applnk/Office
 @exec mkdir -p %D/share/applnk/Graphics
 @dirrm share/applnk/Graphics
 @exec mkdir -p %D/share/applnk/Games/TacticStrategy
@@ -3333,10 +3340,10 @@ share/servicetypes/scriptinterface.desktop
 @exec mkdir -p %D/share/applnk/Editors
 @dirrm share/applnk/Editors
 @dirrm share/applnk
-@dirrm lib/kde3/plugins/styles
-@dirrm lib/kde3/plugins/designer
-@dirrm lib/kde3/plugins
-@dirrm lib/kde3
+@dirrm ${KDE}/plugins/styles
+@dirrm ${KDE}/plugins/designer
+@dirrm ${KDE}/plugins
+@dirrm ${KDE}
 @dirrm include/libkmid
 @dirrm include/ktexteditor
 @dirrm include/kparts
diff --git a/x11/kde/network3/pkg/PFRAG.shared b/x11/kde/network3/pkg/PFRAG.shared
index 1d0a69b6144..aa3dec90aa4 100644
--- a/x11/kde/network3/pkg/PFRAG.shared
+++ b/x11/kde/network3/pkg/PFRAG.shared
@@ -1,13 +1,13 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2002/04/04 18:29:21 espie Exp $
-lib/kde3/libkcm_kcmkxmlrpcd.so.0.0
-lib/kde3/libkcm_ktalkd.so.0.0
-lib/kde3/libkcm_lanbrowser.so.0.0
-lib/kde3/libkcm_newsticker.so.0.0
-lib/kde3/libkcm_xmlrpcd.so.0.0
-lib/kde3/libkdictapplet.so.1.0
-lib/kde3/libknewsticker_applet.so.0.0
-lib/kde3/libkpfapplet.so.0.0
-lib/kde3/libkpfpropertiesdialogplugin.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.5 2002/04/15 06:53:54 espie Exp $
+${KDE}/libkcm_kcmkxmlrpcd.so.0.0
+${KDE}/libkcm_ktalkd.so.0.0
+${KDE}/libkcm_lanbrowser.so.0.0
+${KDE}/libkcm_newsticker.so.0.0
+${KDE}/libkcm_xmlrpcd.so.0.0
+${KDE}/libkdictapplet.so.1.0
+${KDE}/libknewsticker_applet.so.0.0
+${KDE}/libkpfapplet.so.0.0
+${KDE}/libkpfpropertiesdialogplugin.so.0.0
 lib/libkdenetwork.so.2.0
 lib/libkio_lan.so.0.0
 lib/libkntsrcfilepropsdlg.so.0.0
@@ -15,4 +15,3 @@ lib/libksirc.so.0.0
 lib/libkxmlrpcd.so.0.0
 lib/libmimelib.so.1.1
 DYNLIBDIR(%D/lib)
-DYNLIBDIR(%D/lib/kde3)
diff --git a/x11/kde/network3/pkg/PLIST b/x11/kde/network3/pkg/PLIST
index e9308f56af4..a3eee72af17 100644
--- a/x11/kde/network3/pkg/PLIST
+++ b/x11/kde/network3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2002/04/04 18:29:21 espie Exp $
+@comment $OpenBSD: PLIST,v 1.5 2002/04/15 06:53:54 espie Exp $
 bin/dsirc
 bin/kdict
 bin/kit
@@ -52,15 +52,15 @@ include/mimelib/text.h
 include/mimelib/token.h
 include/mimelib/utility.h
 include/mimelib/uuencode.h
-lib/kde3/kdictapplet.la
-lib/kde3/knewsticker_applet.la
-lib/kde3/kpfapplet.la
-lib/kde3/kpfpropertiesdialogplugin.la
-lib/kde3/libkcm_kcmkxmlrpcd.la
-lib/kde3/libkcm_ktalkd.la
-lib/kde3/libkcm_lanbrowser.la
-lib/kde3/libkcm_newsticker.la
-lib/kde3/libkcm_xmlrpcd.la
+${KDE}/kdictapplet.la
+${KDE}/knewsticker_applet.la
+${KDE}/kpfapplet.la
+${KDE}/kpfpropertiesdialogplugin.la
+${KDE}/libkcm_kcmkxmlrpcd.la
+${KDE}/libkcm_ktalkd.la
+${KDE}/libkcm_lanbrowser.la
+${KDE}/libkcm_newsticker.la
+${KDE}/libkcm_xmlrpcd.la
 lib/kio_lan.la
 lib/ksirc.la
 lib/kxmlrpcd.la
diff --git a/x11/kde/office3/pkg/PFRAG.shared b/x11/kde/office3/pkg/PFRAG.shared
index a687fdec936..c3e617287bd 100644
--- a/x11/kde/office3/pkg/PFRAG.shared
+++ b/x11/kde/office3/pkg/PFRAG.shared
@@ -1,40 +1,40 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
-lib/kde3/libabiwordexport.so.0.0
-lib/kde3/libabiwordimport.so.0.0
-lib/kde3/libapplixgraphicimport.so.0.0
-lib/kde3/libapplixspreadimport.so.0.0
-lib/kde3/libapplixwordimport.so.0.0
-lib/kde3/libasciiexport.so.0.0
-lib/kde3/libasciiimport.so.0.0
-lib/kde3/libcsvexport.so.0.0
-lib/kde3/libcsvimport.so.0.0
-lib/kde3/libdocbookexport.so.0.0
-lib/kde3/libgnumericexport.so.0.0
-lib/kde3/libgnumericimport.so.0.0
-lib/kde3/libhtmlexport.so.0.0
-lib/kde3/libhtmlimport.so.0.0
-lib/kde3/libkchartpart.so.0.0
-lib/kde3/libkformulapart.so.0.0
-lib/kde3/libkiviopart.so.0.0
-lib/kde3/libkofficescan.so.0.0
-lib/kde3/libkontourpart.so.0.0
-lib/kde3/libkpresenterpart.so.0.0
-lib/kde3/libkprkword.so.0.0
-lib/kde3/libkspelltool.so.0.0
-lib/kde3/libkspreadcalc.so.0.0
-lib/kde3/libkspreadhtmlexport.so.0.0
-lib/kde3/libkspreadpart.so.0.0
-lib/kde3/libkwordpart.so.0.0
-lib/kde3/liblatexexport.so.0.0
-lib/kde3/libmsodimport.so.0.0
-lib/kde3/libolefilter.so.0.0
-lib/kde3/libqproimport.so.0.0
-lib/kde3/librtfexport.so.0.0
-lib/kde3/libsvgexport.so.0.0
-lib/kde3/libsvgimport.so.0.0
-lib/kde3/libwmfimport.so.0.0
-lib/kde3/libwpimport.so.0.0
-lib/kde3/libxfigimport.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.2 2002/04/15 06:53:54 espie Exp $
+${KDE}/libabiwordexport.so.0.0
+${KDE}/libabiwordimport.so.0.0
+${KDE}/libapplixgraphicimport.so.0.0
+${KDE}/libapplixspreadimport.so.0.0
+${KDE}/libapplixwordimport.so.0.0
+${KDE}/libasciiexport.so.0.0
+${KDE}/libasciiimport.so.0.0
+${KDE}/libcsvexport.so.0.0
+${KDE}/libcsvimport.so.0.0
+${KDE}/libdocbookexport.so.0.0
+${KDE}/libgnumericexport.so.0.0
+${KDE}/libgnumericimport.so.0.0
+${KDE}/libhtmlexport.so.0.0
+${KDE}/libhtmlimport.so.0.0
+${KDE}/libkchartpart.so.0.0
+${KDE}/libkformulapart.so.0.0
+${KDE}/libkiviopart.so.0.0
+${KDE}/libkofficescan.so.0.0
+${KDE}/libkontourpart.so.0.0
+${KDE}/libkpresenterpart.so.0.0
+${KDE}/libkprkword.so.0.0
+${KDE}/libkspelltool.so.0.0
+${KDE}/libkspreadcalc.so.0.0
+${KDE}/libkspreadhtmlexport.so.0.0
+${KDE}/libkspreadpart.so.0.0
+${KDE}/libkwordpart.so.0.0
+${KDE}/liblatexexport.so.0.0
+${KDE}/libmsodimport.so.0.0
+${KDE}/libolefilter.so.0.0
+${KDE}/libqproimport.so.0.0
+${KDE}/librtfexport.so.0.0
+${KDE}/libsvgexport.so.0.0
+${KDE}/libsvgimport.so.0.0
+${KDE}/libwmfimport.so.0.0
+${KDE}/libwpimport.so.0.0
+${KDE}/libxfigimport.so.0.0
 lib/libkchart.so.0.0
 lib/libkdchart.so.0.0
 lib/libkformula.so.3.0
@@ -58,4 +58,3 @@ lib/libkugarpart.so.0.0
 lib/libkwmf.so.1.0
 lib/libkword.so.0.0
 DYNLIBDIR(%D/lib)
-DYNLIBDIR(%D/lib/kde3)
diff --git a/x11/kde/office3/pkg/PLIST b/x11/kde/office3/pkg/PLIST
index aca1abc0123..7c5a3cd18e7 100644
--- a/x11/kde/office3/pkg/PLIST
+++ b/x11/kde/office3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2002/04/05 16:04:24 espie Exp $
+@comment $OpenBSD: PLIST,v 1.2 2002/04/15 06:53:54 espie Exp $
 bin/filter_wrapper
 bin/kchart
 bin/kformula
@@ -63,42 +63,42 @@ include/tkcoloractions.h
 include/tkcombobox.h
 include/tktoolbarbutton.h
 lib/kchart.la
-lib/kde3/kofficescan.la
-lib/kde3/libabiwordexport.la
-lib/kde3/libabiwordimport.la
-lib/kde3/libapplixgraphicimport.la
-lib/kde3/libapplixspreadimport.la
-lib/kde3/libapplixwordimport.la
-lib/kde3/libasciiexport.la
-lib/kde3/libasciiimport.la
-lib/kde3/libcsvexport.la
-lib/kde3/libcsvimport.la
-lib/kde3/libdocbookexport.la
-lib/kde3/libgnumericexport.la
-lib/kde3/libgnumericimport.la
-lib/kde3/libhtmlexport.la
-lib/kde3/libhtmlimport.la
-lib/kde3/libkchartpart.la
-lib/kde3/libkformulapart.la
-lib/kde3/libkiviopart.la
-lib/kde3/libkontourpart.la
-lib/kde3/libkpresenterpart.la
-lib/kde3/libkprkword.la
-lib/kde3/libkspelltool.la
-lib/kde3/libkspreadcalc.la
-lib/kde3/libkspreadhtmlexport.la
-lib/kde3/libkspreadpart.la
-lib/kde3/libkwordpart.la
-lib/kde3/liblatexexport.la
-lib/kde3/libmsodimport.la
-lib/kde3/libolefilter.la
-lib/kde3/libqproimport.la
-lib/kde3/librtfexport.la
-lib/kde3/libsvgexport.la
-lib/kde3/libsvgimport.la
-lib/kde3/libwmfimport.la
-lib/kde3/libwpimport.la
-lib/kde3/libxfigimport.la
+${KDE}/kofficescan.la
+${KDE}/libabiwordexport.la
+${KDE}/libabiwordimport.la
+${KDE}/libapplixgraphicimport.la
+${KDE}/libapplixspreadimport.la
+${KDE}/libapplixwordimport.la
+${KDE}/libasciiexport.la
+${KDE}/libasciiimport.la
+${KDE}/libcsvexport.la
+${KDE}/libcsvimport.la
+${KDE}/libdocbookexport.la
+${KDE}/libgnumericexport.la
+${KDE}/libgnumericimport.la
+${KDE}/libhtmlexport.la
+${KDE}/libhtmlimport.la
+${KDE}/libkchartpart.la
+${KDE}/libkformulapart.la
+${KDE}/libkiviopart.la
+${KDE}/libkontourpart.la
+${KDE}/libkpresenterpart.la
+${KDE}/libkprkword.la
+${KDE}/libkspelltool.la
+${KDE}/libkspreadcalc.la
+${KDE}/libkspreadhtmlexport.la
+${KDE}/libkspreadpart.la
+${KDE}/libkwordpart.la
+${KDE}/liblatexexport.la
+${KDE}/libmsodimport.la
+${KDE}/libolefilter.la
+${KDE}/libqproimport.la
+${KDE}/librtfexport.la
+${KDE}/libsvgexport.la
+${KDE}/libsvgimport.la
+${KDE}/libwmfimport.la
+${KDE}/libwpimport.la
+${KDE}/libxfigimport.la
 lib/kformulamain.la
 lib/kivio.la
 lib/kontour.la
@@ -1372,13 +1372,13 @@ share/icons/hicolor/48x48/mimetypes/kugardata.png
 share/icons/locolor/16x16/apps/kspreadcalc.png
 share/icons/locolor/22x22/apps/kspreadcalc.png
 share/icons/locolor/32x32/apps/kspreadcalc.png
-share/mimelnk/application/x-abiword.desktop
-share/mimelnk/application/x-quattropro.desktop
-share/mimelnk/image/x-msod.desktop
+@comment share/mimelnk/application/x-abiword.desktop
+@comment share/mimelnk/application/x-quattropro.desktop
+@comment share/mimelnk/image/x-msod.desktop
 share/mimelnk/image/x-svg.desktop
-share/mimelnk/image/x-wmf.desktop
-share/mimelnk/image/x-xfig.desktop
-share/mimelnk/text/x-csv.desktop
+@comment share/mimelnk/image/x-wmf.desktop
+@comment share/mimelnk/image/x-xfig.desktop
+@comment share/mimelnk/text/x-csv.desktop
 share/mimelnk/text/x-gnumeric.desktop
 share/services/ki_rtf_export.desktop
 share/services/killustrator_applixgraphic_import.desktop
@@ -1431,8 +1431,6 @@ share/templates/Presentation.desktop
 share/templates/SpreadSheet.desktop
 share/templates/TextDocument.desktop
 %%SHARED%%
-@dirrm share/templates/.source
-@dirrm share/templates
 @dirrm share/icons/locolor/22x22/apps
 @dirrm share/icons/locolor/22x22
 @dirrm share/icons/hicolor/22x22/mimetypes
@@ -1560,4 +1558,3 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kchart/icons/hicolor
 @dirrm share/apps/kchart/icons
 @dirrm share/apps/kchart
-@dirrm share/applnk/Office
diff --git a/x11/kde/toys3/pkg/DESCR b/x11/kde/toys3/pkg/DESCR
index fa550f1826f..92598dba1e8 100644
--- a/x11/kde/toys3/pkg/DESCR
+++ b/x11/kde/toys3/pkg/DESCR
@@ -2,9 +2,12 @@ This features:
 
 * amor - a neko-like clone, with cute characters that sit on your windows
 borders (apparently only works with a kde desktop).
+* kaphorism: displays aphorisms
 * kodo - a mouse odometer.
 * kteatime - timer to prepare tea.
 * kmoon - phases of the moon-type program.
-* ktimewatch - display of night on earth.
+* ktux: Tux-in-a-Spaceship screen saver
+* kworldclock: application and kicker applet showing daylight area on the world
+               globe
 
 Mostly completely useless.
diff --git a/x11/kde/utils3/pkg/PFRAG.shared b/x11/kde/utils3/pkg/PFRAG.shared
index c2aa8baae75..f504cab3778 100644
--- a/x11/kde/utils3/pkg/PFRAG.shared
+++ b/x11/kde/utils3/pkg/PFRAG.shared
@@ -1,11 +1,10 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2002/04/04 18:29:22 espie Exp $
-lib/kde3/libkcharselectapplet.so.1.0
-lib/kde3/libkcm_kdf.so.0.0
-lib/kde3/libkcm_laptop.so.0.0
-lib/kde3/libkedit.so.0.0
-lib/kde3/libkregexpeditorgui.so.0.0
+@comment $OpenBSD: PFRAG.shared,v 1.4 2002/04/15 06:53:54 espie Exp $
+${KDE}/libkcharselectapplet.so.1.0
+${KDE}/libkcm_kdf.so.0.0
+${KDE}/libkcm_laptop.so.0.0
+${KDE}/libkedit.so.0.0
+${KDE}/libkregexpeditorgui.so.0.0
 lib/libark.so.1.0
 lib/libkcalc.so.0.0
 lib/libklaptopdaemon.so.0.0
 DYNLIBDIR(%D/lib)
-DYNLIBDIR(%D/lib/kde3)
diff --git a/x11/kde/utils3/pkg/PLIST b/x11/kde/utils3/pkg/PLIST
index a4c3af32414..1e0f782648e 100644
--- a/x11/kde/utils3/pkg/PLIST
+++ b/x11/kde/utils3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/04/04 18:29:22 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2002/04/15 06:53:54 espie Exp $
 bin/ark
 bin/efax
 bin/efix
@@ -25,11 +25,11 @@ include/kmultiformlistboxentry.h
 include/kmultiformlistboxfactory.h
 include/kwidgetstreamer.h
 lib/kcalc.la
-lib/kde3/kcharselectapplet.la
-lib/kde3/kcm_kdf.la
-lib/kde3/kcm_laptop.la
-lib/kde3/kedit.la
-lib/kde3/libkregexpeditorgui.la
+${KDE}/kcharselectapplet.la
+${KDE}/kcm_kdf.la
+${KDE}/kcm_laptop.la
+${KDE}/kedit.la
+${KDE}/libkregexpeditorgui.la
 lib/klaptopdaemon.la
 lib/libark.la
 man/man1/efax.1