Disable kappfinder_install execution at install time. This will avoid the

installation of some ".desktop" files that make packaging fail for some
users: some desktop shortcuts are not created if you don't have the
corresponding application already installed.

Users may still get the shortcuts in their local configurations by running
kappfinder as usual.

16 files changed, 8 insertions, 224 deletions

diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 95c4a3385a72..4593baf13c66 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -23,6 +23,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
 		--without-ldap \
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index ec17ca31bc61..90690384e8ae 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -424,38 +424,23 @@ share/applnk/.directory
 share/applnk/.hidden/konqfilemgr.desktop
 share/applnk/Applications/.directory
 share/applnk/Development/.directory
-share/applnk/Development/designer.desktop
 share/applnk/Editors/.directory
-share/applnk/Editors/gvim.desktop
 share/applnk/Editors/kate.desktop
 share/applnk/Editors/kwrite.desktop
-share/applnk/Editors/xedit.desktop
 share/applnk/Games/.directory
 share/applnk/Games/Arcade/.directory
 share/applnk/Games/Board/.directory
-share/applnk/Games/Board/xboard.desktop
 share/applnk/Games/Card/.directory
 share/applnk/Games/TacticStrategy/.directory
 share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
 share/applnk/Help.desktop
 share/applnk/Home.desktop
 share/applnk/Internet/.directory
 share/applnk/Internet/Terminal/.directory
-share/applnk/Internet/Terminal/mutt.desktop
-share/applnk/Internet/ethereal.desktop
 share/applnk/Internet/keditbookmarks.desktop
 share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/licq.desktop
-share/applnk/Internet/mozilla.desktop
-share/applnk/Internet/netscape.desktop
 share/applnk/KControl.desktop
 share/applnk/Multimedia/.directory
-share/applnk/Multimedia/aviplay.desktop
-share/applnk/Multimedia/gtv.desktop
-share/applnk/Multimedia/xawtv.desktop
-share/applnk/Multimedia/xmms-enqueue.desktop
-share/applnk/Multimedia/xmms.desktop
 share/applnk/Office/.directory
 share/applnk/Settings/.directory
 share/applnk/Settings/Databases/.directory
@@ -564,7 +549,6 @@ share/applnk/System/ScreenSavers/KVm.desktop
 share/applnk/System/ScreenSavers/Worm.desktop
 share/applnk/System/ScreenSavers/kpartsaver.desktop
 share/applnk/System/Terminal/.directory
-share/applnk/System/Terminal/vmstat.desktop
 share/applnk/System/kappfinder.desktop
 share/applnk/System/kfmclient.desktop
 share/applnk/System/kfmclient_dir.desktop
@@ -578,25 +562,13 @@ share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
-share/applnk/Toys/xeyes.desktop
 share/applnk/Utilities/.directory
-share/applnk/Utilities/XUtilities/xcalc.desktop
-share/applnk/Utilities/XUtilities/xclipboard.desktop
-share/applnk/Utilities/XUtilities/xclock.desktop
-share/applnk/Utilities/XUtilities/xconsole.desktop
-share/applnk/Utilities/XUtilities/xload.desktop
-share/applnk/Utilities/XUtilities/xmag.desktop
-share/applnk/Utilities/XUtilities/xterm.desktop
 share/applnk/Utilities/kaddressbook.desktop
 share/applnk/Utilities/kdeprintfax.desktop
 share/applnk/Utilities/kjobviewer.desktop
 share/applnk/Utilities/klipper.desktop
 share/applnk/Utilities/kpager.desktop
 share/applnk/WordProcessing/.directory
-share/applnk/WordProcessing/acroread.desktop
-share/applnk/WordProcessing/gv.desktop
-share/applnk/WordProcessing/xdvi.desktop
-share/applnk/WordProcessing/xpdf.desktop
 share/applnk/ksysguard/eventsrc
 share/apps/clockapplet/pics/lcd.png
 share/apps/drkonqi/debuggers/gdbrc
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 95c4a3385a72..4593baf13c66 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -23,6 +23,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
 		--without-ldap \
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index ec17ca31bc61..90690384e8ae 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -424,38 +424,23 @@ share/applnk/.directory
 share/applnk/.hidden/konqfilemgr.desktop
 share/applnk/Applications/.directory
 share/applnk/Development/.directory
