30 files changed, 1338 insertions, 958 deletions

diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile
index 98a287155675..c3829671850e 100644
--- a/sysutils/kdeadmin3/Makefile
+++ b/sysutils/kdeadmin3/Makefile
@@ -1,6 +1,7 @@
+# -*-mode: makefile-*-
 # New ports collection makefile for:	kdeadmin
-# Date created:				5 March 2001
-# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
+# Date created:				2 November 2001
+# Whom:					will@cvs.kde.org
 #
 # $FreeBSD$
 #
@@ -9,22 +10,20 @@ PORTNAME=	kdeadmin
 PORTVERSION=	${KDE_VERSION}
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=3
+PREFIX=		${KDE_PREFIX}
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-
-post-patch:
-	@cd ${WRKSRC}/kpackage; \
-	${PERL} -pi -e 's@^typedef[ \t]+__off64.*\n@@' \
-		rpm*.h rpm*.c rpm*.cpp
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.mk>
diff --git a/sysutils/kdeadmin3/distinfo b/sysutils/kdeadmin3/distinfo
index 54314a9f8b5c..5d06f2f20ec2 100644
--- a/sysutils/kdeadmin3/distinfo
+++ b/sysutils/kdeadmin3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeadmin-3.0.4.tar.bz2) = 6e93fd31067deab4e08460e84174dd19
+MD5 (KDE/kdeadmin-3.1.tar.bz2) = 4ceed5f59fc5960105278be58ab80f80
diff --git a/sysutils/kdeadmin3/pkg-plist b/sysutils/kdeadmin3/pkg-plist
index 4c72476bb341..39c2eefb2c22 100644
--- a/sysutils/kdeadmin3/pkg-plist
+++ b/sysutils/kdeadmin3/pkg-plist
@@ -2,7 +2,14 @@ bin/kcron
 bin/kpackage
 bin/kuser
 bin/kwuftpd
+bin/kxconfig
 bin/secpolicy
+lib/kde3/kfile_deb.la
+lib/kde3/kfile_deb.so
+lib/kde3/kfile_rpm.la
+lib/kde3/kfile_rpm.so
+share/applnk/Settings/Peripherals/kxconfig.desktop
+share/applnk/System/More/kwuftpd.desktop
 share/applnk/System/kcron.desktop
 share/applnk/System/kpackage.desktop
 share/applnk/System/kuser.desktop
@@ -31,15 +38,39 @@ share/apps/kpackage/pics/supdated.png
 share/apps/kpackage/pics/tick.png
 share/apps/kpackage/toolbar/ftin.xpm
 share/apps/kpackage/toolbar/ftout.xpm
-share/apps/kuser/icons/hicolor/22x22/actions/add_group.png
-share/apps/kuser/icons/hicolor/22x22/actions/add_user.png
-share/apps/kuser/icons/hicolor/22x22/actions/delete_group.png
-share/apps/kuser/icons/hicolor/22x22/actions/delete_user.png
-share/apps/kuser/icons/hicolor/22x22/actions/edit_group.png
-share/apps/kuser/icons/hicolor/22x22/actions/edit_user.png
+share/apps/kuser/icons/crystalsvg/22x22/actions/add_group.png
+share/apps/kuser/icons/crystalsvg/22x22/actions/add_user.png
+share/apps/kuser/icons/crystalsvg/22x22/actions/delete_group.png
+share/apps/kuser/icons/crystalsvg/22x22/actions/delete_user.png
+share/apps/kuser/icons/crystalsvg/22x22/actions/edit_group.png
+share/apps/kuser/icons/crystalsvg/22x22/actions/edit_user.png
 share/apps/kuser/kuserui.rc
 share/apps/kuser/pics/group.png
 share/apps/kuser/pics/user.png
+share/apps/kxconfig/XF86Config-4.default
+share/apps/kxconfig/XF86Config-4.template
+share/apps/kxconfig/hwdata/Monitors
+share/apps/kxconfig/hwdata/VideoCards
+share/apps/kxconfig/pics/ati.png
+share/apps/kxconfig/pics/decreaseX.png
+share/apps/kxconfig/pics/decreaseY.png
+share/apps/kxconfig/pics/down.png
+share/apps/kxconfig/pics/fonts.png
+share/apps/kxconfig/pics/general.png
+share/apps/kxconfig/pics/increaseX.png
+share/apps/kxconfig/pics/increaseY.png
+share/apps/kxconfig/pics/keyboard.png
+share/apps/kxconfig/pics/layout.png
+share/apps/kxconfig/pics/left.png
+share/apps/kxconfig/pics/matrox.png
+share/apps/kxconfig/pics/monitor.png
+share/apps/kxconfig/pics/pointer.png
+share/apps/kxconfig/pics/resolution.png
+share/apps/kxconfig/pics/right.png
+share/apps/kxconfig/pics/threed.png
+share/apps/kxconfig/pics/up.png
+share/apps/kxconfig/pics/videocard.png
+share/apps/kxconfig/pics/xlogo_small.png
 share/doc/HTML/en/kcron/common
 share/doc/HTML/en/kcron/index.cache.bz2
 share/doc/HTML/en/kcron/index.docbook
@@ -72,24 +103,45 @@ share/doc/HTML/en/kwuftpd/security.png
 share/doc/HTML/en/kwuftpd/uploads.png
 share/doc/HTML/en/kwuftpd/user_classes.png
 share/doc/HTML/en/kwuftpd/virtual.png
-share/icons/hicolor/16x16/apps/kcron.png
-share/icons/hicolor/16x16/apps/kpackage.png
-share/icons/hicolor/16x16/apps/kuser.png
-share/icons/hicolor/32x32/apps/kcron.png
-share/icons/hicolor/32x32/apps/kpackage.png
-share/icons/hicolor/32x32/apps/kuser.png
-share/icons/hicolor/48x48/apps/kpackage.png
-share/icons/hicolor/48x48/apps/kuser.png
+share/doc/HTML/en/kxconfig/common
+share/doc/HTML/en/kxconfig/index.cache.bz2
+share/doc/HTML/en/kxconfig/index.docbook
+share/icons/crystalsvg/128x128/apps/kpackage.png
+share/icons/crystalsvg/128x128/apps/kuser.png
+share/icons/crystalsvg/16x16/apps/kcron.png
+share/icons/crystalsvg/16x16/apps/kpackage.png
+share/icons/crystalsvg/16x16/apps/kuser.png
+share/icons/crystalsvg/32x32/apps/kcron.png
+share/icons/crystalsvg/32x32/apps/kpackage.png
+share/icons/crystalsvg/32x32/apps/kuser.png
+share/icons/crystalsvg/32x32/apps/kxconfig.png
+share/icons/crystalsvg/48x48/apps/kpackage.png
+share/icons/crystalsvg/48x48/apps/kuser.png
+share/icons/crystalsvg/64x64/apps/kpackage.png
+share/icons/crystalsvg/64x64/apps/kuser.png
+share/icons/locolor/16x16/apps/kxconfig.png
 share/mimelnk/application/x-debian-package.desktop
+share/services/kfile_deb.desktop
+share/services/kfile_rpm.desktop
+@dirrm share/services
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
+@dirrm share/icons/crystalsvg/64x64/apps
+@dirrm share/icons/crystalsvg/64x64
+@dirrm share/icons/crystalsvg/48x48/apps
+@dirrm share/icons/crystalsvg/48x48
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/32x32
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/16x16
+@dirrm share/icons/crystalsvg/128x128/apps
+@dirrm share/icons/crystalsvg/128x128
+@dirrm share/icons/crystalsvg
+@dirrm share/icons
+@dirrm share/doc/HTML/en/kxconfig
 @dirrm share/doc/HTML/en/kwuftpd
 @dirrm share/doc/HTML/en/kuser
 @dirrm share/doc/HTML/en/ksysv
@@ -98,13 +150,23 @@ share/mimelnk/application/x-debian-package.desktop
 @dirrm share/doc/HTML/en/kcron
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
+@dirrm share/doc
+@dirrm share/apps/kxconfig/pics
+@dirrm share/apps/kxconfig/hwdata
+@dirrm share/apps/kxconfig
 @dirrm share/apps/kuser/pics
-@dirrm share/apps/kuser/icons/hicolor/22x22/actions
-@dirrm share/apps/kuser/icons/hicolor/22x22
-@dirrm share/apps/kuser/icons/hicolor
+@dirrm share/apps/kuser/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kuser/icons/crystalsvg/22x22
+@dirrm share/apps/kuser/icons/crystalsvg
 @dirrm share/apps/kuser/icons
 @dirrm share/apps/kuser
 @dirrm share/apps/kpackage/toolbar
 @dirrm share/apps/kpackage/pics
 @dirrm share/apps/kpackage
+@dirrm share/apps
+@dirrm share/applnk/System/More
 @dirrm share/applnk/System
+@dirrm share/applnk/Settings/Peripherals
+@dirrm share/applnk/Settings
+@dirrm share/applnk
+@dirrm lib/kde3
diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index 98a287155675..c3829671850e 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -1,6 +1,7 @@
+# -*-mode: makefile-*-
 # New ports collection makefile for:	kdeadmin
-# Date created:				5 March 2001
-# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
+# Date created:				2 November 2001
+# Whom:					will@cvs.kde.org
 #
 # $FreeBSD$
 #
@@ -9,22 +10,20 @@ PORTNAME=	kdeadmin
 PORTVERSION=	${KDE_VERSION}
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=3
+PREFIX=		${KDE_PREFIX}
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-
-post-patch:
-	@cd ${WRKSRC}/kpackage; \
-	${PERL} -pi -e 's@^typedef[ \t]+__off64.*\n@@' \
-		rpm*.h rpm*.c rpm*.cpp
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.mk>
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index 54314a9f8b5c..5d06f2f20ec2 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeadmin-3.0.4.tar.bz2) = 6e93fd31067deab4e08460e84174dd19
+MD5 (KDE/kdeadmin-3.1.tar.bz2) = 4ceed5f59fc5960105278be58ab80f80
diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist
index 4c72476bb341..39c2eefb2c22 100644
--- a/sysutils/kdeadmin4/pkg-plist
+++ b/sysutils/kdeadmin4/pkg-plist
@@ -2,7 +2,14 @@ bin/kcron
 bin/kpackage
 bin/kuser
 bin/kwuftpd
+bin/kxconfig
 bin/secpolicy
+lib/kde3/kfile_deb.la
+lib/kde3/kfile_deb.so
+lib/kde3/kfile_rpm.la
+lib/kde3/kfile_rpm.so
+share/applnk/Settings/Peripherals/kxconfig.desktop
+share/applnk/System/More/kwuftpd.desktop
 share/applnk/System/kcron.desktop
 share/applnk/System/kpackage.desktop
 share/applnk/System/kuser.desktop
@@ -31,15 +38,39 @@ share/apps/kpackage/pics/supdated.png
 share/apps/kpackage/pics/tick.png
 share/apps/kpackage/toolbar/ftin.xpm
 share/apps/kpackage/toolbar/ftout.xpm
-share/apps/kuser/icons/hicolor/22x22/actions/add_group.png
-share/apps/kuser/icons/hicolor/22x22/actions/add_user.png
-share/apps/kuser/icons/hicolor/22x22/actions/delete_group.png
-share/apps/kuser/icons/hicolor/22x22/actions/delete_user.png
-share/apps/kuser/icons/hicolor/22x22/actions/edit_group.png
-share/apps/kuser/icons/hicolor/22x22/actions/edit_user.png
+share/apps/kuser/icons/crystalsvg/22x22/actions/add_group.png
+share/apps/kuser/icons/crystalsvg/22x22/actions/add_user.png
+share/apps/kuser/icons/crystalsvg/22x22/actions/delete_group.png
+share/apps/kuser/icons/crystalsvg/22x22/actions/delete_user.png
+share/apps/kuser/icons/crystalsvg/22x22/actions/edit_group.png
+share/apps/kuser/icons/crystalsvg/22x22/actions/edit_user.png
 share/apps/kuser/kuserui.rc
 share/apps/kuser/pics/group.png
 share/apps/kuser/pics/user.png
+share/apps/kxconfig/XF86Config-4.default
+share/apps/kxconfig/XF86Config-4.template
+share/apps/kxconfig/hwdata/Monitors
+share/apps/kxconfig/hwdata/VideoCards
+share/apps/kxconfig/pics/ati.png
+share/apps/kxconfig/pics/decreaseX.png
+share/apps/kxconfig/pics/decreaseY.png
+share/apps/kxconfig/pics/down.png
+share/apps/kxconfig/pics/fonts.png
+share/apps/kxconfig/pics/general.png
+share/apps/kxconfig/pics/increaseX.png
+share/apps/kxconfig/pics/increaseY.png
+share/apps/kxconfig/pics/keyboard.png
+share/apps/kxconfig/pics/layout.png
+share/apps/kxconfig/pics/left.png
+share/apps/kxconfig/pics/matrox.png
+share/apps/kxconfig/pics/monitor.png
+share/apps/kxconfig/pics/pointer.png
+share/apps/kxconfig/pics/resolution.png
+share/apps/kxconfig/pics/right.png
+share/apps/kxconfig/pics/threed.png
+share/apps/kxconfig/pics/up.png
+share/apps/kxconfig/pics/videocard.png
+share/apps/kxconfig/pics/xlogo_small.png
 share/doc/HTML/en/kcron/common
 share/doc/HTML/en/kcron/index.cache.bz2
 share/doc/HTML/en/kcron/index.docbook
@@ -72,24 +103,45 @@ share/doc/HTML/en/kwuftpd/security.png
 share/doc/HTML/en/kwuftpd/uploads.png
 share/doc/HTML/en/kwuftpd/user_classes.png
 share/doc/HTML/en/kwuftpd/virtual.png
-share/icons/hicolor/16x16/apps/kcron.png
-share/icons/hicolor/16x16/apps/kpackage.png
-share/icons/hicolor/16x16/apps/kuser.png
-share/icons/hicolor/32x32/apps/kcron.png
-share/icons/hicolor/32x32/apps/kpackage.png
-share/icons/hicolor/32x32/apps/kuser.png
-share/icons/hicolor/48x48/apps/kpackage.png
-share/icons/hicolor/48x48/apps/kuser.png
+share/doc/HTML/en/kxconfig/common
+share/doc/HTML/en/kxconfig/index.cache.bz2
+share/doc/HTML/en/kxconfig/index.docbook
+share/icons/crystalsvg/128x128/apps/kpackage.png
+share/icons/crystalsvg/128x128/apps/kuser.png
+share/icons/crystalsvg/16x16/apps/kcron.png
+share/icons/crystalsvg/16x16/apps/kpackage.png
+share/icons/crystalsvg/16x16/apps/kuser.png
+share/icons/crystalsvg/32x32/apps/kcron.png
+share/icons/crystalsvg/32x32/apps/kpackage.png
+share/icons/crystalsvg/32x32/apps/kuser.png
+share/icons/crystalsvg/32x32/apps/kxconfig.png
+share/icons/crystalsvg/48x48/apps/kpackage.png
+share/icons/crystalsvg/48x48/apps/kuser.png
+share/icons/crystalsvg/64x64/apps/kpackage.png
+share/icons/crystalsvg/64x64/apps/kuser.png
+share/icons/locolor/16x16/apps/kxconfig.png
 share/mimelnk/application/x-debian-package.desktop
