3 files changed, 80 insertions, 10 deletions

diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index afe2b84b5758..927429579915 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	kdeutils2
+# New ports collection makefile for:	kdeutils3
 # Date created:				3 November 2001
 # Whom:					will@cvs.kde.org
 #
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	3.0
+PORTVERSION=	3.0.1
 CATEGORIES?=	misc kde
-MASTER_SITES=	http://www.csociety.org/~will/kde/${PORTVERSION}/
+MASTER_SITES=		${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER?=	kde@FreeBSD.org
 
-#WRKSRC=		${WRKDIR}/kdeutils
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 MAN1=		efax.1 efix.1 fax.1
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+
 #klaptop doesn't like alpha because alpha doesn't support apm
 .if ${MACHINE_ARCH} == "alpha"
 post-extract:
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index 37fe27951179..0cf3762a9403 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.0.tar.bz2) = 25df70632935464d9c4ca011ab9d22c2
+MD5 (KDE/kdeutils-3.0.1.tar.bz2) = ad6cd9a0cf8033a04ef9c2be8030a5b6
diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist
index 5d023fd9f7e5..a9d11ccb5fa1 100644
--- a/sysutils/kdf/pkg-plist
+++ b/sysutils/kdf/pkg-plist
@@ -32,10 +32,10 @@ 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/kedit.la
-lib/kde3/kedit.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
@@ -222,5 +222,75 @@ share/icons/locolor/32x32/apps/klprfax.png
 share/services/arkpart.desktop
 %%ALPHA_NA%%share/services/klaptopdaemon.desktop
 share/services/kregexpeditorgui.desktop
+@comment empty dirs
 @exec /bin/mkdir -p %D/share/apps/kcalc/pics
-@exec /bin/mkdir -p %D/share/apps/kcalc/pics
+@comment directories
+@dirrm share/services
+@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/icons
+@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/doc
+@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/apps
+@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
+@dirrm share/applnk
+@dirrm lib/kde3