-share/applnk/Development/designer.desktop
 share/applnk/Editors/.directory
-share/applnk/Editors/gvim.desktop
 share/applnk/Editors/kate.desktop
 share/applnk/Editors/kwrite.desktop
-share/applnk/Editors/xedit.desktop
 share/applnk/Games/.directory
 share/applnk/Games/Arcade/.directory
 share/applnk/Games/Board/.directory
-share/applnk/Games/Board/xboard.desktop
 share/applnk/Games/Card/.directory
 share/applnk/Games/TacticStrategy/.directory
 share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
 share/applnk/Help.desktop
 share/applnk/Home.desktop
 share/applnk/Internet/.directory
 share/applnk/Internet/Terminal/.directory
-share/applnk/Internet/Terminal/mutt.desktop
-share/applnk/Internet/ethereal.desktop
 share/applnk/Internet/keditbookmarks.desktop
 share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/licq.desktop
-share/applnk/Internet/mozilla.desktop
-share/applnk/Internet/netscape.desktop
 share/applnk/KControl.desktop
 share/applnk/Multimedia/.directory
-share/applnk/Multimedia/aviplay.desktop
-share/applnk/Multimedia/gtv.desktop
-share/applnk/Multimedia/xawtv.desktop
-share/applnk/Multimedia/xmms-enqueue.desktop
-share/applnk/Multimedia/xmms.desktop
 share/applnk/Office/.directory
 share/applnk/Settings/.directory
 share/applnk/Settings/Databases/.directory
@@ -564,7 +549,6 @@ share/applnk/System/ScreenSavers/KVm.desktop
 share/applnk/System/ScreenSavers/Worm.desktop
 share/applnk/System/ScreenSavers/kpartsaver.desktop
 share/applnk/System/Terminal/.directory
-share/applnk/System/Terminal/vmstat.desktop
 share/applnk/System/kappfinder.desktop
 share/applnk/System/kfmclient.desktop
 share/applnk/System/kfmclient_dir.desktop
@@ -578,25 +562,13 @@ share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
-share/applnk/Toys/xeyes.desktop
 share/applnk/Utilities/.directory
-share/applnk/Utilities/XUtilities/xcalc.desktop
-share/applnk/Utilities/XUtilities/xclipboard.desktop
-share/applnk/Utilities/XUtilities/xclock.desktop
-share/applnk/Utilities/XUtilities/xconsole.desktop
-share/applnk/Utilities/XUtilities/xload.desktop
-share/applnk/Utilities/XUtilities/xmag.desktop
-share/applnk/Utilities/XUtilities/xterm.desktop
 share/applnk/Utilities/kaddressbook.desktop
 share/applnk/Utilities/kdeprintfax.desktop
 share/applnk/Utilities/kjobviewer.desktop
 share/applnk/Utilities/klipper.desktop
 share/applnk/Utilities/kpager.desktop
 share/applnk/WordProcessing/.directory
-share/applnk/WordProcessing/acroread.desktop
-share/applnk/WordProcessing/gv.desktop
-share/applnk/WordProcessing/xdvi.desktop
-share/applnk/WordProcessing/xpdf.desktop
 share/applnk/ksysguard/eventsrc
 share/apps/clockapplet/pics/lcd.png
 share/apps/drkonqi/debuggers/gdbrc
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 95c4a3385a72..4593baf13c66 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -23,6 +23,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
 		--without-ldap \
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index ec17ca31bc61..90690384e8ae 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -424,38 +424,23 @@ share/applnk/.directory
 share/applnk/.hidden/konqfilemgr.desktop
 share/applnk/Applications/.directory
 share/applnk/Development/.directory
-share/applnk/Development/designer.desktop
 share/applnk/Editors/.directory
-share/applnk/Editors/gvim.desktop
 share/applnk/Editors/kate.desktop
 share/applnk/Editors/kwrite.desktop
-share/applnk/Editors/xedit.desktop
 share/applnk/Games/.directory
 share/applnk/Games/Arcade/.directory
 share/applnk/Games/Board/.directory
-share/applnk/Games/Board/xboard.desktop
 share/applnk/Games/Card/.directory
 share/applnk/Games/TacticStrategy/.directory
 share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
 share/applnk/Help.desktop
 share/applnk/Home.desktop
 share/applnk/Internet/.directory
 share/applnk/Internet/Terminal/.directory