+share/services/kfile_deb.desktop
+share/services/kfile_rpm.desktop
+@dirrm share/services
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
+@dirrm share/icons/crystalsvg/64x64/apps
+@dirrm share/icons/crystalsvg/64x64
+@dirrm share/icons/crystalsvg/48x48/apps
+@dirrm share/icons/crystalsvg/48x48
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/32x32
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/16x16
+@dirrm share/icons/crystalsvg/128x128/apps
+@dirrm share/icons/crystalsvg/128x128
+@dirrm share/icons/crystalsvg
+@dirrm share/icons
+@dirrm share/doc/HTML/en/kxconfig
 @dirrm share/doc/HTML/en/kwuftpd
 @dirrm share/doc/HTML/en/kuser
 @dirrm share/doc/HTML/en/ksysv
@@ -98,13 +150,23 @@ share/mimelnk/application/x-debian-package.desktop
 @dirrm share/doc/HTML/en/kcron
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
+@dirrm share/doc
+@dirrm share/apps/kxconfig/pics
+@dirrm share/apps/kxconfig/hwdata
+@dirrm share/apps/kxconfig
 @dirrm share/apps/kuser/pics
-@dirrm share/apps/kuser/icons/hicolor/22x22/actions
-@dirrm share/apps/kuser/icons/hicolor/22x22
-@dirrm share/apps/kuser/icons/hicolor
+@dirrm share/apps/kuser/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kuser/icons/crystalsvg/22x22
+@dirrm share/apps/kuser/icons/crystalsvg
 @dirrm share/apps/kuser/icons
 @dirrm share/apps/kuser
 @dirrm share/apps/kpackage/toolbar
 @dirrm share/apps/kpackage/pics
 @dirrm share/apps/kpackage
+@dirrm share/apps
+@dirrm share/applnk/System/More
 @dirrm share/applnk/System
+@dirrm share/applnk/Settings/Peripherals
+@dirrm share/applnk/Settings
+@dirrm share/applnk
+@dirrm lib/kde3
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 1725a3ae4156..572a4a02eefc 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -16,30 +16,37 @@ DIST_SUBDIR=	KDE
 MAINTAINER?=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=3
+PREFIX=		${KDE_PREFIX}
+KDE_BUILD_PLIST=yes
+
 USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-MAN1=		efax.1 efix.1 fax.1
+GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 #klaptop doesn't like alpha because alpha doesn't support apm
 .if ${MACHINE_ARCH} == "alpha"
+WITHOUT_KLAPTOP	=yes
+.endif # ${MACHINE_ARCH} == "alpha"
+
+.if defined(WITHOUT_KLAPTOP)
 DO_NOT_COMPILE+=klaptopdaemon
-PLIST_SUB+=	ALPHA_NA="@comment "
 .else
-PLIST_SUB+=	ALPHA_NA=""
-.endif
+PLIST_APPEND+=	plist.klaptop
+.endif # defined(WITHOUT_KLAPTOP)
+
 # kfloppy is a mostly broken, non-standard, linux-centric pain...
 .if !defined(WITH_KFLOPPY)
 DO_NOT_COMPILE+=kfloppy
-PLIST_SUB+=	KFLOPPY="@comment "
 .else
