Enable kdepasswd, depend on kdebase, fix plist.bas*, bump PORTREVISION.

3 files changed, 79 insertions, 7 deletions

diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index ed44d32e1c46..893fc6bedde0 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -7,20 +7,21 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
+MAINTAINER?=	kde@FreeBSD.org
+COMMENT=	Utilities for the KDE integrated X11 desktop
+
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 
 CONFLICTS=	kgpg-*
 
-MAINTAINER?=	kde@FreeBSD.org
-COMMENT=	Utilities for the KDE integrated X11 desktop
-
 USE_KDELIBS_VER=3
+USE_KDEBASE_VER=3
 PREFIX=		${KDE_PREFIX}
 KDE_BUILD_PLIST=yes
 
@@ -28,15 +29,15 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
-DO_NOT_COMPILE+=kmilo kdepasswd
-CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+DO_NOT_COMPILE+=kmilo
+CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 
 CONFLICTS=	kgpg-*
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-#klaptop needs APM, which is i386 only 
+#klaptop needs APM, which is i386 only
 .if ${MACHINE_ARCH} != "i386"
 WITHOUT_KLAPTOP	=yes
 .endif # ${MACHINE_ARCH} == "alpha"
diff --git a/sysutils/kdf/files/plist.base b/sysutils/kdf/files/plist.base
index ae4450052801..f4fcd9bf5741 100644
--- a/sysutils/kdf/files/plist.base
+++ b/sysutils/kdf/files/plist.base
@@ -2,6 +2,7 @@ bin/ark
 bin/irkick
 bin/kcalc
 bin/kcharselect
+bin/kdepasswd
 bin/kdessh
 bin/kdf
 bin/kedit
@@ -41,6 +42,8 @@ lib/kde3/kcm_kdf.la
 lib/kde3/kcm_kdf.so
 lib/kde3/kcm_kwallet.la
 lib/kde3/kcm_kwallet.so
+lib/kde3/kcm_userinfo.la
+lib/kde3/kcm_userinfo.so
 lib/kde3/kedit.la
 lib/kde3/kedit.so
 lib/kde3/ksim_cpu.la
@@ -83,6 +86,7 @@ share/applications/kde/irkick.desktop
 share/applications/kde/kcalc.desktop
 share/applications/kde/kcmdf.desktop
 share/applications/kde/kcmlirc.desktop
+share/applications/kde/kdepasswd.desktop
 share/applications/kde/kdf.desktop
 share/applications/kde/kgpg.desktop
 share/applications/kde/khexedit.desktop
@@ -92,6 +96,7 @@ share/applications/kde/ktimer.desktop
 share/applications/kde/kwalletconfig.desktop
 share/applications/kde/kwalletmanager.desktop
 share/applications/kde/kwikdisk.desktop
+share/applications/kde/userinfo.desktop
 share/apps/ark/ark_part.rc
 share/apps/ark/ark_part_readonly.rc
 share/apps/ark/arkui.rc
@@ -129,6 +134,69 @@ share/apps/kconf_update/kcalcrc.upd
 share/apps/kdf/kdfui.rc
 share/apps/kdf/pics/delete.png
 share/apps/kdf/pics/tick.png
+share/apps/kdm/pics/users/Apple.png
+share/apps/kdm/pics/users/Arch.png
+share/apps/kdm/pics/users/Astronaut.png
+share/apps/kdm/pics/users/BeachBall.png
+share/apps/kdm/pics/users/BeachBall2.png
+share/apps/kdm/pics/users/Blowfish.png
+share/apps/kdm/pics/users/BlueMarble1.png
+share/apps/kdm/pics/users/Bug.png
+share/apps/kdm/pics/users/Burger.png
+share/apps/kdm/pics/users/Butterfly.png
+share/apps/kdm/pics/users/Butterfly2.png
+share/apps/kdm/pics/users/Cactus.png
+share/apps/kdm/pics/users/Car.png
+share/apps/kdm/pics/users/Car2.png
+share/apps/kdm/pics/users/Cheese.png
+share/apps/kdm/pics/users/Clock.png
+share/apps/kdm/pics/users/Cow.png
+share/apps/kdm/pics/users/Daemon.png
+share/apps/kdm/pics/users/Dice.png
+share/apps/kdm/pics/users/Dog.png
+share/apps/kdm/pics/users/Dog2.png
+share/apps/kdm/pics/users/Dragon.png
+share/apps/kdm/pics/users/Elephant.png
+share/apps/kdm/pics/users/Fish.png
+share/apps/kdm/pics/users/Flower.png
+share/apps/kdm/pics/users/Flower2.png
+share/apps/kdm/pics/users/Flower3.png
+share/apps/kdm/pics/users/Frog.png
+share/apps/kdm/pics/users/Ghost.png
+share/apps/kdm/pics/users/Guitar.png
+share/apps/kdm/pics/users/Heart.png
+share/apps/kdm/pics/users/Kiwi.png
+share/apps/kdm/pics/users/Konqui.png
+share/apps/kdm/pics/users/Lava.png
+share/apps/kdm/pics/users/Lion.png
+share/apps/kdm/pics/users/Man.png
+share/apps/kdm/pics/users/Monkey.png
+share/apps/kdm/pics/users/Night.png
+share/apps/kdm/pics/users/Pearl.png
+share/apps/kdm/pics/users/Penguin.png
+share/apps/kdm/pics/users/Pig.png
+share/apps/kdm/pics/users/Pineapple.png
+share/apps/kdm/pics/users/Rabbit.png
+share/apps/kdm/pics/users/Ring.png
+share/apps/kdm/pics/users/Scream.png
+share/apps/kdm/pics/users/Shark.png
+share/apps/kdm/pics/users/Skull.png
+share/apps/kdm/pics/users/Smiley.png
+share/apps/kdm/pics/users/Speakers.png
+share/apps/kdm/pics/users/Splash.png
+share/apps/kdm/pics/users/Star.png
+share/apps/kdm/pics/users/Star2.png
+share/apps/kdm/pics/users/Star3.png
+share/apps/kdm/pics/users/Star4.png
+share/apps/kdm/pics/users/Stars.png
+share/apps/kdm/pics/users/Stars2.png
+share/apps/kdm/pics/users/Teddybear.png
+share/apps/kdm/pics/users/Tiger.png
+share/apps/kdm/pics/users/Tukan.png
+share/apps/kdm/pics/users/Turtle.png
+share/apps/kdm/pics/users/UFO.png
+share/apps/kdm/pics/users/Watch.png
+share/apps/kdm/pics/users/Wind.png
 share/apps/kedit/keditui.rc
 share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key1.png
 share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key2.png
diff --git a/sysutils/kdf/files/plist.base.rm b/sysutils/kdf/files/plist.base.rm
index c6cf19dc5fe2..a81794f7c7a6 100644
--- a/sysutils/kdf/files/plist.base.rm
+++ b/sysutils/kdf/files/plist.base.rm
@@ -90,6 +90,9 @@
 @dirrm share/apps/kgpg/icons
 @dirrm share/apps/kgpg
 @dirrm share/apps/kedit
+@dirrm share/apps/kdm/pics/users
+@dirrm share/apps/kdm/pics
+@dirrm share/apps/kdm
 @dirrm share/apps/kdf/pics
 @dirrm share/apps/kdf
 @dirrm share/apps/kconf_update