-share/applnk/Internet/Terminal/mutt.desktop
-share/applnk/Internet/ethereal.desktop
 share/applnk/Internet/keditbookmarks.desktop
 share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/licq.desktop
-share/applnk/Internet/mozilla.desktop
-share/applnk/Internet/netscape.desktop
 share/applnk/KControl.desktop
 share/applnk/Multimedia/.directory
-share/applnk/Multimedia/aviplay.desktop
-share/applnk/Multimedia/gtv.desktop
-share/applnk/Multimedia/xawtv.desktop
-share/applnk/Multimedia/xmms-enqueue.desktop
-share/applnk/Multimedia/xmms.desktop
 share/applnk/Office/.directory
 share/applnk/Settings/.directory
 share/applnk/Settings/Databases/.directory
@@ -564,7 +549,6 @@ share/applnk/System/ScreenSavers/KVm.desktop
 share/applnk/System/ScreenSavers/Worm.desktop
 share/applnk/System/ScreenSavers/kpartsaver.desktop
 share/applnk/System/Terminal/.directory
-share/applnk/System/Terminal/vmstat.desktop
 share/applnk/System/kappfinder.desktop
 share/applnk/System/kfmclient.desktop
 share/applnk/System/kfmclient_dir.desktop
@@ -578,25 +562,13 @@ share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
-share/applnk/Toys/xeyes.desktop
 share/applnk/Utilities/.directory
-share/applnk/Utilities/XUtilities/xcalc.desktop
-share/applnk/Utilities/XUtilities/xclipboard.desktop
-share/applnk/Utilities/XUtilities/xclock.desktop
-share/applnk/Utilities/XUtilities/xconsole.desktop
-share/applnk/Utilities/XUtilities/xload.desktop
-share/applnk/Utilities/XUtilities/xmag.desktop
-share/applnk/Utilities/XUtilities/xterm.desktop
 share/applnk/Utilities/kaddressbook.desktop
 share/applnk/Utilities/kdeprintfax.desktop
 share/applnk/Utilities/kjobviewer.desktop
 share/applnk/Utilities/klipper.desktop
 share/applnk/Utilities/kpager.desktop
 share/applnk/WordProcessing/.directory
-share/applnk/WordProcessing/acroread.desktop
-share/applnk/WordProcessing/gv.desktop
-share/applnk/WordProcessing/xdvi.desktop
-share/applnk/WordProcessing/xpdf.desktop
 share/applnk/ksysguard/eventsrc
 share/apps/clockapplet/pics/lcd.png
 share/apps/drkonqi/debuggers/gdbrc
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 95c4a3385a72..4593baf13c66 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -23,6 +23,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
 		--without-ldap \
diff --git a/x11/kdebase2/pkg-plist b/x11/kdebase2/pkg-plist
index ec17ca31bc61..90690384e8ae 100644
--- a/x11/kdebase2/pkg-plist
+++ b/x11/kdebase2/pkg-plist
@@ -424,38 +424,23 @@ share/applnk/.directory
 share/applnk/.hidden/konqfilemgr.desktop
 share/applnk/Applications/.directory
 share/applnk/Development/.directory
-share/applnk/Development/designer.desktop
 share/applnk/Editors/.directory
-share/applnk/Editors/gvim.desktop
 share/applnk/Editors/kate.desktop
 share/applnk/Editors/kwrite.desktop
-share/applnk/Editors/xedit.desktop
 share/applnk/Games/.directory
 share/applnk/Games/Arcade/.directory
 share/applnk/Games/Board/.directory
-share/applnk/Games/Board/xboard.desktop
 share/applnk/Games/Card/.directory
 share/applnk/Games/TacticStrategy/.directory
 share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
 share/applnk/Help.desktop
 share/applnk/Home.desktop
 share/applnk/Internet/.directory
 share/applnk/Internet/Terminal/.directory
-share/applnk/Internet/Terminal/mutt.desktop
-share/applnk/Internet/ethereal.desktop
 share/applnk/Internet/keditbookmarks.desktop
 share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/licq.desktop
-share/applnk/Internet/mozilla.desktop
-share/applnk/Internet/netscape.desktop
 share/applnk/KControl.desktop
 share/applnk/Multimedia/.directory
