* Strongly buildinkify.

* Use qt2-designer-kde for a uic that understands KDE2 widgets.
* Remove dynamic generation of PLIST.  It generates incorrectly if other
  packages install files in locations that kdebase2 thinks belong to it
  (cervisia2 does this).  Just list all of the files kdebase2 installs
  directly in the PLIST.  Also create a separate list of the plugins created
  when requested.  This fixes the problem noted in pkg/14549 by Mark Davies
  <mark@mcs.vuw.ac.nz>.
* Fix problem noted in pkg/14428 by Mark Davies <mark@mcs.vuw.ac.nz> where
  the the "Create New" links on the background menu in KDE2 fail to work
  properly, complaining about insufficient permissions to write files.
* Support finding -lXdpms on XFree86-3.3.x with the configure script.
* Support Netscape plugins in Konqueror on Linux.
* Fix problem noted in pkg/14429 by Mark Davies <mark@mcs.vuw.ac.nz> where
  the kdeeject script fails to properly call "eject" on NetBSD.

9 files changed, 538 insertions, 91 deletions

diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 726a880f744..20a55579539 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -1,89 +1,111 @@
-# $NetBSD: Makefile,v 1.27 2001/10/21 08:46:29 skrll Exp $
+# $NetBSD: Makefile,v 1.28 2001/11/13 21:10:45 jlam Exp $
 
 DISTNAME=	kdebase-2.2.1
-CATEGORIES=	x11 kde
-.include "../../x11/kde2/Makefile.part1"
+CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 2 integrated X11 desktop
 
+.include "../../x11/kde2/Makefile.kde2"
+
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
 
-BUILD_DEPENDS+=		{qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}:../../x11/qt2-designer
+BUILD_DEPENDS+=	qt2-designer-kde>=2.3.1nb1:../../x11/qt2-designer-kde
 
-USE_BUILDLINK_ONLY=	yes
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-.include "../../x11/kde2/Makefile.part2"
+USE_BUILDLINK_ONLY=	YES
 
-CONFIGURE_ENV+=		UIC="${QTDIR}/bin/uic"
-CONFIGURE_ENV+=		USER_LDFLAGS="${USER_LDFLAGS}"
-CONFIGURE_ENV+=		GL_INCLUDE="${MESABASE}/include"
-#CONFIGURE_ARGS+=	--with-motif-includes="${BUILDLINK_DIR}/include"
-#CONFIGURE_ARGS+=	--with-motif-libraries="${BUILDLINK_DIR}/lib"
 CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_DIR}"
 CONFIGURE_ARGS+=	--disable-greet-lib
 CONFIGURE_ARGS+=	--without-pam
-LIBS+=			"-Wl,--export-dynamic"
-USER_LDFLAGS=		-L${BUILDLINK_DIR}/lib
-USER_LDFLAGS+=		-Wl,-R${LOCALBASE}/lib
-USER_LDFLAGS+=		-Wl,-R${X11BASE}/lib
-
-EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
+CONFIGURE_ARGS+=	--without-cdparanoia
+CONFIGURE_ARGS+=	--without-lame
+CONFIGURE_ARGS+=	--without-vorbis
+CONFIGURE_ARGS+=	--without-ldap
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_INIT=		${PKGDIR}/PLIST
-PLIST_SRC=		${WRKDIR}/PLIST
-PLIST_DIRS=		share/kde/applnk \
-			share/kde/apps/kappfinder
+.if ${OPSYS} == "NetBSD"
+LIBS+=			-Wl,--export-dynamic
+.endif
 
-MKDIRS=	\
-	share/kde/icons/hicolor/22x22/apps
+PLIST_SRC=		${WRKDIR}/PLIST.Xdpms
 
-post-build:
-	@${SED} -e "s|@LOCALBASE@|${LOCALBASE}|" \
-		< ${WRKSRC}/kioslave/info/kde-info2html.conf \
-		> ${WRKSRC}/kioslave/info/kde-info2html.conf.new
-	@${MV} \
-		${WRKSRC}/kioslave/info/kde-info2html.conf.new \
-		${WRKSRC}/kioslave/info/kde-info2html.conf
+.if ${OPSYS} == "Linux"
+KDE2_NSPLUGINS?=	YES
+.else
+KDE2_NSPLUGINS?=	NO
+.endif
+BUILD_DEFS+=		KDE2_NSPLUGINS
 
-pre-install:
-	${RM} -f ${PLIST_SRC}
+.if ${KDE2_NSPLUGINS} == "YES"
+PLIST_SRC+=		${PKGDIR}/PLIST.nsplugins
+CONFIGURE_ARGS+=	--with-motif-includes="${BUILDLINK_DIR}/include"
+CONFIGURE_ARGS+=	--with-motif-libraries="${BUILDLINK_DIR}/lib"
+.include "../../mk/motif.buildlink.mk"
+.else
+CONFIGURE_ARGS+=	--without-motif
+.endif
+
+PLIST_SRC+=		${PKGDIR}/PLIST
+
+ICONDIR=		share/kde/icons
+
+post-build:
+	cd ${WRKSRC};							\
+	files="kioslave/info/kde-info2html.conf";			\
+	for file in $${files}; do					\
+		${SED}	-e "s|@LOCALBASE@|${LOCALBASE}|"		\
+			$${file} > $${file}.new;			\
+		${MV} -f $${file}.new $${file};				\
+	done
 
 post-install:
-	# Check that this is still the case - the configure goop might do a better job
-	@# on some systems libkcm_energy.so and libkcm_screensaver.so aren't created as
-	@# the Xdpms stuff isn't available in a shared library
-.if exists(${PREFIX}/lib/kde2/libkcm_energy.so)
-	${ECHO} "lib/kde2/libkcm_energy.so" >> ${PLIST_SRC}
-.endif
-.if exists(${PREFIX}/lib/kde2/libkcm_screensaver.so)
-	${ECHO} "lib/kde2/libkcm_screensaver.so" >>${PLIST_SRC}
-.endif
-	${CAT} ${PLIST_INIT} >> ${PLIST_SRC}
-	@${CHMOD} u+s ${PREFIX}/bin/konsole_grantpty
-	@${CHMOD} u+s ${PREFIX}/bin/kcheckpass
-	@${CHMOD} u+s ${PREFIX}/bin/ksysguardd
-	@(cd ${PREFIX}; ${FIND} ${PLIST_DIRS} \! -type d | sort >>${PLIST_SRC})
-	@(cd ${PREFIX}; ${FIND} ${PLIST_DIRS} -type d | sort -r | \
-		${SED} "s/^/\@dirrm /" >>${PLIST_SRC})
-	@for DIR in ${MKDIRS}; do \
-		${INSTALL_DATA_DIR} ${PREFIX}/$${DIR}; \
-		${ECHO} "@exec mkdir -p %D/$${DIR}" >>${PLIST_SRC}; \
-		${ECHO} "@dirrm $${DIR}" >>${PLIST_SRC}; \
+	${INSTALL_DATA_DIR} ${PREFIX}/share/kde/templates/.source/emptydir
+	${INSTALL_DATA} ${DISTDIR}/Daemon.png ${PREFIX}/${ICONDIR}
+	${INSTALL_DATA} ${DISTDIR}/Daemon.README			\
+		${PREFIX}/share/doc/kde/HTML/en/kdm
+
+	@# Several programs need to be setuid-root, so we need to remove
+	@# remove read/write permissions for security reasons.
+	@#
+	suid_progs="							\
+		bin/konsole_grantpty					\
+		bin/kcheckpass						\
+		bin/ksysguardd						\
+	";								\
+	for prog in $${suid_progs}; do					\
+		${CHMOD} 4711 ${PREFIX}/$${prog};			\
 	done