-PLIST_SUB+=	KFLOPPY=""
-.endif
+PLIST_APPEND+=	plist.kfloppy
+.endif # !defined(WITH_KFLOPPY)
+
 .if defined(DO_NOT_COMPILE)
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif
+.endif # defined(DO_NOT_COMPILE)
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.mk>
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index cba41d522370..a8af40a21512 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.0.4.tar.bz2) = e34ccb00b25f04f0a27474fa17d68e77
+MD5 (KDE/kdeutils-3.1.tar.bz2) = 81e2916ba0fa865053aff858982c040e
diff --git a/sysutils/kdf/files/plist.base b/sysutils/kdf/files/plist.base
new file mode 100644
index 000000000000..4db631d4dff3
--- /dev/null
+++ b/sysutils/kdf/files/plist.base
@@ -0,0 +1,247 @@
+bin/ark
+bin/kcalc
+bin/kcharselect
+bin/kdepasswd
+bin/kdessh
+bin/kdf
+bin/kedit
+bin/khexedit
+bin/kjots
+bin/ksim
+bin/ktimer
+bin/kwikdisk
+include/kmultiformlistbox.h
+include/kmultiformlistboxentry.h
+include/kmultiformlistboxfactory.h
+include/ksim/chart.h
+include/ksim/common.h
+include/ksim/label.h
+include/ksim/led.h
+include/ksim/pluginglobal.h
+include/ksim/pluginloader.h
+include/ksim/pluginmodule.h
+include/ksim/progress.h
+include/ksim/themeloader.h
+include/ksim/themetypes.h
+include/kwidgetstreamer.h
+lib/kcalc.la
+lib/kcalc.so
+lib/kde3/kcharselect_panelapplet.la
+lib/kde3/kcharselect_panelapplet.so
+lib/kde3/kcm_kdf.la
+lib/kde3/kcm_kdf.so
+lib/kde3/ksim_cpu.la
+lib/kde3/ksim_cpu.so
+lib/kde3/ksim_disk.la
+lib/kde3/ksim_disk.so
+lib/kde3/ksim_filesystem.la
+lib/kde3/ksim_filesystem.so
+lib/kde3/ksim_net.la
+lib/kde3/ksim_net.so
+lib/kde3/ksim_sensors.la
+lib/kde3/ksim_sensors.so
+lib/kde3/libkregexpeditorgui.la
+lib/kde3/libkregexpeditorgui.so
+lib/kedit.la
+lib/kedit.so
+lib/ksim.la
+lib/ksim.so
+lib/libarkpart.la
+lib/libarkpart.so
+lib/libksimcore.la
+lib/libksimcore.so
+lib/libksimcore.so.1
+share/applnk/Editors/KEdit.desktop
+share/applnk/Settings/Information/kcmdf.desktop
+share/applnk/Settingsmenu/kdepasswd.desktop
+share/applnk/System/More/kdf.desktop
+share/applnk/System/More/ksim.desktop
+share/applnk/System/More/kwikdisk.desktop
+share/applnk/System/kdf.desktop
+share/applnk/System/kwikdisk.desktop
+share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/Kjots.desktop
+share/applnk/Utilities/More/KCharSelect.desktop
+share/applnk/Utilities/More/Kjots.desktop
+share/applnk/Utilities/More/khexedit.desktop
+share/applnk/Utilities/More/ktimer.desktop
+share/applnk/Utilities/ark.desktop
+share/applnk/Utilities/kcalc.desktop
+share/applnk/Utilities/kdepasswd.desktop
+share/applnk/Utilities/khexedit.desktop
+share/applnk/Utilities/ktimer.desktop
+share/apps/ark/ark_part.rc
+share/apps/ark/ark_part_readonly.rc
+share/apps/ark/arkui.rc
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_adddir.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_addfile.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_delete.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_extract.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_help.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_new.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_open.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_options.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_selectall.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_view.png
+share/apps/kdf/pics/delete.png
+share/apps/kdf/pics/tick.png
+share/apps/kedit/keditui.rc
+share/apps/khexedit/toolbar/hexdrag.png
+share/apps/khexedit/toolbar/hexmask.png
+share/apps/khexedit/toolbar/hexwrite.png
+share/apps/kicker/applets/kcharselectapplet.desktop
+share/apps/kjots/pics/filedel.png
+share/apps/konqueror/servicemenus/arkservicemenu.desktop
+share/apps/kregexpeditor/pics/altn.png
+share/apps/kregexpeditor/pics/anychar.png
+share/apps/kregexpeditor/pics/begline.png
+share/apps/kregexpeditor/pics/characters.png
+share/apps/kregexpeditor/pics/compound.png
+share/apps/kregexpeditor/pics/endline.png
+share/apps/kregexpeditor/pics/error.png
+share/apps/kregexpeditor/pics/neglookahead.png
+share/apps/kregexpeditor/pics/nonwordboundary.png
+share/apps/kregexpeditor/pics/poslookahead.png
+share/apps/kregexpeditor/pics/repeat.png
+share/apps/kregexpeditor/pics/select.png
+share/apps/kregexpeditor/pics/text.png
+share/apps/kregexpeditor/pics/wordboundary.png
+share/apps/kregexpeditor/predefined/general/anything.regexp
+share/apps/kregexpeditor/predefined/general/spaces.regexp
+share/apps/ksim/monitors/DFree.desktop
+share/apps/ksim/monitors/Lm_sensors.desktop
+share/apps/ksim/monitors/Net.desktop
+share/apps/ksim/monitors/cpu.desktop
+share/apps/ksim/monitors/disk.desktop
+share/apps/ksim/pics/clock.png
+share/apps/ksim/pics/uptime.png
+share/apps/ksim/themes/ksim/bg_chart.png
+share/apps/ksim/themes/ksim/bg_grid.png
+share/apps/ksim/themes/ksim/bg_meter.png
+share/apps/ksim/themes/ksim/bg_panel.png
+share/apps/ksim/themes/ksim/frame_bottom.png
+share/apps/ksim/themes/ksim/frame_left.png
+share/apps/ksim/themes/ksim/frame_right.png
+share/apps/ksim/themes/ksim/frame_top.png
+share/apps/ksim/themes/ksim/gkrellmrc
+share/apps/ksim/themes/ksim/gkrellmrc_ksim
+share/apps/ksim/themes/ksim/host/bg_meter.png
+share/apps/ksim/themes/ksim/krell_meter.png
+share/apps/ksim/themes/ksim/krell_panel.png
+share/apps/ksim/themes/ksim/krell_slider.png
+share/apps/ksim/themes/ksim/mail/decal_mail.png
+share/apps/ksim/themes/ksim/mail/krell_mail.png
+share/apps/ksim/themes/ksim/mail/krell_mail_daemon.png
+share/apps/ksim/themes/ksim/net/decal_net_leds.png
+share/config/ksimrc
+share/doc/HTML/en/KRegExpEditor/altn.png
+share/doc/HTML/en/KRegExpEditor/altntool.png
+share/doc/HTML/en/KRegExpEditor/anychar.png
+share/doc/HTML/en/KRegExpEditor/anychartool.png
+share/doc/HTML/en/KRegExpEditor/begline.png
+share/doc/HTML/en/KRegExpEditor/boundarytools.png
+share/doc/HTML/en/KRegExpEditor/characters.png
+share/doc/HTML/en/KRegExpEditor/charactertool.png
+share/doc/HTML/en/KRegExpEditor/common
+share/doc/HTML/en/KRegExpEditor/compound.png
+share/doc/HTML/en/KRegExpEditor/compoundtool.png
+share/doc/HTML/en/KRegExpEditor/endline.png
+share/doc/HTML/en/KRegExpEditor/index.cache.bz2
+share/doc/HTML/en/KRegExpEditor/index.docbook
+share/doc/HTML/en/KRegExpEditor/linestartendtool.png
+share/doc/HTML/en/KRegExpEditor/lookaheadtools.png
+share/doc/HTML/en/KRegExpEditor/neglookahead.png
+share/doc/HTML/en/KRegExpEditor/nonwordboundary.png
+share/doc/HTML/en/KRegExpEditor/poslookahead.png
+share/doc/HTML/en/KRegExpEditor/repeat.png
+share/doc/HTML/en/KRegExpEditor/repeattool.png
+share/doc/HTML/en/KRegExpEditor/select.png
+share/doc/HTML/en/KRegExpEditor/text.png
+share/doc/HTML/en/KRegExpEditor/texttool.png
+share/doc/HTML/en/KRegExpEditor/theEditor.png
+share/doc/HTML/en/KRegExpEditor/wordboundary.png
+share/doc/HTML/en/ark/common
+share/doc/HTML/en/ark/index.cache.bz2
+share/doc/HTML/en/ark/index.docbook
+share/doc/HTML/en/kcalc/common
+share/doc/HTML/en/kcalc/index.cache.bz2
+share/doc/HTML/en/kcalc/index.docbook
+share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
+share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
+share/doc/HTML/en/kcharselect/common
+share/doc/HTML/en/kcharselect/index.cache.bz2
+share/doc/HTML/en/kcharselect/index.docbook
+share/doc/HTML/en/kcontrol/kcmlowbatcrit/common
+share/doc/HTML/en/kcontrol/kcmlowbatcrit/index.cache.bz2
+share/doc/HTML/en/kcontrol/kcmlowbatcrit/index.docbook
+share/doc/HTML/en/kcontrol/kcmlowbatwarn/common
+share/doc/HTML/en/kcontrol/kcmlowbatwarn/index.cache.bz2
+share/doc/HTML/en/kcontrol/kcmlowbatwarn/index.docbook
+share/doc/HTML/en/kcontrol/laptop/common
+share/doc/HTML/en/kcontrol/laptop/index.cache.bz2
+share/doc/HTML/en/kcontrol/laptop/index.docbook
+share/doc/HTML/en/kcontrol/powerctrl/common
+share/doc/HTML/en/kcontrol/powerctrl/index.cache.bz2
+share/doc/HTML/en/kcontrol/powerctrl/index.docbook
+share/doc/HTML/en/kdf/common
+share/doc/HTML/en/kdf/index.cache.bz2
+share/doc/HTML/en/kdf/index.docbook
+share/doc/HTML/en/kdf/kdf.png
+share/doc/HTML/en/kdf/kdf_config.png
+share/doc/HTML/en/kedit/common
+share/doc/HTML/en/kedit/index.cache.bz2
+share/doc/HTML/en/kedit/index.docbook
+share/doc/HTML/en/kfloppy/common
+share/doc/HTML/en/kfloppy/index.cache.bz2
+share/doc/HTML/en/kfloppy/index.docbook
+share/doc/HTML/en/khexedit/common
+share/doc/HTML/en/khexedit/index.cache.bz2
+share/doc/HTML/en/khexedit/index.docbook
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/kinfocenter/blockdevices/common
+share/doc/HTML/en/kinfocenter/blockdevices/index.cache.bz2
+share/doc/HTML/en/kinfocenter/blockdevices/index.docbook
+share/doc/HTML/en/kjots/common
+share/doc/HTML/en/kjots/index.cache.bz2
+share/doc/HTML/en/kjots/index.docbook
+share/doc/HTML/en/ksim/common
+share/doc/HTML/en/ksim/index.cache.bz2
+share/doc/HTML/en/ksim/index.docbook
+share/doc/HTML/en/ktimer/common
+share/doc/HTML/en/ktimer/index.cache.bz2
+share/doc/HTML/en/ktimer/index.docbook
+share/icons/crystalsvg/128x128/apps/ark.png
+share/icons/crystalsvg/128x128/apps/kdf.png
+share/icons/crystalsvg/16x16/apps/ark.png
+share/icons/crystalsvg/16x16/apps/kcalc.png
+share/icons/crystalsvg/16x16/apps/kcharselect.png
+share/icons/crystalsvg/16x16/apps/kcmdf.png
+share/icons/crystalsvg/16x16/apps/kdf.png
+share/icons/crystalsvg/16x16/apps/kedit.png
+share/icons/crystalsvg/16x16/apps/khexedit.png
+share/icons/crystalsvg/16x16/apps/kjots.png
+share/icons/crystalsvg/16x16/apps/ksim.png
+share/icons/crystalsvg/16x16/apps/kwikdisk.png
+share/icons/crystalsvg/16x16/devices/ksim_cpu.png
+share/icons/crystalsvg/32x32/apps/ark.png
+share/icons/crystalsvg/32x32/apps/kcalc.png
+share/icons/crystalsvg/32x32/apps/kcmdf.png
+share/icons/crystalsvg/32x32/apps/kdf.png
+share/icons/crystalsvg/32x32/apps/kedit.png
+share/icons/crystalsvg/32x32/apps/khexedit.png
+share/icons/crystalsvg/32x32/apps/kjots.png
+share/icons/crystalsvg/32x32/apps/ksim.png
+share/icons/crystalsvg/32x32/apps/kwikdisk.png
+share/icons/crystalsvg/48x48/apps/ark.png
+share/icons/crystalsvg/48x48/apps/kcalc.png
+share/icons/crystalsvg/48x48/apps/kcharselect.png
+share/icons/crystalsvg/48x48/apps/kdf.png
+share/icons/crystalsvg/48x48/apps/kedit.png
+share/icons/crystalsvg/48x48/apps/khexedit.png
+share/icons/crystalsvg/48x48/apps/kjots.png
+share/icons/crystalsvg/48x48/apps/ksim.png
+share/icons/crystalsvg/64x64/apps/ark.png
+share/icons/crystalsvg/64x64/apps/kdf.png
+share/services/ark_part.desktop
+share/services/kregexpeditorgui.desktop
+@exec /bin/mkdir -p %D/share/apps/kcalc/pics
diff --git a/sysutils/kdf/files/plist.base.rm b/sysutils/kdf/files/plist.base.rm
new file mode 100644
index 000000000000..197cb22fe65b
--- /dev/null
+++ b/sysutils/kdf/files/plist.base.rm
@@ -0,0 +1,78 @@
+@unexec /bin/rmdir %D/share/apps/kcalc/pics || true
+@dirrm share/services
+@dirrm share/icons/crystalsvg/64x64/apps
+@dirrm share/icons/crystalsvg/64x64
+@dirrm share/icons/crystalsvg/48x48/apps
+@dirrm share/icons/crystalsvg/48x48
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/32x32
+@dirrm share/icons/crystalsvg/16x16/devices
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/16x16
+@dirrm share/icons/crystalsvg/128x128/apps
+@dirrm share/icons/crystalsvg/128x128
+@dirrm share/icons/crystalsvg
+@dirrm share/icons
+@dirrm share/doc/HTML/en/ktimer
+@dirrm share/doc/HTML/en/ksim
+@dirrm share/doc/HTML/en/kjots
+@dirrm share/doc/HTML/en/kinfocenter/blockdevices
+@dirrm share/doc/HTML/en/kinfocenter
+@dirrm share/doc/HTML/en/khexedit
+@dirrm share/doc/HTML/en/kfloppy
+@dirrm share/doc/HTML/en/kedit
+@dirrm share/doc/HTML/en/kdf
+@dirrm share/doc/HTML/en/kcontrol/powerctrl
+@dirrm share/doc/HTML/en/kcontrol/laptop
+@dirrm share/doc/HTML/en/kcontrol/kcmlowbatwarn
+@dirrm share/doc/HTML/en/kcontrol/kcmlowbatcrit
+@dirrm share/doc/HTML/en/kcontrol
+@dirrm share/doc/HTML/en/kcharselect
+@dirrm share/doc/HTML/en/kcalc
+@dirrm share/doc/HTML/en/ark
+@dirrm share/doc/HTML/en/KRegExpEditor
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/doc
+@dirrm share/config
+@dirrm share/apps/ksim/themes/ksim/net
+@dirrm share/apps/ksim/themes/ksim/mail
+@dirrm share/apps/ksim/themes/ksim/host
+@dirrm share/apps/ksim/themes/ksim
+@dirrm share/apps/ksim/themes
+@dirrm share/apps/ksim/pics
+@dirrm share/apps/ksim/monitors
+@dirrm share/apps/ksim
+@dirrm share/apps/kregexpeditor/predefined/general
+@dirrm share/apps/kregexpeditor/predefined
+@dirrm share/apps/kregexpeditor/pics
+@dirrm share/apps/kregexpeditor
+@dirrm share/apps/konqueror/servicemenus
+@dirrm share/apps/konqueror
+@dirrm share/apps/kjots/pics
+@dirrm share/apps/kjots
+@dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
+@dirrm share/apps/khexedit/toolbar
+@dirrm share/apps/khexedit
+@dirrm share/apps/kedit
+@dirrm share/apps/kdf/pics
+@dirrm share/apps/kdf
+@dirrm share/apps/kcalc
+@dirrm share/apps/ark/icons/crystalsvg/22x22/actions
+@dirrm share/apps/ark/icons/crystalsvg/22x22
+@dirrm share/apps/ark/icons/crystalsvg
+@dirrm share/apps/ark/icons
+@dirrm share/apps/ark
+@dirrm share/apps
+@dirrm share/applnk/Utilities/More
+@dirrm share/applnk/Utilities
+@dirrm share/applnk/System/More
+@dirrm share/applnk/System
+@dirrm share/applnk/Settingsmenu
+@dirrm share/applnk/Settings/Information
+@dirrm share/applnk/Settings
+@dirrm share/applnk/Editors
+@dirrm share/applnk
+@dirrm lib/kde3
+@dirrm include/ksim
diff --git a/sysutils/kdf/files/plist.kfloppy b/sysutils/kdf/files/plist.kfloppy
new file mode 100644
index 000000000000..58363c80f2de
--- /dev/null
+++ b/sysutils/kdf/files/plist.kfloppy
@@ -0,0 +1,7 @@
+bin/kfloppy
+share/applnk/Utilities/KFloppy.desktop
+share/icons/crystalsvg/128x128/apps/kfloppy.png
+share/icons/crystalsvg/16x16/apps/kfloppy.png
+share/icons/crystalsvg/32x32/apps/kfloppy.png
+share/icons/crystalsvg/48x48/apps/kfloppy.png
+share/icons/crystalsvg/64x64/apps/kfloppy.png
diff --git a/sysutils/kdf/files/plist.klaptop b/sysutils/kdf/files/plist.klaptop
new file mode 100644
index 000000000000..00f1bfdbc5c9
--- /dev/null
+++ b/sysutils/kdf/files/plist.klaptop
@@ -0,0 +1,22 @@
+bin/klaptopdaemon
+lib/kde3/kcm_laptop.la
+lib/kde3/kcm_laptop.so
+lib/klaptopdaemon.la
+lib/klaptopdaemon.so
+share/applnk/Settings/Information/pcmcia.desktop
+share/applnk/Settings/PowerControl/laptop.desktop
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png
+share/icons/crystalsvg/128x128/apps/laptop_battery.png
+share/icons/crystalsvg/16x16/apps/klaptopdaemon.png
+share/icons/crystalsvg/16x16/apps/laptop_battery.png
+share/icons/crystalsvg/16x16/apps/laptop_pcmcia.png
+share/icons/crystalsvg/32x32/apps/laptop_battery.png
+share/icons/crystalsvg/32x32/apps/laptop_pcmcia.png
+share/icons/crystalsvg/48x48/apps/laptop_battery.png
+share/icons/crystalsvg/48x48/apps/laptop_pcmcia.png
+share/icons/crystalsvg/64x64/apps/laptop_battery.png
+share/services/klaptopdaemon.desktop
diff --git a/sysutils/kdf/files/plist.klaptop.rm b/sysutils/kdf/files/plist.klaptop.rm
new file mode 100644
index 000000000000..34ce14d82234
--- /dev/null
+++ b/sysutils/kdf/files/plist.klaptop.rm
@@ -0,0 +1,8 @@
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg
+@dirrm share/apps/klaptopdaemon/icons
+@dirrm share/apps/klaptopdaemon
+@dirrm share/applnk/Settings/PowerControl
diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist
deleted file mode 100644
index e8f6cb0e0436..000000000000
--- a/sysutils/kdf/pkg-plist
+++ /dev/null
@@ -1,283 +0,0 @@
-bin/ark
-bin/efax
-bin/efix
-bin/fax
-bin/kcalc
-bin/kcharselect
-bin/kdepasswd
-bin/kdessh
-bin/kdf
-bin/kedit
-bin/khexedit
-bin/kjots
-%%ALPHA_NA%%bin/klaptopdaemon
-bin/kljettool
-bin/klpq
-bin/klprfax
-bin/klprfax_filter
-bin/klprfax_lpd
-bin/ktimer
-bin/kwikdisk
-include/kmultiformlistbox.h
-include/kmultiformlistboxentry.h
-include/kmultiformlistboxfactory.h
-include/kwidgetstreamer.h
-lib/kcalc.la
-lib/kcalc.so
-lib/kde3/kcharselectapplet.la
-lib/kde3/kcharselectapplet.so
-lib/kde3/kcharselectapplet.so.1
-lib/kde3/kcm_kdf.la
-lib/kde3/kcm_kdf.so
-%%ALPHA_NA%%lib/kde3/kcm_laptop.la
-%%ALPHA_NA%%lib/kde3/kcm_laptop.so
-lib/kde3/libkregexpeditorgui.la
-lib/kde3/libkregexpeditorgui.so
-lib/kedit.la
-lib/kedit.so
-%%ALPHA_NA%%lib/klaptopdaemon.la
-%%ALPHA_NA%%lib/klaptopdaemon.so
-lib/libark.la
-lib/libark.so
-lib/libark.so.1
-share/applnk/Editors/KEdit.desktop
-share/applnk/Settings/Information/kcmdf.desktop
-%%ALPHA_NA%%share/applnk/Settings/Information/pcmcia.desktop
-%%ALPHA_NA%%share/applnk/Settings/PowerControl/battery.desktop
-%%ALPHA_NA%%share/applnk/Settings/PowerControl/bwarning.desktop
-%%ALPHA_NA%%share/applnk/Settings/PowerControl/cwarning.desktop
-%%ALPHA_NA%%share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/KCharSelect.desktop
-share/applnk/Utilities/KLJetTool.desktop
-share/applnk/Utilities/KLpq.desktop
-share/applnk/Utilities/Kjots.desktop
-share/applnk/Utilities/ark.desktop
-share/applnk/Utilities/kcalc.desktop
-share/applnk/Utilities/kdepasswd.desktop
-share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klprfax.desktop
-share/applnk/Utilities/ktimer.desktop
-share/apps/ark/ark_part.rc
-share/apps/ark/arkui.rc
-share/apps/ark/icons/hicolor/22x22/actions/ark_adddir.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_addfile.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_delete.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_extract.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_help.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_new.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_open.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_options.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_selectall.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_view.png
-share/apps/kdf/pics/delete.png
-share/apps/kdf/pics/tick.png
-share/apps/kedit/keditui.rc
-share/apps/khexedit/toolbar/hexdrag.png
-share/apps/khexedit/toolbar/hexmask.png
-share/apps/khexedit/toolbar/hexwrite.png
-share/apps/kicker/applets/kcharselectapplet.desktop
-share/apps/kjots/pics/filedel.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_charge.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nobattery.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nocharge.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/power.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/32x32/actions/power.png
-share/apps/kljettool/pics/kljetlogo.png
-share/apps/konqueror/servicemenus/arkservicemenu.desktop
-share/apps/kregexpeditor/pics/altn.png
-share/apps/kregexpeditor/pics/anychar.png
-share/apps/kregexpeditor/pics/begline.png
-share/apps/kregexpeditor/pics/characters.png
-share/apps/kregexpeditor/pics/compound.png
-share/apps/kregexpeditor/pics/endline.png
-share/apps/kregexpeditor/pics/error.png
-share/apps/kregexpeditor/pics/neglookahead.png
-share/apps/kregexpeditor/pics/nonwordboundary.png
-share/apps/kregexpeditor/pics/poslookahead.png
-share/apps/kregexpeditor/pics/repeat.png
-share/apps/kregexpeditor/pics/select.png
-share/apps/kregexpeditor/pics/text.png
-share/apps/kregexpeditor/pics/wordboundary.png
-share/apps/kregexpeditor/predefined/general/anything.regexp
-share/apps/kregexpeditor/predefined/general/spaces.regexp
-share/doc/HTML/en/KRegExpEditor/altn.png
-share/doc/HTML/en/KRegExpEditor/altntool.png
-share/doc/HTML/en/KRegExpEditor/anychar.png
-share/doc/HTML/en/KRegExpEditor/anychartool.png
-share/doc/HTML/en/KRegExpEditor/begline.png
-share/doc/HTML/en/KRegExpEditor/boundarytools.png
-share/doc/HTML/en/KRegExpEditor/characters.png
-share/doc/HTML/en/KRegExpEditor/charactertool.png
-share/doc/HTML/en/KRegExpEditor/common
-share/doc/HTML/en/KRegExpEditor/compound.png
-share/doc/HTML/en/KRegExpEditor/compoundtool.png
-share/doc/HTML/en/KRegExpEditor/endline.png
-share/doc/HTML/en/KRegExpEditor/index.cache.bz2
-share/doc/HTML/en/KRegExpEditor/index.docbook
-share/doc/HTML/en/KRegExpEditor/linestartendtool.png
-share/doc/HTML/en/KRegExpEditor/lookaheadtools.png
-share/doc/HTML/en/KRegExpEditor/neglookahead.png
-share/doc/HTML/en/KRegExpEditor/nonwordboundary.png
-share/doc/HTML/en/KRegExpEditor/poslookahead.png
-share/doc/HTML/en/KRegExpEditor/repeat.png
-share/doc/HTML/en/KRegExpEditor/repeattool.png
-share/doc/HTML/en/KRegExpEditor/select.png
-share/doc/HTML/en/KRegExpEditor/text.png
-share/doc/HTML/en/KRegExpEditor/texttool.png
-share/doc/HTML/en/KRegExpEditor/theEditor.png
-share/doc/HTML/en/KRegExpEditor/wordboundary.png
-share/doc/HTML/en/ark/common
-share/doc/HTML/en/ark/index.cache.bz2
-share/doc/HTML/en/ark/index.docbook
-share/doc/HTML/en/kab/common
-share/doc/HTML/en/kab/index.cache.bz2
-share/doc/HTML/en/kab/index.docbook
-share/doc/HTML/en/kab/kab-edit.png
-share/doc/HTML/en/kab/kab-using.png
-share/doc/HTML/en/kcalc/common
-share/doc/HTML/en/kcalc/index.cache.bz2
-share/doc/HTML/en/kcalc/index.docbook
-share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
-share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/HTML/en/kdf/common
-share/doc/HTML/en/kdf/index.cache.bz2
-share/doc/HTML/en/kdf/index.docbook
-share/doc/HTML/en/kdf/kdf.png
-share/doc/HTML/en/kdf/kdf_config.png
-share/doc/HTML/en/kedit/common
-share/doc/HTML/en/kedit/index.cache.bz2
-share/doc/HTML/en/kedit/index.docbook
-share/doc/HTML/en/kfloppy/common
-share/doc/HTML/en/kfloppy/index.cache.bz2
-share/doc/HTML/en/kfloppy/index.docbook
-share/doc/HTML/en/khexedit/common
-share/doc/HTML/en/khexedit/index.cache.bz2
-share/doc/HTML/en/khexedit/index.docbook
-share/doc/HTML/en/khexedit/khexedit1.png
-share/doc/HTML/en/kjots/common
-share/doc/HTML/en/kjots/index.cache.bz2
-share/doc/HTML/en/kjots/index.docbook
-share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/common
-share/doc/HTML/en/kljettool/djcdoscommands.txt
-share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/hp690c.zip
-share/doc/HTML/en/kljettool/index.cache.bz2
-share/doc/HTML/en/kljettool/index.docbook
-share/doc/HTML/en/kljettool/magic
-share/doc/HTML/en/kljettool/screenshot.png
-share/doc/HTML/en/klpq/common
-share/doc/HTML/en/klpq/index.cache.bz2
-share/doc/HTML/en/klpq/index.docbook
-share/doc/HTML/en/klprfax/common
-share/doc/HTML/en/klprfax/index.cache.bz2
-share/doc/HTML/en/klprfax/index.docbook
-share/icons/hicolor/16x16/apps/ark.png
-share/icons/hicolor/16x16/apps/kcalc.png
-share/icons/hicolor/16x16/apps/kcharselect.png
-share/icons/hicolor/16x16/apps/kcmdf.png
-share/icons/hicolor/16x16/apps/kdf.png
-share/icons/hicolor/16x16/apps/kedit.png
-share/icons/hicolor/16x16/apps/khexedit.png
-share/icons/hicolor/16x16/apps/kjots.png
-%%ALPHA_NA%%share/icons/hicolor/16x16/apps/klaptopdaemon.png
-share/icons/hicolor/16x16/apps/kljettool.png
-share/icons/hicolor/16x16/apps/klpq.png
-share/icons/hicolor/16x16/apps/klprfax.png
-share/icons/hicolor/16x16/apps/kwikdisk.png
-%%ALPHA_NA%%share/icons/hicolor/16x16/apps/laptop_battery.png
-%%ALPHA_NA%%share/icons/hicolor/16x16/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/ark.png
-share/icons/hicolor/32x32/apps/kcalc.png
-share/icons/hicolor/32x32/apps/kcmdf.png
-share/icons/hicolor/32x32/apps/kdf.png
-share/icons/hicolor/32x32/apps/kedit.png
-share/icons/hicolor/32x32/apps/khexedit.png
-share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/kljettool.png
-share/icons/hicolor/32x32/apps/klpq.png
-share/icons/hicolor/32x32/apps/klprfax.png
-share/icons/hicolor/32x32/apps/kwikdisk.png
-%%ALPHA_NA%%share/icons/hicolor/32x32/apps/laptop_battery.png
-%%ALPHA_NA%%share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/ark.png
-share/icons/hicolor/48x48/apps/kcalc.png
-share/icons/hicolor/48x48/apps/kcharselect.png
-share/icons/hicolor/48x48/apps/kedit.png
-share/icons/hicolor/48x48/apps/khexedit.png
-share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/kljettool.png
-share/icons/hicolor/48x48/apps/klpq.png
-%%ALPHA_NA%%share/icons/hicolor/48x48/apps/laptop_battery.png
-%%ALPHA_NA%%share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/klprfax.png
-share/icons/locolor/32x32/apps/klprfax.png
-share/services/arkpart.desktop
-%%ALPHA_NA%%share/services/klaptopdaemon.desktop
-share/services/kregexpeditorgui.desktop
-@exec /bin/mkdir -p %D/share/apps/kcalc/pics
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
-@dirrm share/doc/HTML/en/klprfax
-@dirrm share/doc/HTML/en/klpq
-@dirrm share/doc/HTML/en/kljettool
-@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/khexedit
-@dirrm share/doc/HTML/en/kfloppy
-@dirrm share/doc/HTML/en/kedit
-@dirrm share/doc/HTML/en/kdf
-@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/kab
-@dirrm share/doc/HTML/en/ark
-@dirrm share/doc/HTML/en/KRegExpEditor
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/apps/kregexpeditor/predefined/general
-@dirrm share/apps/kregexpeditor/predefined
-@dirrm share/apps/kregexpeditor/pics
-@dirrm share/apps/kregexpeditor
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror
-@dirrm share/apps/kljettool/pics
-@dirrm share/apps/kljettool
-@dirrm share/apps/klaptopdaemon/icons/hicolor/32x32/actions
-@dirrm share/apps/klaptopdaemon/icons/hicolor/32x32
-@dirrm share/apps/klaptopdaemon/icons/hicolor/16x16/actions
-@dirrm share/apps/klaptopdaemon/icons/hicolor/16x16
-@dirrm share/apps/klaptopdaemon/icons/hicolor
-@dirrm share/apps/klaptopdaemon/icons
-@dirrm share/apps/klaptopdaemon
-@dirrm share/apps/kjots/pics
-@dirrm share/apps/kjots
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
-@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit
-@dirrm share/apps/kedit
-@dirrm share/apps/kdf/pics
-@dirrm share/apps/kdf
-@dirrm share/apps/kcalc/pics
-@dirrm share/apps/kcalc
-@dirrm share/apps/ark/icons/hicolor/22x22/actions
-@dirrm share/apps/ark/icons/hicolor/22x22
-@dirrm share/apps/ark/icons/hicolor
-@dirrm share/apps/ark/icons
-@dirrm share/apps/ark
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/System
-@dirrm share/applnk/Settings/PowerControl
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Editors
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 1725a3ae4156..572a4a02eefc 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -16,30 +16,37 @@ DIST_SUBDIR=	KDE
 MAINTAINER?=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=3