-share/applnk/Multimedia/aviplay.desktop
-share/applnk/Multimedia/gtv.desktop
-share/applnk/Multimedia/xawtv.desktop
-share/applnk/Multimedia/xmms-enqueue.desktop
-share/applnk/Multimedia/xmms.desktop
 share/applnk/Office/.directory
 share/applnk/Settings/.directory
 share/applnk/Settings/Databases/.directory
@@ -564,7 +549,6 @@ share/applnk/System/ScreenSavers/KVm.desktop
 share/applnk/System/ScreenSavers/Worm.desktop
 share/applnk/System/ScreenSavers/kpartsaver.desktop
 share/applnk/System/Terminal/.directory
-share/applnk/System/Terminal/vmstat.desktop
 share/applnk/System/kappfinder.desktop
 share/applnk/System/kfmclient.desktop
 share/applnk/System/kfmclient_dir.desktop
@@ -578,25 +562,13 @@ share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
-share/applnk/Toys/xeyes.desktop
 share/applnk/Utilities/.directory
-share/applnk/Utilities/XUtilities/xcalc.desktop
-share/applnk/Utilities/XUtilities/xclipboard.desktop
-share/applnk/Utilities/XUtilities/xclock.desktop
-share/applnk/Utilities/XUtilities/xconsole.desktop
-share/applnk/Utilities/XUtilities/xload.desktop
-share/applnk/Utilities/XUtilities/xmag.desktop
-share/applnk/Utilities/XUtilities/xterm.desktop
 share/applnk/Utilities/kaddressbook.desktop
 share/applnk/Utilities/kdeprintfax.desktop
 share/applnk/Utilities/kjobviewer.desktop
 share/applnk/Utilities/klipper.desktop
 share/applnk/Utilities/kpager.desktop
 share/applnk/WordProcessing/.directory
-share/applnk/WordProcessing/acroread.desktop
-share/applnk/WordProcessing/gv.desktop
-share/applnk/WordProcessing/xdvi.desktop
-share/applnk/WordProcessing/xpdf.desktop
 share/applnk/ksysguard/eventsrc
 share/apps/clockapplet/pics/lcd.png
 share/apps/drkonqi/debuggers/gdbrc
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 95c4a3385a72..4593baf13c66 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -23,6 +23,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
 		--without-ldap \
diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist
index ec17ca31bc61..90690384e8ae 100644
--- a/x11/kdebase3/pkg-plist
+++ b/x11/kdebase3/pkg-plist
@@ -424,38 +424,23 @@ share/applnk/.directory
 share/applnk/.hidden/konqfilemgr.desktop
 share/applnk/Applications/.directory
 share/applnk/Development/.directory
-share/applnk/Development/designer.desktop
 share/applnk/Editors/.directory
-share/applnk/Editors/gvim.desktop
 share/applnk/Editors/kate.desktop
 share/applnk/Editors/kwrite.desktop
-share/applnk/Editors/xedit.desktop
 share/applnk/Games/.directory
 share/applnk/Games/Arcade/.directory
 share/applnk/Games/Board/.directory
-share/applnk/Games/Board/xboard.desktop
 share/applnk/Games/Card/.directory
 share/applnk/Games/TacticStrategy/.directory
 share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
 share/applnk/Help.desktop
 share/applnk/Home.desktop
 share/applnk/Internet/.directory
 share/applnk/Internet/Terminal/.directory
-share/applnk/Internet/Terminal/mutt.desktop
-share/applnk/Internet/ethereal.desktop
 share/applnk/Internet/keditbookmarks.desktop
 share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/licq.desktop
-share/applnk/Internet/mozilla.desktop
-share/applnk/Internet/netscape.desktop
 share/applnk/KControl.desktop
 share/applnk/Multimedia/.directory
-share/applnk/Multimedia/aviplay.desktop
-share/applnk/Multimedia/gtv.desktop
-share/applnk/Multimedia/xawtv.desktop
-share/applnk/Multimedia/xmms-enqueue.desktop
-share/applnk/Multimedia/xmms.desktop
 share/applnk/Office/.directory
 share/applnk/Settings/.directory
 share/applnk/Settings/Databases/.directory