+
+	@# The global desktop template files need to be user-writeable, or
+	@# else users won't be able to alter them after copying them to 
+	@# their local directories.
+	@#
+	${CHMOD} u+w ${PREFIX}/share/kde/templates/.source/*
+
+	@# On some systems, the Xdpms routines aren't available in a shared
+	@# library, and some libraries aren't created as a result.
+	@#
+	( files="							\
+		lib/kde2/libkcm_energy.so				\
+		lib/kde2/libkcm_screensaver.so				\
+	  ";								\
+	  for file in $${files}; do					\
+		if [ -f ${PREFIX}/$${file} ]; then			\
+			${ECHO} "$${file}";				\
+		fi;							\
+	  done;								\
+	) > ${WRKDIR}/PLIST.Xdpms
+
+.if ${OPSYS} == "NetBSD"
 	@# NetBSD Advertisement O:-)
-	cd ${PREFIX}/share/kde/config/kdm ; \
-	${CP} kdmrc kdmrc.new ; \
-	${SED} \
-		-e 's|^#\(LogoPixmap\)=.*|\1=${PREFIX}/share/kde/icons/Daemon.png|' \
-		<kdmrc.new >kdmrc ; \
-	${RM} kdmrc.new
-	@${INSTALL_DATA} ${DISTDIR}/Daemon.png ${PREFIX}/share/kde/icons
-	@${INSTALL_DATA} ${DISTDIR}/Daemon.README \
-		${PREFIX}/share/doc/kde/HTML/en/kdm
+	cd ${PREFIX}/share/kde/config/kdm;				\
+	${SED} -e 's|^#\(LogoPixmap\)=.*|\1=${PREFIX}/${ICONDIR}/Daemon.png|' \
+		kdmrc > ${WRKDIR}/kdmrc.ad;				\
+	${CP} -f ${WRKDIR}/kdmrc.ad kdmrc
+.endif
 
-.include "../../graphics/Mesa/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
+.include "../../x11/kde2/buildlink.mk"
 .include "../../x11/kdelibs2/buildlink.mk"
-
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase2/PLIST b/x11/kdebase2/PLIST
index 54683a9007f..e4a77a09dd1 100644
--- a/x11/kdebase2/PLIST
+++ b/x11/kdebase2/PLIST
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:04 zuntum Exp $
-share/doc/kde/HTML/en/kdm/Daemon.README
-share/kde/icons/Daemon.png
+@comment $NetBSD: PLIST,v 1.2 2001/11/13 21:10:45 jlam Exp $
 bin/appletproxy
 bin/chooser
 bin/conttest
@@ -580,6 +578,9 @@ lib/libklegacyimport_main.la
 lib/libklegacyimport_main.so
 lib/libklegacyimport_main.so.0
 lib/libklegacyimport_main.so.0.0
+lib/libklipper_main.a
+lib/libklipper_main.la
+lib/libklipper_main.so
 lib/libkmenuedit_main.a
 lib/libkmenuedit_main.la
 lib/libkmenuedit_main.so
@@ -921,6 +922,7 @@ share/doc/kde/HTML/en/kdeprint/xpp-fonts.png
 share/doc/kde/HTML/en/kdesu/common
 share/doc/kde/HTML/en/kdesu/index.cache.bz2
 share/doc/kde/HTML/en/kdesu/index.docbook
+share/doc/kde/HTML/en/kdm/Daemon.README
 share/doc/kde/HTML/en/kdm/common
 share/doc/kde/HTML/en/kdm/index.cache.bz2
 share/doc/kde/HTML/en/kdm/index.docbook
@@ -1092,6 +1094,161 @@ share/fonts/console8x16.pcf.gz
 share/fonts/console8x8.pcf.gz
 share/fonts/fonts.dir
 share/fonts/override/fonts.dir
+share/kde/applnk/.directory
+share/kde/applnk/.hidden/konqfilemgr.desktop
+share/kde/applnk/Applications/.directory
+share/kde/applnk/Development/.directory
+share/kde/applnk/Editors/.directory
+share/kde/applnk/Editors/kate.desktop
+share/kde/applnk/Editors/kwrite.desktop
+share/kde/applnk/Editors/xedit.desktop
+share/kde/applnk/Games/.directory
+share/kde/applnk/Games/Arcade/.directory
+share/kde/applnk/Games/Board/.directory
+share/kde/applnk/Games/Card/.directory
+share/kde/applnk/Games/TacticStrategy/.directory
+share/kde/applnk/Graphics/.directory
+share/kde/applnk/Help.desktop
+share/kde/applnk/Home.desktop
+share/kde/applnk/Internet/.directory
+share/kde/applnk/Internet/Terminal/.directory
+share/kde/applnk/Internet/keditbookmarks.desktop
+share/kde/applnk/Internet/konqbrowser.desktop
+share/kde/applnk/Internet/netscape.desktop
+share/kde/applnk/KControl.desktop
+share/kde/applnk/Multimedia/.directory
+share/kde/applnk/Multimedia/realplayer.desktop
+share/kde/applnk/Office/.directory
+share/kde/applnk/Settings/.directory
+share/kde/applnk/Settings/Databases/.directory
+share/kde/applnk/Settings/FileBrowsing/.directory
+share/kde/applnk/Settings/FileBrowsing/filetypes.desktop
+share/kde/applnk/Settings/FileBrowsing/kcmkonq.desktop
+share/kde/applnk/Settings/Help/.directory
+share/kde/applnk/Settings/Information/.directory
+share/kde/applnk/Settings/Information/devices.desktop
+share/kde/applnk/Settings/Information/dma.desktop
+share/kde/applnk/Settings/Information/interrupts.desktop
+share/kde/applnk/Settings/Information/ioports.desktop
+share/kde/applnk/Settings/Information/ioslaveinfo.desktop
+share/kde/applnk/Settings/Information/kcmusb.desktop
+share/kde/applnk/Settings/Information/memory.desktop
+share/kde/applnk/Settings/Information/partitions.desktop
+share/kde/applnk/Settings/Information/pci.desktop
+share/kde/applnk/Settings/Information/processor.desktop
+share/kde/applnk/Settings/Information/scsi.desktop
+share/kde/applnk/Settings/Information/smbstatus.desktop
+share/kde/applnk/Settings/Information/sound.desktop
+share/kde/applnk/Settings/Information/xserver.desktop
+share/kde/applnk/Settings/LookNFeel/.directory
+share/kde/applnk/Settings/LookNFeel/Desktop/background.desktop
+share/kde/applnk/Settings/LookNFeel/Desktop/borders.desktop
+share/kde/applnk/Settings/LookNFeel/Desktop/desktop.desktop
+share/kde/applnk/Settings/LookNFeel/Desktop/virtualdesktops.desktop
+share/kde/applnk/Settings/LookNFeel/Themes/iconthemes.desktop
+share/kde/applnk/Settings/LookNFeel/Themes/style.desktop
+share/kde/applnk/Settings/LookNFeel/Windows/actions.desktop
+share/kde/applnk/Settings/LookNFeel/Windows/kwinmouse.desktop
+share/kde/applnk/Settings/LookNFeel/Windows/mouse.desktop
+share/kde/applnk/Settings/LookNFeel/background.desktop
+share/kde/applnk/Settings/LookNFeel/colors.desktop
+share/kde/applnk/Settings/LookNFeel/desktop.desktop
+share/kde/applnk/Settings/LookNFeel/fonts.desktop
+share/kde/applnk/Settings/LookNFeel/icons.desktop
+share/kde/applnk/Settings/LookNFeel/kcmlaunch.desktop
+share/kde/applnk/Settings/LookNFeel/kcmtaskbar.desktop
+share/kde/applnk/Settings/LookNFeel/keys.desktop
+share/kde/applnk/Settings/LookNFeel/kthememgr.desktop
+share/kde/applnk/Settings/LookNFeel/kwindecoration.desktop
+share/kde/applnk/Settings/LookNFeel/kwinoptions.desktop
+share/kde/applnk/Settings/LookNFeel/panel.desktop
+share/kde/applnk/Settings/LookNFeel/screensaver.desktop
+share/kde/applnk/Settings/LookNFeel/style.desktop
+share/kde/applnk/Settings/LookNFeel/virtualdesktops.desktop
+share/kde/applnk/Settings/Network/.directory
+share/kde/applnk/Settings/Network/email.desktop
+share/kde/applnk/Settings/Network/ioslaveinfo.desktop
+share/kde/applnk/Settings/Network/netpref.desktop
+share/kde/applnk/Settings/Network/smb.desktop
+share/kde/applnk/Settings/Network/socks.desktop
+share/kde/applnk/Settings/Peripherals/.directory
+share/kde/applnk/Settings/Peripherals/keyboard.desktop
+share/kde/applnk/Settings/Peripherals/mouse.desktop
+share/kde/applnk/Settings/Personalization/.directory
+share/kde/applnk/Settings/Personalization/crypto.desktop
+share/kde/applnk/Settings/Personalization/kcmaccess.desktop
+share/kde/applnk/Settings/Personalization/kcmlayout.desktop
+share/kde/applnk/Settings/Personalization/language.desktop
+share/kde/applnk/Settings/Personalization/passwords.desktop
+share/kde/applnk/Settings/Personalization/spellchecking.desktop
+share/kde/applnk/Settings/PowerControl/.directory
+share/kde/applnk/Settings/PowerControl/energy.desktop
+share/kde/applnk/Settings/Sound/.directory
+share/kde/applnk/Settings/Sound/arts.desktop
+share/kde/applnk/Settings/Sound/bell.desktop
+share/kde/applnk/Settings/Sound/kcmnotify.desktop
+share/kde/applnk/Settings/Sound/midi.desktop
+share/kde/applnk/Settings/System/.directory
+share/kde/applnk/Settings/System/clock.desktop
+share/kde/applnk/Settings/System/kcmkonsole.desktop
+share/kde/applnk/Settings/System/kcmsmserver.desktop
+share/kde/applnk/Settings/System/kdm.desktop
+share/kde/applnk/Settings/System/printmgr.desktop
+share/kde/applnk/Settings/WebBrowsing/.directory
+share/kde/applnk/Settings/WebBrowsing/cookies.desktop
+share/kde/applnk/Settings/WebBrowsing/ebrowsing.desktop
+share/kde/applnk/Settings/WebBrowsing/kcmcss.desktop
+share/kde/applnk/Settings/WebBrowsing/konqhtml.desktop
+share/kde/applnk/Settings/WebBrowsing/proxy.desktop
+share/kde/applnk/Settings/WebBrowsing/smb.desktop
+share/kde/applnk/Settings/WebBrowsing/useragent.desktop
+share/kde/applnk/System/.directory
+share/kde/applnk/System/ScreenSavers/.directory
+share/kde/applnk/System/ScreenSavers/KBanner.desktop
+share/kde/applnk/System/ScreenSavers/KBlankscreen.desktop
+share/kde/applnk/System/ScreenSavers/KBlob.desktop
+share/kde/applnk/System/ScreenSavers/KBouboule.desktop
+share/kde/applnk/System/ScreenSavers/KLines.desktop
+share/kde/applnk/System/ScreenSavers/KLorenz.desktop
+share/kde/applnk/System/ScreenSavers/KMatrix.desktop
+share/kde/applnk/System/ScreenSavers/KMorph3D.desktop
+share/kde/applnk/System/ScreenSavers/KPipes.desktop
+share/kde/applnk/System/ScreenSavers/KPolygon.desktop
+share/kde/applnk/System/ScreenSavers/KPyro.desktop
+share/kde/applnk/System/ScreenSavers/KRandom.desktop
+share/kde/applnk/System/ScreenSavers/KRock.desktop
+share/kde/applnk/System/ScreenSavers/KScience.desktop
+share/kde/applnk/System/ScreenSavers/KSlidescreen.desktop
+share/kde/applnk/System/ScreenSavers/KSlideshow.desktop
+share/kde/applnk/System/ScreenSavers/KSpace.desktop
+share/kde/applnk/System/ScreenSavers/KSwarm.desktop
+share/kde/applnk/System/ScreenSavers/KVm.desktop
+share/kde/applnk/System/ScreenSavers/Worm.desktop
+share/kde/applnk/System/ScreenSavers/kpartsaver.desktop
+share/kde/applnk/System/Terminal/.directory
+share/kde/applnk/System/Terminal/vmstat.desktop
+share/kde/applnk/System/kappfinder.desktop
+share/kde/applnk/System/kfmclient.desktop
+share/kde/applnk/System/kfmclient_dir.desktop
+share/kde/applnk/System/kfmclient_html.desktop
+share/kde/applnk/System/klegacyimport.desktop
+share/kde/applnk/System/kmenuedit.desktop
+share/kde/applnk/System/konquerorsu.desktop
+share/kde/applnk/System/konsole.desktop
+share/kde/applnk/System/konsolesu.desktop
+share/kde/applnk/System/kpersonalizer.desktop
+share/kde/applnk/System/ksysguard.desktop
+share/kde/applnk/Toys/.directory
+share/kde/applnk/Toys/ktip.desktop
+share/kde/applnk/Toys/xeyes.desktop
+share/kde/applnk/Utilities/.directory
+share/kde/applnk/Utilities/kaddressbook.desktop
+share/kde/applnk/Utilities/kdeprintfax.desktop
+share/kde/applnk/Utilities/kjobviewer.desktop
+share/kde/applnk/Utilities/klipper.desktop
+share/kde/applnk/Utilities/kpager.desktop
+share/kde/applnk/WordProcessing/.directory
+share/kde/applnk/ksysguard/eventsrc
 share/kde/apps/clockapplet/pics/lcd.png
 share/kde/apps/drkonqi/debuggers/gdbrc
 share/kde/apps/drkonqi/pics/konqi.png
@@ -1106,6 +1263,135 @@ share/kde/apps/kaddressbook/pics/find.xpm
 share/kde/apps/kaddressbook/pics/group.xpm
 share/kde/apps/kaddressbook/pics/page.xpm
 share/kde/apps/kaddressbook/pics/up.xpm
+share/kde/apps/kappfinder/apps/Development/ddd.desktop
+share/kde/apps/kappfinder/apps/Development/designer.desktop
+share/kde/apps/kappfinder/apps/Development/dlgedit.desktop
+share/kde/apps/kappfinder/apps/Development/linguist.desktop
+share/kde/apps/kappfinder/apps/Editors/emacs.desktop
+share/kde/apps/kappfinder/apps/Editors/gvim.desktop
+share/kde/apps/kappfinder/apps/Editors/lemacs.desktop
+share/kde/apps/kappfinder/apps/Editors/nedit.desktop
+share/kde/apps/kappfinder/apps/Editors/xedit.desktop
+share/kde/apps/kappfinder/apps/Editors/xemacs.desktop
+@exec ${MKDIR} %D/share/kde/apps/kappfinder/apps/Games/Arcade
+share/kde/apps/kappfinder/apps/Games/Board/xboard.desktop
+share/kde/apps/kappfinder/apps/Games/Card/PySol.desktop
+share/kde/apps/kappfinder/apps/Games/Clanbomber.desktop
+share/kde/apps/kappfinder/apps/Games/Emulators/qmamecat.desktop
+share/kde/apps/kappfinder/apps/Games/TacticStrategy/freeciv.desktop
+share/kde/apps/kappfinder/apps/Games/defendguin.desktop
+share/kde/apps/kappfinder/apps/Games/penguin-command.desktop
+share/kde/apps/kappfinder/apps/Games/xshipwars.desktop
+share/kde/apps/kappfinder/apps/Graphics/gimp.desktop
+share/kde/apps/kappfinder/apps/Graphics/xfig.desktop
+share/kde/apps/kappfinder/apps/Graphics/xpaint.desktop
+share/kde/apps/kappfinder/apps/Graphics/xv.desktop
+share/kde/apps/kappfinder/apps/Internet/Terminal/lftp.desktop
+share/kde/apps/kappfinder/apps/Internet/Terminal/mutt.desktop
+share/kde/apps/kappfinder/apps/Internet/Terminal/ncftp.desktop
+share/kde/apps/kappfinder/apps/Internet/Terminal/pine.desktop
+share/kde/apps/kappfinder/apps/Internet/arena.desktop
+share/kde/apps/kappfinder/apps/Internet/coolmail.desktop
+share/kde/apps/kappfinder/apps/Internet/ethereal.desktop
+share/kde/apps/kappfinder/apps/Internet/licq.desktop
+share/kde/apps/kappfinder/apps/Internet/mozilla.desktop
+share/kde/apps/kappfinder/apps/Internet/netscape.desktop
+share/kde/apps/kappfinder/apps/Internet/xbiff.desktop
+share/kde/apps/kappfinder/apps/Internet/xchat.desktop
+share/kde/apps/kappfinder/apps/Internet/xfmail.desktop
+share/kde/apps/kappfinder/apps/Internet/xftp.desktop
+share/kde/apps/kappfinder/apps/Multimedia/alevt.desktop
+share/kde/apps/kappfinder/apps/Multimedia/aviplay.desktop
+share/kde/apps/kappfinder/apps/Multimedia/gtv.desktop
+share/kde/apps/kappfinder/apps/Multimedia/mtv.desktop
+share/kde/apps/kappfinder/apps/Multimedia/realplayer.desktop
+share/kde/apps/kappfinder/apps/Multimedia/xawtv.desktop
+share/kde/apps/kappfinder/apps/Multimedia/xmms-enqueue.desktop
+share/kde/apps/kappfinder/apps/Multimedia/xmms.desktop
+share/kde/apps/kappfinder/apps/Office/Applix.desktop
+share/kde/apps/kappfinder/apps/Office/XAcc.desktop
+share/kde/apps/kappfinder/apps/Office/XsLite.desktop
+share/kde/apps/kappfinder/apps/Office/plan.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Ant.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Atlantis.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Attraction.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Bouboule.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Braid.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Bubble3d.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Bubbles.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Cage.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Compass.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Coral.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Crystal.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Cynosure.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Demon.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Drift.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Fadeplot.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Flag.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Flame.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Flow.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Forest.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/GLPlanet.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Galaxy.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Gears.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Goop.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Grav.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Hopalong.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Hypercube.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Ifs.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Imsmap.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Interference.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Julia.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Kaleidescope.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Kumppa.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/LMorph.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Lament.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Laser.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Lightning.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Lissie.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Moenius.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Penrose.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Phosphor.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Pulsar.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Rubik.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Slip.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Sonar.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Sproingies.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Stairs.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Starfish.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Strange.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Superquadrics.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Swirl.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/T3d.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Triangle.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Vines.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/Worm.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/XFlame.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/XJack.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/XMatrix.desktop
+share/kde/apps/kappfinder/apps/System/ScreenSavers/XPipes.desktop
+share/kde/apps/kappfinder/apps/System/Terminal/procinfo.desktop
+share/kde/apps/kappfinder/apps/System/Terminal/vmstat.desktop
+share/kde/apps/kappfinder/apps/System/sam.desktop
+share/kde/apps/kappfinder/apps/System/xosview.desktop
+share/kde/apps/kappfinder/apps/Toys/xeyes.desktop
+share/kde/apps/kappfinder/apps/Toys/xpinguin.desktop
+share/kde/apps/kappfinder/apps/Utilities/XUtilities/xcalc.desktop
+share/kde/apps/kappfinder/apps/Utilities/XUtilities/xclipboard.desktop
+share/kde/apps/kappfinder/apps/Utilities/XUtilities/xclock.desktop
+share/kde/apps/kappfinder/apps/Utilities/XUtilities/xconsole.desktop
+share/kde/apps/kappfinder/apps/Utilities/XUtilities/xload.desktop
+share/kde/apps/kappfinder/apps/Utilities/XUtilities/xmag.desktop
+share/kde/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop
+share/kde/apps/kappfinder/apps/WordProcessing/WordPerfect.desktop
+share/kde/apps/kappfinder/apps/WordProcessing/WordPerfect2000.desktop
+share/kde/apps/kappfinder/apps/WordProcessing/acroread.desktop
+share/kde/apps/kappfinder/apps/WordProcessing/ghostview.desktop
+share/kde/apps/kappfinder/apps/WordProcessing/gv.desktop
+share/kde/apps/kappfinder/apps/WordProcessing/lyx.desktop
+share/kde/apps/kappfinder/apps/WordProcessing/pybliographic.desktop
+share/kde/apps/kappfinder/apps/WordProcessing/xdvi.desktop
+share/kde/apps/kappfinder/apps/WordProcessing/xpdf.desktop
 share/kde/apps/kate/icons/hicolor/16x16/actions/curfiledir.png
 share/kde/apps/kate/icons/hicolor/16x16/actions/highlighting.png
 share/kde/apps/kate/icons/hicolor/16x16/actions/modified.png
@@ -1677,6 +1963,7 @@ share/kde/config/lissierc
 share/kde/config/penroserc
 share/kde/config/rocksrc
 share/kde/config/sliprc
+share/kde/icons/Daemon.png
 share/kde/icons/hicolor/16x16/actions/view_choose.png
 share/kde/icons/hicolor/16x16/actions/view_detailed.png
 share/kde/icons/hicolor/16x16/actions/view_icon.png
@@ -2376,6 +2663,8 @@ share/kde/templates/linkFloppy.desktop
 share/kde/templates/linkHD.desktop
 share/kde/templates/linkProgram.desktop
 share/kde/templates/linkURL.desktop
+@exec ${MKDIR} %D/share/kde/templates/.source/emptydir
+@exec ${CHMOD} 755 %D/share/kde/templates/.source/emptydir
 share/kde/wallpapers/All-Good-People-1.jpg
 share/kde/wallpapers/Ancient_Glyphs.jpg
 share/kde/wallpapers/Appropriately-Left-Handed-2.jpg
@@ -2406,7 +2695,6 @@ share/kde/wallpapers/simple_wallpaper.jpg
 share/kde/wallpapers/sunday_brunch.jpg
 share/kde/wallpapers/vegetative_fog.jpg
 @dirrm share/kde/wallpapers
-@exec /bin/mkdir -p %D/share/kde/templates/.source/emptydir
 @dirrm share/kde/templates/.source/emptydir
 @dirrm share/kde/templates/.source
 @dirrm share/kde/templates
@@ -2488,14 +2776,6 @@ share/kde/wallpapers/vegetative_fog.jpg
 @dirrm share/kde/locale/l10n/C
 @dirrm share/kde/locale/l10n
 @dirrm share/kde/locale/C
-@dirrm share/kde/locale
-@dirrm share/kde/icons/locolor/32x32/apps
-@dirrm share/kde/icons/locolor/32x32
-@dirrm share/kde/icons/locolor/16x16/apps
-@dirrm share/kde/icons/locolor/16x16
-@dirrm share/kde/icons/locolor
-@dirrm share/kde/icons/hicolor/48x48/apps
-@dirrm share/kde/icons/hicolor/32x32/apps
 @dirrm share/kde/config/kdm
 @dirrm share/kde/apps/naughtyapplet/pics
 @dirrm share/kde/apps/naughtyapplet
@@ -2627,6 +2907,28 @@ share/kde/wallpapers/vegetative_fog.jpg
 @dirrm share/kde/apps/kate/icons/hicolor
 @dirrm share/kde/apps/kate/icons
 @dirrm share/kde/apps/kate
+@dirrm share/kde/apps/kappfinder/apps/WordProcessing
+@dirrm share/kde/apps/kappfinder/apps/Utilities/XUtilities
+@dirrm share/kde/apps/kappfinder/apps/Utilities
+@dirrm share/kde/apps/kappfinder/apps/Toys
+@dirrm share/kde/apps/kappfinder/apps/System/Terminal
+@dirrm share/kde/apps/kappfinder/apps/System/ScreenSavers
+@dirrm share/kde/apps/kappfinder/apps/System
+@dirrm share/kde/apps/kappfinder/apps/Office
+@dirrm share/kde/apps/kappfinder/apps/Multimedia
+@dirrm share/kde/apps/kappfinder/apps/Internet/Terminal
+@dirrm share/kde/apps/kappfinder/apps/Internet
+@dirrm share/kde/apps/kappfinder/apps/Graphics
+@dirrm share/kde/apps/kappfinder/apps/Games/TacticStrategy
+@dirrm share/kde/apps/kappfinder/apps/Games/Emulators
+@dirrm share/kde/apps/kappfinder/apps/Games/Card
+@dirrm share/kde/apps/kappfinder/apps/Games/Board
+@dirrm share/kde/apps/kappfinder/apps/Games/Arcade
+@dirrm share/kde/apps/kappfinder/apps/Games
+@dirrm share/kde/apps/kappfinder/apps/Editors
+@dirrm share/kde/apps/kappfinder/apps/Development
+@dirrm share/kde/apps/kappfinder/apps
+@dirrm share/kde/apps/kappfinder
 @dirrm share/kde/apps/kaddressbook/pics
 @dirrm share/kde/apps/kaddressbook
 @dirrm share/kde/apps/drkonqi/presets
@@ -2635,6 +2937,44 @@ share/kde/wallpapers/vegetative_fog.jpg
 @dirrm share/kde/apps/drkonqi
 @dirrm share/kde/apps/clockapplet/pics
 @dirrm share/kde/apps/clockapplet
+@unexec ${RMDIR} %D/share/kde/applnk/ksysguard 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/WordProcessing 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Utilities 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Toys 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/System/Terminal 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/System/ScreenSavers 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/System 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/WebBrowsing 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/System 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/Sound 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/PowerControl 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/Personalization 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/Peripherals 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/Network 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/LookNFeel/Windows 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/LookNFeel/Themes 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/LookNFeel/Desktop 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/LookNFeel 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/Information 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/Help 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/FileBrowsing 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings/Databases 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Settings 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Office 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Multimedia 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Internet/Terminal 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Internet 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Graphics 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Games/TacticStrategy 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Games/Card 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Games/Board 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Games/Arcade 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Games 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Editors 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Development 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/Applications 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk/.hidden 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/applnk 2>/dev/null || ${TRUE}
 @dirrm share/doc/kde/HTML/en/kwrite
 @dirrm share/doc/kde/HTML/en/ksysguard
 @dirrm share/doc/kde/HTML/en/kpager
diff --git a/x11/kdebase2/PLIST.nsplugins b/x11/kdebase2/PLIST.nsplugins
new file mode 100644
index 00000000000..5ac9ecc801f
--- /dev/null
+++ b/x11/kdebase2/PLIST.nsplugins
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.nsplugins,v 1.1 2001/11/13 21:10:45 jlam Exp $
+bin/nspluginscan
+bin/nspluginviewer
+lib/libkcm_nsplugin.a
+lib/libkcm_nsplugin.la
+lib/libkcm_nsplugin.so
+lib/libnsplugin.a
+lib/libnsplugin.la
+lib/libnsplugin.so
+lib/libnsplugin.so.1
+lib/libnsplugin.so.1.1
diff --git a/x11/kdebase2/buildlink.mk b/x11/kdebase2/buildlink.mk
index 067765e7da7..a735655586d 100644
--- a/x11/kdebase2/buildlink.mk
+++ b/x11/kdebase2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/11/01 18:32:02 tron Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/11/13 21:10:46 jlam Exp $
 #
 # This Makefile fragment is included by packages that use kdebase2.
 #
@@ -17,7 +17,7 @@ KDEBASE2_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.kdebase2?=	kdebase>=2.2.1
+BUILDLINK_DEPENDS.kdebase2?=	kdebase-2.[1-9]*
 DEPENDS+=	${BUILDLINK_DEPENDS.kdebase2}:../../x11/kdebase2
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo
index 55e25cd39c8..b109fc51725 100644
--- a/x11/kdebase2/distinfo
+++ b/x11/kdebase2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2001/10/18 15:43:10 skrll Exp $
+$NetBSD: distinfo,v 1.13 2001/11/13 21:10:46 jlam Exp $
 
 SHA1 (kdebase-2.2.1.tar.bz2) = 5c3a300829fee66bfe26faea39112050fc4cd1e9
 Size (kdebase-2.2.1.tar.bz2) = 12696643 bytes
@@ -6,7 +6,7 @@ SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 Size (Daemon.README) = 2191 bytes
-SHA1 (patch-aa) = 913e5b2f4db3cc06bd922210fea097ab393c5dc2
+SHA1 (patch-aa) = 75df9bfa1f5447a056e7565a4658a17272f482a1
 SHA1 (patch-ab) = b20193817a7d4e10dc84890e024e48f63fdcf889
 SHA1 (patch-ac) = 9a6326413006036df756dc4d7c90516c261948ff
 SHA1 (patch-ad) = 972b0cace3baacc5d7ea031065a391b43dd377e5
@@ -137,3 +137,5 @@ SHA1 (patch-ex) = 96fac765f7678be3563245c3fa1a23ace5bce86b
 SHA1 (patch-ey) = 2252a4ed9f9d15021e59b542568b0dc0f9c73e48
 SHA1 (patch-ez) = 904a251a996d9c73e7ea4a0dbc384422ba7d28db
 SHA1 (patch-fa) = c8ceb03ef5eb7a3b16f3fd988e03278e7661978c
+SHA1 (patch-fb) = 8f95df054822fd535c967ea770e6c65af6545b20
+SHA1 (patch-fc) = 5b3da5ab4370d01c1378a4e14467fd05e58932b7
diff --git a/x11/kdebase2/files/Imakefile b/x11/kdebase2/files/Imakefile
deleted file mode 100644
index 884eb724847..00000000000
--- a/x11/kdebase2/files/Imakefile
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $NetBSD: Imakefile,v 1.1.1.1 2001/03/14 16:03:09 skrll Exp $ */
-
-hasxdmauth:
-#ifdef HasXdmAuth
-#if HasXdmAuth == YES
-	@echo "#define HASXDMAUTH 1"
-#endif
-#endif
diff --git a/x11/kdebase2/patches/patch-aa b/x11/kdebase2/patches/patch-aa
index cb4a054b079..67fa8803278 100644
--- a/x11/kdebase2/patches/patch-aa
+++ b/x11/kdebase2/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2001/10/15 22:45:59 skrll Exp $
+$NetBSD: patch-aa,v 1.7 2001/11/13 21:10:46 jlam Exp $
 