+PREFIX=		${KDE_PREFIX}
+KDE_BUILD_PLIST=yes
+
 USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-MAN1=		efax.1 efix.1 fax.1
+GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 #klaptop doesn't like alpha because alpha doesn't support apm
 .if ${MACHINE_ARCH} == "alpha"
+WITHOUT_KLAPTOP	=yes
+.endif # ${MACHINE_ARCH} == "alpha"
+
+.if defined(WITHOUT_KLAPTOP)
 DO_NOT_COMPILE+=klaptopdaemon
-PLIST_SUB+=	ALPHA_NA="@comment "
 .else
-PLIST_SUB+=	ALPHA_NA=""
-.endif
+PLIST_APPEND+=	plist.klaptop
+.endif # defined(WITHOUT_KLAPTOP)
+
 # kfloppy is a mostly broken, non-standard, linux-centric pain...
 .if !defined(WITH_KFLOPPY)
 DO_NOT_COMPILE+=kfloppy
-PLIST_SUB+=	KFLOPPY="@comment "
 .else
-PLIST_SUB+=	KFLOPPY=""
-.endif
+PLIST_APPEND+=	plist.kfloppy
+.endif # !defined(WITH_KFLOPPY)
+
 .if defined(DO_NOT_COMPILE)
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif
+.endif # defined(DO_NOT_COMPILE)
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.mk>
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index cba41d522370..a8af40a21512 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.0.4.tar.bz2) = e34ccb00b25f04f0a27474fa17d68e77
+MD5 (KDE/kdeutils-3.1.tar.bz2) = 81e2916ba0fa865053aff858982c040e
diff --git a/sysutils/kfloppy/files/plist.base b/sysutils/kfloppy/files/plist.base
new file mode 100644
index 000000000000..4db631d4dff3
--- /dev/null
+++ b/sysutils/kfloppy/files/plist.base
@@ -0,0 +1,247 @@
+bin/ark
+bin/kcalc
+bin/kcharselect
+bin/kdepasswd
+bin/kdessh
+bin/kdf
+bin/kedit
+bin/khexedit
+bin/kjots
+bin/ksim
+bin/ktimer
+bin/kwikdisk
+include/kmultiformlistbox.h
+include/kmultiformlistboxentry.h
+include/kmultiformlistboxfactory.h
+include/ksim/chart.h
+include/ksim/common.h
+include/ksim/label.h
+include/ksim/led.h
+include/ksim/pluginglobal.h
+include/ksim/pluginloader.h
+include/ksim/pluginmodule.h
+include/ksim/progress.h
+include/ksim/themeloader.h
+include/ksim/themetypes.h
+include/kwidgetstreamer.h
+lib/kcalc.la
+lib/kcalc.so
+lib/kde3/kcharselect_panelapplet.la
+lib/kde3/kcharselect_panelapplet.so
+lib/kde3/kcm_kdf.la
+lib/kde3/kcm_kdf.so
+lib/kde3/ksim_cpu.la
+lib/kde3/ksim_cpu.so
+lib/kde3/ksim_disk.la
+lib/kde3/ksim_disk.so
+lib/kde3/ksim_filesystem.la
+lib/kde3/ksim_filesystem.so
+lib/kde3/ksim_net.la
+lib/kde3/ksim_net.so
+lib/kde3/ksim_sensors.la
+lib/kde3/ksim_sensors.so
+lib/kde3/libkregexpeditorgui.la
+lib/kde3/libkregexpeditorgui.so
+lib/kedit.la
+lib/kedit.so
+lib/ksim.la
+lib/ksim.so
+lib/libarkpart.la
+lib/libarkpart.so
+lib/libksimcore.la
+lib/libksimcore.so
+lib/libksimcore.so.1
+share/applnk/Editors/KEdit.desktop
+share/applnk/Settings/Information/kcmdf.desktop
+share/applnk/Settingsmenu/kdepasswd.desktop
+share/applnk/System/More/kdf.desktop
+share/applnk/System/More/ksim.desktop
+share/applnk/System/More/kwikdisk.desktop
+share/applnk/System/kdf.desktop
+share/applnk/System/kwikdisk.desktop
+share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/Kjots.desktop
+share/applnk/Utilities/More/KCharSelect.desktop
+share/applnk/Utilities/More/Kjots.desktop
+share/applnk/Utilities/More/khexedit.desktop
+share/applnk/Utilities/More/ktimer.desktop
+share/applnk/Utilities/ark.desktop
+share/applnk/Utilities/kcalc.desktop
+share/applnk/Utilities/kdepasswd.desktop
+share/applnk/Utilities/khexedit.desktop
+share/applnk/Utilities/ktimer.desktop
+share/apps/ark/ark_part.rc
+share/apps/ark/ark_part_readonly.rc
+share/apps/ark/arkui.rc
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_adddir.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_addfile.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_delete.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_extract.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_help.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_new.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_open.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_options.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_selectall.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_view.png
+share/apps/kdf/pics/delete.png
+share/apps/kdf/pics/tick.png
+share/apps/kedit/keditui.rc
+share/apps/khexedit/toolbar/hexdrag.png
+share/apps/khexedit/toolbar/hexmask.png
+share/apps/khexedit/toolbar/hexwrite.png
+share/apps/kicker/applets/kcharselectapplet.desktop
+share/apps/kjots/pics/filedel.png
+share/apps/konqueror/servicemenus/arkservicemenu.desktop
+share/apps/kregexpeditor/pics/altn.png
+share/apps/kregexpeditor/pics/anychar.png
+share/apps/kregexpeditor/pics/begline.png
+share/apps/kregexpeditor/pics/characters.png
+share/apps/kregexpeditor/pics/compound.png
+share/apps/kregexpeditor/pics/endline.png
+share/apps/kregexpeditor/pics/error.png
+share/apps/kregexpeditor/pics/neglookahead.png
+share/apps/kregexpeditor/pics/nonwordboundary.png
+share/apps/kregexpeditor/pics/poslookahead.png
+share/apps/kregexpeditor/pics/repeat.png
+share/apps/kregexpeditor/pics/select.png
+share/apps/kregexpeditor/pics/text.png
+share/apps/kregexpeditor/pics/wordboundary.png
+share/apps/kregexpeditor/predefined/general/anything.regexp
+share/apps/kregexpeditor/predefined/general/spaces.regexp
+share/apps/ksim/monitors/DFree.desktop
+share/apps/ksim/monitors/Lm_sensors.desktop
+share/apps/ksim/monitors/Net.desktop
+share/apps/ksim/monitors/cpu.desktop
+share/apps/ksim/monitors/disk.desktop
+share/apps/ksim/pics/clock.png
+share/apps/ksim/pics/uptime.png
+share/apps/ksim/themes/ksim/bg_chart.png
+share/apps/ksim/themes/ksim/bg_grid.png
+share/apps/ksim/themes/ksim/bg_meter.png
+share/apps/ksim/themes/ksim/bg_panel.png
+share/apps/ksim/themes/ksim/frame_bottom.png
+share/apps/ksim/themes/ksim/frame_left.png
+share/apps/ksim/themes/ksim/frame_right.png
+share/apps/ksim/themes/ksim/frame_top.png
+share/apps/ksim/themes/ksim/gkrellmrc
+share/apps/ksim/themes/ksim/gkrellmrc_ksim
+share/apps/ksim/themes/ksim/host/bg_meter.png
+share/apps/ksim/themes/ksim/krell_meter.png
+share/apps/ksim/themes/ksim/krell_panel.png
+share/apps/ksim/themes/ksim/krell_slider.png
+share/apps/ksim/themes/ksim/mail/decal_mail.png
+share/apps/ksim/themes/ksim/mail/krell_mail.png
+share/apps/ksim/themes/ksim/mail/krell_mail_daemon.png
+share/apps/ksim/themes/ksim/net/decal_net_leds.png
+share/config/ksimrc
+share/doc/HTML/en/KRegExpEditor/altn.png
+share/doc/HTML/en/KRegExpEditor/altntool.png
+share/doc/HTML/en/KRegExpEditor/anychar.png
+share/doc/HTML/en/KRegExpEditor/anychartool.png
+share/doc/HTML/en/KRegExpEditor/begline.png
+share/doc/HTML/en/KRegExpEditor/boundarytools.png
+share/doc/HTML/en/KRegExpEditor/characters.png
+share/doc/HTML/en/KRegExpEditor/charactertool.png
+share/doc/HTML/en/KRegExpEditor/common
+share/doc/HTML/en/KRegExpEditor/compound.png
+share/doc/HTML/en/KRegExpEditor/compoundtool.png
+share/doc/HTML/en/KRegExpEditor/endline.png
+share/doc/HTML/en/KRegExpEditor/index.cache.bz2
+share/doc/HTML/en/KRegExpEditor/index.docbook
+share/doc/HTML/en/KRegExpEditor/linestartendtool.png
+share/doc/HTML/en/KRegExpEditor/lookaheadtools.png
+share/doc/HTML/en/KRegExpEditor/neglookahead.png
+share/doc/HTML/en/KRegExpEditor/nonwordboundary.png
+share/doc/HTML/en/KRegExpEditor/poslookahead.png
+share/doc/HTML/en/KRegExpEditor/repeat.png
+share/doc/HTML/en/KRegExpEditor/repeattool.png
+share/doc/HTML/en/KRegExpEditor/select.png
+share/doc/HTML/en/KRegExpEditor/text.png
+share/doc/HTML/en/KRegExpEditor/texttool.png
+share/doc/HTML/en/KRegExpEditor/theEditor.png
+share/doc/HTML/en/KRegExpEditor/wordboundary.png
+share/doc/HTML/en/ark/common
+share/doc/HTML/en/ark/index.cache.bz2
+share/doc/HTML/en/ark/index.docbook
+share/doc/HTML/en/kcalc/common
+share/doc/HTML/en/kcalc/index.cache.bz2
+share/doc/HTML/en/kcalc/index.docbook
+share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
+share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
+share/doc/HTML/en/kcharselect/common
+share/doc/HTML/en/kcharselect/index.cache.bz2
+share/doc/HTML/en/kcharselect/index.docbook
+share/doc/HTML/en/kcontrol/kcmlowbatcrit/common
+share/doc/HTML/en/kcontrol/kcmlowbatcrit/index.cache.bz2
+share/doc/HTML/en/kcontrol/kcmlowbatcrit/index.docbook
+share/doc/HTML/en/kcontrol/kcmlowbatwarn/common
+share/doc/HTML/en/kcontrol/kcmlowbatwarn/index.cache.bz2
+share/doc/HTML/en/kcontrol/kcmlowbatwarn/index.docbook
+share/doc/HTML/en/kcontrol/laptop/common
+share/doc/HTML/en/kcontrol/laptop/index.cache.bz2
+share/doc/HTML/en/kcontrol/laptop/index.docbook
+share/doc/HTML/en/kcontrol/powerctrl/common
+share/doc/HTML/en/kcontrol/powerctrl/index.cache.bz2
+share/doc/HTML/en/kcontrol/powerctrl/index.docbook
+share/doc/HTML/en/kdf/common
+share/doc/HTML/en/kdf/index.cache.bz2
+share/doc/HTML/en/kdf/index.docbook
+share/doc/HTML/en/kdf/kdf.png
+share/doc/HTML/en/kdf/kdf_config.png
+share/doc/HTML/en/kedit/common
+share/doc/HTML/en/kedit/index.cache.bz2
+share/doc/HTML/en/kedit/index.docbook
+share/doc/HTML/en/kfloppy/common
+share/doc/HTML/en/kfloppy/index.cache.bz2
+share/doc/HTML/en/kfloppy/index.docbook
+share/doc/HTML/en/khexedit/common
+share/doc/HTML/en/khexedit/index.cache.bz2
+share/doc/HTML/en/khexedit/index.docbook
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/kinfocenter/blockdevices/common
+share/doc/HTML/en/kinfocenter/blockdevices/index.cache.bz2
+share/doc/HTML/en/kinfocenter/blockdevices/index.docbook
+share/doc/HTML/en/kjots/common
+share/doc/HTML/en/kjots/index.cache.bz2
+share/doc/HTML/en/kjots/index.docbook
+share/doc/HTML/en/ksim/common
+share/doc/HTML/en/ksim/index.cache.bz2
+share/doc/HTML/en/ksim/index.docbook
+share/doc/HTML/en/ktimer/common
+share/doc/HTML/en/ktimer/index.cache.bz2
+share/doc/HTML/en/ktimer/index.docbook
+share/icons/crystalsvg/128x128/apps/ark.png
+share/icons/crystalsvg/128x128/apps/kdf.png
+share/icons/crystalsvg/16x16/apps/ark.png
+share/icons/crystalsvg/16x16/apps/kcalc.png
+share/icons/crystalsvg/16x16/apps/kcharselect.png
+share/icons/crystalsvg/16x16/apps/kcmdf.png
+share/icons/crystalsvg/16x16/apps/kdf.png
+share/icons/crystalsvg/16x16/apps/kedit.png
+share/icons/crystalsvg/16x16/apps/khexedit.png
+share/icons/crystalsvg/16x16/apps/kjots.png
+share/icons/crystalsvg/16x16/apps/ksim.png
+share/icons/crystalsvg/16x16/apps/kwikdisk.png
+share/icons/crystalsvg/16x16/devices/ksim_cpu.png
+share/icons/crystalsvg/32x32/apps/ark.png
+share/icons/crystalsvg/32x32/apps/kcalc.png
+share/icons/crystalsvg/32x32/apps/kcmdf.png
+share/icons/crystalsvg/32x32/apps/kdf.png
+share/icons/crystalsvg/32x32/apps/kedit.png
+share/icons/crystalsvg/32x32/apps/khexedit.png
+share/icons/crystalsvg/32x32/apps/kjots.png
+share/icons/crystalsvg/32x32/apps/ksim.png
+share/icons/crystalsvg/32x32/apps/kwikdisk.png
+share/icons/crystalsvg/48x48/apps/ark.png
+share/icons/crystalsvg/48x48/apps/kcalc.png
+share/icons/crystalsvg/48x48/apps/kcharselect.png
+share/icons/crystalsvg/48x48/apps/kdf.png
+share/icons/crystalsvg/48x48/apps/kedit.png
+share/icons/crystalsvg/48x48/apps/khexedit.png
+share/icons/crystalsvg/48x48/apps/kjots.png
+share/icons/crystalsvg/48x48/apps/ksim.png
+share/icons/crystalsvg/64x64/apps/ark.png
+share/icons/crystalsvg/64x64/apps/kdf.png
+share/services/ark_part.desktop
+share/services/kregexpeditorgui.desktop
+@exec /bin/mkdir -p %D/share/apps/kcalc/pics
diff --git a/sysutils/kfloppy/files/plist.base.rm b/sysutils/kfloppy/files/plist.base.rm
new file mode 100644
index 000000000000..197cb22fe65b
--- /dev/null
+++ b/sysutils/kfloppy/files/plist.base.rm
@@ -0,0 +1,78 @@
+@unexec /bin/rmdir %D/share/apps/kcalc/pics || true
+@dirrm share/services
+@dirrm share/icons/crystalsvg/64x64/apps
+@dirrm share/icons/crystalsvg/64x64
+@dirrm share/icons/crystalsvg/48x48/apps
+@dirrm share/icons/crystalsvg/48x48
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/32x32
+@dirrm share/icons/crystalsvg/16x16/devices
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/16x16
+@dirrm share/icons/crystalsvg/128x128/apps
+@dirrm share/icons/crystalsvg/128x128
+@dirrm share/icons/crystalsvg
+@dirrm share/icons
+@dirrm share/doc/HTML/en/ktimer
+@dirrm share/doc/HTML/en/ksim
+@dirrm share/doc/HTML/en/kjots
+@dirrm share/doc/HTML/en/kinfocenter/blockdevices
+@dirrm share/doc/HTML/en/kinfocenter
+@dirrm share/doc/HTML/en/khexedit
+@dirrm share/doc/HTML/en/kfloppy
+@dirrm share/doc/HTML/en/kedit
+@dirrm share/doc/HTML/en/kdf
+@dirrm share/doc/HTML/en/kcontrol/powerctrl
+@dirrm share/doc/HTML/en/kcontrol/laptop
+@dirrm share/doc/HTML/en/kcontrol/kcmlowbatwarn
+@dirrm share/doc/HTML/en/kcontrol/kcmlowbatcrit
+@dirrm share/doc/HTML/en/kcontrol
+@dirrm share/doc/HTML/en/kcharselect
+@dirrm share/doc/HTML/en/kcalc
+@dirrm share/doc/HTML/en/ark
+@dirrm share/doc/HTML/en/KRegExpEditor
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/doc
+@dirrm share/config
+@dirrm share/apps/ksim/themes/ksim/net
+@dirrm share/apps/ksim/themes/ksim/mail
+@dirrm share/apps/ksim/themes/ksim/host
+@dirrm share/apps/ksim/themes/ksim
+@dirrm share/apps/ksim/themes
+@dirrm share/apps/ksim/pics
+@dirrm share/apps/ksim/monitors
+@dirrm share/apps/ksim
+@dirrm share/apps/kregexpeditor/predefined/general
+@dirrm share/apps/kregexpeditor/predefined
+@dirrm share/apps/kregexpeditor/pics
+@dirrm share/apps/kregexpeditor
+@dirrm share/apps/konqueror/servicemenus
+@dirrm share/apps/konqueror
+@dirrm share/apps/kjots/pics
+@dirrm share/apps/kjots
+@dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
+@dirrm share/apps/khexedit/toolbar
+@dirrm share/apps/khexedit
+@dirrm share/apps/kedit
+@dirrm share/apps/kdf/pics
+@dirrm share/apps/kdf
+@dirrm share/apps/kcalc
+@dirrm share/apps/ark/icons/crystalsvg/22x22/actions
+@dirrm share/apps/ark/icons/crystalsvg/22x22
+@dirrm share/apps/ark/icons/crystalsvg
+@dirrm share/apps/ark/icons
+@dirrm share/apps/ark
+@dirrm share/apps
+@dirrm share/applnk/Utilities/More
+@dirrm share/applnk/Utilities
+@dirrm share/applnk/System/More
+@dirrm share/applnk/System
+@dirrm share/applnk/Settingsmenu
+@dirrm share/applnk/Settings/Information
+@dirrm share/applnk/Settings
+@dirrm share/applnk/Editors
+@dirrm share/applnk
+@dirrm lib/kde3
+@dirrm include/ksim
diff --git a/sysutils/kfloppy/files/plist.kfloppy b/sysutils/kfloppy/files/plist.kfloppy
new file mode 100644
index 000000000000..58363c80f2de
--- /dev/null
+++ b/sysutils/kfloppy/files/plist.kfloppy
@@ -0,0 +1,7 @@
+bin/kfloppy
+share/applnk/Utilities/KFloppy.desktop
+share/icons/crystalsvg/128x128/apps/kfloppy.png
+share/icons/crystalsvg/16x16/apps/kfloppy.png
+share/icons/crystalsvg/32x32/apps/kfloppy.png
+share/icons/crystalsvg/48x48/apps/kfloppy.png
+share/icons/crystalsvg/64x64/apps/kfloppy.png
diff --git a/sysutils/kfloppy/files/plist.klaptop b/sysutils/kfloppy/files/plist.klaptop
new file mode 100644
index 000000000000..00f1bfdbc5c9
--- /dev/null
+++ b/sysutils/kfloppy/files/plist.klaptop
@@ -0,0 +1,22 @@
+bin/klaptopdaemon
+lib/kde3/kcm_laptop.la
+lib/kde3/kcm_laptop.so
+lib/klaptopdaemon.la
+lib/klaptopdaemon.so
+share/applnk/Settings/Information/pcmcia.desktop
+share/applnk/Settings/PowerControl/laptop.desktop
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png
+share/icons/crystalsvg/128x128/apps/laptop_battery.png
+share/icons/crystalsvg/16x16/apps/klaptopdaemon.png
+share/icons/crystalsvg/16x16/apps/laptop_battery.png
+share/icons/crystalsvg/16x16/apps/laptop_pcmcia.png
+share/icons/crystalsvg/32x32/apps/laptop_battery.png
+share/icons/crystalsvg/32x32/apps/laptop_pcmcia.png
+share/icons/crystalsvg/48x48/apps/laptop_battery.png
+share/icons/crystalsvg/48x48/apps/laptop_pcmcia.png
+share/icons/crystalsvg/64x64/apps/laptop_battery.png
+share/services/klaptopdaemon.desktop
diff --git a/sysutils/kfloppy/files/plist.klaptop.rm b/sysutils/kfloppy/files/plist.klaptop.rm
new file mode 100644
index 000000000000..34ce14d82234
--- /dev/null
+++ b/sysutils/kfloppy/files/plist.klaptop.rm
@@ -0,0 +1,8 @@
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg
+@dirrm share/apps/klaptopdaemon/icons
+@dirrm share/apps/klaptopdaemon
+@dirrm share/applnk/Settings/PowerControl
diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist
deleted file mode 100644
index e8f6cb0e0436..000000000000
--- a/sysutils/kfloppy/pkg-plist
+++ /dev/null
@@ -1,283 +0,0 @@
-bin/ark
-bin/efax
-bin/efix
-bin/fax
-bin/kcalc
-bin/kcharselect
-bin/kdepasswd
-bin/kdessh
-bin/kdf
-bin/kedit
-bin/khexedit
-bin/kjots
-%%ALPHA_NA%%bin/klaptopdaemon
-bin/kljettool
-bin/klpq
-bin/klprfax
-bin/klprfax_filter
-bin/klprfax_lpd
-bin/ktimer
-bin/kwikdisk
-include/kmultiformlistbox.h
-include/kmultiformlistboxentry.h
-include/kmultiformlistboxfactory.h
-include/kwidgetstreamer.h
-lib/kcalc.la
-lib/kcalc.so
-lib/kde3/kcharselectapplet.la
-lib/kde3/kcharselectapplet.so
-lib/kde3/kcharselectapplet.so.1
-lib/kde3/kcm_kdf.la
-lib/kde3/kcm_kdf.so
-%%ALPHA_NA%%lib/kde3/kcm_laptop.la
-%%ALPHA_NA%%lib/kde3/kcm_laptop.so
-lib/kde3/libkregexpeditorgui.la
-lib/kde3/libkregexpeditorgui.so
-lib/kedit.la
-lib/kedit.so
-%%ALPHA_NA%%lib/klaptopdaemon.la
-%%ALPHA_NA%%lib/klaptopdaemon.so
-lib/libark.la
-lib/libark.so
-lib/libark.so.1
-share/applnk/Editors/KEdit.desktop
-share/applnk/Settings/Information/kcmdf.desktop
-%%ALPHA_NA%%share/applnk/Settings/Information/pcmcia.desktop
-%%ALPHA_NA%%share/applnk/Settings/PowerControl/battery.desktop
-%%ALPHA_NA%%share/applnk/Settings/PowerControl/bwarning.desktop
-%%ALPHA_NA%%share/applnk/Settings/PowerControl/cwarning.desktop
-%%ALPHA_NA%%share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/KCharSelect.desktop
-share/applnk/Utilities/KLJetTool.desktop
-share/applnk/Utilities/KLpq.desktop
-share/applnk/Utilities/Kjots.desktop
-share/applnk/Utilities/ark.desktop
-share/applnk/Utilities/kcalc.desktop
-share/applnk/Utilities/kdepasswd.desktop
-share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klprfax.desktop
-share/applnk/Utilities/ktimer.desktop
-share/apps/ark/ark_part.rc
-share/apps/ark/arkui.rc
-share/apps/ark/icons/hicolor/22x22/actions/ark_adddir.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_addfile.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_delete.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_extract.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_help.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_new.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_open.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_options.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_selectall.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_view.png
-share/apps/kdf/pics/delete.png
-share/apps/kdf/pics/tick.png
-share/apps/kedit/keditui.rc
-share/apps/khexedit/toolbar/hexdrag.png
-share/apps/khexedit/toolbar/hexmask.png
-share/apps/khexedit/toolbar/hexwrite.png
-share/apps/kicker/applets/kcharselectapplet.desktop
-share/apps/kjots/pics/filedel.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_charge.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nobattery.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nocharge.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/power.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/32x32/actions/power.png
-share/apps/kljettool/pics/kljetlogo.png
-share/apps/konqueror/servicemenus/arkservicemenu.desktop
-share/apps/kregexpeditor/pics/altn.png
-share/apps/kregexpeditor/pics/anychar.png
-share/apps/kregexpeditor/pics/begline.png
-share/apps/kregexpeditor/pics/characters.png
-share/apps/kregexpeditor/pics/compound.png
-share/apps/kregexpeditor/pics/endline.png
-share/apps/kregexpeditor/pics/error.png
-share/apps/kregexpeditor/pics/neglookahead.png
-share/apps/kregexpeditor/pics/nonwordboundary.png
-share/apps/kregexpeditor/pics/poslookahead.png
-share/apps/kregexpeditor/pics/repeat.png
-share/apps/kregexpeditor/pics/select.png
-share/apps/kregexpeditor/pics/text.png
-share/apps/kregexpeditor/pics/wordboundary.png
-share/apps/kregexpeditor/predefined/general/anything.regexp
-share/apps/kregexpeditor/predefined/general/spaces.regexp
-share/doc/HTML/en/KRegExpEditor/altn.png
-share/doc/HTML/en/KRegExpEditor/altntool.png
-share/doc/HTML/en/KRegExpEditor/anychar.png
-share/doc/HTML/en/KRegExpEditor/anychartool.png
-share/doc/HTML/en/KRegExpEditor/begline.png
-share/doc/HTML/en/KRegExpEditor/boundarytools.png
-share/doc/HTML/en/KRegExpEditor/characters.png
-share/doc/HTML/en/KRegExpEditor/charactertool.png
-share/doc/HTML/en/KRegExpEditor/common
-share/doc/HTML/en/KRegExpEditor/compound.png
-share/doc/HTML/en/KRegExpEditor/compoundtool.png
-share/doc/HTML/en/KRegExpEditor/endline.png
-share/doc/HTML/en/KRegExpEditor/index.cache.bz2
-share/doc/HTML/en/KRegExpEditor/index.docbook
-share/doc/HTML/en/KRegExpEditor/linestartendtool.png
-share/doc/HTML/en/KRegExpEditor/lookaheadtools.png
-share/doc/HTML/en/KRegExpEditor/neglookahead.png
-share/doc/HTML/en/KRegExpEditor/nonwordboundary.png
-share/doc/HTML/en/KRegExpEditor/poslookahead.png
-share/doc/HTML/en/KRegExpEditor/repeat.png
-share/doc/HTML/en/KRegExpEditor/repeattool.png
-share/doc/HTML/en/KRegExpEditor/select.png
-share/doc/HTML/en/KRegExpEditor/text.png
-share/doc/HTML/en/KRegExpEditor/texttool.png
-share/doc/HTML/en/KRegExpEditor/theEditor.png
-share/doc/HTML/en/KRegExpEditor/wordboundary.png
-share/doc/HTML/en/ark/common
-share/doc/HTML/en/ark/index.cache.bz2
-share/doc/HTML/en/ark/index.docbook
-share/doc/HTML/en/kab/common
-share/doc/HTML/en/kab/index.cache.bz2
-share/doc/HTML/en/kab/index.docbook
-share/doc/HTML/en/kab/kab-edit.png
-share/doc/HTML/en/kab/kab-using.png
-share/doc/HTML/en/kcalc/common
-share/doc/HTML/en/kcalc/index.cache.bz2
-share/doc/HTML/en/kcalc/index.docbook
-share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
-share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/HTML/en/kdf/common
-share/doc/HTML/en/kdf/index.cache.bz2
-share/doc/HTML/en/kdf/index.docbook
-share/doc/HTML/en/kdf/kdf.png
-share/doc/HTML/en/kdf/kdf_config.png
-share/doc/HTML/en/kedit/common
-share/doc/HTML/en/kedit/index.cache.bz2
-share/doc/HTML/en/kedit/index.docbook
-share/doc/HTML/en/kfloppy/common
-share/doc/HTML/en/kfloppy/index.cache.bz2
-share/doc/HTML/en/kfloppy/index.docbook
-share/doc/HTML/en/khexedit/common
-share/doc/HTML/en/khexedit/index.cache.bz2
-share/doc/HTML/en/khexedit/index.docbook
-share/doc/HTML/en/khexedit/khexedit1.png
-share/doc/HTML/en/kjots/common
-share/doc/HTML/en/kjots/index.cache.bz2
-share/doc/HTML/en/kjots/index.docbook
-share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/common
-share/doc/HTML/en/kljettool/djcdoscommands.txt
-share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/hp690c.zip
-share/doc/HTML/en/kljettool/index.cache.bz2
-share/doc/HTML/en/kljettool/index.docbook
-share/doc/HTML/en/kljettool/magic
-share/doc/HTML/en/kljettool/screenshot.png
-share/doc/HTML/en/klpq/common
-share/doc/HTML/en/klpq/index.cache.bz2
-share/doc/HTML/en/klpq/index.docbook
-share/doc/HTML/en/klprfax/common
-share/doc/HTML/en/klprfax/index.cache.bz2
-share/doc/HTML/en/klprfax/index.docbook
-share/icons/hicolor/16x16/apps/ark.png
-share/icons/hicolor/16x16/apps/kcalc.png
-share/icons/hicolor/16x16/apps/kcharselect.png
-share/icons/hicolor/16x16/apps/kcmdf.png
-share/icons/hicolor/16x16/apps/kdf.png
-share/icons/hicolor/16x16/apps/kedit.png
-share/icons/hicolor/16x16/apps/khexedit.png
-share/icons/hicolor/16x16/apps/kjots.png
-%%ALPHA_NA%%share/icons/hicolor/16x16/apps/klaptopdaemon.png
-share/icons/hicolor/16x16/apps/kljettool.png
-share/icons/hicolor/16x16/apps/klpq.png
-share/icons/hicolor/16x16/apps/klprfax.png
-share/icons/hicolor/16x16/apps/kwikdisk.png
-%%ALPHA_NA%%share/icons/hicolor/16x16/apps/laptop_battery.png
-%%ALPHA_NA%%share/icons/hicolor/16x16/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/ark.png
-share/icons/hicolor/32x32/apps/kcalc.png
-share/icons/hicolor/32x32/apps/kcmdf.png
-share/icons/hicolor/32x32/apps/kdf.png
-share/icons/hicolor/32x32/apps/kedit.png
-share/icons/hicolor/32x32/apps/khexedit.png
-share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/kljettool.png
-share/icons/hicolor/32x32/apps/klpq.png
-share/icons/hicolor/32x32/apps/klprfax.png
-share/icons/hicolor/32x32/apps/kwikdisk.png
-%%ALPHA_NA%%share/icons/hicolor/32x32/apps/laptop_battery.png
-%%ALPHA_NA%%share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/ark.png
-share/icons/hicolor/48x48/apps/kcalc.png
-share/icons/hicolor/48x48/apps/kcharselect.png
-share/icons/hicolor/48x48/apps/kedit.png
-share/icons/hicolor/48x48/apps/khexedit.png
-share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/kljettool.png
-share/icons/hicolor/48x48/apps/klpq.png
-%%ALPHA_NA%%share/icons/hicolor/48x48/apps/laptop_battery.png
-%%ALPHA_NA%%share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/klprfax.png
-share/icons/locolor/32x32/apps/klprfax.png
-share/services/arkpart.desktop
-%%ALPHA_NA%%share/services/klaptopdaemon.desktop
-share/services/kregexpeditorgui.desktop
-@exec /bin/mkdir -p %D/share/apps/kcalc/pics
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
-@dirrm share/doc/HTML/en/klprfax
-@dirrm share/doc/HTML/en/klpq
-@dirrm share/doc/HTML/en/kljettool
-@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/khexedit
-@dirrm share/doc/HTML/en/kfloppy
-@dirrm share/doc/HTML/en/kedit
-@dirrm share/doc/HTML/en/kdf
-@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/kab
-@dirrm share/doc/HTML/en/ark
-@dirrm share/doc/HTML/en/KRegExpEditor
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/apps/kregexpeditor/predefined/general
-@dirrm share/apps/kregexpeditor/predefined
-@dirrm share/apps/kregexpeditor/pics
-@dirrm share/apps/kregexpeditor
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror
-@dirrm share/apps/kljettool/pics
-@dirrm share/apps/kljettool
-@dirrm share/apps/klaptopdaemon/icons/hicolor/32x32/actions
-@dirrm share/apps/klaptopdaemon/icons/hicolor/32x32
-@dirrm share/apps/klaptopdaemon/icons/hicolor/16x16/actions
-@dirrm share/apps/klaptopdaemon/icons/hicolor/16x16
-@dirrm share/apps/klaptopdaemon/icons/hicolor
-@dirrm share/apps/klaptopdaemon/icons
-@dirrm share/apps/klaptopdaemon
-@dirrm share/apps/kjots/pics
-@dirrm share/apps/kjots
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
-@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit
-@dirrm share/apps/kedit
-@dirrm share/apps/kdf/pics
-@dirrm share/apps/kdf
-@dirrm share/apps/kcalc/pics
-@dirrm share/apps/kcalc
-@dirrm share/apps/ark/icons/hicolor/22x22/actions
-@dirrm share/apps/ark/icons/hicolor/22x22
-@dirrm share/apps/ark/icons/hicolor
-@dirrm share/apps/ark/icons
-@dirrm share/apps/ark
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/System
-@dirrm share/applnk/Settings/PowerControl
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Editors
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 1725a3ae4156..572a4a02eefc 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -16,30 +16,37 @@ DIST_SUBDIR=	KDE
 MAINTAINER?=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=3