@@ -564,7 +549,6 @@ share/applnk/System/ScreenSavers/KVm.desktop
 share/applnk/System/ScreenSavers/Worm.desktop
 share/applnk/System/ScreenSavers/kpartsaver.desktop
 share/applnk/System/Terminal/.directory
-share/applnk/System/Terminal/vmstat.desktop
 share/applnk/System/kappfinder.desktop
 share/applnk/System/kfmclient.desktop
 share/applnk/System/kfmclient_dir.desktop
@@ -578,25 +562,13 @@ share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
-share/applnk/Toys/xeyes.desktop
 share/applnk/Utilities/.directory
-share/applnk/Utilities/XUtilities/xcalc.desktop
-share/applnk/Utilities/XUtilities/xclipboard.desktop
-share/applnk/Utilities/XUtilities/xclock.desktop
-share/applnk/Utilities/XUtilities/xconsole.desktop
-share/applnk/Utilities/XUtilities/xload.desktop
-share/applnk/Utilities/XUtilities/xmag.desktop
-share/applnk/Utilities/XUtilities/xterm.desktop
 share/applnk/Utilities/kaddressbook.desktop
 share/applnk/Utilities/kdeprintfax.desktop
 share/applnk/Utilities/kjobviewer.desktop
 share/applnk/Utilities/klipper.desktop
 share/applnk/Utilities/kpager.desktop
 share/applnk/WordProcessing/.directory
-share/applnk/WordProcessing/acroread.desktop
-share/applnk/WordProcessing/gv.desktop
-share/applnk/WordProcessing/xdvi.desktop
-share/applnk/WordProcessing/xpdf.desktop
 share/applnk/ksysguard/eventsrc
 share/apps/clockapplet/pics/lcd.png
 share/apps/drkonqi/debuggers/gdbrc
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 95c4a3385a72..4593baf13c66 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -23,6 +23,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
 		--without-ldap \
diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist
index ec17ca31bc61..90690384e8ae 100644
--- a/x11/kdebase4-runtime/pkg-plist
+++ b/x11/kdebase4-runtime/pkg-plist
@@ -424,38 +424,23 @@ share/applnk/.directory
 share/applnk/.hidden/konqfilemgr.desktop
 share/applnk/Applications/.directory
 share/applnk/Development/.directory
-share/applnk/Development/designer.desktop
 share/applnk/Editors/.directory
-share/applnk/Editors/gvim.desktop
 share/applnk/Editors/kate.desktop
 share/applnk/Editors/kwrite.desktop
-share/applnk/Editors/xedit.desktop
 share/applnk/Games/.directory
 share/applnk/Games/Arcade/.directory
 share/applnk/Games/Board/.directory
-share/applnk/Games/Board/xboard.desktop
 share/applnk/Games/Card/.directory
 share/applnk/Games/TacticStrategy/.directory
 share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
 share/applnk/Help.desktop
 share/applnk/Home.desktop
 share/applnk/Internet/.directory
 share/applnk/Internet/Terminal/.directory
-share/applnk/Internet/Terminal/mutt.desktop
-share/applnk/Internet/ethereal.desktop
 share/applnk/Internet/keditbookmarks.desktop
 share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/licq.desktop
-share/applnk/Internet/mozilla.desktop
-share/applnk/Internet/netscape.desktop
 share/applnk/KControl.desktop
 share/applnk/Multimedia/.directory
-share/applnk/Multimedia/aviplay.desktop
-share/applnk/Multimedia/gtv.desktop
-share/applnk/Multimedia/xawtv.desktop
-share/applnk/Multimedia/xmms-enqueue.desktop
-share/applnk/Multimedia/xmms.desktop
 share/applnk/Office/.directory
 share/applnk/Settings/.directory
 share/applnk/Settings/Databases/.directory
@@ -564,7 +549,6 @@ share/applnk/System/ScreenSavers/KVm.desktop
 share/applnk/System/ScreenSavers/Worm.desktop
 share/applnk/System/ScreenSavers/kpartsaver.desktop
 share/applnk/System/Terminal/.directory
-share/applnk/System/Terminal/vmstat.desktop
 share/applnk/System/kappfinder.desktop
 share/applnk/System/kfmclient.desktop
 share/applnk/System/kfmclient_dir.desktop
@@ -578,25 +562,13 @@ share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
-share/applnk/Toys/xeyes.desktop
 share/applnk/Utilities/.directory