---- configure.orig	Sat Sep  8 01:36:55 2001
+--- configure.orig	Fri Sep  7 20:36:55 2001
 +++ configure
 @@ -12536,7 +12536,7 @@
  
@@ -36,7 +36,31 @@ $NetBSD: patch-aa,v 1.6 2001/10/15 22:45:59 skrll Exp $
  for ac_hdr in GL/xmesa.h GL/glut.h memory.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-@@ -12919,6 +12919,7 @@
+@@ -12810,6 +12810,23 @@
+   
+                 ac_cv_have_dpms="-lXdpms"
+                 
++	lib=Xdpms
++	shared_lib_found=no
++	for i in ${LDFLAGS}; do
++		case "$i" in
++		-L*)
++			dir=`echo $i | sed "s,^-L,,"`
++			if [ -e $dir/lib${lib}.so ] ||
++			   [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
++				shared_lib_found=yes
++				break;
++			fi
++		esac
++	done
++	if [ "$shared_lib_found" = "no" ]; then
++		eval "ac_cv_have_dpms=no"
++	fi
++
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+@@ -12919,6 +12936,7 @@
  case "$host" in 
    *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
    *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
diff --git a/x11/kdebase2/patches/patch-fb b/x11/kdebase2/patches/patch-fb
new file mode 100644
index 00000000000..684e5c73c7e
--- /dev/null
+++ b/x11/kdebase2/patches/patch-fb
@@ -0,0 +1,21 @@
+$NetBSD: patch-fb,v 1.1 2001/11/13 21:10:46 jlam Exp $
+
+--- kdesktop/kdeeject.orig	Sat May  5 16:05:58 2001
++++ kdesktop/kdeeject
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ # Script used by kdesktop to eject a removable media (CDROM/Tape/SCSI/Floppy)
+-# Relies on the 'eject' program, 'cdcontrol' on *BSD
++# Relies on the 'eject' program, 'cdcontrol' on FreeBSD
+ #
+ # Copyright GPL v2 by David Faure <david@mandrakesoft.com>
+ #
+@@ -13,7 +13,7 @@
+   # I guess this is the reason for making this a kde app...
+   OS=`uname -s`
+   case "$OS" in
+-    *BSD)
++    FreeBSD)
+       dev=`echo $1 | sed -E -e 's#/dev/##' -e 's/([0-9])./\1/'`
+       cdcontrol -f $dev eject >/dev/null 2>&1
+       ;;
diff --git a/x11/kdebase2/patches/patch-fc b/x11/kdebase2/patches/patch-fc
new file mode 100644
index 00000000000..d51b650b59e
--- /dev/null
+++ b/x11/kdebase2/patches/patch-fc
@@ -0,0 +1,35 @@
+$NetBSD: patch-fc,v 1.1 2001/11/13 21:10:46 jlam Exp $
+
+--- kdesktop/init.cc.orig	Tue Sep  4 19:12:48 2001
++++ kdesktop/init.cc
+@@ -80,9 +80,13 @@
+ {
+   if (force || !QFile::exists(dir + "/.directory")) {
+     QCString cmd;
+-    cmd.sprintf( "cp %s %s/.directory",
++    QCString dest;
++    dest.sprintf( "%s/.directory", QFile::encodeName(dir).data() );
++    cmd.sprintf( "cp %s %s",
+      QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(),
+-     QFile::encodeName(dir).data() );
++     dest.data() );
++    system( cmd );
++    cmd.sprintf( "chmod u+w %s", dest.data() );
+     system( cmd );
+   }
+ }
+@@ -106,10 +110,13 @@
+     for (QStringList::ConstIterator it = list.begin(); it != list.end(); it++) {
+ 	QCString cmd = "cp '";
+ 	KDesktopFile desk( *it );
++	QCString dest = QFile::encodeName(desktopPath + desk.readName());
+ 	cmd += QFile::encodeName(*it);
+ 	cmd += "' '";
+-	cmd += QFile::encodeName(desktopPath + desk.readName());
++	cmd += dest;
+ 	cmd += "'";
++	system( cmd );
++	cmd = "chmod u+w '" + dest + "'";
+ 	system( cmd );
+     }
+ }