+PREFIX=		${KDE_PREFIX}
+KDE_BUILD_PLIST=yes
+
 USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-MAN1=		efax.1 efix.1 fax.1
+GNU_CONFIGURE=	yes
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 #klaptop doesn't like alpha because alpha doesn't support apm
 .if ${MACHINE_ARCH} == "alpha"
+WITHOUT_KLAPTOP	=yes
+.endif # ${MACHINE_ARCH} == "alpha"
+
+.if defined(WITHOUT_KLAPTOP)
 DO_NOT_COMPILE+=klaptopdaemon
-PLIST_SUB+=	ALPHA_NA="@comment "
 .else
-PLIST_SUB+=	ALPHA_NA=""
-.endif
+PLIST_APPEND+=	plist.klaptop
+.endif # defined(WITHOUT_KLAPTOP)
+
 # kfloppy is a mostly broken, non-standard, linux-centric pain...
 .if !defined(WITH_KFLOPPY)
 DO_NOT_COMPILE+=kfloppy
-PLIST_SUB+=	KFLOPPY="@comment "
 .else
-PLIST_SUB+=	KFLOPPY=""
-.endif
+PLIST_APPEND+=	plist.kfloppy
+.endif # !defined(WITH_KFLOPPY)
+
 .if defined(DO_NOT_COMPILE)
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif
+.endif # defined(DO_NOT_COMPILE)
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.mk>
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index cba41d522370..a8af40a21512 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.0.4.tar.bz2) = e34ccb00b25f04f0a27474fa17d68e77
+MD5 (KDE/kdeutils-3.1.tar.bz2) = 81e2916ba0fa865053aff858982c040e
diff --git a/sysutils/sweeper/files/plist.base b/sysutils/sweeper/files/plist.base
new file mode 100644
index 000000000000..4db631d4dff3
--- /dev/null
+++ b/sysutils/sweeper/files/plist.base
@@ -0,0 +1,247 @@
+bin/ark
+bin/kcalc
+bin/kcharselect
+bin/kdepasswd
+bin/kdessh
+bin/kdf
+bin/kedit
+bin/khexedit
+bin/kjots
+bin/ksim
+bin/ktimer
+bin/kwikdisk
+include/kmultiformlistbox.h
+include/kmultiformlistboxentry.h
+include/kmultiformlistboxfactory.h
+include/ksim/chart.h
+include/ksim/common.h
+include/ksim/label.h
+include/ksim/led.h
+include/ksim/pluginglobal.h
+include/ksim/pluginloader.h
+include/ksim/pluginmodule.h
+include/ksim/progress.h
+include/ksim/themeloader.h
+include/ksim/themetypes.h
+include/kwidgetstreamer.h
+lib/kcalc.la
+lib/kcalc.so
+lib/kde3/kcharselect_panelapplet.la
+lib/kde3/kcharselect_panelapplet.so
+lib/kde3/kcm_kdf.la
+lib/kde3/kcm_kdf.so
+lib/kde3/ksim_cpu.la
+lib/kde3/ksim_cpu.so
+lib/kde3/ksim_disk.la
+lib/kde3/ksim_disk.so
+lib/kde3/ksim_filesystem.la
+lib/kde3/ksim_filesystem.so
+lib/kde3/ksim_net.la
+lib/kde3/ksim_net.so
+lib/kde3/ksim_sensors.la
+lib/kde3/ksim_sensors.so
+lib/kde3/libkregexpeditorgui.la
+lib/kde3/libkregexpeditorgui.so
+lib/kedit.la
+lib/kedit.so
+lib/ksim.la
+lib/ksim.so
+lib/libarkpart.la
+lib/libarkpart.so
+lib/libksimcore.la
+lib/libksimcore.so
+lib/libksimcore.so.1
+share/applnk/Editors/KEdit.desktop
+share/applnk/Settings/Information/kcmdf.desktop
+share/applnk/Settingsmenu/kdepasswd.desktop
+share/applnk/System/More/kdf.desktop
+share/applnk/System/More/ksim.desktop
+share/applnk/System/More/kwikdisk.desktop
+share/applnk/System/kdf.desktop
+share/applnk/System/kwikdisk.desktop
+share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/Kjots.desktop
+share/applnk/Utilities/More/KCharSelect.desktop
+share/applnk/Utilities/More/Kjots.desktop
+share/applnk/Utilities/More/khexedit.desktop
+share/applnk/Utilities/More/ktimer.desktop
+share/applnk/Utilities/ark.desktop
+share/applnk/Utilities/kcalc.desktop
+share/applnk/Utilities/kdepasswd.desktop
+share/applnk/Utilities/khexedit.desktop
+share/applnk/Utilities/ktimer.desktop
+share/apps/ark/ark_part.rc
+share/apps/ark/ark_part_readonly.rc
+share/apps/ark/arkui.rc
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_adddir.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_addfile.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_delete.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_extract.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_help.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_new.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_open.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_options.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_selectall.png
+share/apps/ark/icons/crystalsvg/22x22/actions/ark_view.png
+share/apps/kdf/pics/delete.png
+share/apps/kdf/pics/tick.png
+share/apps/kedit/keditui.rc
+share/apps/khexedit/toolbar/hexdrag.png
+share/apps/khexedit/toolbar/hexmask.png
+share/apps/khexedit/toolbar/hexwrite.png
+share/apps/kicker/applets/kcharselectapplet.desktop
+share/apps/kjots/pics/filedel.png
+share/apps/konqueror/servicemenus/arkservicemenu.desktop
+share/apps/kregexpeditor/pics/altn.png
+share/apps/kregexpeditor/pics/anychar.png
+share/apps/kregexpeditor/pics/begline.png
+share/apps/kregexpeditor/pics/characters.png
+share/apps/kregexpeditor/pics/compound.png
+share/apps/kregexpeditor/pics/endline.png
+share/apps/kregexpeditor/pics/error.png
+share/apps/kregexpeditor/pics/neglookahead.png
+share/apps/kregexpeditor/pics/nonwordboundary.png
+share/apps/kregexpeditor/pics/poslookahead.png
+share/apps/kregexpeditor/pics/repeat.png
+share/apps/kregexpeditor/pics/select.png
+share/apps/kregexpeditor/pics/text.png
+share/apps/kregexpeditor/pics/wordboundary.png
+share/apps/kregexpeditor/predefined/general/anything.regexp
+share/apps/kregexpeditor/predefined/general/spaces.regexp
+share/apps/ksim/monitors/DFree.desktop
+share/apps/ksim/monitors/Lm_sensors.desktop
+share/apps/ksim/monitors/Net.desktop
+share/apps/ksim/monitors/cpu.desktop
+share/apps/ksim/monitors/disk.desktop
+share/apps/ksim/pics/clock.png
+share/apps/ksim/pics/uptime.png
+share/apps/ksim/themes/ksim/bg_chart.png
+share/apps/ksim/themes/ksim/bg_grid.png
+share/apps/ksim/themes/ksim/bg_meter.png
+share/apps/ksim/themes/ksim/bg_panel.png
+share/apps/ksim/themes/ksim/frame_bottom.png
+share/apps/ksim/themes/ksim/frame_left.png
+share/apps/ksim/themes/ksim/frame_right.png
+share/apps/ksim/themes/ksim/frame_top.png
+share/apps/ksim/themes/ksim/gkrellmrc
+share/apps/ksim/themes/ksim/gkrellmrc_ksim
+share/apps/ksim/themes/ksim/host/bg_meter.png
+share/apps/ksim/themes/ksim/krell_meter.png
+share/apps/ksim/themes/ksim/krell_panel.png
+share/apps/ksim/themes/ksim/krell_slider.png
+share/apps/ksim/themes/ksim/mail/decal_mail.png
+share/apps/ksim/themes/ksim/mail/krell_mail.png
+share/apps/ksim/themes/ksim/mail/krell_mail_daemon.png
+share/apps/ksim/themes/ksim/net/decal_net_leds.png
+share/config/ksimrc
+share/doc/HTML/en/KRegExpEditor/altn.png
+share/doc/HTML/en/KRegExpEditor/altntool.png
+share/doc/HTML/en/KRegExpEditor/anychar.png
+share/doc/HTML/en/KRegExpEditor/anychartool.png
+share/doc/HTML/en/KRegExpEditor/begline.png
+share/doc/HTML/en/KRegExpEditor/boundarytools.png
+share/doc/HTML/en/KRegExpEditor/characters.png
+share/doc/HTML/en/KRegExpEditor/charactertool.png
+share/doc/HTML/en/KRegExpEditor/common
+share/doc/HTML/en/KRegExpEditor/compound.png
+share/doc/HTML/en/KRegExpEditor/compoundtool.png
+share/doc/HTML/en/KRegExpEditor/endline.png
+share/doc/HTML/en/KRegExpEditor/index.cache.bz2
+share/doc/HTML/en/KRegExpEditor/index.docbook
+share/doc/HTML/en/KRegExpEditor/linestartendtool.png
+share/doc/HTML/en/KRegExpEditor/lookaheadtools.png
+share/doc/HTML/en/KRegExpEditor/neglookahead.png
+share/doc/HTML/en/KRegExpEditor/nonwordboundary.png
+share/doc/HTML/en/KRegExpEditor/poslookahead.png
+share/doc/HTML/en/KRegExpEditor/repeat.png
+share/doc/HTML/en/KRegExpEditor/repeattool.png
+share/doc/HTML/en/KRegExpEditor/select.png
+share/doc/HTML/en/KRegExpEditor/text.png
+share/doc/HTML/en/KRegExpEditor/texttool.png
+share/doc/HTML/en/KRegExpEditor/theEditor.png
+share/doc/HTML/en/KRegExpEditor/wordboundary.png
+share/doc/HTML/en/ark/common
+share/doc/HTML/en/ark/index.cache.bz2
+share/doc/HTML/en/ark/index.docbook
+share/doc/HTML/en/kcalc/common
+share/doc/HTML/en/kcalc/index.cache.bz2
+share/doc/HTML/en/kcalc/index.docbook
+share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
+share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
+share/doc/HTML/en/kcharselect/common
+share/doc/HTML/en/kcharselect/index.cache.bz2
+share/doc/HTML/en/kcharselect/index.docbook
+share/doc/HTML/en/kcontrol/kcmlowbatcrit/common
+share/doc/HTML/en/kcontrol/kcmlowbatcrit/index.cache.bz2
+share/doc/HTML/en/kcontrol/kcmlowbatcrit/index.docbook
+share/doc/HTML/en/kcontrol/kcmlowbatwarn/common
+share/doc/HTML/en/kcontrol/kcmlowbatwarn/index.cache.bz2
+share/doc/HTML/en/kcontrol/kcmlowbatwarn/index.docbook
+share/doc/HTML/en/kcontrol/laptop/common
+share/doc/HTML/en/kcontrol/laptop/index.cache.bz2
+share/doc/HTML/en/kcontrol/laptop/index.docbook
+share/doc/HTML/en/kcontrol/powerctrl/common
+share/doc/HTML/en/kcontrol/powerctrl/index.cache.bz2
+share/doc/HTML/en/kcontrol/powerctrl/index.docbook
+share/doc/HTML/en/kdf/common
+share/doc/HTML/en/kdf/index.cache.bz2
+share/doc/HTML/en/kdf/index.docbook
+share/doc/HTML/en/kdf/kdf.png
+share/doc/HTML/en/kdf/kdf_config.png
+share/doc/HTML/en/kedit/common
+share/doc/HTML/en/kedit/index.cache.bz2
+share/doc/HTML/en/kedit/index.docbook
+share/doc/HTML/en/kfloppy/common
+share/doc/HTML/en/kfloppy/index.cache.bz2
+share/doc/HTML/en/kfloppy/index.docbook
+share/doc/HTML/en/khexedit/common
+share/doc/HTML/en/khexedit/index.cache.bz2
+share/doc/HTML/en/khexedit/index.docbook
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/kinfocenter/blockdevices/common
+share/doc/HTML/en/kinfocenter/blockdevices/index.cache.bz2
+share/doc/HTML/en/kinfocenter/blockdevices/index.docbook
+share/doc/HTML/en/kjots/common
+share/doc/HTML/en/kjots/index.cache.bz2
+share/doc/HTML/en/kjots/index.docbook
+share/doc/HTML/en/ksim/common
+share/doc/HTML/en/ksim/index.cache.bz2
+share/doc/HTML/en/ksim/index.docbook
+share/doc/HTML/en/ktimer/common
+share/doc/HTML/en/ktimer/index.cache.bz2
+share/doc/HTML/en/ktimer/index.docbook
+share/icons/crystalsvg/128x128/apps/ark.png
+share/icons/crystalsvg/128x128/apps/kdf.png
+share/icons/crystalsvg/16x16/apps/ark.png
+share/icons/crystalsvg/16x16/apps/kcalc.png
+share/icons/crystalsvg/16x16/apps/kcharselect.png
+share/icons/crystalsvg/16x16/apps/kcmdf.png
+share/icons/crystalsvg/16x16/apps/kdf.png
+share/icons/crystalsvg/16x16/apps/kedit.png
+share/icons/crystalsvg/16x16/apps/khexedit.png
+share/icons/crystalsvg/16x16/apps/kjots.png
+share/icons/crystalsvg/16x16/apps/ksim.png
+share/icons/crystalsvg/16x16/apps/kwikdisk.png
+share/icons/crystalsvg/16x16/devices/ksim_cpu.png
+share/icons/crystalsvg/32x32/apps/ark.png
+share/icons/crystalsvg/32x32/apps/kcalc.png
+share/icons/crystalsvg/32x32/apps/kcmdf.png
+share/icons/crystalsvg/32x32/apps/kdf.png
+share/icons/crystalsvg/32x32/apps/kedit.png
+share/icons/crystalsvg/32x32/apps/khexedit.png
+share/icons/crystalsvg/32x32/apps/kjots.png
+share/icons/crystalsvg/32x32/apps/ksim.png
+share/icons/crystalsvg/32x32/apps/kwikdisk.png
+share/icons/crystalsvg/48x48/apps/ark.png
+share/icons/crystalsvg/48x48/apps/kcalc.png
+share/icons/crystalsvg/48x48/apps/kcharselect.png
+share/icons/crystalsvg/48x48/apps/kdf.png
+share/icons/crystalsvg/48x48/apps/kedit.png
+share/icons/crystalsvg/48x48/apps/khexedit.png
+share/icons/crystalsvg/48x48/apps/kjots.png
+share/icons/crystalsvg/48x48/apps/ksim.png
+share/icons/crystalsvg/64x64/apps/ark.png
+share/icons/crystalsvg/64x64/apps/kdf.png
+share/services/ark_part.desktop
+share/services/kregexpeditorgui.desktop
+@exec /bin/mkdir -p %D/share/apps/kcalc/pics
diff --git a/sysutils/sweeper/files/plist.base.rm b/sysutils/sweeper/files/plist.base.rm
new file mode 100644
index 000000000000..197cb22fe65b
--- /dev/null
+++ b/sysutils/sweeper/files/plist.base.rm
@@ -0,0 +1,78 @@
+@unexec /bin/rmdir %D/share/apps/kcalc/pics || true
+@dirrm share/services
+@dirrm share/icons/crystalsvg/64x64/apps
+@dirrm share/icons/crystalsvg/64x64
+@dirrm share/icons/crystalsvg/48x48/apps
+@dirrm share/icons/crystalsvg/48x48
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/32x32
+@dirrm share/icons/crystalsvg/16x16/devices
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/16x16
+@dirrm share/icons/crystalsvg/128x128/apps
+@dirrm share/icons/crystalsvg/128x128
+@dirrm share/icons/crystalsvg
+@dirrm share/icons
+@dirrm share/doc/HTML/en/ktimer
+@dirrm share/doc/HTML/en/ksim
+@dirrm share/doc/HTML/en/kjots
+@dirrm share/doc/HTML/en/kinfocenter/blockdevices
+@dirrm share/doc/HTML/en/kinfocenter
+@dirrm share/doc/HTML/en/khexedit
+@dirrm share/doc/HTML/en/kfloppy
+@dirrm share/doc/HTML/en/kedit
+@dirrm share/doc/HTML/en/kdf
+@dirrm share/doc/HTML/en/kcontrol/powerctrl
+@dirrm share/doc/HTML/en/kcontrol/laptop
+@dirrm share/doc/HTML/en/kcontrol/kcmlowbatwarn
+@dirrm share/doc/HTML/en/kcontrol/kcmlowbatcrit
+@dirrm share/doc/HTML/en/kcontrol
+@dirrm share/doc/HTML/en/kcharselect
+@dirrm share/doc/HTML/en/kcalc
+@dirrm share/doc/HTML/en/ark
+@dirrm share/doc/HTML/en/KRegExpEditor
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/doc
+@dirrm share/config
+@dirrm share/apps/ksim/themes/ksim/net
+@dirrm share/apps/ksim/themes/ksim/mail
+@dirrm share/apps/ksim/themes/ksim/host
+@dirrm share/apps/ksim/themes/ksim
+@dirrm share/apps/ksim/themes
+@dirrm share/apps/ksim/pics
+@dirrm share/apps/ksim/monitors
+@dirrm share/apps/ksim
+@dirrm share/apps/kregexpeditor/predefined/general
+@dirrm share/apps/kregexpeditor/predefined
+@dirrm share/apps/kregexpeditor/pics
+@dirrm share/apps/kregexpeditor
+@dirrm share/apps/konqueror/servicemenus
+@dirrm share/apps/konqueror
+@dirrm share/apps/kjots/pics
+@dirrm share/apps/kjots
+@dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
+@dirrm share/apps/khexedit/toolbar
+@dirrm share/apps/khexedit
+@dirrm share/apps/kedit
+@dirrm share/apps/kdf/pics
+@dirrm share/apps/kdf
+@dirrm share/apps/kcalc
+@dirrm share/apps/ark/icons/crystalsvg/22x22/actions
+@dirrm share/apps/ark/icons/crystalsvg/22x22
+@dirrm share/apps/ark/icons/crystalsvg
+@dirrm share/apps/ark/icons
+@dirrm share/apps/ark
+@dirrm share/apps
+@dirrm share/applnk/Utilities/More
+@dirrm share/applnk/Utilities
+@dirrm share/applnk/System/More
+@dirrm share/applnk/System
+@dirrm share/applnk/Settingsmenu
+@dirrm share/applnk/Settings/Information
+@dirrm share/applnk/Settings
+@dirrm share/applnk/Editors
+@dirrm share/applnk
+@dirrm lib/kde3
+@dirrm include/ksim
diff --git a/sysutils/sweeper/files/plist.kfloppy b/sysutils/sweeper/files/plist.kfloppy
new file mode 100644
index 000000000000..58363c80f2de
--- /dev/null
+++ b/sysutils/sweeper/files/plist.kfloppy
@@ -0,0 +1,7 @@
+bin/kfloppy
+share/applnk/Utilities/KFloppy.desktop
+share/icons/crystalsvg/128x128/apps/kfloppy.png
+share/icons/crystalsvg/16x16/apps/kfloppy.png
+share/icons/crystalsvg/32x32/apps/kfloppy.png
+share/icons/crystalsvg/48x48/apps/kfloppy.png
+share/icons/crystalsvg/64x64/apps/kfloppy.png
diff --git a/sysutils/sweeper/files/plist.klaptop b/sysutils/sweeper/files/plist.klaptop
new file mode 100644
index 000000000000..00f1bfdbc5c9
--- /dev/null
+++ b/sysutils/sweeper/files/plist.klaptop
@@ -0,0 +1,22 @@
+bin/klaptopdaemon
+lib/kde3/kcm_laptop.la
+lib/kde3/kcm_laptop.so
+lib/klaptopdaemon.la
+lib/klaptopdaemon.so
+share/applnk/Settings/Information/pcmcia.desktop
+share/applnk/Settings/PowerControl/laptop.desktop
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png
+share/icons/crystalsvg/128x128/apps/laptop_battery.png
+share/icons/crystalsvg/16x16/apps/klaptopdaemon.png
+share/icons/crystalsvg/16x16/apps/laptop_battery.png
+share/icons/crystalsvg/16x16/apps/laptop_pcmcia.png
+share/icons/crystalsvg/32x32/apps/laptop_battery.png
+share/icons/crystalsvg/32x32/apps/laptop_pcmcia.png
+share/icons/crystalsvg/48x48/apps/laptop_battery.png
+share/icons/crystalsvg/48x48/apps/laptop_pcmcia.png
+share/icons/crystalsvg/64x64/apps/laptop_battery.png
+share/services/klaptopdaemon.desktop
diff --git a/sysutils/sweeper/files/plist.klaptop.rm b/sysutils/sweeper/files/plist.klaptop.rm
new file mode 100644
index 000000000000..34ce14d82234
--- /dev/null
+++ b/sysutils/sweeper/files/plist.klaptop.rm
@@ -0,0 +1,8 @@
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg
+@dirrm share/apps/klaptopdaemon/icons
+@dirrm share/apps/klaptopdaemon
+@dirrm share/applnk/Settings/PowerControl
diff --git a/sysutils/sweeper/pkg-plist b/sysutils/sweeper/pkg-plist
deleted file mode 100644
index e8f6cb0e0436..000000000000
--- a/sysutils/sweeper/pkg-plist
+++ /dev/null
@@ -1,283 +0,0 @@
-bin/ark
-bin/efax
-bin/efix
-bin/fax
-bin/kcalc
-bin/kcharselect
-bin/kdepasswd
-bin/kdessh
-bin/kdf
-bin/kedit
-bin/khexedit
-bin/kjots
-%%ALPHA_NA%%bin/klaptopdaemon
-bin/kljettool
-bin/klpq
-bin/klprfax
-bin/klprfax_filter
-bin/klprfax_lpd
-bin/ktimer
-bin/kwikdisk
-include/kmultiformlistbox.h
-include/kmultiformlistboxentry.h
-include/kmultiformlistboxfactory.h
-include/kwidgetstreamer.h
-lib/kcalc.la
-lib/kcalc.so
-lib/kde3/kcharselectapplet.la
-lib/kde3/kcharselectapplet.so
-lib/kde3/kcharselectapplet.so.1
-lib/kde3/kcm_kdf.la
-lib/kde3/kcm_kdf.so
-%%ALPHA_NA%%lib/kde3/kcm_laptop.la
-%%ALPHA_NA%%lib/kde3/kcm_laptop.so
-lib/kde3/libkregexpeditorgui.la
-lib/kde3/libkregexpeditorgui.so
-lib/kedit.la
-lib/kedit.so
-%%ALPHA_NA%%lib/klaptopdaemon.la
-%%ALPHA_NA%%lib/klaptopdaemon.so
-lib/libark.la
-lib/libark.so
-lib/libark.so.1
-share/applnk/Editors/KEdit.desktop
-share/applnk/Settings/Information/kcmdf.desktop
-%%ALPHA_NA%%share/applnk/Settings/Information/pcmcia.desktop
-%%ALPHA_NA%%share/applnk/Settings/PowerControl/battery.desktop
-%%ALPHA_NA%%share/applnk/Settings/PowerControl/bwarning.desktop
-%%ALPHA_NA%%share/applnk/Settings/PowerControl/cwarning.desktop
-%%ALPHA_NA%%share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/KCharSelect.desktop
-share/applnk/Utilities/KLJetTool.desktop
-share/applnk/Utilities/KLpq.desktop
-share/applnk/Utilities/Kjots.desktop
-share/applnk/Utilities/ark.desktop
-share/applnk/Utilities/kcalc.desktop
-share/applnk/Utilities/kdepasswd.desktop
-share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klprfax.desktop
-share/applnk/Utilities/ktimer.desktop
-share/apps/ark/ark_part.rc
-share/apps/ark/arkui.rc
-share/apps/ark/icons/hicolor/22x22/actions/ark_adddir.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_addfile.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_delete.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_extract.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_help.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_new.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_open.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_options.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_selectall.png
-share/apps/ark/icons/hicolor/22x22/actions/ark_view.png
-share/apps/kdf/pics/delete.png
-share/apps/kdf/pics/tick.png
-share/apps/kedit/keditui.rc
-share/apps/khexedit/toolbar/hexdrag.png
-share/apps/khexedit/toolbar/hexmask.png
-share/apps/khexedit/toolbar/hexwrite.png
-share/apps/kicker/applets/kcharselectapplet.desktop
-share/apps/kjots/pics/filedel.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_charge.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nobattery.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/laptop_nocharge.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/16x16/actions/power.png
-%%ALPHA_NA%%share/apps/klaptopdaemon/icons/hicolor/32x32/actions/power.png
-share/apps/kljettool/pics/kljetlogo.png
-share/apps/konqueror/servicemenus/arkservicemenu.desktop
-share/apps/kregexpeditor/pics/altn.png
-share/apps/kregexpeditor/pics/anychar.png
-share/apps/kregexpeditor/pics/begline.png
-share/apps/kregexpeditor/pics/characters.png
-share/apps/kregexpeditor/pics/compound.png
-share/apps/kregexpeditor/pics/endline.png
-share/apps/kregexpeditor/pics/error.png
-share/apps/kregexpeditor/pics/neglookahead.png
-share/apps/kregexpeditor/pics/nonwordboundary.png
-share/apps/kregexpeditor/pics/poslookahead.png
-share/apps/kregexpeditor/pics/repeat.png
-share/apps/kregexpeditor/pics/select.png
-share/apps/kregexpeditor/pics/text.png
-share/apps/kregexpeditor/pics/wordboundary.png
-share/apps/kregexpeditor/predefined/general/anything.regexp
-share/apps/kregexpeditor/predefined/general/spaces.regexp
-share/doc/HTML/en/KRegExpEditor/altn.png
-share/doc/HTML/en/KRegExpEditor/altntool.png
-share/doc/HTML/en/KRegExpEditor/anychar.png
-share/doc/HTML/en/KRegExpEditor/anychartool.png
-share/doc/HTML/en/KRegExpEditor/begline.png
-share/doc/HTML/en/KRegExpEditor/boundarytools.png
-share/doc/HTML/en/KRegExpEditor/characters.png
-share/doc/HTML/en/KRegExpEditor/charactertool.png
-share/doc/HTML/en/KRegExpEditor/common
-share/doc/HTML/en/KRegExpEditor/compound.png
-share/doc/HTML/en/KRegExpEditor/compoundtool.png
-share/doc/HTML/en/KRegExpEditor/endline.png
-share/doc/HTML/en/KRegExpEditor/index.cache.bz2
-share/doc/HTML/en/KRegExpEditor/index.docbook
-share/doc/HTML/en/KRegExpEditor/linestartendtool.png
-share/doc/HTML/en/KRegExpEditor/lookaheadtools.png
-share/doc/HTML/en/KRegExpEditor/neglookahead.png
-share/doc/HTML/en/KRegExpEditor/nonwordboundary.png
-share/doc/HTML/en/KRegExpEditor/poslookahead.png
-share/doc/HTML/en/KRegExpEditor/repeat.png
-share/doc/HTML/en/KRegExpEditor/repeattool.png
-share/doc/HTML/en/KRegExpEditor/select.png
-share/doc/HTML/en/KRegExpEditor/text.png
-share/doc/HTML/en/KRegExpEditor/texttool.png
-share/doc/HTML/en/KRegExpEditor/theEditor.png
-share/doc/HTML/en/KRegExpEditor/wordboundary.png
-share/doc/HTML/en/ark/common
-share/doc/HTML/en/ark/index.cache.bz2
-share/doc/HTML/en/ark/index.docbook
-share/doc/HTML/en/kab/common
-share/doc/HTML/en/kab/index.cache.bz2
-share/doc/HTML/en/kab/index.docbook
-share/doc/HTML/en/kab/kab-edit.png
-share/doc/HTML/en/kab/kab-using.png
-share/doc/HTML/en/kcalc/common
-share/doc/HTML/en/kcalc/index.cache.bz2
-share/doc/HTML/en/kcalc/index.docbook
-share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
-share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/HTML/en/kdf/common
-share/doc/HTML/en/kdf/index.cache.bz2
-share/doc/HTML/en/kdf/index.docbook
-share/doc/HTML/en/kdf/kdf.png
-share/doc/HTML/en/kdf/kdf_config.png
-share/doc/HTML/en/kedit/common
-share/doc/HTML/en/kedit/index.cache.bz2
-share/doc/HTML/en/kedit/index.docbook
-share/doc/HTML/en/kfloppy/common
-share/doc/HTML/en/kfloppy/index.cache.bz2
-share/doc/HTML/en/kfloppy/index.docbook
-share/doc/HTML/en/khexedit/common
-share/doc/HTML/en/khexedit/index.cache.bz2
-share/doc/HTML/en/khexedit/index.docbook
-share/doc/HTML/en/khexedit/khexedit1.png
-share/doc/HTML/en/kjots/common
-share/doc/HTML/en/kjots/index.cache.bz2
-share/doc/HTML/en/kjots/index.docbook
-share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/common
-share/doc/HTML/en/kljettool/djcdoscommands.txt
-share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/hp690c.zip
-share/doc/HTML/en/kljettool/index.cache.bz2
-share/doc/HTML/en/kljettool/index.docbook
-share/doc/HTML/en/kljettool/magic
-share/doc/HTML/en/kljettool/screenshot.png
-share/doc/HTML/en/klpq/common
-share/doc/HTML/en/klpq/index.cache.bz2
-share/doc/HTML/en/klpq/index.docbook
-share/doc/HTML/en/klprfax/common
-share/doc/HTML/en/klprfax/index.cache.bz2
-share/doc/HTML/en/klprfax/index.docbook
-share/icons/hicolor/16x16/apps/ark.png
-share/icons/hicolor/16x16/apps/kcalc.png
-share/icons/hicolor/16x16/apps/kcharselect.png
-share/icons/hicolor/16x16/apps/kcmdf.png
-share/icons/hicolor/16x16/apps/kdf.png
-share/icons/hicolor/16x16/apps/kedit.png
-share/icons/hicolor/16x16/apps/khexedit.png
-share/icons/hicolor/16x16/apps/kjots.png
-%%ALPHA_NA%%share/icons/hicolor/16x16/apps/klaptopdaemon.png
-share/icons/hicolor/16x16/apps/kljettool.png
-share/icons/hicolor/16x16/apps/klpq.png
-share/icons/hicolor/16x16/apps/klprfax.png
-share/icons/hicolor/16x16/apps/kwikdisk.png
-%%ALPHA_NA%%share/icons/hicolor/16x16/apps/laptop_battery.png
-%%ALPHA_NA%%share/icons/hicolor/16x16/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/ark.png
-share/icons/hicolor/32x32/apps/kcalc.png
-share/icons/hicolor/32x32/apps/kcmdf.png
-share/icons/hicolor/32x32/apps/kdf.png
-share/icons/hicolor/32x32/apps/kedit.png
-share/icons/hicolor/32x32/apps/khexedit.png
-share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/kljettool.png
-share/icons/hicolor/32x32/apps/klpq.png
-share/icons/hicolor/32x32/apps/klprfax.png
-share/icons/hicolor/32x32/apps/kwikdisk.png
-%%ALPHA_NA%%share/icons/hicolor/32x32/apps/laptop_battery.png
-%%ALPHA_NA%%share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/ark.png
-share/icons/hicolor/48x48/apps/kcalc.png
-share/icons/hicolor/48x48/apps/kcharselect.png
-share/icons/hicolor/48x48/apps/kedit.png
-share/icons/hicolor/48x48/apps/khexedit.png
-share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/kljettool.png
-share/icons/hicolor/48x48/apps/klpq.png
-%%ALPHA_NA%%share/icons/hicolor/48x48/apps/laptop_battery.png
-%%ALPHA_NA%%share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/klprfax.png
-share/icons/locolor/32x32/apps/klprfax.png
-share/services/arkpart.desktop
-%%ALPHA_NA%%share/services/klaptopdaemon.desktop
-share/services/kregexpeditorgui.desktop
-@exec /bin/mkdir -p %D/share/apps/kcalc/pics
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
-@dirrm share/doc/HTML/en/klprfax
-@dirrm share/doc/HTML/en/klpq
-@dirrm share/doc/HTML/en/kljettool
-@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/khexedit
-@dirrm share/doc/HTML/en/kfloppy
-@dirrm share/doc/HTML/en/kedit
-@dirrm share/doc/HTML/en/kdf
-@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/kab
-@dirrm share/doc/HTML/en/ark
-@dirrm share/doc/HTML/en/KRegExpEditor
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/apps/kregexpeditor/predefined/general
-@dirrm share/apps/kregexpeditor/predefined
-@dirrm share/apps/kregexpeditor/pics
-@dirrm share/apps/kregexpeditor
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror
-@dirrm share/apps/kljettool/pics
-@dirrm share/apps/kljettool
-@dirrm share/apps/klaptopdaemon/icons/hicolor/32x32/actions
-@dirrm share/apps/klaptopdaemon/icons/hicolor/32x32
-@dirrm share/apps/klaptopdaemon/icons/hicolor/16x16/actions
-@dirrm share/apps/klaptopdaemon/icons/hicolor/16x16
-@dirrm share/apps/klaptopdaemon/icons/hicolor
-@dirrm share/apps/klaptopdaemon/icons
-@dirrm share/apps/klaptopdaemon
-@dirrm share/apps/kjots/pics
-@dirrm share/apps/kjots
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
-@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit
-@dirrm share/apps/kedit
-@dirrm share/apps/kdf/pics
-@dirrm share/apps/kdf
-@dirrm share/apps/kcalc/pics
-@dirrm share/apps/kcalc
-@dirrm share/apps/ark/icons/hicolor/22x22/actions
-@dirrm share/apps/ark/icons/hicolor/22x22
-@dirrm share/apps/ark/icons/hicolor
-@dirrm share/apps/ark/icons
-@dirrm share/apps/ark
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/System
-@dirrm share/applnk/Settings/PowerControl
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Editors