-share/applnk/Utilities/XUtilities/xcalc.desktop
-share/applnk/Utilities/XUtilities/xclipboard.desktop
-share/applnk/Utilities/XUtilities/xclock.desktop
-share/applnk/Utilities/XUtilities/xconsole.desktop
-share/applnk/Utilities/XUtilities/xload.desktop
-share/applnk/Utilities/XUtilities/xmag.desktop
-share/applnk/Utilities/XUtilities/xterm.desktop
 share/applnk/Utilities/kaddressbook.desktop
 share/applnk/Utilities/kdeprintfax.desktop
 share/applnk/Utilities/kjobviewer.desktop
 share/applnk/Utilities/klipper.desktop
 share/applnk/Utilities/kpager.desktop
 share/applnk/WordProcessing/.directory
-share/applnk/WordProcessing/acroread.desktop
-share/applnk/WordProcessing/gv.desktop
-share/applnk/WordProcessing/xdvi.desktop
-share/applnk/WordProcessing/xpdf.desktop
 share/applnk/ksysguard/eventsrc
 share/apps/clockapplet/pics/lcd.png
 share/apps/drkonqi/debuggers/gdbrc
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 95c4a3385a72..4593baf13c66 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -23,6 +23,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
 		--without-ldap \
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index ec17ca31bc61..90690384e8ae 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -424,38 +424,23 @@ share/applnk/.directory
 share/applnk/.hidden/konqfilemgr.desktop
 share/applnk/Applications/.directory
 share/applnk/Development/.directory
-share/applnk/Development/designer.desktop
 share/applnk/Editors/.directory
-share/applnk/Editors/gvim.desktop
 share/applnk/Editors/kate.desktop
 share/applnk/Editors/kwrite.desktop
-share/applnk/Editors/xedit.desktop
 share/applnk/Games/.directory
 share/applnk/Games/Arcade/.directory
 share/applnk/Games/Board/.directory
-share/applnk/Games/Board/xboard.desktop
 share/applnk/Games/Card/.directory
 share/applnk/Games/TacticStrategy/.directory
 share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
 share/applnk/Help.desktop
 share/applnk/Home.desktop
 share/applnk/Internet/.directory
 share/applnk/Internet/Terminal/.directory
-share/applnk/Internet/Terminal/mutt.desktop
-share/applnk/Internet/ethereal.desktop
 share/applnk/Internet/keditbookmarks.desktop
 share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/licq.desktop
-share/applnk/Internet/mozilla.desktop
-share/applnk/Internet/netscape.desktop
 share/applnk/KControl.desktop
 share/applnk/Multimedia/.directory
-share/applnk/Multimedia/aviplay.desktop
-share/applnk/Multimedia/gtv.desktop
-share/applnk/Multimedia/xawtv.desktop
-share/applnk/Multimedia/xmms-enqueue.desktop
-share/applnk/Multimedia/xmms.desktop
 share/applnk/Office/.directory
 share/applnk/Settings/.directory
 share/applnk/Settings/Databases/.directory
@@ -564,7 +549,6 @@ share/applnk/System/ScreenSavers/KVm.desktop
 share/applnk/System/ScreenSavers/Worm.desktop
 share/applnk/System/ScreenSavers/kpartsaver.desktop
 share/applnk/System/Terminal/.directory
-share/applnk/System/Terminal/vmstat.desktop
 share/applnk/System/kappfinder.desktop
 share/applnk/System/kfmclient.desktop
 share/applnk/System/kfmclient_dir.desktop
@@ -578,25 +562,13 @@ share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
-share/applnk/Toys/xeyes.desktop
 share/applnk/Utilities/.directory
-share/applnk/Utilities/XUtilities/xcalc.desktop
-share/applnk/Utilities/XUtilities/xclipboard.desktop
-share/applnk/Utilities/XUtilities/xclock.desktop
-share/applnk/Utilities/XUtilities/xconsole.desktop
-share/applnk/Utilities/XUtilities/xload.desktop
-share/applnk/Utilities/XUtilities/xmag.desktop
-share/applnk/Utilities/XUtilities/xterm.desktop
 share/applnk/Utilities/kaddressbook.desktop
 share/applnk/Utilities/kdeprintfax.desktop
 share/applnk/Utilities/kjobviewer.desktop
 share/applnk/Utilities/klipper.desktop
 share/applnk/Utilities/kpager.desktop
 share/applnk/WordProcessing/.directory
-share/applnk/WordProcessing/acroread.desktop
-share/applnk/WordProcessing/gv.desktop
-share/applnk/WordProcessing/xdvi.desktop
-share/applnk/WordProcessing/xpdf.desktop
 share/applnk/ksysguard/eventsrc
 share/apps/clockapplet/pics/lcd.png
 share/apps/drkonqi/debuggers/gdbrc
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 95c4a3385a72..4593baf13c66 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -23,6 +23,7 @@ USE_XPM=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
 		--without-ldap \
diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index ec17ca31bc61..90690384e8ae 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -424,38 +424,23 @@ share/applnk/.directory
 share/applnk/.hidden/konqfilemgr.desktop
 share/applnk/Applications/.directory
 share/applnk/Development/.directory
-share/applnk/Development/designer.desktop
 share/applnk/Editors/.directory
-share/applnk/Editors/gvim.desktop
 share/applnk/Editors/kate.desktop
 share/applnk/Editors/kwrite.desktop
-share/applnk/Editors/xedit.desktop
 share/applnk/Games/.directory
 share/applnk/Games/Arcade/.directory
 share/applnk/Games/Board/.directory
-share/applnk/Games/Board/xboard.desktop
 share/applnk/Games/Card/.directory
 share/applnk/Games/TacticStrategy/.directory
 share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
 share/applnk/Help.desktop
 share/applnk/Home.desktop
 share/applnk/Internet/.directory
 share/applnk/Internet/Terminal/.directory
-share/applnk/Internet/Terminal/mutt.desktop
-share/applnk/Internet/ethereal.desktop
 share/applnk/Internet/keditbookmarks.desktop
 share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/licq.desktop
-share/applnk/Internet/mozilla.desktop
-share/applnk/Internet/netscape.desktop
 share/applnk/KControl.desktop
 share/applnk/Multimedia/.directory
-share/applnk/Multimedia/aviplay.desktop
-share/applnk/Multimedia/gtv.desktop
-share/applnk/Multimedia/xawtv.desktop
-share/applnk/Multimedia/xmms-enqueue.desktop
-share/applnk/Multimedia/xmms.desktop
 share/applnk/Office/.directory
 share/applnk/Settings/.directory
 share/applnk/Settings/Databases/.directory
@@ -564,7 +549,6 @@ share/applnk/System/ScreenSavers/KVm.desktop
 share/applnk/System/ScreenSavers/Worm.desktop
 share/applnk/System/ScreenSavers/kpartsaver.desktop
 share/applnk/System/Terminal/.directory
-share/applnk/System/Terminal/vmstat.desktop
 share/applnk/System/kappfinder.desktop
 share/applnk/System/kfmclient.desktop
 share/applnk/System/kfmclient_dir.desktop
@@ -578,25 +562,13 @@ share/applnk/System/kpersonalizer.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
-share/applnk/Toys/xeyes.desktop
 share/applnk/Utilities/.directory
-share/applnk/Utilities/XUtilities/xcalc.desktop
-share/applnk/Utilities/XUtilities/xclipboard.desktop
-share/applnk/Utilities/XUtilities/xclock.desktop
-share/applnk/Utilities/XUtilities/xconsole.desktop
-share/applnk/Utilities/XUtilities/xload.desktop
-share/applnk/Utilities/XUtilities/xmag.desktop
-share/applnk/Utilities/XUtilities/xterm.desktop
 share/applnk/Utilities/kaddressbook.desktop
 share/applnk/Utilities/kdeprintfax.desktop
 share/applnk/Utilities/kjobviewer.desktop
 share/applnk/Utilities/klipper.desktop
 share/applnk/Utilities/kpager.desktop
 share/applnk/WordProcessing/.directory
-share/applnk/WordProcessing/acroread.desktop
-share/applnk/WordProcessing/gv.desktop
-share/applnk/WordProcessing/xdvi.desktop
-share/applnk/WordProcessing/xpdf.desktop
 share/applnk/ksysguard/eventsrc
 share/apps/clockapplet/pics/lcd.png
 share/apps/drkonqi/debuggers/gdbrc