Update to KDE 2.2.1

With apologies to Al I wouldn't know where to start with a summary of the changes between 2.1 and 2.2.1 - there are just too many. A couple of hopefully static URLS that contain useful information are http://www.kde.org/announcements/changelog2_1to2_2.html http://www.kde.org/announcements/changelog2_2to2_2_1.html Support for a.out for kde{libs,base} added by me. The libtool/a.out combination doesn't like the linking of modules into binaries. A better way of doing this will appear in future versions of KDE/pkgsrc.
author: skrll <skrll@pkgsrc.org> 2001-10-15 22:45:55 +0000
committer: skrll <skrll@pkgsrc.org> 2001-10-15 22:45:55 +0000
commit: a62b3e67a68598fb0fe4dc2e4d5c5c9e4b884cb3 (patch)
tree: 49e414584e7255669c95e2837a22f79f3eb9d507 /x11/kdebase2
parent: 0fd50d6c14cb246a43399f14bb57be000010fcc8 (diff)
download: pkgsrc-a62b3e67a68598fb0fe4dc2e4d5c5c9e4b884cb3.tar.gz
133 files changed, 7103 insertions, 1711 deletions
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 419a711f356..5a057cac62f 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.25 2001/09/08 19:55:48 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2001/10/15 22:45:59 skrll Exp $
 
-DISTNAME=	kdebase-2.1.1
+DISTNAME=	kdebase-2.2.1
 CATEGORIES=	x11 kde
 .include "../../x11/kde2/Makefile.part1"
 COMMENT=	Base modules for the KDE 2 integrated X11 desktop
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
 
-BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 BUILD_DEPENDS+=		{qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}:../../x11/qt2-designer
 
 USE_BUILDLINK_ONLY=	yes
@@ -16,93 +15,75 @@ USE_BUILDLINK_ONLY=	yes
 
 CONFIGURE_ENV+=		UIC="${QTDIR}/bin/uic"
 CONFIGURE_ENV+=		USER_LDFLAGS="${USER_LDFLAGS}"
-CONFIGURE_ARGS+=	--with-motif-includes="${BUILDLINK_DIR}/include"
-CONFIGURE_ARGS+=	--with-motif-libraries="${BUILDLINK_DIR}/lib"
+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
+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}
-IMAKEDIR=	${WRKDIR}/imake
-
-CONFIGURE_ENV+=	GL_INCLUDE="${BUILDLINK_DIR}/include"
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OBJECT_FMT} == "a.out"
-BROKEN=		"This package doesn't build on a.out. This is being worked on."
-.endif
-
-PLIST_INIT=	${PKGDIR}/PLIST
-PLIST_SRC=	${WRKDIR}/PLIST
-PLIST_DIRS=	share/kde/applnk \
-		share/kde/apps/kappfinder
+PLIST_INIT=		${PKGDIR}/PLIST
+PLIST_SRC=		${WRKDIR}/PLIST
+PLIST_DIRS=		share/kde/applnk \
+			share/kde/apps/kappfinder
 
-KDE_RPATH_MAKEFILES=	kcontrol/ebrowsing/Makefile.in
-KDE_RPATH_MAKEFILES+=	kcontrol/ebrowsing/plugins/ikws/Makefile.in
-KDE_RPATH_MAKEFILES+=	kcontrol/ebrowsing/plugins/shorturi/Makefile.in
-KDE_RPATH_MAKEFILES+=	kcontrol/kio/Makefile.in
-KDE_RPATH_MAKEFILES+=	kcontrol/konq/Makefile.in
-KDE_RPATH_MAKEFILES+=	kcontrol/konqhtml/Makefile.in
+MKDIRS=	\
+	share/kde/icons/hicolor/22x22/apps
 
-# Add a missing $(KDE_RPATH) to the LDFLAGS setting in several Makefiles.
-post-patch:
-	@cd ${WRKSRC};							\
-	for file in ${KDE_RPATH_MAKEFILES}; do				\
-		${SED}	-e "s,\(^LDFLAGS.*\),\1 \$$(KDE_RPATH),"	\
-			$${file} > $${file}.add-kde-rpath;		\
-		${MV} -f $${file}.add-kde-rpath $${file};		\
-	done
-
-post-configure:
-	${MKDIR} ${IMAKEDIR}
-	${LN} -fs ${FILESDIR}/Imakefile ${IMAKEDIR}
-	cd ${IMAKEDIR} && \
-	${XMKMF} && ${MAKE} hasxdmauth >>${WRKSRC}/kdm/kdm-config.h
-	${RM} -rf ${IMAKEDIR}
+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
 
 pre-install:
-	@# on some systems we only have libXdpms.a which makes libkcm_energy and 
-	@# libkcm_screensaver to only build static libs.
 	${RM} -f ${PLIST_SRC}
-.if !exists(${X11BASE}/lib/libXdpms.a) || exists(${X11BASE}/lib/libXdpms.so)
+
+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}
-
-post-install:
 	@${CHMOD} u+s ${PREFIX}/bin/konsole_grantpty
+	@${CHMOD} u+s ${PREFIX}/bin/*.kss
 	@${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 ${KDE_DIRS}; do					\
-		${INSTALL_DATA_DIR} ${PREFIX}/${DIR};			\
-		${ECHO} "@exec mkdir -p %D/${DIR}" >>${PLIST_SRC};	\
-		${ECHO} "@dirrm ${DIR}" >>${PLIST_SRC};			\
+	@(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}; \
 	done
 	@# NetBSD Advertisement O:-)
-	@cd ${PREFIX}/share/kde/config;					\
-	${CP} kdmrc kdmrc.new;						\
+	cd ${PREFIX}/share/kde/config/kdm ; \
+	${CP} kdmrc kdmrc.new ; \
 	${SED} \
-		-e 's|^\(GreetString\)=.*|\1=Welcome to ${OPSYS}! [HOSTNAME]|' \
 		-e 's|^#\(LogoPixmap\)=.*|\1=${PREFIX}/share/kde/icons/Daemon.png|' \
-		kdmrc.new > kdmrc;					\
+		<kdmrc.new >kdmrc ; \
 	${RM} kdmrc.new
 	@${INSTALL_DATA} ${DISTDIR}/Daemon.png ${PREFIX}/share/kde/icons
-	@${INSTALL_DATA} ${DISTDIR}/Daemon.README			\
+	@${INSTALL_DATA} ${DISTDIR}/Daemon.README \
 		${PREFIX}/share/doc/kde/HTML/en/kdm
 
 .include "../../graphics/Mesa/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
 .include "../../x11/kdelibs2/buildlink.mk"
-.include "../../mk/motif.buildlink.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase2/buildlink.mk b/x11/kdebase2/buildlink.mk
index 85f3ca5adec..d75b67ff70b 100644
--- a/x11/kdebase2/buildlink.mk
+++ b/x11/kdebase2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/09/27 06:12:43 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/10/15 22:45:59 skrll 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.1
+BUILDLINK_DEPENDS.kdebase2?=	kdebase>=2.2.1
 DEPENDS+=	${BUILDLINK_DEPENDS.kdebase2}:../../x11/kdebase2
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo
index 049d70b94fa..5e52f534053 100644
--- a/x11/kdebase2/distinfo
+++ b/x11/kdebase2/distinfo
@@ -1,34 +1,137 @@
-$NetBSD: distinfo,v 1.8 2001/10/14 17:20:00 tron Exp $
+$NetBSD: distinfo,v 1.9 2001/10/15 22:45:59 skrll Exp $
 
-SHA1 (kdebase-2.1.1.tar.bz2) = af38d452c957715fa6ae59e99af3e7da2c3369b0
-Size (kdebase-2.1.1.tar.bz2) = 9188425 bytes
+SHA1 (kdebase-2.2.1.tar.bz2) = 5c3a300829fee66bfe26faea39112050fc4cd1e9
+Size (kdebase-2.2.1.tar.bz2) = 12696643 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 Size (Daemon.README) = 2191 bytes
-SHA1 (patch-aa) = b1b0536c3df63efae4ef578ac209a119be1f6a80
-SHA1 (patch-ab) = eb28210220a2973412b65ce61544d69527f04b60
-SHA1 (patch-ac) = 535455e9b978c48ac4230b3b9aebec3920674ed9
-SHA1 (patch-ad) = a5d2c077a2239b6cfbd56cc8299fa7545f2e4c3e
-SHA1 (patch-af) = b91246a123ade7fc354308839e1363a4ee513c7f
-SHA1 (patch-ag) = 1666f52f9d31f972c49879d8f314c7f93fd992d4
-SHA1 (patch-ah) = d30d837719e8bbdf4bc6f5ff377d6febcd85c502
-SHA1 (patch-ai) = 2681287d8817be3d95f97abba834c906b1226c96
-SHA1 (patch-aj) = 3233b247a68a4184a6e85630a6718bd7f2978d67
-SHA1 (patch-ak) = 923b3cb036f5c6e8024dd432138b29ddf203a84c
-SHA1 (patch-al) = 8f8d0ebd8691d73b1ab9c3328e73a81b56c9e47b
-SHA1 (patch-am) = 005245d03c846d2900154172c5936ea1c7a71087
-SHA1 (patch-an) = d6ed06e93d721699395259d573e785a12aec5f6c
-SHA1 (patch-ao) = 3a0a4a1fcd6ccac801bb8c4b9a612644d441a392
-SHA1 (patch-ap) = 1f815fb506a50c5e3b2b0f285b5682375a4cfcb2
-SHA1 (patch-aq) = b3083732d920690019293d06c249f22cf5a3c8d5
-SHA1 (patch-ar) = e1aaa5c899593b9c151b56fa6cad460393c9caf0
-SHA1 (patch-as) = bb94b41a90f6db85f82f3b64adea24c4e1ae22ec
-SHA1 (patch-at) = 3a9345c6793365b3e52721b96014bcbff7371ab0
-SHA1 (patch-au) = 7e82964090089b37f2e4e1a4ca0f2201506b8303
-SHA1 (patch-av) = edd6bb62a65f7569907d26bf76a65beecc434670
-SHA1 (patch-aw) = 6510c6e55f619778c318a96cd5120bb07d9aa6d9
-SHA1 (patch-ax) = bd3a8494663da789fffd1a9d5340b0f44819f26c
-SHA1 (patch-ay) = 287912fd2f3ff04f0239545a1d215b36cb8c1d0f
-SHA1 (patch-az) = 5af89343863ed55268c9ef22dee394665270cb8b
-SHA1 (patch-ba) = 81edce3b636e6bdb2012ef3fe8c7bba704935081
+SHA1 (patch-aa) = 913e5b2f4db3cc06bd922210fea097ab393c5dc2
+SHA1 (patch-ab) = b20193817a7d4e10dc84890e024e48f63fdcf889
+SHA1 (patch-ac) = 9a6326413006036df756dc4d7c90516c261948ff
+SHA1 (patch-ad) = 972b0cace3baacc5d7ea031065a391b43dd377e5
+SHA1 (patch-ae) = 647a44a4f5db8c7ca44ca94e7f720eb18bd3285d
+SHA1 (patch-af) = d60a3d8f5fcc6ed0ebf71ff9aa7dbfb25cbbb3f5
+SHA1 (patch-ag) = b5173768733b68e49028daa8c81b5c5cb9be70ff
+SHA1 (patch-ah) = 538abd3555bf93e1a477e3e3753f141199a70ec3
+SHA1 (patch-ai) = f4cc95a9383aff302c078fe5562eb4a61f14d4d1
+SHA1 (patch-aj) = 9b9c94d0b70c6eb1166144ef0da6fa51405fd698
+SHA1 (patch-ak) = b84ba03330ba49d8410237f3551a8331aa51c8e8
+SHA1 (patch-al) = 0540bc48551547b2d749c5a3abce3f0511c04522
+SHA1 (patch-am) = c4031c4ae4e3059615e744c634857af7c8e9ceef
+SHA1 (patch-an) = 143cfcc7c484a9b8e2ecfe8b20e1530c0126bd44
+SHA1 (patch-ao) = bfaa153d9e7429955def1b549647e5a56befb862
+SHA1 (patch-ap) = 9b2c20a744ac6b0e1166f26d77fa1beacf12f5b2
+SHA1 (patch-aq) = 41bc29852561d5dbc2b5d874f63e0f14ecde9677
+SHA1 (patch-ar) = 65077f21078b47810238962fa97eae4278916f9d
+SHA1 (patch-as) = 60919f97d69070ed4cf92b57d9ba3af98cac17a1
+SHA1 (patch-at) = a83ed07e5fb01ea1ac3b64f8550b84b1ceeb35dc
+SHA1 (patch-au) = df8e81dfaae33e0a8371d1176d37ab64b26b4984
+SHA1 (patch-av) = c2e2777a0b9f25a3418e919121a8cb95c104425a
+SHA1 (patch-aw) = d510d135a475c5f3367e218a7b35cf3f81a92a04
+SHA1 (patch-ax) = 67e65b516fec8d69fd24da2416c9392c5b8e0c19
+SHA1 (patch-ay) = 99da69fbe2e746d362ef3a9d37f93bfba1671502
+SHA1 (patch-az) = c0d3bd7de39f25e5aeb6c6b8a2f53ed6a723a51e
+SHA1 (patch-ba) = e35ed891863c43c0d23c5039e46a66b45f225812
+SHA1 (patch-bb) = 3fdad176411aa555a98278e0770479cc0aa188e1
+SHA1 (patch-bc) = 355f23f7dcaded142c94c8ca039ccf922362e410
+SHA1 (patch-bd) = 8e0436a500cc2b37098beac7413d8320310e8bb3
+SHA1 (patch-be) = 316ea71a9c2724f790f02a297c5029e556c027f9
+SHA1 (patch-bf) = 2cace1983f5009e94e39eabbebfc261086ffe7bd
+SHA1 (patch-bg) = 4e708f50e2f0cd2f222ac0cb7d155caa929da99a
+SHA1 (patch-bh) = e9c20ea39b09f38f2c8342a388ff249baabbb13e
+SHA1 (patch-bi) = 09b17a8238286e798ea58839029ea6e95f277e7a
+SHA1 (patch-bj) = 5745f452875481fef0225dc48603ce6fc4afb7ba
+SHA1 (patch-bk) = cdb0cc50e498c101e47b689a31078f7f942dcb9c
+SHA1 (patch-bl) = dc3a589816c7c5681c09c9ef962178ff9e37409d
+SHA1 (patch-bm) = 5675e1672697461011657b492f2ca18babcec3f6
+SHA1 (patch-bn) = 93c8f8a3bb6aaf1a5c852eac73441ea868aacf98
+SHA1 (patch-bo) = 3ed1b9b2bd2870c80aad7a0b39aee9ac3bdc9238
+SHA1 (patch-bp) = dbab7f40f19758f9967c2082ad105e678af010c1
+SHA1 (patch-bq) = 6c83d70a7ac5ad65c7bcfb909bae4a005e060dbe
+SHA1 (patch-br) = ccb960d5b9f43f70e17bde094ffa1b49f0d89d2b
+SHA1 (patch-bs) = ce2eeeb511591fec68f96cf246c324debfd2690d
+SHA1 (patch-bt) = 19dad64a5f030d502116934618e62913318eb272
+SHA1 (patch-bu) = 27ebf1865fa59c2a3b7f6a72ee5127cb342705bb
+SHA1 (patch-bv) = a38c2aae13e3f5fd1f8934624bf8619fa58c0583
+SHA1 (patch-bw) = 8085afa89f26d1814d006321b060641f0e82a8c9
+SHA1 (patch-bx) = b17a1bf7eaf50274ae74c3b344b2e31a53d75472
+SHA1 (patch-by) = 2f1c28c09d8fd2f5c1776222d4f1365c1920f3b5
+SHA1 (patch-bz) = 9bbd80c748b2e2cd56c3c2c1cd336d712382c97a
+SHA1 (patch-ca) = 737e6edbbf4e63d254227a3156b2fb944fa466fc
+SHA1 (patch-cb) = b55ec33208f56ac784c5fce3b386f17f158f752c
+SHA1 (patch-cc) = eca19e5c3f0efbcb919a5c2d570079ea17c1ea58
+SHA1 (patch-cd) = 0b0c2f7f9f5608500be781d5bd56a0b4a608e5a9
+SHA1 (patch-ce) = 59abadb4bcd1b194dfab07ebf667afb0b85bcfc8
+SHA1 (patch-cf) = 759a4c5179806c07e797fcf8427eb929f6e42db0
+SHA1 (patch-cg) = 909c29002c494c2d04dbb01fa6ab8c981e7ea349
+SHA1 (patch-ch) = b8fb2688192c61778d79f8fbd1c4fb5fc3fe409d
+SHA1 (patch-ci) = 12e515c4517a59c3c5f529162ea66c44cbcdd69c
+SHA1 (patch-cj) = 1c659b1cfeda7fa0610dfd6124cd49c763796479
+SHA1 (patch-ck) = 6af4e727203046c7fedda9a5870c37285849f85c
+SHA1 (patch-cl) = c4b36e0d27a719d99e8e154691c52a111944ccd4
+SHA1 (patch-cm) = 1b6d0a49111a4e6dda4e262200c57e5a32e0ee4c
+SHA1 (patch-cn) = 8f6c708f061d443a2cb6f26971bd8073e304bd68
+SHA1 (patch-co) = 07f5c0bfae64c180ce954c5eb07a7e425d98a9b2
+SHA1 (patch-cp) = ffed00158cc312d71ee6b090599282c2acf09385
+SHA1 (patch-cq) = 6d8bd231a1d4cc7c1aaa679d55606d4920c01774
+SHA1 (patch-cr) = 6597394593adf2c192bb1efda1ce6d90518a1636
+SHA1 (patch-cs) = c111370c446497bd009950f42badfb2ac8ae6ba6
+SHA1 (patch-ct) = 55150f15cdcb502c972791fa7800ed5ac13cdc00
+SHA1 (patch-cu) = 905c9cdb6a257d56bbcc17d8db9abdcbf2cb13ee
+SHA1 (patch-cv) = 300ad933f112da299ea019b18fecdd751c55c3f7
+SHA1 (patch-cw) = 4e153072d46391cfd8ec92aa680e15567a7cfd61
+SHA1 (patch-cx) = 99210d00107bf63f62928a614a60cb95c6d966ca
+SHA1 (patch-cy) = 3a74e5fab69748d0fd9f8c1ba356200c7731a7ee
+SHA1 (patch-cz) = 2bc9173a96d1011367241703676b359e839a3282
+SHA1 (patch-da) = e95356642c3eb7f16fefb8ff9b0d12b81e6dca77
+SHA1 (patch-db) = 7f7b40b560a1e5d80df0c3365a4e21b5e09bab5a
+SHA1 (patch-dc) = f96c5afb536e8458b9022aa289b19ffa7b7fc3cb
+SHA1 (patch-dd) = 4bdfcd867cf41116771bb751d568aad4254ab4b7
+SHA1 (patch-de) = d30d837719e8bbdf4bc6f5ff377d6febcd85c502
+SHA1 (patch-df) = 2681287d8817be3d95f97abba834c906b1226c96
+SHA1 (patch-dg) = 4bd7d431a28a970355a6abe1b74bab9e13fcb0c5
+SHA1 (patch-dh) = 117d31103867ee047cde035b1decf9abd2fa306a
+SHA1 (patch-di) = 60f389ba30cb8dddbb7542eb52de672b47af66d5
+SHA1 (patch-dj) = 86e1c6218e7e62fc0529e50b04fcb94bd69633ff
+SHA1 (patch-dk) = faa2733e735965f3ba16d34c986dca973e429db6
+SHA1 (patch-dl) = de55f1f18852278896239e56cc561f34272ba574
+SHA1 (patch-dm) = 7a73526844a40e3ad99b35617a18a1c7e58ede00
+SHA1 (patch-dn) = 1a3fb5692cf1c3ed81d6bdac3500f97fd98bb295
+SHA1 (patch-do) = 837a1c746ce91c7840e1b05083b3ad62a03ce74b
+SHA1 (patch-dp) = f93857e6410ec475281f2bd153430de911f051b6
+SHA1 (patch-dq) = 18bc38b1f348908838aa309024e1a8252d006d97
+SHA1 (patch-dr) = 6f33a15c8cdc34fb1e67390e48c529ccef249171
+SHA1 (patch-ds) = a75bc4e7d48047fd2b625e59f9025f5045a9c8f1
+SHA1 (patch-dt) = c05f146222ea7342241ca857e48eb310850c8047
+SHA1 (patch-du) = dba726f3a0aea90c857d005b3ef3bde8820a0e0a
+SHA1 (patch-dv) = 84abd1e2951346aeac06bc407057219920339768
+SHA1 (patch-dw) = c9c91ae5c6a3e95eae74220dcd7a925d9c96a063
+SHA1 (patch-dx) = 82a2b28db04ac66bf9348e5c83d48171e44938d7
+SHA1 (patch-dy) = 40f84c38d5338b8c7bb0de2f569ea08df8f3ab5a
+SHA1 (patch-dz) = 680397ce7b0d3176876fb2cdec0680c22708c9f9
+SHA1 (patch-ea) = 514ead7137f3ef9d1f839162d0f79495a7377859
+SHA1 (patch-eb) = 8e1777dabe29400120ea27148e8d8b3e9c357a66
+SHA1 (patch-ec) = 7350b01a16f459e2e23ba474a3fa1074105b7d81
+SHA1 (patch-ed) = 8ee44615ce8372a000d5550e764e980c925a5a0f
+SHA1 (patch-ee) = e6ace4dfbf1b3ed0000cac6f78d41636f0951242
+SHA1 (patch-ef) = 692eb8d20ce34c35e711eaa7366332ae3272305f
+SHA1 (patch-eg) = 482455343b12e42930828949ddd3bf1c4bd1880b
+SHA1 (patch-eh) = 642c18fdcbe215418597a5ab17ed148c112c0789
+SHA1 (patch-ei) = ce6aad1dab3f0f66ba4e844ae8f1ee37b6188561
+SHA1 (patch-ej) = c6b8075e6da941a03032eb22c311867d0372a6d0
+SHA1 (patch-ek) = 2d0be7912cb009593e71ea6d53c9c538aec9caef
+SHA1 (patch-el) = 99f484d15555fdf38acf0d7c04bd55a0d0d2bff7
+SHA1 (patch-em) = 636dc26af3ca541dfecea60bcb8d4d5af7944f6d
+SHA1 (patch-en) = e62d89268c19a0ad02f55b9543518b0fed0c8a5a
+SHA1 (patch-eo) = 3f6ceff6f3c000f11fc5035995b3dd6e6b78da47
+SHA1 (patch-ep) = 57e1ed1d41871b626f7d7b906c552abb4dde8e9f
+SHA1 (patch-eq) = 52e74649447f35114c0b92aebf23262ed67495b3
+SHA1 (patch-er) = df2f9a856bd75b7f3726b8d7457ab7123f91314b
+SHA1 (patch-es) = ec61651f85b48e4f9b747fd97474c726efcabf5c
+SHA1 (patch-et) = 1a573a0f3043e803f7edb08492aa8d42f79ce5e5
+SHA1 (patch-eu) = d31dee4dbf809b237662eae8bdec019cc594dc73
+SHA1 (patch-ev) = 2e42263d67e5e44035bed13dc3e5245fc3a86709
+SHA1 (patch-ew) = 78ff80b8b8de9fedaba7d875ac00ea6fd9e88a0a
+SHA1 (patch-ex) = 96fac765f7678be3563245c3fa1a23ace5bce86b
+SHA1 (patch-ey) = 2252a4ed9f9d15021e59b542568b0dc0f9c73e48
diff --git a/x11/kdebase2/patches/patch-aa b/x11/kdebase2/patches/patch-aa
index 233e970950e..cb4a054b079 100644
--- a/x11/kdebase2/patches/patch-aa
+++ b/x11/kdebase2/patches/patch-aa
@@ -1,59 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2001/09/28 21:19:16 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2001/10/15 22:45:59 skrll Exp $
 
---- configure.orig	Tue Mar 20 12:02:28 2001
+--- configure.orig	Sat Sep  8 01:36:55 2001
 +++ configure
-@@ -4460,7 +4460,7 @@
-    for dir in $kde_use_extra_libs; do
-      kde_extra_libs="$kde_extra_libs $dir"
-      KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
--     USER_LDFLAGS="$USER_LDFLAGS -L$dir"
-+     #USER_LDFLAGS="$USER_LDFLAGS -L$dir"	# buildlink.mk
-    done
-    IFS=$ac_save_ifs
-    kde_use_extra_libs="added"
-@@ -5654,7 +5654,7 @@
- if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
-  QT_LDFLAGS=""
- else
-- QT_LDFLAGS="-L$qt_libraries"
-+ QT_LDFLAGS="-L${QTDIR}/lib"			# buildlink.mk
-  all_libraries="$all_libraries $QT_LDFLAGS"
- fi
- 
-@@ -5981,11 +5981,11 @@
- if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" ; then
-  KDE_INCLUDES=""
- else
-- KDE_INCLUDES="-I$kde_includes"
-+ KDE_INCLUDES="-I${BUILDLINK_DIR}/include"	# buildlink.mk
-  all_includes="$KDE_INCLUDES $all_includes"
- fi
-  
--KDE_LDFLAGS="-L$kde_libraries"
-+KDE_LDFLAGS="-L${BUILDLINK_DIR}/lib"		# buildlink.mk
- if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then 
-  all_libraries="$all_libraries $KDE_LDFLAGS"
- fi
-@@ -9944,7 +9944,9 @@
- 
- 
- 
--for ac_func in getsecretkey getloadavg getusershell login_getclass auth_timeok
-+ac_save_LIBS="$LIBS"
-+LIBS="$LIBS -lutil"
-+for ac_func in getsecretkey getloadavg getusershell login_getclass auth_timeok setusercontext
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:9951: checking for $ac_func" >&5
-@@ -10001,6 +10003,7 @@
-   echo "$ac_t""no" 1>&6
- fi
- done
-+LIBS="$ac_save_LIBS"
- 
- 
- # Extract the first word of "X", so it can be a program name with args.
-@@ -11113,7 +11116,7 @@
+@@ -12536,7 +12536,7 @@
  
      ac_save_ldflags="$LDFLAGS"
      ac_save_cflags="$CFLAGS"
@@ -62,7 +11,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/28 21:19:16 jlam Exp $
      CFLAGS="$CFLAGS $X_INCLUDES"
      test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
      cat > conftest.$ac_ext <<EOF
-@@ -11178,13 +11181,13 @@
+@@ -12601,13 +12601,13 @@
  
      if test "$GL_LDFLAGS" = ""; then
         if test "$ac_cv_have_gl" = "mesa"; then
@@ -78,7 +27,7 @@ $NetBSD: patch-aa,v 1.5 2001/09/28 21:19:16 jlam Exp $
         else
            GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(LIB_X11)'
         fi
-@@ -11198,7 +11201,7 @@
+@@ -12621,7 +12621,7 @@
      
  GL_SAVERS="kmorph3d.kss kspace.kss kpipes.kss"
  ac_save_CPPFLAGS="$CPPFLAGS"
@@ -87,11 +36,11 @@ $NetBSD: patch-aa,v 1.5 2001/09/28 21:19:16 jlam Exp $
  for ac_hdr in GL/xmesa.h GL/glut.h memory.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-@@ -11581,6 +11584,7 @@
+@@ -12919,6 +12919,7 @@
  case "$host" in 
    *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
    *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
 +  *-*-netbsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
- #  *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
+   *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
    *) ksysguard_compile=no; UNAME='' ;;
  esac
diff --git a/x11/kdebase2/patches/patch-ab b/x11/kdebase2/patches/patch-ab
index 74969ebe7ef..a5772d4f529 100644
--- a/x11/kdebase2/patches/patch-ab
+++ b/x11/kdebase2/patches/patch-ab
@@ -1,14 +1,47 @@
-$NetBSD: patch-ab,v 1.3 2001/10/14 17:20:00 tron Exp $
+$NetBSD: patch-ab,v 1.4 2001/10/15 22:45:59 skrll Exp $
 
---- kdm/Makefile.in.orig	Sun Oct 14 17:56:19 2001
-+++ kdm/Makefile.in	Sun Oct 14 18:02:24 2001
-@@ -278,6 +278,9 @@
- # Libraries:
- LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KRB_RPATH)
- LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSLIB)     $(LIB_LIBS) $(KERBEROS_LIBS) $(LIBSOCKET)     $(LIBCRYPT) $(LIBUCB) $(LIBDL) $(LIBUTIL) $(LIBRESOLV)
-+ifeq ($(OPSYS),NetBSD)
-+LDADD += -lstdc++
-+endif
- 
- kdm_LDADD = $(LDADD) $(KDM_GREET_LIBS)
+--- kate/main/Makefile.am.orig	Thu May 31 16:51:43 2001
++++ kate/main/Makefile.am
+@@ -1,4 +1,4 @@
+-lib_LTLIBRARIES = libkatecore.la kate.la kwrite.la
++lib_LTLIBRARIES = libkatecore.la libkate_main.la kate.la libkwrite_main.la kwrite.la
+ bin_PROGRAMS = kate kwrite
  
+ libkatecore_la_SOURCES = dummy.cpp
+@@ -10,20 +10,28 @@
+ 		../pluginmanager/libkatepluginmanager.la ../interfaces/libkateinterfaces.la -lktexteditor -lkspell -lkdeprint
+ libkatecore_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)  $(KDE_PLUGIN)  -module -avoid-version
+ 
+-kate_la_SOURCES = katemain.cpp
+-kate_la_LIBADD  = libkatecore.la
++libkate_main_la_SOURCES = katemain.cpp
++libkate_main_la_LIBADD  = libkatecore.la
++libkate_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++
++kate_la_SOURCES = kate_main.cpp
++kate_la_LIBADD  = libkate_main.la
+ kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
+ 
+-kwrite_la_SOURCES = kwritemain.cpp
+-kwrite_la_LIBADD   = libkatecore.la
++libkwrite_main_la_SOURCES = kwritemain.cpp
++libkwrite_main_la_LIBADD   = libkatecore.la
++libkwrite_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++
++kwrite_la_SOURCES = kwrite_main.cpp
++kwrite_la_LIBADD   = libkwrite_main.la
+ kwrite_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)  -module -avoid-version
+ 
+-kate_SOURCES = dummy.cpp
+-kate_LDADD = kate.la
++kate_SOURCES = kate_main.cpp
++kate_LDADD = libkate_main.la
+ kate_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+-kwrite_SOURCES = dummy.cpp
+-kwrite_LDADD = kwrite.la
++kwrite_SOURCES = kwrite_main.cpp
++kwrite_LDADD = libkwrite_main.la
+ kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ dummy.cpp:
diff --git a/x11/kdebase2/patches/patch-ac b/x11/kdebase2/patches/patch-ac
index 84a62db44f7..75968cb13c1 100644
--- a/x11/kdebase2/patches/patch-ac
+++ b/x11/kdebase2/patches/patch-ac
@@ -1,13 +1,183 @@
-$NetBSD: patch-ac,v 1.4 2001/07/05 23:41:27 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2001/10/15 22:46:00 skrll Exp $
 
---- kcontrol/arts/Makefile.in.orig	Thu Feb 22 08:16:33 2001
-+++ kcontrol/arts/Makefile.in
-@@ -263,7 +263,7 @@
- libkcm_arts_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
- libkcm_arts_la_LIBADD = -lkdeui
- 
--INCLUDES = $(all_includes) -I$(kde_includes)/arts 
-+INCLUDES = $(all_includes) -I${BUILDLINK_DIR}/include/arts 
- 
- #>- libkcm_arts_la_METASOURCES = AUTO
- 
+--- kate/main/Makefile.in.orig	Sat Sep  8 01:36:21 2001
++++ kate/main/Makefile.in
+@@ -274 +274 @@
+-lib_LTLIBRARIES = libkatecore.la kate.la kwrite.la
++lib_LTLIBRARIES = libkatecore.la libkate_main.la kate.la libkwrite_main.la kwrite.la
+@@ -282,2 +282,6 @@
+-kate_la_SOURCES = katemain.cpp
+-kate_la_LIBADD = libkatecore.la
++libkate_main_la_SOURCES = katemain.cpp
++libkate_main_la_LIBADD = libkatecore.la
++libkate_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++
++kate_la_SOURCES = kate_main.cpp
++kate_la_LIBADD = libkate_main.la
+@@ -286,2 +290,6 @@
+-kwrite_la_SOURCES = kwritemain.cpp
+-kwrite_la_LIBADD = libkatecore.la
++libkwrite_main_la_SOURCES = kwritemain.cpp
++libkwrite_main_la_LIBADD = libkatecore.la
++libkwrite_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++
++kwrite_la_SOURCES = kwrite_main.cpp
++kwrite_la_LIBADD = libkwrite_main.la
+@@ -290,2 +298,2 @@
+-kate_SOURCES = dummy.cpp
+-kate_LDADD = kate.la
++kate_SOURCES = kate_main.cpp
++kate_LDADD = libkate_main.la
+@@ -294,2 +302,2 @@
+-kwrite_SOURCES = dummy.cpp
+-kwrite_LDADD = kwrite.la
++kwrite_SOURCES = kwrite_main.cpp
++kwrite_LDADD = libkwrite_main.la
+@@ -323,2 +331,6 @@
+-kate_la_DEPENDENCIES =  libkatecore.la
+-#>- kate_la_OBJECTS =  katemain.lo
++libkate_main_la_DEPENDENCIES =  libkatecore.la
++#>- libkate_main_la_OBJECTS =  katemain.lo
++#>+ 1
++libkate_main_la_OBJECTS = katemain.lo
++kate_la_DEPENDENCIES =  libkate_main.la
++#>- kate_la_OBJECTS =  kate_main.lo
+@@ -326,3 +338,3 @@
+-kate_la_OBJECTS = katemain.lo
+-kwrite_la_DEPENDENCIES =  libkatecore.la
+-#>- kwrite_la_OBJECTS =  kwritemain.lo
++kate_la_OBJECTS = kate_main.lo
++libkwrite_main_la_DEPENDENCIES =  libkatecore.la
++#>- libkwrite_main_la_OBJECTS =  kwritemain.lo
+@@ -330,5 +342,9 @@
+-kwrite_la_final_OBJECTS = kwrite_la.all_cpp.lo 
+-kwrite_la_nofinal_OBJECTS = kwritemain.lo \
+-kwrite_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kwrite_la_OBJECTS = $(kwrite_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kwrite_la_OBJECTS = $(kwrite_la_final_OBJECTS)
++libkwrite_main_la_final_OBJECTS = libkwrite_main_la.all_cpp.lo 
++libkwrite_main_la_nofinal_OBJECTS = kwritemain.lo \
++libkwrite_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_final_OBJECTS)
++kwrite_la_DEPENDENCIES =  libkwrite_main.la
++#>- kwrite_la_OBJECTS =  kwrite_main.lo
++#>+ 1
++kwrite_la_OBJECTS = kwrite_main.lo
+@@ -338 +354 @@
+-#>- kate_OBJECTS =  dummy.$(OBJEXT)
++#>- kate_OBJECTS =  kate_main.$(OBJEXT)
+@@ -340,3 +356,3 @@
+-kate_OBJECTS = dummy.$(OBJEXT)
+-kate_DEPENDENCIES =  kate.la
+-#>- kwrite_OBJECTS =  dummy.$(OBJEXT)
++kate_OBJECTS = kate_main.$(OBJEXT)
++kate_DEPENDENCIES =  libkate_main.la
++#>- kwrite_OBJECTS =  kwrite_main.$(OBJEXT)
+@@ -344,2 +360,2 @@
+-kwrite_OBJECTS = dummy.$(OBJEXT)
+-kwrite_DEPENDENCIES =  kwrite.la
++kwrite_OBJECTS = kwrite_main.$(OBJEXT)
++kwrite_DEPENDENCIES =  libkwrite_main.la
+@@ -369,2 +385,2 @@
+-SOURCES = $(libkatecore_la_SOURCES) $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES)
+-OBJECTS = $(libkatecore_la_OBJECTS) $(kate_la_OBJECTS) $(kwrite_la_OBJECTS) $(kate_OBJECTS) $(kwrite_OBJECTS)
++SOURCES = $(libkatecore_la_SOURCES) $(libkate_main_la_SOURCES) $(kate_la_SOURCES) $(libkwrite_main_la_SOURCES) $(kwrite_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES)
++OBJECTS = $(libkatecore_la_OBJECTS) $(libkate_main_la_OBJECTS) $(kate_la_OBJECTS) $(libkwrite_main_la_OBJECTS) $(kwrite_la_OBJECTS) $(kate_OBJECTS) $(kwrite_OBJECTS)
+@@ -462,0 +479,3 @@
++libkate_main.la: $(libkate_main_la_OBJECTS) $(libkate_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkate_main_la_LDFLAGS) $(libkate_main_la_OBJECTS) $(libkate_main_la_LIBADD) $(LIBS)
++
+@@ -465,0 +485,3 @@
++libkwrite_main.la: $(libkwrite_main_la_OBJECTS) $(libkwrite_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkwrite_main_la_LDFLAGS) $(libkwrite_main_la_OBJECTS) $(libkwrite_main_la_LIBADD) $(LIBS)
++
+@@ -542,11 +563,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -687,8 +698,8 @@
+-kwrite_la_meta_unload.cpp:  kwritemain.moc
+-	@echo 'creating kwrite_la_meta_unload.cpp'
+-	@-rm -f kwrite_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_kwrite_la[] = {' > kwrite_la_meta_unload.cpp
+-	@cat  kwritemain.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrite_la_meta_unload.cpp
+-	@echo '0};' >> kwrite_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> kwrite_la_meta_unload.cpp
+-	@echo '_UNLOAD(kwrite_la)' >> kwrite_la_meta_unload.cpp
++libkwrite_main_la_meta_unload.cpp:  kwritemain.moc
++	@echo 'creating libkwrite_main_la_meta_unload.cpp'
++	@-rm -f libkwrite_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkwrite_main_la[] = {' > libkwrite_main_la_meta_unload.cpp
++	@cat  kwritemain.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrite_main_la_meta_unload.cpp
++	@echo '0};' >> libkwrite_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkwrite_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libkwrite_main_la)' >> libkwrite_main_la_meta_unload.cpp
+@@ -699 +710 @@
+-	-rm -f  kwrite_la_meta_unload.cpp
++	-rm -f  libkwrite_main_la_meta_unload.cpp
+@@ -714 +725,13 @@
+-kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/katemain.cpp  
++libkate_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/katemain.cpp  
++	@echo 'creating libkate_main_la.all_cpp.cpp ...'; \
++	rm -f libkate_main_la.all_cpp.files libkate_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkate_main_la.all_cpp.final; \
++	for file in katemain.cpp ; do \
++	  echo "#include \"$$file\"" >> libkate_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkate_main_la.all_cpp.final; \
++	done; \
++	cat libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files  > libkate_main_la.all_cpp.cpp; \
++	rm -f libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files
++
++#>+ 11
++kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kate_main.cpp  
+@@ -718 +741 @@
+-	for file in katemain.cpp ; do \
++	for file in kate_main.cpp ; do \
+@@ -726 +749,13 @@
+-kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp kwrite_la_meta_unload.cpp  
++libkwrite_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp libkwrite_main_la_meta_unload.cpp  
++	@echo 'creating libkwrite_main_la.all_cpp.cpp ...'; \
++	rm -f libkwrite_main_la.all_cpp.files libkwrite_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkwrite_main_la.all_cpp.final; \
++	for file in kwritemain.cpp libkwrite_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkwrite_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwrite_main_la.all_cpp.final; \
++	done; \
++	cat libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files  > libkwrite_main_la.all_cpp.cpp; \
++	rm -f libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files
++
++#>+ 11
++kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrite_main.cpp  
+@@ -730 +765 @@
+-	for file in kwritemain.cpp kwrite_la_meta_unload.cpp ; do \
++	for file in kwrite_main.cpp ; do \
+@@ -738 +773 @@
+-kate.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kate.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kate_main.cpp  
+@@ -742 +777 @@
+-	for file in dummy.cpp ; do \
++	for file in kate_main.cpp ; do \
+@@ -750 +785 @@
+-kwrite.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kwrite.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrite_main.cpp  
+@@ -754 +789 @@
+-	for file in dummy.cpp ; do \
++	for file in kwrite_main.cpp ; do \
+@@ -763 +798 @@
+-	-rm -f libkatecore_la.all_cpp.cpp kate_la.all_cpp.cpp kwrite_la.all_cpp.cpp kate.all_cpp.cpp kwrite.all_cpp.cpp
++	-rm -f libkatecore_la.all_cpp.cpp libkate_main_la.all_cpp.cpp kate_la.all_cpp.cpp libkwrite_main_la.all_cpp.cpp kwrite_la.all_cpp.cpp kate.all_cpp.cpp kwrite.all_cpp.cpp
+@@ -767 +802 @@
+-	$(MAKE) kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" all-am
++	$(MAKE) libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" all-am
+@@ -770 +805 @@
+-	$(MAKE) kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-ad b/x11/kdebase2/patches/patch-ad
index d7e8dd8894a..669a3a5dea8 100644
--- a/x11/kdebase2/patches/patch-ad
+++ b/x11/kdebase2/patches/patch-ad
@@ -1,15 +1,33 @@
-$NetBSD: patch-ad,v 1.3 2001/07/05 23:41:27 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2001/10/15 22:46:00 skrll Exp $
 
---- kcontrol/konq/Makefile.in.orig	Thu Jul  5 13:49:35 2001
-+++ kcontrol/konq/Makefile.in
-@@ -642,8 +642,8 @@
- .NOEXPORT:
- 
- #>+ 5
--uiserver.kidl: $(kde_includes)/kio/uiserver.h $(DCOPIDL_DEPENDENCIES)
--	$(DCOPIDL) $(kde_includes)/kio/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false )
-+uiserver.kidl: ${BUILDLINK_DIR}/include/kio/uiserver.h $(DCOPIDL_DEPENDENCIES)
-+	$(DCOPIDL) ${BUILDLINK_DIR}/include/kio/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false )
- uiserver_stub.h: uiserver.kidl
- 	$(DCOPIDL2CPP) --c++-suffix cpp --no-skel uiserver.kidl
- 
+--- kate/main/kate_main.cpp.orig	Tue Oct  2 17:50:30 2001
++++ kate/main/kate_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int kate_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kate_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-ae b/x11/kdebase2/patches/patch-ae
new file mode 100644
index 00000000000..359883008d4
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.4 2001/10/15 22:46:00 skrll Exp $
+
+--- kate/main/katemain.cpp.orig	Sun Jul 29 05:56:17 2001
++++ kate/main/katemain.cpp
+@@ -39,7 +39,7 @@
+     { 0,0,0 }
+ };
+ 
+-int main( int argc, char **argv )
++int kate_main( int argc, char **argv )
+ {
+   KCmdLineArgs::init (argc, argv, KateFactory::aboutData());
+   KCmdLineArgs::addCmdLineOptions (options);
diff --git a/x11/kdebase2/patches/patch-af b/x11/kdebase2/patches/patch-af
index 7e497b27579..1afe34cae1e 100644
--- a/x11/kdebase2/patches/patch-af
+++ b/x11/kdebase2/patches/patch-af
@@ -1,22 +1,33 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/03/14 16:03:12 skrll Exp $
+$NetBSD: patch-af,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- kicker/share/pluginmgr.cpp.orig	Wed Dec 13 18:25:06 2000
-+++ kicker/share/pluginmgr.cpp
-@@ -59,7 +59,7 @@
- 	return(NULL);
-     }
- 
--    lt_ptr_t init_func = lt_dlsym(handle, "init");
-+    lt_ptr init_func = lt_dlsym(handle, "init");
-     if(!init_func){
- 	kdWarning() << libStr << " is not a kicker applet!" << endl;
- 	lt_dlclose(handle);
-@@ -104,7 +104,7 @@
- 	return(NULL);
-     }
- 
--    lt_ptr_t init_func = lt_dlsym(handle, "init");
-+    lt_ptr init_func = lt_dlsym(handle, "init");
-     if(!init_func){
- 	kdWarning() << libStr << " is not a kicker extension!" << endl;
- 	lt_dlclose(handle);
+--- kate/main/kwrite_main.cpp.orig	Tue Oct  2 17:50:30 2001
++++ kate/main/kwrite_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int kwrite_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kwrite_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-ag b/x11/kdebase2/patches/patch-ag
index e7444535c3e..beb5d89fd2b 100644
--- a/x11/kdebase2/patches/patch-ag
+++ b/x11/kdebase2/patches/patch-ag
@@ -1,55 +1,13 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/03/14 16:03:12 skrll Exp $
+$NetBSD: patch-ag,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- konsole/src/TEPty.C.orig	Sun Feb 18 15:28:28 2001
-+++ konsole/src/TEPty.C
-@@ -179,9 +179,18 @@
- // param grant: 1 to grant, 0 to revoke
- // returns 1 on success 0 on fail
+--- kate/main/kwritemain.cpp.orig	Sun Jul 29 05:56:17 2001
++++ kate/main/kwritemain.cpp
+@@ -468,7 +468,7 @@
+   { 0, 0, 0}
+ };
+ 
+-int main(int argc, char **argv)
++int kwrite_main(int argc, char **argv)
  {
-+  struct sigaction newsa, oldsa;
-+  newsa.sa_handler = SIG_DFL;
-+  newsa.sa_mask = sigset_t();
-+  newsa.sa_flags = 0;
-+  sigaction(SIGCHLD, &newsa, &oldsa);
-+
-   pid_t pid = fork();
-   if (pid < 0)
-   {
-+    // restore previous SIGCHLD handler
-+    sigaction(SIGCHLD, &oldsa, NULL);
-+
-     return 0;
-   }
-   if (pid == 0)
-@@ -194,14 +203,6 @@
-   }
+   KLocale::setMainCatalogue("kate");         //lukas: set this to have the kwritepart translated using kate message catalog
  
-   if (pid > 0) {
--    // ### FreeBSD seems to need the SIGCHLD sighandler resett to default for
--    // waitpid() to work. - Brad
--    struct sigaction newsa, oldsa;
--    newsa.sa_handler = SIG_DFL;
--    newsa.sa_mask = sigset_t();
--    newsa.sa_flags = 0;
--    sigaction(SIGCHLD, &newsa, &oldsa);
--
-     int w;
- retry:
-     int rc = waitpid (pid, &w, 0);
-@@ -238,7 +239,7 @@
- #ifdef HAVE_UTEMPTER
-   removeLineFromUtmp(ttynam, fd);
- #elif defined(USE_LOGIN)
--  char *tty_name=ttyname(0);
-+  char *tty_name=ttyname(fd);
-   if (tty_name)
-   {
-   	if (strncmp(tty_name, "/dev/", 5) == 0)
-@@ -296,6 +297,7 @@
-       strncpy(ptynam, name, 50);
-       strncpy(ttynam, name, 50);
-       ttynam[5]='t';
-+      ptynam[5]='p';
-       // one needs to look into who owns what to make sure chownpty is needed
-       // FIXME: further, the logic of openPty has to adjusted to pass a file
-       //        handle instead of a name.
diff --git a/x11/kdebase2/patches/patch-ah b/x11/kdebase2/patches/patch-ah
index e2cebab263f..2fa8c570e16 100644
--- a/x11/kdebase2/patches/patch-ah
+++ b/x11/kdebase2/patches/patch-ah
@@ -1,16 +1,36 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/03/14 16:03:12 skrll Exp $
+$NetBSD: patch-ah,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- ksysguard/ksysguardd/FreeBSD/CPU.c.orig	Tue Aug  8 23:53:56 2000
-+++ ksysguard/ksysguardd/FreeBSD/CPU.c
-@@ -25,7 +25,11 @@
+--- kcontrol/access/Makefile.am.orig	Sat Dec  9 11:07:22 2000
++++ kcontrol/access/Makefile.am
+@@ -4,15 +4,19 @@
  
- #include <kvm.h>
- #include <nlist.h>
-+#ifdef __NetBSD__
-+#include <sys/sched.h>		/* CPUSTATES */
-+#else
- #include <devstat.h>
-+#endif
- #include <fcntl.h>
- #include <stdio.h>
- #include <stdlib.h>
+ bin_PROGRAMS = kaccess
+ 
+-kaccess_SOURCES = dummy.cpp
++kaccess_SOURCES = kaccess_main.cpp
+ kaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kaccess_LDADD = kaccess.la
++kaccess_LDADD = libkaccess_sl.la
+ 
+-kde_module_LTLIBRARIES = libkcm_access.la kaccess.la
++kde_module_LTLIBRARIES = libkcm_access.la libkaccess_sl.la kaccess.la
+ 
+-kaccess_la_SOURCES = kaccess.cpp main.cpp
++libkaccess_sl_la_SOURCES = kaccess.cpp main.cpp
++libkaccess_sl_la_LDFLAGS = $(all_libraries)
++libkaccess_sl_la_LIBADD = $(LIB_KDEUI)
++
++kaccess_la_SOURCES = kaccess_main.cpp
+ kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kaccess_la_LIBADD = $(LIB_KDEUI)
++kaccess_la_LIBADD = libkaccess_sl.la $(LIB_KDEUI)
+ 
+ libkcm_access_la_SOURCES = kcmaccess.cpp 
+ libkcm_access_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
+@@ -31,6 +35,3 @@
+ messages:
+ 	$(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot
+ 	$(XGETTEXT) $(libkcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
diff --git a/x11/kdebase2/patches/patch-ai b/x11/kdebase2/patches/patch-ai
index 37e444d9d30..cef4b9b37ea 100644
--- a/x11/kdebase2/patches/patch-ai
+++ b/x11/kdebase2/patches/patch-ai
@@ -1,75 +1,132 @@
-$NetBSD: patch-ai,v 1.2 2001/03/15 17:58:48 skrll Exp $
+$NetBSD: patch-ai,v 1.3 2001/10/15 22:46:00 skrll Exp $
 
---- ksysguard/ksysguardd/FreeBSD/Memory.c.orig	Fri Jul 28 00:59:28 2000
-+++ ksysguard/ksysguardd/FreeBSD/Memory.c
-@@ -29,7 +29,12 @@
- 
- #include <sys/param.h>
- #include <sys/sysctl.h>
-+/* Everything post 1.5.x uses uvm/uvm_* includes */
-+#if __NetBSD_Version__ >= 105010000
-+#include <uvm/uvm_param.h>
-+#else
- #include <vm/vm_param.h>
-+#endif
- #include <sys/vmmeter.h>
- #include <string.h>
- #include <unistd.h>
-@@ -65,9 +70,16 @@
-         struct vmtotal p;
-         FILE *file;
-         char buf[256];
-+	int rc;
- 
-         len = sizeof (Total);
-+#ifdef __NetBSD__
-+        mib[0] = CTL_HW;
-+        mib[1] = HW_PHYSMEM;
-+        sysctl(mib, sizeof(mib), &Total, &len, NULL, 0);
-+#else
-         sysctlbyname("hw.physmem", &Total, &len, NULL, 0);
-+#endif
-         Total /= 1024;
- 
-         /* Q&D hack for swap display. Borrowed from xsysinfo-1.4 */
-@@ -92,23 +104,40 @@
- 	}
- 
- 
-+#ifdef __NetBSD__
-+        /* NetBSD doesn't know about vfs.bufspace */
-+        Buffers = -1;
-+#else
-         len = sizeof (Buffers);
-         if ((sysctlbyname("vfs.bufspace", &Buffers, &len, NULL, 0) == -1) || !len)
-                 Buffers = 0; /* Doesn't work under FreeBSD v2.2.x */
-+#endif
-         Buffers /= 1024;
- 
- 
-+#ifdef __NetBSD__
-+	/* NetBSD doesn't know about vm.stats */
-+	Cached = -1;
-+#else
-         len = sizeof (Cached);
-         if ((sysctlbyname("vm.stats.vm.v_cache_count", &Cached, &len, NULL, 0) == -1) || !len)
-                 Cached = 0; /* Doesn't work under FreeBSD v2.2.x */
-+#endif
-         Cached *= getpagesize() / 1024;
- 
- 
-+#ifdef __NetBSD__
-+	/* No idea where to get them right now.
-+	 * I don't want to start kmem-digging... */
-+	MFree = -1;
-+	Used = -1;
-+#else
- 	/* initializes the pointer to the vmmeter struct */
- 	len = sizeof (p);
- 	sysctlbyname("vm.vmmeter", &p, &len, NULL, 0);
-         MFree = p.t_free * getpagesize() / 1024;
-         Used = p.t_arm * getpagesize() / 1024 + Buffers + Cached;
-+#endif
- 
- 	return 0;
- }
+--- kcontrol/access/Makefile.in.orig	Sat Sep  8 01:36:21 2001
++++ kcontrol/access/Makefile.in
+@@ -278 +278 @@
+-kaccess_SOURCES = dummy.cpp
++kaccess_SOURCES = kaccess_main.cpp
+@@ -280 +280 @@
+-kaccess_LDADD = kaccess.la
++kaccess_LDADD = libkaccess_sl.la
+@@ -282 +282 @@
+-kde_module_LTLIBRARIES = libkcm_access.la kaccess.la
++kde_module_LTLIBRARIES = libkcm_access.la libkaccess_sl.la kaccess.la
+@@ -284 +284,5 @@
+-kaccess_la_SOURCES = kaccess.cpp main.cpp
++libkaccess_sl_la_SOURCES = kaccess.cpp main.cpp
++libkaccess_sl_la_LDFLAGS = $(all_libraries)
++libkaccess_sl_la_LIBADD = $(LIB_KDEUI)
++
++kaccess_la_SOURCES = kaccess_main.cpp
+@@ -286 +290 @@
+-kaccess_la_LIBADD = $(LIB_KDEUI)
++kaccess_la_LIBADD = libkaccess_sl.la $(LIB_KDEUI)
+@@ -319,2 +323,2 @@
+-kaccess_la_DEPENDENCIES = 
+-#>- kaccess_la_OBJECTS =  kaccess.lo main.lo
++libkaccess_sl_la_DEPENDENCIES = 
++#>- libkaccess_sl_la_OBJECTS =  kaccess.lo main.lo
+@@ -322,5 +326,9 @@
+-kaccess_la_final_OBJECTS = kaccess_la.all_cpp.lo 
+-kaccess_la_nofinal_OBJECTS = kaccess.lo main.lo \
+-kaccess_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kaccess_la_OBJECTS = $(kaccess_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kaccess_la_OBJECTS = $(kaccess_la_final_OBJECTS)
++libkaccess_sl_la_final_OBJECTS = libkaccess_sl_la.all_cpp.lo 
++libkaccess_sl_la_nofinal_OBJECTS = kaccess.lo main.lo \
++libkaccess_sl_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkaccess_sl_la_OBJECTS = $(libkaccess_sl_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkaccess_sl_la_OBJECTS = $(libkaccess_sl_la_final_OBJECTS)
++kaccess_la_DEPENDENCIES =  libkaccess_sl.la
++#>- kaccess_la_OBJECTS =  kaccess_main.lo
++#>+ 1
++kaccess_la_OBJECTS = kaccess_main.lo
+@@ -330 +338 @@
+-#>- kaccess_OBJECTS =  dummy.$(OBJEXT)
++#>- kaccess_OBJECTS =  kaccess_main.$(OBJEXT)
+@@ -332,2 +340,2 @@
+-kaccess_OBJECTS = dummy.$(OBJEXT)
+-kaccess_DEPENDENCIES =  kaccess.la
++kaccess_OBJECTS = kaccess_main.$(OBJEXT)
++kaccess_DEPENDENCIES =  libkaccess_sl.la
+@@ -354 +362 @@
+-KDE_DIST=kaccess.desktop configure.in.in kaccess.h kcmaccess.desktop 
++KDE_DIST=configure.in.in kcmaccess.desktop kaccess.desktop kaccess.h 
+@@ -361,2 +369,2 @@
+-SOURCES = $(libkcm_access_la_SOURCES) $(kaccess_la_SOURCES) $(kaccess_SOURCES)
+-OBJECTS = $(libkcm_access_la_OBJECTS) $(kaccess_la_OBJECTS) $(kaccess_OBJECTS)
++SOURCES = $(libkcm_access_la_SOURCES) $(libkaccess_sl_la_SOURCES) $(kaccess_la_SOURCES) $(kaccess_SOURCES)
++OBJECTS = $(libkcm_access_la_OBJECTS) $(libkaccess_sl_la_OBJECTS) $(kaccess_la_OBJECTS) $(kaccess_OBJECTS)
+@@ -454,0 +463,3 @@
++libkaccess_sl.la: $(libkaccess_sl_la_OBJECTS) $(libkaccess_sl_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(kde_moduledir) $(libkaccess_sl_la_LDFLAGS) $(libkaccess_sl_la_OBJECTS) $(libkaccess_sl_la_LIBADD) $(LIBS)
++
+@@ -565,11 +575,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -688,3 +687,0 @@
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+@@ -741,8 +738,8 @@
+-kaccess_la_meta_unload.cpp:  kaccess.moc
+-	@echo 'creating kaccess_la_meta_unload.cpp'
+-	@-rm -f kaccess_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_kaccess_la[] = {' > kaccess_la_meta_unload.cpp
+-	@cat  kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kaccess_la_meta_unload.cpp
+-	@echo '0};' >> kaccess_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> kaccess_la_meta_unload.cpp
+-	@echo '_UNLOAD(kaccess_la)' >> kaccess_la_meta_unload.cpp
++libkaccess_sl_la_meta_unload.cpp:  kaccess.moc
++	@echo 'creating libkaccess_sl_la_meta_unload.cpp'
++	@-rm -f libkaccess_sl_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkaccess_sl_la[] = {' > libkaccess_sl_la_meta_unload.cpp
++	@cat  kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkaccess_sl_la_meta_unload.cpp
++	@echo '0};' >> libkaccess_sl_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkaccess_sl_la_meta_unload.cpp
++	@echo '_UNLOAD(libkaccess_sl_la)' >> libkaccess_sl_la_meta_unload.cpp
+@@ -753 +750 @@
+-	-rm -f  libkcm_access_la_meta_unload.cpp kaccess_la_meta_unload.cpp
++	-rm -f  libkcm_access_la_meta_unload.cpp libkaccess_sl_la_meta_unload.cpp
+@@ -768 +765,13 @@
+-kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp kaccess_la_meta_unload.cpp  
++libkaccess_sl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp libkaccess_sl_la_meta_unload.cpp  
++	@echo 'creating libkaccess_sl_la.all_cpp.cpp ...'; \
++	rm -f libkaccess_sl_la.all_cpp.files libkaccess_sl_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkaccess_sl_la.all_cpp.final; \
++	for file in kaccess.cpp main.cpp libkaccess_sl_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkaccess_sl_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaccess_sl_la.all_cpp.final; \
++	done; \
++	cat libkaccess_sl_la.all_cpp.final libkaccess_sl_la.all_cpp.files  > libkaccess_sl_la.all_cpp.cpp; \
++	rm -f libkaccess_sl_la.all_cpp.final libkaccess_sl_la.all_cpp.files
++
++#>+ 11
++kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess_main.cpp  
+@@ -772 +781 @@
+-	for file in kaccess.cpp main.cpp kaccess_la_meta_unload.cpp ; do \
++	for file in kaccess_main.cpp ; do \
+@@ -780 +789 @@
+-kaccess.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kaccess.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess_main.cpp  
+@@ -784 +793 @@
+-	for file in dummy.cpp ; do \
++	for file in kaccess_main.cpp ; do \
+@@ -793 +802 @@
+-	-rm -f libkcm_access_la.all_cpp.cpp kaccess_la.all_cpp.cpp kaccess.all_cpp.cpp
++	-rm -f libkcm_access_la.all_cpp.cpp libkaccess_sl_la.all_cpp.cpp kaccess_la.all_cpp.cpp kaccess.all_cpp.cpp
+@@ -797 +806 @@
+-	$(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_final_OBJECTS)" kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" all-am
++	$(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_final_OBJECTS)" libkaccess_sl_la_OBJECTS="$(libkaccess_sl_la_final_OBJECTS)" all-am
+@@ -800 +809 @@
+-	$(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_nofinal_OBJECTS)" kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_nofinal_OBJECTS)" libkaccess_sl_la_OBJECTS="$(libkaccess_sl_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-aj b/x11/kdebase2/patches/patch-aj
index 7ca4d28b992..feefc341e92 100644
--- a/x11/kdebase2/patches/patch-aj
+++ b/x11/kdebase2/patches/patch-aj
@@ -1,13 +1,33 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+$NetBSD: patch-aj,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig	Mon Jan 22 12:12:05 2001
-+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c
-@@ -199,7 +199,7 @@
- #if __FreeBSD_version >= 300000
-         ps->userTime = p.kp_proc.p_runtime / 10000;
- #else
--        ps->userTime = p.kp_proc.p_rtime.tv_sec*100+p.kp_proc.p_rtime.tv_usec/100
-+        ps->userTime = p.kp_proc.p_rtime.tv_sec*100+p.kp_proc.p_rtime.tv_usec/100;
- #endif
-         ps->sysTime  = 0;
-         ps->userLoad = p.kp_proc.p_pctcpu / 100;
+--- kcontrol/access/kaccess_main.cpp.orig	Tue Oct  2 17:50:31 2001
++++ kcontrol/access/kaccess_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int kaccess_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kaccess_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-ak b/x11/kdebase2/patches/patch-ak
index fb9df80d1bc..1ad9618cc63 100644
--- a/x11/kdebase2/patches/patch-ak
+++ b/x11/kdebase2/patches/patch-ak
@@ -1,31 +1,13 @@
-$NetBSD: patch-ak,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+$NetBSD: patch-ak,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- kwin/Makefile.am.orig	Wed Feb 21 10:39:04 2001
-+++ kwin/Makefile.am
-@@ -3,13 +3,13 @@
- SUBDIRS = default . pics clients
+--- kcontrol/access/main.cpp.orig	Mon Oct 30 01:36:22 2000
++++ kcontrol/access/main.cpp
+@@ -11,7 +11,7 @@
+ 	    "with disabilities.");
  
- bin_PROGRAMS = kwin
--lib_LTLIBRARIES = kwin.la
-+lib_LTLIBRARIES = libkwin.la
  
--kwin_la_SOURCES = atoms.cpp  client.cpp main.cpp workspace.cpp \
-+libkwin_la_SOURCES = atoms.cpp  client.cpp main.cpp workspace.cpp \
- 	tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \
- 	killwindow.cpp 
--kwin_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kwin/default/libkwindefault.la
--kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
-+libkwin_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kwin/default/libkwindefault.la
-+libkwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
- 
- include_HEADERS = KWinInterface.h
- 
-@@ -17,7 +17,7 @@
- kwininclude_HEADERS = options.h client.h workspace.h
- 
- kwin_SOURCES = kwin_main.cpp
--kwin_LDADD = kwin.la
-+kwin_LDADD = libkwin.la
- kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- 
- KDE_ICON = kwin
+-int main(int argc, char *argv[])
++int kaccess_main(int argc, char *argv[])
+ {
+   KAboutData about("kaccess", I18N_NOOP("KDE Accessibility Tool"), "0.1",
+                    DESCRIPTION, KAboutData::License_QPL, 
diff --git a/x11/kdebase2/patches/patch-al b/x11/kdebase2/patches/patch-al
index cd5023d92e2..28c2b72b84f 100644
--- a/x11/kdebase2/patches/patch-al
+++ b/x11/kdebase2/patches/patch-al
@@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+$NetBSD: patch-al,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- kwin/clients/b2/Makefile.am.orig	Wed Dec 13 18:25:17 2000
-+++ kwin/clients/b2/Makefile.am
-@@ -4,7 +4,7 @@
- kde_module_LTLIBRARIES = libkwinb2.la
+--- kcontrol/ebrowsing/Makefile.am.orig	Sat Dec  9 11:07:23 2000
++++ kcontrol/ebrowsing/Makefile.am
+@@ -10,7 +10,7 @@
  
- libkwinb2_la_SOURCES = b2client.cpp
--libkwinb2_la_LIBADD = ../../kwin.la
-+libkwinb2_la_LIBADD = ../../libkwin.la
- libkwinb2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ libkcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp
  
- METASOURCES = AUTO
+-libkcm_kurifilt_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
++libkcm_kurifilt_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined ${KDE_RPATH}
+ libkcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA)
+ # Don't link this lib to the plugins. They are dlopened and linking to them
+ # results in crashes when closing kcmshell.
diff --git a/x11/kdebase2/patches/patch-am b/x11/kdebase2/patches/patch-am
index 9cf42ce36a5..e362b049a46 100644
--- a/x11/kdebase2/patches/patch-am
+++ b/x11/kdebase2/patches/patch-am
@@ -1,13 +1,25 @@
-$NetBSD: patch-am,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+$NetBSD: patch-am,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- kwin/clients/kde/Makefile.am.orig	Wed Dec 13 18:25:17 2000
-+++ kwin/clients/kde/Makefile.am
-@@ -16,7 +16,7 @@
- TitleBar.cpp \
- TitleText.cpp \
- Static.cpp
--libkwindefault_la_LIBADD = ../../kwin.la
-+libkwindefault_la_LIBADD = ../../libkwin.la
- libkwindefault_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
- 
- METASOURCES = AUTO
+--- kcontrol/ebrowsing/Makefile.in.orig	Sat Sep  8 01:36:23 2001
++++ kcontrol/ebrowsing/Makefile.in
+@@ -284 +284 @@
+-libkcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
++libkcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined ${KDE_RPATH}
+@@ -326 +326 @@
+-KDE_DIST=ebrowsing.desktop filteropts.h main.h 
++KDE_DIST=main.h ebrowsing.desktop filteropts.h 
+@@ -488 +488 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -546,11 +545,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-an b/x11/kdebase2/patches/patch-an
index 1013f1200bd..4c1ae5b41ab 100644
--- a/x11/kdebase2/patches/patch-an
+++ b/x11/kdebase2/patches/patch-an
@@ -1,13 +1,240 @@
-$NetBSD: patch-an,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+$NetBSD: patch-an,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- kwin/clients/kde1/Makefile.am.orig	Wed Dec 13 18:25:17 2000
-+++ kwin/clients/kde1/Makefile.am
-@@ -4,7 +4,7 @@
- kde_module_LTLIBRARIES = libkwinkde1.la
+--- kcontrol/info/info_netbsd.cpp.orig	Fri Sep  7 20:23:47 2001
++++ kcontrol/info/info_netbsd.cpp
+@@ -34,8 +34,10 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
++#include <sys/mount.h>
+ #include <stdio.h>	/* for NULL */
+ #include <stdlib.h>	/* for malloc(3) */
++#include <fstab.h>
  
- libkwinkde1_la_SOURCES = kde1client.cpp
--libkwinkde1_la_LIBADD = ../../kwin.la
-+libkwinkde1_la_LIBADD = ../../libkwin.la
- libkwinkde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ #include <qfile.h>
+ #include <qfontmetrics.h>
+@@ -100,15 +102,14 @@
+ // this is used to find out which devices are currently
+ // on system
+ static bool GetDmesgInfo(QListView *lBox, const char *filter,
+-	void func(QListView *, QCString s, void **, bool))
++	void func(QListView *, QString s))
+ {
+         QFile *dmesg = new QFile("/var/run/dmesg.boot");
+ 	bool usepipe = false;
+ 	FILE *pipe = NULL;
+ 	QTextStream *t;
+ 	bool seencpu = false;
+-	void *opaque = NULL;
+-	QCString s;
++	QString s;
+ 	bool found = false;
  
- METASOURCES = AUTO
+ 	if (dmesg->exists() && dmesg->open(IO_ReadOnly)) {
+@@ -134,25 +135,20 @@
+ 			s.contains("WARNING: old BSD partition ID!"))
+ 			break;
+ 
+-		if (!filter || s.contains(filter)) {
+-			if (func) {
+-				func(lBox, s, &opaque, false);
+-			}
+-			else {
++		if (!filter
++		    || (filter[0] == '^' && s.find(&filter[1]) == 0)
++		    || (filter[0] != '^' && s.contains(filter))) {
++			if (func)
++				func(lBox, s);
++			else
+ 				olditem = new QListViewItem(lBox, olditem, s);
+-			}
+ 			found = true;
+ 		}
+ 	}
+-	if (func) {
+-		func(lBox, s, &opaque, true);
+-	}
+-	//lBox->triggerUpdate();
+ 
+ 	delete t;
+-	if (pipe) {
++	if (pipe)
+ 		pclose(pipe);
+-	}
+ 	else {
+ 		dmesg->close();
+ 		delete dmesg;
+@@ -162,32 +158,31 @@
+ }
+ 
+ 
+-void AddIRQLine(QListView *lBox, QCString s, void **opaque, bool final)
++void
++AddIRQLine(QListView *lBox, QString s)
+ {
+-	if (!final) {
+-		char str[3];
+-		const char *p = s.data();
+-		int pos = s.find(" irq ");
+-		int irq = (pos<0) ? 0 : atoi(p+pos+5);
++	int pos, irqnum;
++	char numstr[3];
+ 
+-		if (irq) {
+-			sprintf(str, "%2d", irq);
+-		}
+-		else {
+-			str[0] = str[1] = '?';
+-			str[2] = 0;
+-		}
+-		new QListViewItem(lBox, str, p);
++	pos = s.find(" irq ");
++	irqnum = (pos < 0) ? 0 : atoi(&s.ascii()[pos+5]);
++	if (irqnum)
++		snprintf(numstr, 3, "%02d", irqnum);
++	else {
++		// this should never happen
++		strcpy(numstr, "??");
+ 	}
++
++	new QListViewItem(lBox, numstr, s);
+ }
+ 
+ bool GetInfo_IRQ (QListView *lBox)
+ {
+ 	lBox->addColumn(i18n("IRQ"));
+ 	lBox->addColumn(i18n("Device"));
++	lBox->setSorting(0);
++	lBox->setShowSortIndicator(FALSE);
+ 	(void) GetDmesgInfo(lBox, " irq ", AddIRQLine);
+-	sorting_allowed = true;
+-	lBox->setSorting(1);
+ 	return true;
+ }
+ 
+@@ -212,26 +207,27 @@
+ 
+ bool GetInfo_Sound (QListView *lbox)
+ {
++	lbox->setSorting(false);
++
+ 	if (!GetDmesgInfo(lbox, "audio", NULL))
+ 		new QListViewItem(lbox, i18n("No audio devices found."));
+ 
+-	// append information on any audio devices found
++	// append information for each audio devices found
+ 	QListViewItem *lvitem = lbox->firstChild();
+ 	for(; lvitem; lvitem = lvitem->nextSibling()) {
+ 		QString s;
+ 		int pos, len;
+-		const char *start, *end;
++		const char *start;
+ 		char *dev;
+ 
+ 		s = lvitem->text(0);
+-		if ((pos = s.find("at ")) >= 0) {
+-			pos += 3;	// skip "at "
+-			start = end = s.ascii();
+-			for(; (*end!=':') && (*end!='\n'); end++);
+-			len = end - start;
+-			dev = (char *) malloc(len + 1);
+-			strncpy(dev, start, len);
+-			dev[len] = '\0';
++		// The autoconf message is in form 'audio0 at auvia0: ...'
++		if (s.find("audio") == 0 && (pos = s.find(" at ")) > 0) {
++			pos += 4;	// skip " at "
++			start = s.ascii() + pos;
++			len = (int) strcspn(start, ":\n\t ");
++			dev = (char *) malloc(1 + len + 1);
++			sprintf(dev, "^%.*s", len, start);	/* safe */
+ 
+ 			GetDmesgInfo(lbox, dev, NULL);
+ 
+@@ -252,16 +248,32 @@
+ {
+ 	if (!GetDmesgInfo(lbox, "scsibus", NULL))
+ 		new QListViewItem(lbox, i18n("No SCSI devices found."));
++
++	// remove the 'waiting %d seconds for devices to settle' message
++	QListViewItem *lvitem = lbox->firstChild();
++	for(; lvitem; lvitem = lvitem->nextSibling()) {
++		QString s = lvitem->text(0);
++
++		if (s.contains("seconds for devices to settle")) {
++			lbox->removeItem(lvitem);
++			break;
++		}
++	}
++	
+ 	return true;
+ }
+ 
+ bool GetInfo_Partitions (QListView *lbox)
+ {
+-	QCString s;
++	QString s;
++	QString MB;
+ 	char *line, *orig_line;
+ 	const char *device, *mountpoint, *type, *flags;
+ 	FILE *pipe = popen("/sbin/mount", "r");
+ 	QTextStream *t;
++	u_int64_t tsz, fsz;
++	struct statfs sfs;
++	int ok;
+ 
+ 	if (!pipe) {
+ 		kdError(0) << i18n("Ahh couldn't run /sbin/mount!") << endl;
+@@ -269,14 +281,19 @@
+ 	}
+ 	t = new QTextStream(pipe, IO_ReadOnly);
+ 
++	MB = QString(" ") + QString(i18n("MB"));
+ 	lbox->addColumn(i18n("Device"));
+ 	lbox->addColumn(i18n("Mount Point"));
+ 	lbox->addColumn(i18n("FS Type"));
++	lbox->addColumn(i18n("Total Size"));
++	lbox->addColumn(i18n("Free Size"));
+ 	lbox->addColumn(i18n("Mount Options"));
+ 
+-	QListViewItem *olditem = 0;
+ 	while (!(s = t->readLine().latin1()).isEmpty()) {
+-		orig_line = line = strdup(s);
++		orig_line = line = strdup(s.ascii());
++
++		// the lines returned by /sbin/mount look like:
++		// /dev/wd0a on / type ffs (local, soft dependencies)
+ 
+ 		device = strsep(&line, " ");
+ 
+@@ -286,10 +303,28 @@
+ 		(void) strsep(&line, " "); // consume word "type"
+ 		type = strsep(&line, " ");
+ 
+-		flags = line;
+ 
+-		olditem = new QListViewItem(lbox, olditem, device, mountpoint,
+-					type, flags);
++		// Skip leading '(' and trailing ')'
++		line++;
++		flags = strsep(&line, ")");
++
++		if (statfs(mountpoint, &sfs) == 0) {
++			tsz = ((1LL * sfs.f_blocks * sfs.f_bsize / 1024) + 513)
++					/ 1024;
++			fsz = ((1LL * sfs.f_bfree * sfs.f_bsize / 1024) + 513)
++					/ 1024;
++			ok = 1;
++		} else {
++			tsz = fsz = 0;
++			ok = 0;
++		}
++
++		new QListViewItem(lbox,
++			QString(device) + " ",
++			QString(mountpoint) + " ", QString(type) + " ",
++			(ok) ? (Value(tsz, 6) + MB) : " ",
++			(ok) ? (Value(fsz, 6) + MB) : " ",
++			flags);
+ 
+ 		free(orig_line);
+ 	}
diff --git a/x11/kdebase2/patches/patch-ao b/x11/kdebase2/patches/patch-ao
index b345d6cb535..107acae8a03 100644
--- a/x11/kdebase2/patches/patch-ao
+++ b/x11/kdebase2/patches/patch-ao
@@ -1,13 +1,78 @@
-$NetBSD: patch-ao,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+$NetBSD: patch-ao,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- kwin/clients/kstep/Makefile.am.orig	Wed Dec 13 18:25:17 2000
-+++ kwin/clients/kstep/Makefile.am
-@@ -4,7 +4,7 @@
- kde_module_LTLIBRARIES = libkwinkstep.la
+--- kcontrol/kcontrol/Makefile.am.orig	Sun Jul 29 05:56:20 2001
++++ kcontrol/kcontrol/Makefile.am
+@@ -22,41 +22,51 @@
  
- libkwinkstep_la_SOURCES = nextclient.cpp
--libkwinkstep_la_LIBADD = ../../kwin.la
-+libkwinkstep_la_LIBADD = ../../libkwin.la
- libkwinkstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ SUBDIRS = . pics
  
- METASOURCES = AUTO
+-CLEANFILES = dummy.cpp
+-
+ bin_PROGRAMS = kcontrol kcmshell kcminit
+-kde_module_LTLIBRARIES = kcontrol.la kcmshell.la kcminit.la
++kde_module_LTLIBRARIES = libkcontrol_main.la kcontrol.la libkcmshell_main.la \
++	kcmshell.la libkcminit_main.la kcminit.la
+ 
+-kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \
++libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \
+ 	helpwidget.cpp moduleinfo.cpp utils.cpp modules.cpp proxywidget.cpp \
+ 	modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \
+ 	quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \
+ 	kecdialog.cpp kcrootonly.cpp 
+ 
+-kcontrol_la_LIBADD  = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcontrol_main_la_LIBADD  = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcontrol_main_la_LDFLAGS = $(all_libraries)
++
++kcontrol_la_SOURCES = kcontrol_main.cpp
++kcontrol_la_LIBADD  = libkcontrol_main.la
+ kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+-kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \
++libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \
+ 			utils.cpp proxywidget.cpp kcdialog.cpp global.cpp \
+ 			kcdialog.skel
+-kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcmshell_main_la_LDFLAGS = $(all_libraries)
++
++kcmshell_la_SOURCES = kcmshell_main.cpp
++kcmshell_la_LIBADD = libkcmshell_main.la
+ kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
++libkcminit_main_la_SOURCES = kcminit.cpp global.cpp utils.cpp
++libkcminit_main_la_LIBADD   = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcminit_main_la_LDFLAGS = $(all_libraries)
+ 
+-kcminit_la_SOURCES = kcminit.cpp global.cpp utils.cpp
+-kcminit_la_LIBADD   = $(LIB_KDEUI) $(LIB_KSYCOCA)
++kcminit_la_SOURCES = kcminit_main.cpp
++kcminit_la_LIBADD   = libkcminit_main.la
+ kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+-kcontrol_SOURCES = dummy.cpp
+-kcontrol_LDADD = kcontrol.la
++kcontrol_SOURCES = kcontrol_main.cpp
++kcontrol_LDADD = libkcontrol_main.la
+ kcontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
+ 
+-kcmshell_SOURCES = dummy.cpp
+-kcmshell_LDADD = kcmshell.la
++kcmshell_SOURCES = kcmshell_main.cpp
++kcmshell_LDADD = libkcmshell_main.la
+ kcmshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
+ 
+-kcminit_SOURCES = dummy.cpp
+-kcminit_LDADD = kcminit.la
++kcminit_SOURCES = kcminit_main.cpp
++kcminit_LDADD = libkcminit_main.la
+ kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
+ 
+ rcdir = $(kde_datadir)/kcontrol
+@@ -71,6 +81,3 @@
+ 
+ messages: rc.cpp
+ 	$(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
diff --git a/x11/kdebase2/patches/patch-ap b/x11/kdebase2/patches/patch-ap
index fc6b9cc0954..dafe10c9379 100644
--- a/x11/kdebase2/patches/patch-ap
+++ b/x11/kdebase2/patches/patch-ap
@@ -1,13 +1,298 @@
-$NetBSD: patch-ap,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+$NetBSD: patch-ap,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- kwin/clients/kwmtheme/Makefile.am.orig	Wed Dec 13 18:25:17 2000
-+++ kwin/clients/kwmtheme/Makefile.am
-@@ -4,7 +4,7 @@
- kde_module_LTLIBRARIES = libkwinkwmtheme.la
- 
- libkwinkwmtheme_la_SOURCES = kwmthemeclient.cpp
--libkwinkwmtheme_la_LIBADD = ../../kwin.la
-+libkwinkwmtheme_la_LIBADD = ../../libkwin.la
- libkwinkwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
- 
- METASOURCES = AUTO
+--- kcontrol/kcontrol/Makefile.in.orig	Sat Sep  8 01:36:25 2001
++++ kcontrol/kcontrol/Makefile.in
+@@ -297,2 +296,0 @@
+-CLEANFILES = dummy.cpp
+-
+@@ -300 +298,4 @@
+-kde_module_LTLIBRARIES = kcontrol.la kcmshell.la kcminit.la
++kde_module_LTLIBRARIES = libkcontrol_main.la kcontrol.la libkcmshell_main.la 	kcmshell.la libkcminit_main.la kcminit.la
++
++
++libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp 	helpwidget.cpp moduleinfo.cpp utils.cpp modules.cpp proxywidget.cpp 	modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp 	quickhelp.cpp moduletreeview.cpp moduleiconview.cpp 	kecdialog.cpp kcrootonly.cpp 
+@@ -302 +302,0 @@
+-kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp 	helpwidget.cpp moduleinfo.cpp utils.cpp modules.cpp proxywidget.cpp 	modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp 	quickhelp.cpp moduletreeview.cpp moduleiconview.cpp 	kecdialog.cpp kcrootonly.cpp 
+@@ -303,0 +304,2 @@
++libkcontrol_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcontrol_main_la_LDFLAGS = $(all_libraries)
+@@ -305 +307,2 @@
+-kcontrol_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
++kcontrol_la_SOURCES = kcontrol_main.cpp
++kcontrol_la_LIBADD = libkcontrol_main.la
+@@ -308 +311 @@
+-#>- kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp 			utils.cpp proxywidget.cpp kcdialog.cpp global.cpp 			kcdialog.skel
++#>- libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp 			utils.cpp proxywidget.cpp kcdialog.cpp global.cpp 			kcdialog.skel
+@@ -310 +313 @@
+-kcmshell_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp 			utils.cpp proxywidget.cpp kcdialog.cpp global.cpp 			 kcdialog_skel.cpp
++libkcmshell_main_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp 			utils.cpp proxywidget.cpp kcdialog.cpp global.cpp 			 kcdialog_skel.cpp
+@@ -312 +315,5 @@
+-kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcmshell_main_la_LDFLAGS = $(all_libraries)
++
++kcmshell_la_SOURCES = kcmshell_main.cpp
++kcmshell_la_LIBADD = libkcmshell_main.la
+@@ -315,2 +322,6 @@
+-kcminit_la_SOURCES = kcminit.cpp global.cpp utils.cpp
+-kcminit_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcminit_main_la_SOURCES = kcminit.cpp global.cpp utils.cpp
++libkcminit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcminit_main_la_LDFLAGS = $(all_libraries)
++
++kcminit_la_SOURCES = kcminit_main.cpp
++kcminit_la_LIBADD = libkcminit_main.la
+@@ -319,2 +330,2 @@
+-kcontrol_SOURCES = dummy.cpp
+-kcontrol_LDADD = kcontrol.la
++kcontrol_SOURCES = kcontrol_main.cpp
++kcontrol_LDADD = libkcontrol_main.la
+@@ -323,2 +334,2 @@
+-kcmshell_SOURCES = dummy.cpp
+-kcmshell_LDADD = kcmshell.la
++kcmshell_SOURCES = kcmshell_main.cpp
++kcmshell_LDADD = libkcmshell_main.la
+@@ -327,2 +338,2 @@
+-kcminit_SOURCES = dummy.cpp
+-kcminit_LDADD = kcminit.la
++kcminit_SOURCES = kcminit_main.cpp
++kcminit_LDADD = libkcminit_main.la
+@@ -352,2 +363,2 @@
+-kcontrol_la_DEPENDENCIES = 
+-#>- kcontrol_la_OBJECTS =  main.lo toplevel.lo indexwidget.lo \
++libkcontrol_main_la_DEPENDENCIES = 
++#>- libkcontrol_main_la_OBJECTS =  main.lo toplevel.lo indexwidget.lo \
+@@ -359,2 +370,2 @@
+-kcontrol_la_final_OBJECTS = kcontrol_la.all_cpp.lo 
+-kcontrol_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \
++libkcontrol_main_la_final_OBJECTS = libkcontrol_main_la.all_cpp.lo 
++libkcontrol_main_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \
+@@ -365,5 +376,9 @@
+-kcontrol_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kcontrol_la_OBJECTS = $(kcontrol_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kcontrol_la_OBJECTS = $(kcontrol_la_final_OBJECTS)
+-kcmshell_la_DEPENDENCIES = 
+-#>- kcmshell_la_OBJECTS =  kcmshell.lo moduleinfo.lo modloader.lo \
++libkcontrol_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_final_OBJECTS)
++kcontrol_la_DEPENDENCIES =  libkcontrol_main.la
++#>- kcontrol_la_OBJECTS =  kcontrol_main.lo
++#>+ 1
++kcontrol_la_OBJECTS = kcontrol_main.lo
++libkcmshell_main_la_DEPENDENCIES = 
++#>- libkcmshell_main_la_OBJECTS =  kcmshell.lo moduleinfo.lo modloader.lo \
+@@ -372,2 +387,2 @@
+-kcmshell_la_final_OBJECTS = kcmshell_la.all_cpp.lo 
+-kcmshell_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \
++libkcmshell_main_la_final_OBJECTS = libkcmshell_main_la.all_cpp.lo 
++libkcmshell_main_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \
+@@ -375,5 +390,9 @@
+-kcmshell_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kcmshell_la_OBJECTS = $(kcmshell_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kcmshell_la_OBJECTS = $(kcmshell_la_final_OBJECTS)
+-kcminit_la_DEPENDENCIES = 
+-#>- kcminit_la_OBJECTS =  kcminit.lo global.lo utils.lo
++libkcmshell_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_final_OBJECTS)
++kcmshell_la_DEPENDENCIES =  libkcmshell_main.la
++#>- kcmshell_la_OBJECTS =  kcmshell_main.lo
++#>+ 1
++kcmshell_la_OBJECTS = kcmshell_main.lo
++libkcminit_main_la_DEPENDENCIES = 
++#>- libkcminit_main_la_OBJECTS =  kcminit.lo global.lo utils.lo
+@@ -381,4 +400,8 @@
+-kcminit_la_final_OBJECTS = kcminit_la.all_cpp.lo 
+-kcminit_la_nofinal_OBJECTS = kcminit.lo global.lo utils.lo
+-@KDE_USE_FINAL_FALSE@kcminit_la_OBJECTS = $(kcminit_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kcminit_la_OBJECTS = $(kcminit_la_final_OBJECTS)
++libkcminit_main_la_final_OBJECTS = libkcminit_main_la.all_cpp.lo 
++libkcminit_main_la_nofinal_OBJECTS = kcminit.lo global.lo utils.lo
++@KDE_USE_FINAL_FALSE@libkcminit_main_la_OBJECTS = $(libkcminit_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkcminit_main_la_OBJECTS = $(libkcminit_main_la_final_OBJECTS)
++kcminit_la_DEPENDENCIES =  libkcminit_main.la
++#>- kcminit_la_OBJECTS =  kcminit_main.lo
++#>+ 1
++kcminit_la_OBJECTS = kcminit_main.lo
+@@ -388 +411 @@
+-#>- kcontrol_OBJECTS =  dummy.$(OBJEXT)
++#>- kcontrol_OBJECTS =  kcontrol_main.$(OBJEXT)
+@@ -390,3 +413,3 @@
+-kcontrol_OBJECTS = dummy.$(OBJEXT)
+-kcontrol_DEPENDENCIES =  kcontrol.la
+-#>- kcmshell_OBJECTS =  dummy.$(OBJEXT)
++kcontrol_OBJECTS = kcontrol_main.$(OBJEXT)
++kcontrol_DEPENDENCIES =  libkcontrol_main.la
++#>- kcmshell_OBJECTS =  kcmshell_main.$(OBJEXT)
+@@ -394,3 +417,3 @@
+-kcmshell_OBJECTS = dummy.$(OBJEXT)
+-kcmshell_DEPENDENCIES =  kcmshell.la
+-#>- kcminit_OBJECTS =  dummy.$(OBJEXT)
++kcmshell_OBJECTS = kcmshell_main.$(OBJEXT)
++kcmshell_DEPENDENCIES =  libkcmshell_main.la
++#>- kcminit_OBJECTS =  kcminit_main.$(OBJEXT)
+@@ -398,2 +421,2 @@
+-kcminit_OBJECTS = dummy.$(OBJEXT)
+-kcminit_DEPENDENCIES =  kcminit.la
++kcminit_OBJECTS = kcminit_main.$(OBJEXT)
++kcminit_DEPENDENCIES =  libkcminit_main.la
+@@ -418 +441 @@
+-KDE_DIST=indexwidget.h proxywidget.h modules.h moduleinfo.h modloader.h quickhelp.h searchwidget.h kcdialog.h hi48-app-kcontrol.png helpwidget.h moduleiconview.h kcontrolui.rc dockcontainer.h main.h moduletreeview.h utils.h kecdialog.h aboutwidget.h hi16-app-kcontrol.png toplevel.h kcmshell.h modulemenu.cpp hi32-app-kcontrol.png modulemenu.h kcrootonly.h KControl.desktop global.h 
++KDE_DIST=kcontrolui.rc indexwidget.h hi32-app-kcontrol.png proxywidget.h dockcontainer.h modulemenu.h quickhelp.h searchwidget.h main.h moduletreeview.h utils.h kecdialog.h kcdialog.h aboutwidget.h hi48-app-kcontrol.png hi16-app-kcontrol.png kcrootonly.h toplevel.h helpwidget.h KControl.desktop modules.h moduleiconview.h moduleinfo.h global.h kcmshell.h modulemenu.cpp modloader.h 
+@@ -425,2 +448,2 @@
+-SOURCES = $(kcontrol_la_SOURCES) $(kcmshell_la_SOURCES) $(kcminit_la_SOURCES) $(kcontrol_SOURCES) $(kcmshell_SOURCES) $(kcminit_SOURCES)
+-OBJECTS = $(kcontrol_la_OBJECTS) $(kcmshell_la_OBJECTS) $(kcminit_la_OBJECTS) $(kcontrol_OBJECTS) $(kcmshell_OBJECTS) $(kcminit_OBJECTS)
++SOURCES = $(libkcontrol_main_la_SOURCES) $(kcontrol_la_SOURCES) $(libkcmshell_main_la_SOURCES) $(kcmshell_la_SOURCES) $(libkcminit_main_la_SOURCES) $(kcminit_la_SOURCES) $(kcontrol_SOURCES) $(kcmshell_SOURCES) $(kcminit_SOURCES)
++OBJECTS = $(libkcontrol_main_la_OBJECTS) $(kcontrol_la_OBJECTS) $(libkcmshell_main_la_OBJECTS) $(kcmshell_la_OBJECTS) $(libkcminit_main_la_OBJECTS) $(kcminit_la_OBJECTS) $(kcontrol_OBJECTS) $(kcmshell_OBJECTS) $(kcminit_OBJECTS)
+@@ -512,0 +536,3 @@
++libkcontrol_main.la: $(libkcontrol_main_la_OBJECTS) $(libkcontrol_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(kde_moduledir) $(libkcontrol_main_la_LDFLAGS) $(libkcontrol_main_la_OBJECTS) $(libkcontrol_main_la_LIBADD) $(LIBS)
++
+@@ -515,0 +542,3 @@
++libkcmshell_main.la: $(libkcmshell_main_la_OBJECTS) $(libkcmshell_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(kde_moduledir) $(libkcmshell_main_la_LDFLAGS) $(libkcmshell_main_la_OBJECTS) $(libkcmshell_main_la_LIBADD) $(LIBS)
++
+@@ -518,0 +548,3 @@
++libkcminit_main.la: $(libkcminit_main_la_OBJECTS) $(libkcminit_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(kde_moduledir) $(libkcminit_main_la_LDFLAGS) $(libkcminit_main_la_OBJECTS) $(libkcminit_main_la_LIBADD) $(LIBS)
++
+@@ -639 +671 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -697,11 +728,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -772 +792,0 @@
+-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+@@ -838,3 +857,0 @@
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+@@ -952,8 +969,8 @@
+-kcontrol_la_meta_unload.cpp:  indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc moduleiconview.moc modules.moc aboutwidget.moc searchwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc
+-	@echo 'creating kcontrol_la_meta_unload.cpp'
+-	@-rm -f kcontrol_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_kcontrol_la[] = {' > kcontrol_la_meta_unload.cpp
+-	@cat  indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc moduleiconview.moc modules.moc aboutwidget.moc searchwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcontrol_la_meta_unload.cpp
+-	@echo '0};' >> kcontrol_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> kcontrol_la_meta_unload.cpp
+-	@echo '_UNLOAD(kcontrol_la)' >> kcontrol_la_meta_unload.cpp
++libkcontrol_main_la_meta_unload.cpp:  indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc moduleiconview.moc modules.moc aboutwidget.moc searchwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc
++	@echo 'creating libkcontrol_main_la_meta_unload.cpp'
++	@-rm -f libkcontrol_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkcontrol_main_la[] = {' > libkcontrol_main_la_meta_unload.cpp
++	@cat  indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc moduleiconview.moc modules.moc aboutwidget.moc searchwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcontrol_main_la_meta_unload.cpp
++	@echo '0};' >> libkcontrol_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkcontrol_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libkcontrol_main_la)' >> libkcontrol_main_la_meta_unload.cpp
+@@ -963,8 +980,8 @@
+-kcmshell_la_meta_unload.cpp:  kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc
+-	@echo 'creating kcmshell_la_meta_unload.cpp'
+-	@-rm -f kcmshell_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_kcmshell_la[] = {' > kcmshell_la_meta_unload.cpp
+-	@cat  kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcmshell_la_meta_unload.cpp
+-	@echo '0};' >> kcmshell_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> kcmshell_la_meta_unload.cpp
+-	@echo '_UNLOAD(kcmshell_la)' >> kcmshell_la_meta_unload.cpp
++libkcmshell_main_la_meta_unload.cpp:  kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc
++	@echo 'creating libkcmshell_main_la_meta_unload.cpp'
++	@-rm -f libkcmshell_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkcmshell_main_la[] = {' > libkcmshell_main_la_meta_unload.cpp
++	@cat  kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcmshell_main_la_meta_unload.cpp
++	@echo '0};' >> libkcmshell_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkcmshell_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libkcmshell_main_la)' >> libkcmshell_main_la_meta_unload.cpp
+@@ -975 +992,13 @@
+-	-rm -f  kcontrol_la_meta_unload.cpp kcmshell_la_meta_unload.cpp
++	-rm -f  libkcontrol_main_la_meta_unload.cpp libkcmshell_main_la_meta_unload.cpp
++
++#>+ 11
++libkcontrol_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/utils.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp libkcontrol_main_la_meta_unload.cpp   indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc moduleiconview.moc modules.moc kcdialog.moc aboutwidget.moc searchwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc 
++	@echo 'creating libkcontrol_main_la.all_cpp.cpp ...'; \
++	rm -f libkcontrol_main_la.all_cpp.files libkcontrol_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkcontrol_main_la.all_cpp.final; \
++	for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp utils.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp libkcontrol_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkcontrol_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcontrol_main_la.all_cpp.final; \
++	done; \
++	cat libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files  > libkcontrol_main_la.all_cpp.cpp; \
++	rm -f libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files
+@@ -978 +1007 @@
+-kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/utils.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp kcontrol_la_meta_unload.cpp   indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc moduleiconview.moc modules.moc kcdialog.moc aboutwidget.moc searchwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc 
++kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in kcontrol_main.cpp  
+@@ -982 +1011 @@
+-	for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp utils.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp kcontrol_la_meta_unload.cpp ; do \
++	for file in kcontrol_main.cpp ; do \
+@@ -990 +1019,13 @@
+-kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/utils.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp  
++libkcmshell_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/utils.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp  
++	@echo 'creating libkcmshell_main_la.all_cpp.cpp ...'; \
++	rm -f libkcmshell_main_la.all_cpp.files libkcmshell_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkcmshell_main_la.all_cpp.final; \
++	for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp utils.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkcmshell_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcmshell_main_la.all_cpp.final; \
++	done; \
++	cat libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files  > libkcmshell_main_la.all_cpp.cpp; \
++	rm -f libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files
++
++#>+ 11
++kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp  
+@@ -994 +1035 @@
+-	for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp utils.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp ; do \
++	for file in kcmshell_main.cpp ; do \
+@@ -1002 +1043,13 @@
+-kcminit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp $(srcdir)/utils.cpp  
++libkcminit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp $(srcdir)/utils.cpp  
++	@echo 'creating libkcminit_main_la.all_cpp.cpp ...'; \
++	rm -f libkcminit_main_la.all_cpp.files libkcminit_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkcminit_main_la.all_cpp.final; \
++	for file in kcminit.cpp global.cpp utils.cpp ; do \
++	  echo "#include \"$$file\"" >> libkcminit_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcminit_main_la.all_cpp.final; \
++	done; \
++	cat libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files  > libkcminit_main_la.all_cpp.cpp; \
++	rm -f libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files
++
++#>+ 11
++kcminit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit_main.cpp  
+@@ -1006 +1059 @@
+-	for file in kcminit.cpp global.cpp utils.cpp ; do \
++	for file in kcminit_main.cpp ; do \
+@@ -1014 +1067 @@
+-kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in kcontrol_main.cpp  
+@@ -1018 +1071 @@
+-	for file in dummy.cpp ; do \
++	for file in kcontrol_main.cpp ; do \
+@@ -1026 +1079 @@
+-kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp  
+@@ -1030 +1083 @@
+-	for file in dummy.cpp ; do \
++	for file in kcmshell_main.cpp ; do \
+@@ -1038 +1091 @@
+-kcminit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kcminit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit_main.cpp  
+@@ -1042 +1095 @@
+-	for file in dummy.cpp ; do \
++	for file in kcminit_main.cpp ; do \
+@@ -1051 +1104 @@
+-	-rm -f kcontrol_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcminit_la.all_cpp.cpp kcontrol.all_cpp.cpp kcmshell.all_cpp.cpp kcminit.all_cpp.cpp
++	-rm -f libkcontrol_main_la.all_cpp.cpp kcontrol_la.all_cpp.cpp libkcmshell_main_la.all_cpp.cpp kcmshell_la.all_cpp.cpp libkcminit_main_la.all_cpp.cpp kcminit_la.all_cpp.cpp kcontrol.all_cpp.cpp kcmshell.all_cpp.cpp kcminit.all_cpp.cpp
+@@ -1055 +1108 @@
+-	$(MAKE) kcontrol_la_OBJECTS="$(kcontrol_la_final_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_final_OBJECTS)" kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" all-am
++	$(MAKE) libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_final_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_final_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_final_OBJECTS)" all-am
+@@ -1058 +1111 @@
+-	$(MAKE) kcontrol_la_OBJECTS="$(kcontrol_la_nofinal_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_nofinal_OBJECTS)" kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-aq b/x11/kdebase2/patches/patch-aq
index 38804aabd66..cd8b2638793 100644
--- a/x11/kdebase2/patches/patch-aq
+++ b/x11/kdebase2/patches/patch-aq
@@ -1,13 +1,13 @@
-$NetBSD: patch-aq,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+$NetBSD: patch-aq,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- kwin/clients/laptop/Makefile.am.orig	Wed Dec 13 18:25:18 2000
-+++ kwin/clients/laptop/Makefile.am
-@@ -4,7 +4,7 @@
- kde_module_LTLIBRARIES = libkwinlaptop.la
+--- kcontrol/kcontrol/kcminit.cpp.orig	Sun May 20 15:55:23 2001
++++ kcontrol/kcontrol/kcminit.cpp
+@@ -36,7 +36,7 @@
+     KCmdLineLastOption
+ };
  
- libkwinlaptop_la_SOURCES = laptopclient.cpp
--libkwinlaptop_la_LIBADD = ../../kwin.la
-+libkwinlaptop_la_LIBADD = ../../libkwin.la
- libkwinlaptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
- 
- METASOURCES = AUTO
+-int main(int argc, char *argv[])
++int kcminit_main(int argc, char *argv[])
+ {
+   KLocale::setMainCatalogue("kcontrol");
+   KAboutData aboutData( "kcminit", I18N_NOOP("KCMInit"),
diff --git a/x11/kdebase2/patches/patch-ar b/x11/kdebase2/patches/patch-ar
index 943a7ff5be8..5966cad0153 100644
--- a/x11/kdebase2/patches/patch-ar
+++ b/x11/kdebase2/patches/patch-ar
@@ -1,13 +1,33 @@
-$NetBSD: patch-ar,v 1.1.1.1 2001/03/14 16:03:15 skrll Exp $
+$NetBSD: patch-ar,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- kwin/clients/modernsystem/Makefile.am.orig	Wed Dec 13 18:25:18 2000
-+++ kwin/clients/modernsystem/Makefile.am
-@@ -4,7 +4,7 @@
- kde_module_LTLIBRARIES = libkwinmodernsys.la
- 
- libkwinmodernsys_la_SOURCES = modernsys.cpp
--libkwinmodernsys_la_LIBADD = ../../kwin.la
-+libkwinmodernsys_la_LIBADD = ../../libkwin.la
- libkwinmodernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
- 
- METASOURCES = AUTO
+--- kcontrol/kcontrol/kcminit_main.cpp.orig	Tue Oct  2 17:50:31 2001
++++ kcontrol/kcontrol/kcminit_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int kcminit_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kcminit_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-as b/x11/kdebase2/patches/patch-as
index baa4a4689dd..e13f1454b2e 100644
--- a/x11/kdebase2/patches/patch-as
+++ b/x11/kdebase2/patches/patch-as
@@ -1,13 +1,13 @@
-$NetBSD: patch-as,v 1.1.1.1 2001/03/14 16:03:15 skrll Exp $
+$NetBSD: patch-as,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- kwin/clients/mwm/Makefile.am.orig	Wed Dec 13 18:25:18 2000
-+++ kwin/clients/mwm/Makefile.am
-@@ -4,7 +4,7 @@
- kde_module_LTLIBRARIES = libkwinmwm.la
+--- kcontrol/kcontrol/kcmshell.cpp.orig	Wed Apr 18 19:52:33 2001
++++ kcontrol/kcontrol/kcmshell.cpp
+@@ -125,7 +125,7 @@
+ }
  
- libkwinmwm_la_SOURCES = mwmclient.cpp
--libkwinmwm_la_LIBADD = ../../kwin.la
-+libkwinmwm_la_LIBADD = ../../libkwin.la
- libkwinmwm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
  
- METASOURCES = AUTO
+-int main(int _argc, char *_argv[])
++int kcmshell_main(int _argc, char *_argv[])
+ {
+     KAboutData aboutData( "kcmshell", I18N_NOOP("KDE Control Module"),
+                           "2.0",
diff --git a/x11/kdebase2/patches/patch-at b/x11/kdebase2/patches/patch-at
index 6a18913ba91..84930d3301f 100644
--- a/x11/kdebase2/patches/patch-at
+++ b/x11/kdebase2/patches/patch-at
@@ -1,13 +1,33 @@
-$NetBSD: patch-at,v 1.1.1.1 2001/03/14 16:03:15 skrll Exp $
+$NetBSD: patch-at,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- kwin/clients/riscos/Makefile.am.orig	Wed Dec 13 18:25:18 2000
-+++ kwin/clients/riscos/Makefile.am
-@@ -12,7 +12,7 @@
- StickyButton.cpp \
- HelpButton.cpp \
- Static.cpp
--libkwinriscos_la_LIBADD = ../../kwin.la
-+libkwinriscos_la_LIBADD = ../../libkwin.la
- libkwinriscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
- 
- METASOURCES = AUTO
+--- kcontrol/kcontrol/kcmshell_main.cpp.orig	Tue Oct  2 17:50:31 2001
++++ kcontrol/kcontrol/kcmshell_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int kcmshell_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kcmshell_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-au b/x11/kdebase2/patches/patch-au
index afc6c3d58e8..56423dfd5b8 100644
--- a/x11/kdebase2/patches/patch-au
+++ b/x11/kdebase2/patches/patch-au
@@ -1,13 +1,33 @@
-$NetBSD: patch-au,v 1.1.1.1 2001/03/14 16:03:15 skrll Exp $
+$NetBSD: patch-au,v 1.2 2001/10/15 22:46:00 skrll Exp $
 
---- kwin/clients/system/Makefile.am.orig	Wed Dec 13 18:25:18 2000
-+++ kwin/clients/system/Makefile.am
-@@ -4,7 +4,7 @@
- kde_module_LTLIBRARIES = libkwinsystem.la
- 
- libkwinsystem_la_SOURCES = systemclient.cpp
--libkwinsystem_la_LIBADD = ../../kwin.la
-+libkwinsystem_la_LIBADD = ../../libkwin.la
- libkwinsystem_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
- 
- METASOURCES = AUTO
+--- kcontrol/kcontrol/kcontrol_main.cpp.orig	Tue Oct  2 17:50:31 2001
++++ kcontrol/kcontrol/kcontrol_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int kcontrol_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kcontrol_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-av b/x11/kdebase2/patches/patch-av
index e0d8fe88d51..f1e41aae597 100644
--- a/x11/kdebase2/patches/patch-av
+++ b/x11/kdebase2/patches/patch-av
@@ -1,13 +1,13 @@
-$NetBSD: patch-av,v 1.1.1.1 2001/03/14 16:03:15 skrll Exp $
+$NetBSD: patch-av,v 1.2 2001/10/15 22:46:01 skrll Exp $
 
---- kwin/clients/win2k/Makefile.am.orig	Thu Jan 11 12:24:04 2001
-+++ kwin/clients/win2k/Makefile.am
-@@ -4,7 +4,7 @@
- kde_module_LTLIBRARIES = libkwin2k.la
+--- kcontrol/kcontrol/main.cpp.orig	Thu Apr 19 14:57:22 2001
++++ kcontrol/kcontrol/main.cpp
+@@ -75,7 +75,7 @@
+   delete toplevel;
+ }
  
- libkwin2k_la_SOURCES = win2k.cpp
--libkwin2k_la_LIBADD = ../../kwin.la
-+libkwin2k_la_LIBADD = ../../libkwin.la
- libkwin2k_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
- 
- METASOURCES = AUTO
+-int main(int argc, char *argv[])
++int kcontrol_main(int argc, char *argv[])
+ {
+   KAboutData aboutData( "kcontrol", I18N_NOOP("KDE Control Center"),
+     "v2.0", I18N_NOOP("The KDE Control Center"), KAboutData::License_GPL,
diff --git a/x11/kdebase2/patches/patch-aw b/x11/kdebase2/patches/patch-aw
index aa7ab95bf9a..2f7b3320ec0 100644
--- a/x11/kdebase2/patches/patch-aw
+++ b/x11/kdebase2/patches/patch-aw
@@ -1,13 +1,13 @@
-$NetBSD: patch-aw,v 1.1.1.1 2001/03/14 16:03:15 skrll Exp $
+$NetBSD: patch-aw,v 1.2 2001/10/15 22:46:01 skrll Exp $
 
---- kwin/plugins.cpp.orig	Thu Feb 22 13:04:03 2001
-+++ kwin/plugins.cpp
-@@ -164,7 +164,7 @@
+--- kcontrol/kcontrol/modules.h.orig	Sat Jul 15 14:21:39 2000
++++ kcontrol/kcontrol/modules.h
+@@ -20,8 +20,6 @@
+ #ifndef __modules_h__
+ #define __modules_h__
  
- 	if( !path.isEmpty() ) {
- 	    if ( (handle = lt_dlopen(path.latin1() ) ) ) {
--		lt_ptr_t alloc_func = lt_dlsym(handle, "allocate");
-+		lt_ptr alloc_func = lt_dlsym(handle, "allocate");
- 		if(alloc_func) {
- 		    alloc_ptr = (Client* (*)(Workspace *ws, WId w, int tool))alloc_func;
- 		} else{
+-#include <ltdl.h>
+-
+ #include <qobject.h>
+ #include <qstringlist.h>
+ #include <qlist.h>
diff --git a/x11/kdebase2/patches/patch-ax b/x11/kdebase2/patches/patch-ax
index b4e9604308c..decee11a279 100644
--- a/x11/kdebase2/patches/patch-ax
+++ b/x11/kdebase2/patches/patch-ax
@@ -1,12 +1,13 @@
-$NetBSD: patch-ax,v 1.1.1.1 2001/03/14 16:03:15 skrll Exp $
+$NetBSD: patch-ax,v 1.2 2001/10/15 22:46:01 skrll Exp $
 
---- nsplugins/pluginscan.cpp.orig	Sun Feb 18 15:28:44 2001
-+++ nsplugins/pluginscan.cpp
-@@ -22,6 +22,7 @@
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+--- kcontrol/kio/Makefile.am.orig	Fri Jun 15 10:02:02 2001
++++ kcontrol/kio/Makefile.am
+@@ -16,7 +16,7 @@
+       fakeuaprovider.cpp uagentproviderdlg.cpp kproxydlgui.ui netpref.cpp
  
- */
-+#include <stdlib.h>
+ libkcm_kio_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
+-libkcm_kio_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KFILE)
++libkcm_kio_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KFILE) ${KDE_RPATH}
  
- #include <qdir.h>
- #include <qfile.h>
+ messages: rc.cpp
+ 	$(XGETTEXT) *.cpp -o $(podir)/kcmkio.pot
diff --git a/x11/kdebase2/patches/patch-ay b/x11/kdebase2/patches/patch-ay
index a479150755d..fde5cddaaf1 100644
--- a/x11/kdebase2/patches/patch-ay
+++ b/x11/kdebase2/patches/patch-ay
@@ -1,13 +1,25 @@
-$NetBSD: patch-ay,v 1.1 2001/03/24 13:42:05 skrll Exp $
+$NetBSD: patch-ay,v 1.2 2001/10/15 22:46:01 skrll Exp $
 
---- kdm/greeter/verify.c.orig	Sun Feb 18 15:28:18 2001
-+++ kdm/greeter/verify.c
-@@ -74,7 +74,7 @@
- static char krbtkfile[MAXPATHLEN];
- #endif
- 
--#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__)
-+#if defined(HAVE_LOGIN_CAP_H)
- # define USE_LOGIN_CAP 1
- # include <login_cap.h>
- #endif
+--- kcontrol/kio/Makefile.in.orig	Sat Sep  8 01:36:26 2001
++++ kcontrol/kio/Makefile.in
+@@ -292 +292 @@
+-libkcm_kio_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KFILE)
++libkcm_kio_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KFILE) ${KDE_RPATH}
+@@ -361 +361 @@
+-KDE_DIST=UA-DESKTOP-FILE-HOWTO cookies.desktop useragent.desktop useragentdlg.h uagentproviderdlg.h proxy.desktop policydlg.h ksmboptdlg.h kcookiesmanagement.h fakeuaprovider.h netpref.desktop kproxydlg.h kcookiesmain.h kproxydlgui.ui kcookiespolicies.h uninstall.desktop smb.desktop uasprovider.desktop netpref.h smbrodlg.h 
++KDE_DIST=policydlg.h ksmboptdlg.h kcookiesmanagement.h UA-DESKTOP-FILE-HOWTO kproxydlgui.ui fakeuaprovider.h useragentdlg.h uagentproviderdlg.h cookies.desktop kcookiespolicies.h netpref.desktop uninstall.desktop smb.desktop proxy.desktop useragent.desktop uasprovider.desktop kproxydlg.h netpref.h kcookiesmain.h smbrodlg.h 
+@@ -574 +574 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -632,11 +631,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-az b/x11/kdebase2/patches/patch-az
index 2bfe72e75ca..e32e240b0fe 100644
--- a/x11/kdebase2/patches/patch-az
+++ b/x11/kdebase2/patches/patch-az
@@ -1,14 +1,13 @@
-$NetBSD: patch-az,v 1.1 2001/03/24 13:42:05 skrll Exp $
+$NetBSD: patch-az,v 1.2 2001/10/15 22:46:01 skrll Exp $
 
---- config.h.in.orig	Thu Feb 22 13:15:14 2001
-+++ config.h.in
-@@ -110,6 +110,9 @@
- /* Define if you have the setpriority function.  */
- #undef HAVE_SETPRIORITY
+--- kcontrol/konq/Makefile.am.orig	Tue May 15 14:09:00 2001
++++ kcontrol/konq/Makefile.am
+@@ -10,7 +10,7 @@
+ 		desktop.cpp uiserver.stub main.cpp
  
-+/* Define if you have the setusercontext function.  */
-+#undef HAVE_SETUSERCONTEXT
-+
- /* Define if you have the snprintf function.  */
- #undef HAVE_SNPRINTF
+ libkcm_konq_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
+-libkcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA) ${KDE_RPATH}
  
+ libkcm_konq_la_DATA = overlapping.png onlyone.png
+ libkcm_konq_ladir = $(kde_datadir)/kcontrol/pics
diff --git a/x11/kdebase2/patches/patch-ba b/x11/kdebase2/patches/patch-ba
index 96875e6a060..8073d2199f3 100644
--- a/x11/kdebase2/patches/patch-ba
+++ b/x11/kdebase2/patches/patch-ba
@@ -1,256 +1,22 @@
-$NetBSD: patch-ba,v 1.1 2001/09/22 14:51:50 jdolecek Exp $
+$NetBSD: patch-ba,v 1.2 2001/10/15 22:46:01 skrll Exp $
 
---- kcontrol/info/info_netbsd.cpp.orig	Fri Sep 21 23:01:26 2001
-+++ kcontrol/info/info_netbsd.cpp	Sat Sep 22 16:25:36 2001
-@@ -34,8 +34,10 @@
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/sysctl.h>
-+#include <sys/mount.h>
- #include <stdio.h>	/* for NULL */
- #include <stdlib.h>	/* for malloc(3) */
-+#include <fstab.h>
- 
- #include <qfile.h>
- #include <qfontmetrics.h>
-@@ -100,20 +102,18 @@ bool GetInfo_CPU(QListView *lBox)
- // this is used to find out which devices are currently
- // on system
- static bool GetDmesgInfo(QListView *lBox, const char *filter,
--	void func(QListView *, QCString s, void **, bool))
-+	void func(QListView *, QString s))
- {
-         QFile *dmesg = new QFile("/var/run/dmesg.boot");
- 	bool usepipe=false;
- 	FILE *pipe=NULL;
- 	QTextStream *t;
- 	bool seencpu=false;
--	void *opaque=NULL;
--	QCString s;
-+	QString s;
- 	bool found=false;
- 
--	if (dmesg->exists() && dmesg->open(IO_ReadOnly)) {
-+	if (dmesg->exists() && dmesg->open(IO_ReadOnly))
- 		t = new QTextStream(dmesg);
--	}
- 	else {
- 		delete dmesg;
- 		pipe = popen("/sbin/dmesg", "r");
-@@ -134,25 +134,20 @@ static bool GetDmesgInfo(QListView *lBox
- 			s.contains("WARNING: old BSD partition ID!"))
- 			break;
- 
--		if (!filter || s.contains(filter)) {
--			if (func) {
--				func(lBox, s, &opaque, false);
--			}
--			else {
-+		if (!filter
-+		    || (filter[0] == '^' && s.find(&filter[1]) == 0)
-+		    || (filter[0] != '^' && s.contains(filter))) {
-+			if (func)
-+				func(lBox, s);
-+			else
- 				olditem = new QListViewItem(lBox, olditem, s);
--			}
- 			found = true;
- 		}
- 	}
--	if (func) {
--		func(lBox, s, &opaque, true);
--	}
--	//lBox->triggerUpdate();
- 
- 	delete t;
--	if (pipe) {
-+	if (pipe)
- 		pclose(pipe);
--	}
- 	else {
- 		dmesg->close();
- 		delete dmesg;
-@@ -161,40 +156,31 @@ static bool GetDmesgInfo(QListView *lBox
- 	return found;
- }
- 
--void AddIRQLine(QListView *lBox, QCString s, void **opaque, bool ending)
-+void
-+AddIRQLine(QListView *lBox, QString s)
- {
--	QStrList *strlist = (QStrList *) *opaque;
--	const char *str;
--	int pos, irqnum=0;
--
--	if (!strlist) {
--		strlist = new QStrList();
--		*opaque = (void *) strlist;
--	}
--	if (ending) {
--		str = strlist->first();
--		for(;str; str = strlist->next()) {
--			new QListViewItem(lBox, str);
--		}
--		delete strlist;
--		return;
--	}
-+	int pos, irqnum;
-+	char numstr[3];
- 
- 	pos = s.find(" irq ");
--	irqnum = (pos < 0) ? 0 : atoi(&(((const char *)s)[pos+5]));
--	if (irqnum) {
--		s.sprintf("%02d%s", irqnum, (const char *)s);
--	}
-+	irqnum = (pos < 0) ? 0 : atoi(&s.ascii()[pos+5]);
-+	if (irqnum)
-+		snprintf(numstr, 3, "%02d", irqnum);
- 	else {
--		s.sprintf("??%s", (const char *)s);
-+		// this should never happen
-+		strcpy(numstr, "??");
- 	}
--	strlist->inSort(s);
-+
-+	new QListViewItem(lBox, numstr, s);
- }
- 
-+
- bool GetInfo_IRQ (QListView *lBox)
- {
- 	lBox->addColumn(i18n("IRQ"));
- 	lBox->addColumn(i18n("Device"));
-+	lBox->setSorting(0);
-+	lBox->setShowSortIndicator(FALSE);
- 	(void) GetDmesgInfo(lBox, " irq ", AddIRQLine);
- 	return true;
- }
-@@ -220,26 +206,27 @@ bool GetInfo_IO_Ports (QListView *lbox)
- 
- bool GetInfo_Sound (QListView *lbox)
- {
-+	lbox->setSorting(false);
-+
- 	if (!GetDmesgInfo(lbox, "audio", NULL))
- 		new QListViewItem(lbox, i18n("No audio devices found."));
- 
--	// append information on any audio devices found
-+	// append information for each audio devices found
- 	QListViewItem *lvitem = lbox->firstChild();
- 	for(; lvitem; lvitem = lvitem->nextSibling()) {
- 		QString s;
- 		int pos, len;
--		const char *start, *end;
-+		const char *start;
- 		char *dev;
- 
- 		s = lvitem->text(0);
--		if ((pos = s.find("at ")) >= 0) {
--			pos += 3;	// skip "at "
--			start = end = s.ascii();
--			for(; (*end!=':') && (*end!='\n'); end++);
--			len = end - start;
--			dev = (char *) malloc(len + 1);
--			strncpy(dev, start, len);
--			dev[len] = '\0';
-+		// The autoconf message is in form 'audio0 at auvia0: ...'
-+		if (s.find("audio") == 0 && (pos = s.find(" at ")) > 0) {
-+			pos += 4;	// skip " at "
-+			start = s.ascii() + pos;
-+			len = (int) strcspn(start, ":\n\t ");
-+			dev = (char *) malloc(1 + len + 1);
-+			sprintf(dev, "^%.*s", len, start);	/* safe */
- 
- 			GetDmesgInfo(lbox, dev, NULL);
- 
-@@ -260,16 +247,32 @@ bool GetInfo_SCSI (QListView *lbox)
- {
- 	if (!GetDmesgInfo(lbox, "scsibus", NULL))
- 		new QListViewItem(lbox, i18n("No SCSI devices found."));
-+
-+	// remove the 'waiting %d seconds for devices to settle' message
-+	QListViewItem *lvitem = lbox->firstChild();
-+	for(; lvitem; lvitem = lvitem->nextSibling()) {
-+		QString s = lvitem->text(0);
-+
-+		if (s.contains("seconds for devices to settle")) {
-+			lbox->removeItem(lvitem);
-+			break;
-+		}
-+	}
-+	
- 	return true;
- }
- 
- bool GetInfo_Partitions (QListView *lbox)
- {
--	QCString s;
-+	QString s;
-+	QString MB;
- 	char *line, *orig_line;
- 	const char *device, *mountpoint, *type, *flags;
- 	FILE *pipe = popen("/sbin/mount", "r");
- 	QTextStream *t;
-+	u_int64_t tsz, fsz;
-+	struct statfs sfs;
-+	int ok;
- 
- 	if (!pipe) {
- 		kdError(0) << i18n("Ahh couldn't run /sbin/mount!") << endl;
-@@ -277,27 +280,49 @@ bool GetInfo_Partitions (QListView *lbox
- 	}
- 	t = new QTextStream(pipe, IO_ReadOnly);
- 
-+	MB = QString(" ") + QString(i18n("MB"));
- 	lbox->addColumn(i18n("Device"));
- 	lbox->addColumn(i18n("Mount Point"));
- 	lbox->addColumn(i18n("FS Type"));
-+	lbox->addColumn(i18n("Total Size"));
-+	lbox->addColumn(i18n("Free Size"));
- 	lbox->addColumn(i18n("Mount Options"));
- 
--	QListViewItem *olditem = 0;
- 	while (!(s = t->readLine().latin1()).isEmpty()) {
--		orig_line = line = strdup(s);
-+		orig_line = line = strdup(s.ascii());
-+
-+		// the lines returned by /sbin/mount look like:
-+		// /dev/wd0a on / type ffs (local, soft dependencies)
- 
- 		device = strsep(&line, " ");
- 
--		(void) strsep(&line, " "); // cosume word "on"
-+		(void) strsep(&line, " "); // consume word "on"
- 		mountpoint = strsep(&line, " ");
- 
--		(void) strsep(&line, " "); // cosume word "type"
-+		(void) strsep(&line, " "); // consume word "type"
- 		type = strsep(&line, " ");
- 
--		flags = line;
-+		/* skip leading '(' and trailing ')' */
-+		line++;
-+		flags = strsep(&line, ")");
-+
-+		if (statfs(mountpoint, &sfs) == 0) {
-+			tsz = ((1LL * sfs.f_blocks * sfs.f_bsize / 1024) + 513)
-+					/ 1024;
-+			fsz = ((1LL * sfs.f_bfree * sfs.f_bsize / 1024) + 513)
-+					/ 1024;
-+			ok = 1;
-+		} else {
-+			tsz = fsz = 0;
-+			ok = 0;
-+		}
- 
--		olditem = new QListViewItem(lbox, olditem, device, mountpoint,
--					type, flags);
-+		new QListViewItem(lbox,
-+			QString(device) + " ",
-+			QString(mountpoint) + " ", QString(type) + " ",
-+			(ok) ? (Value(tsz, 6) + MB) : " ",
-+			(ok) ? (Value(fsz, 6) + MB) : " ",
-+			flags);
- 
- 		free(orig_line);
- 	}
+--- kcontrol/konq/Makefile.in.orig	Sat Sep  8 01:36:26 2001
++++ kcontrol/konq/Makefile.in
+@@ -286 +286 @@
+-libkcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA)
++libkcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA) ${KDE_RPATH}
+@@ -339 +339 @@
+-KDE_DIST=fontopts.h onlyone.png kcmkonq.desktop desktop.desktop desktop.h main.h rootopts.h overlapping.png virtualdesktops.desktop behaviour.h uninstall.desktop trashopts.h 
++KDE_DIST=trashopts.h desktop.h behaviour.h virtualdesktops.desktop onlyone.png desktop.desktop kcmkonq.desktop fontopts.h main.h rootopts.h uninstall.desktop overlapping.png 
+@@ -537,11 +536,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-bb b/x11/kdebase2/patches/patch-bb
new file mode 100644
index 00000000000..7bc8559a16e
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2001/10/15 22:46:01 skrll Exp $
+
+--- kcontrol/konqhtml/Makefile.am.orig	Mon Jan  8 23:43:56 2001
++++ kcontrol/konqhtml/Makefile.am
+@@ -9,7 +9,7 @@
+ 			     javaopts.cpp pluginopts.cpp appearance.cpp \
+ 			     khttpoptdlg.cpp policydlg.cpp main.cpp
+ 
+-libkcm_konqhtml_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
++libkcm_konqhtml_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined ${KDE_RPATH}
+ libkcm_konqhtml_la_LIBADD = -lkhtml -lkdeui
+ 
+ data_DATA = konqhtml.desktop
diff --git a/x11/kdebase2/patches/patch-bc b/x11/kdebase2/patches/patch-bc
new file mode 100644
index 00000000000..26052719deb
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bc
@@ -0,0 +1,22 @@
+$NetBSD: patch-bc,v 1.1 2001/10/15 22:46:01 skrll Exp $
+
+--- kcontrol/konqhtml/Makefile.in.orig	Sat Sep  8 01:36:26 2001
++++ kcontrol/konqhtml/Makefile.in
+@@ -283 +283 @@
+-libkcm_konqhtml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
++libkcm_konqhtml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined ${KDE_RPATH}
+@@ -329 +329 @@
+-KDE_DIST=javaopts.h jsopts.h appearance.h htmlopts.h khttpoptdlg.h policydlg.h main.h pluginopts.h konqhtml.desktop 
++KDE_DIST=policydlg.h jsopts.h khttpoptdlg.h konqhtml.desktop main.h htmlopts.h javaopts.h pluginopts.h appearance.h 
+@@ -489,11 +488,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-bd b/x11/kdebase2/patches/patch-bd
new file mode 100644
index 00000000000..77957881105
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bd
@@ -0,0 +1,40 @@
+$NetBSD: patch-bd,v 1.1 2001/10/15 22:46:01 skrll Exp $
+
+--- kdeprint/kjobviewer/Makefile.am.orig	Sun Jul 29 05:56:25 2001
++++ kdeprint/kjobviewer/Makefile.am
+@@ -1,15 +1,20 @@
+ INCLUDES = $(all_includes)
+ 
+ bin_PROGRAMS = kjobviewer
+-lib_LTLIBRARIES = kjobviewer.la
++lib_LTLIBRARIES = libkjobviewer_main.la kjobviewer.la
+ 
+-kjobviewer_SOURCES = dummy.cpp
+-kjobviewer_LDADD = kjobviewer.la
++kjobviewer_SOURCES = kjobviewer_main.cpp
++kjobviewer_LDADD = libkjobviewer_main.la
+ kjobviewer_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+-kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp
++libkjobviewer_main_la_SOURCES = kjobviewer.cpp main.cpp
++libkjobviewer_main_la_METASOURCES = AUTO
++libkjobviewer_main_la_LIBADD = -lkdeprint_management $(LIB_KDEUI)
++libkjobviewer_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++
++kjobviewer_la_SOURCES = kjobviewer_main.cpp
+ kjobviewer_la_METASOURCES = AUTO
+-kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI)
++kjobviewer_la_LIBADD = libkjobviewer_main.la
+ kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
+ 
+ noinst_HEADERS = kjobviewer.h
+@@ -21,9 +26,6 @@
+ 
+ desktop_DATA = kjobviewer.desktop
+ desktopdir = $(kde_appsdir)/Utilities
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+ 
+ messages: rc.cpp
+ 	$(XGETTEXT) *.cpp -o $(podir)/kjobviewer.pot
diff --git a/x11/kdebase2/patches/patch-be b/x11/kdebase2/patches/patch-be
new file mode 100644
index 00000000000..a16fa06421e
--- /dev/null
+++ b/x11/kdebase2/patches/patch-be
@@ -0,0 +1,143 @@
+$NetBSD: patch-be,v 1.1 2001/10/15 22:46:01 skrll Exp $
+
+--- kdeprint/kjobviewer/Makefile.in.orig	Sat Sep  8 01:36:29 2001
++++ kdeprint/kjobviewer/Makefile.in
+@@ -277 +277 @@
+-lib_LTLIBRARIES = kjobviewer.la
++lib_LTLIBRARIES = libkjobviewer_main.la kjobviewer.la
+@@ -279,2 +279,2 @@
+-kjobviewer_SOURCES = dummy.cpp
+-kjobviewer_LDADD = kjobviewer.la
++kjobviewer_SOURCES = kjobviewer_main.cpp
++kjobviewer_LDADD = libkjobviewer_main.la
+@@ -283 +283,6 @@
+-kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp
++libkjobviewer_main_la_SOURCES = kjobviewer.cpp main.cpp
++#>- libkjobviewer_main_la_METASOURCES = AUTO
++libkjobviewer_main_la_LIBADD = -lkdeprint_management $(LIB_KDEUI)
++libkjobviewer_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++
++kjobviewer_la_SOURCES = kjobviewer_main.cpp
+@@ -285 +290 @@
+-kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI)
++kjobviewer_la_LIBADD = libkjobviewer_main.la
+@@ -309,2 +314,2 @@
+-kjobviewer_la_DEPENDENCIES = 
+-#>- kjobviewer_la_OBJECTS =  kjobviewer.lo main.lo
++libkjobviewer_main_la_DEPENDENCIES = 
++#>- libkjobviewer_main_la_OBJECTS =  kjobviewer.lo main.lo
+@@ -312,5 +317,9 @@
+-kjobviewer_la_final_OBJECTS = kjobviewer_la.all_cpp.lo 
+-kjobviewer_la_nofinal_OBJECTS = kjobviewer.lo main.lo \
+-kjobviewer_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kjobviewer_la_OBJECTS = $(kjobviewer_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kjobviewer_la_OBJECTS = $(kjobviewer_la_final_OBJECTS)
++libkjobviewer_main_la_final_OBJECTS = libkjobviewer_main_la.all_cpp.lo 
++libkjobviewer_main_la_nofinal_OBJECTS = kjobviewer.lo main.lo \
++libkjobviewer_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkjobviewer_main_la_OBJECTS = $(libkjobviewer_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkjobviewer_main_la_OBJECTS = $(libkjobviewer_main_la_final_OBJECTS)
++kjobviewer_la_DEPENDENCIES =  libkjobviewer_main.la
++#>- kjobviewer_la_OBJECTS =  kjobviewer_main.lo
++#>+ 1
++kjobviewer_la_OBJECTS = kjobviewer_main.lo
+@@ -320 +329 @@
+-#>- kjobviewer_OBJECTS =  dummy.$(OBJEXT)
++#>- kjobviewer_OBJECTS =  kjobviewer_main.$(OBJEXT)
+@@ -322,2 +331,2 @@
+-kjobviewer_OBJECTS = dummy.$(OBJEXT)
+-kjobviewer_DEPENDENCIES =  kjobviewer.la
++kjobviewer_OBJECTS = kjobviewer_main.$(OBJEXT)
++kjobviewer_DEPENDENCIES =  libkjobviewer_main.la
+@@ -344 +353 @@
+-KDE_DIST=kjobviewerui.rc hi32-app-kjobviewer.png kjobviewer.desktop hi16-app-kjobviewer.png 
++KDE_DIST=hi32-app-kjobviewer.png hi16-app-kjobviewer.png kjobviewerui.rc kjobviewer.desktop 
+@@ -351,2 +360,2 @@
+-SOURCES = $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES)
+-OBJECTS = $(kjobviewer_la_OBJECTS) $(kjobviewer_OBJECTS)
++SOURCES = $(libkjobviewer_main_la_SOURCES) $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES)
++OBJECTS = $(libkjobviewer_main_la_OBJECTS) $(kjobviewer_la_OBJECTS) $(kjobviewer_OBJECTS)
+@@ -438,0 +448,3 @@
++libkjobviewer_main.la: $(libkjobviewer_main_la_OBJECTS) $(libkjobviewer_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkjobviewer_main_la_LDFLAGS) $(libkjobviewer_main_la_OBJECTS) $(libkjobviewer_main_la_LIBADD) $(LIBS)
++
+@@ -549,11 +560,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -664,3 +664,0 @@
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+@@ -678,0 +677,4 @@
++kjobviewer.moc: $(srcdir)/kjobviewer.h
++	$(MOC) $(srcdir)/kjobviewer.h -o kjobviewer.moc
++
++#>+ 3
+@@ -680 +682 @@
+-	-rm -f  kjobviewer.moc
++	-rm -f  kjobviewer.moc kjobviewer.moc
+@@ -703,8 +705,8 @@
+-kjobviewer_la_meta_unload.cpp:  kjobviewer.moc
+-	@echo 'creating kjobviewer_la_meta_unload.cpp'
+-	@-rm -f kjobviewer_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_kjobviewer_la[] = {' > kjobviewer_la_meta_unload.cpp
+-	@cat  kjobviewer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kjobviewer_la_meta_unload.cpp
+-	@echo '0};' >> kjobviewer_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> kjobviewer_la_meta_unload.cpp
+-	@echo '_UNLOAD(kjobviewer_la)' >> kjobviewer_la_meta_unload.cpp
++libkjobviewer_main_la_meta_unload.cpp:  kjobviewer.moc
++	@echo 'creating libkjobviewer_main_la_meta_unload.cpp'
++	@-rm -f libkjobviewer_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkjobviewer_main_la[] = {' > libkjobviewer_main_la_meta_unload.cpp
++	@cat  kjobviewer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkjobviewer_main_la_meta_unload.cpp
++	@echo '0};' >> libkjobviewer_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkjobviewer_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libkjobviewer_main_la)' >> libkjobviewer_main_la_meta_unload.cpp
+@@ -715 +717,13 @@
+-	-rm -f  kjobviewer_la_meta_unload.cpp
++	-rm -f  libkjobviewer_main_la_meta_unload.cpp
++
++#>+ 11
++libkjobviewer_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp libkjobviewer_main_la_meta_unload.cpp   kjobviewer.moc 
++	@echo 'creating libkjobviewer_main_la.all_cpp.cpp ...'; \
++	rm -f libkjobviewer_main_la.all_cpp.files libkjobviewer_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkjobviewer_main_la.all_cpp.final; \
++	for file in kjobviewer.cpp main.cpp libkjobviewer_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkjobviewer_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkjobviewer_main_la.all_cpp.final; \
++	done; \
++	cat libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files  > libkjobviewer_main_la.all_cpp.cpp; \
++	rm -f libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files
+@@ -718 +732 @@
+-kjobviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp kjobviewer_la_meta_unload.cpp   kjobviewer.moc 
++kjobviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer_main.cpp   kjobviewer.moc 
+@@ -722 +736 @@
+-	for file in kjobviewer.cpp main.cpp kjobviewer_la_meta_unload.cpp ; do \
++	for file in kjobviewer_main.cpp ; do \
+@@ -730 +744 @@
+-kjobviewer.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kjobviewer.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer_main.cpp  
+@@ -734 +748 @@
+-	for file in dummy.cpp ; do \
++	for file in kjobviewer_main.cpp ; do \
+@@ -743 +757 @@
+-	-rm -f kjobviewer_la.all_cpp.cpp kjobviewer.all_cpp.cpp
++	-rm -f libkjobviewer_main_la.all_cpp.cpp kjobviewer_la.all_cpp.cpp kjobviewer.all_cpp.cpp
+@@ -747 +761 @@
+-	$(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_final_OBJECTS)" all-am
++	$(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_final_OBJECTS)" all-am
+@@ -750 +764 @@
+-	$(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_nofinal_OBJECTS)" all-am
+@@ -760 +774 @@
+-$(srcdir)/kjobviewer.cpp: kjobviewer.moc 
++$(srcdir)/kjobviewer.cpp: kjobviewer.moc kjobviewer.moc 
diff --git a/x11/kdebase2/patches/patch-bf b/x11/kdebase2/patches/patch-bf
new file mode 100644
index 00000000000..5f3090b93df
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bf
@@ -0,0 +1,33 @@
+$NetBSD: patch-bf,v 1.1 2001/10/15 22:46:01 skrll Exp $
+
+--- kdeprint/kjobviewer/kjobviewer_main.cpp.orig	Tue Oct  2 17:50:32 2001
++++ kdeprint/kjobviewer/kjobviewer_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int kjobviewer_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kjobviewer_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-bg b/x11/kdebase2/patches/patch-bg
new file mode 100644
index 00000000000..1b462810d79
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bg
@@ -0,0 +1,13 @@
+$NetBSD: patch-bg,v 1.1 2001/10/15 22:46:01 skrll Exp $
+
+--- kdeprint/kjobviewer/main.cpp.orig	Fri Mar 30 23:33:28 2001
++++ kdeprint/kjobviewer/main.cpp
+@@ -33,7 +33,7 @@
+ };
+ 
+ 
+-int main(int argc, char *argv[])
++int kjobviewer_main(int argc, char *argv[])
+ {
+ 	KAboutData	aboutData("kjobviewer","KJobViewer","0.1","A print job viewer",KAboutData::License_GPL,"(c) 2001, Michael Goffioul");
+ 	aboutData.addAuthor("Michael Goffioul",0,"goffioul@imec.be");
diff --git a/x11/kdebase2/patches/patch-bh b/x11/kdebase2/patches/patch-bh
new file mode 100644
index 00000000000..a9b576c25c2
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bh
@@ -0,0 +1,50 @@
+$NetBSD: patch-bh,v 1.1 2001/10/15 22:46:02 skrll Exp $
+
+--- kdesktop/Makefile.am.orig	Sun Jul 29 05:56:25 2001
++++ kdesktop/Makefile.am
+@@ -1,10 +1,12 @@
+ ## Makefile.am of kdebase/kdesktop
+ 
+ INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes)
++libkdesktop_main_la_LDFLAGS  = $(all_libraries) -lkdesu
++libkdesktop_main_la_LIBADD   = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la 
+ kdesktop_la_LDFLAGS  = $(all_libraries) -lkdesu -module -avoid-version
+-kdesktop_la_LIBADD   = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la 
++kdesktop_la_LIBADD   = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la
+ kdesktop_LDFLAGS  = $(KDE_RPATH) $(all_libraries)
+-kdesktop_LDADD    = kdesktop.la
++kdesktop_LDADD    = libkdesktop_main.la
+ 
+ SUBDIRS = . pics patterns programs init kwebdesktop
+ 
+@@ -12,15 +14,17 @@
+ 
+ bin_PROGRAMS = kdesktop kdmdesktop
+ bin_SCRIPTS = kdeeject
+-lib_LTLIBRARIES = kdesktop.la
++lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la
+ 
+-kdesktop_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \
++libkdesktop_main_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \
+ 	lockeng.cc lockdlg.cc KDesktopIface.skel \
+ 	bgmanager.cc init.cc KScreensaverIface.skel \
+ 	minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \
+ 	startupid.cpp
+ 
+-kdesktop_SOURCES = dummy.cc
++kdesktop_la_SOURCES = kdesktop_main.cc
++
++kdesktop_SOURCES = kdesktop_main.cc
+ 
+ include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h
+ 
+@@ -38,9 +42,6 @@
+ 
+ messages:
+ 	$(XGETTEXT) *.cc *.cpp *.h -o $(podir)/kdesktop.pot
+-
+-dummy.cc:
+-	echo > dummy.cc
+ 
+ menu_DATA = kdesktop_custom_menu1 kdesktop_custom_menu2
+ menudir = $(kde_confdir)
diff --git a/x11/kdebase2/patches/patch-bi b/x11/kdebase2/patches/patch-bi
new file mode 100644
index 00000000000..e126fb7ef7d
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bi
@@ -0,0 +1,168 @@
+$NetBSD: patch-bi,v 1.1 2001/10/15 22:46:02 skrll Exp $
+
+--- kdesktop/Makefile.in.orig	Sat Sep  8 01:36:30 2001
++++ kdesktop/Makefile.in
+@@ -274,0 +275,2 @@
++libkdesktop_main_la_LDFLAGS = $(all_libraries) -lkdesu
++libkdesktop_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la 
+@@ -276 +278 @@
+-kdesktop_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la 
++kdesktop_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la
+@@ -278 +280 @@
+-kdesktop_LDADD = kdesktop.la
++kdesktop_LDADD = libkdesktop_main.la
+@@ -286 +288 @@
+-lib_LTLIBRARIES = kdesktop.la
++lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la
+@@ -288 +290 @@
+-#>- kdesktop_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc 	lockeng.cc lockdlg.cc KDesktopIface.skel 	bgmanager.cc init.cc KScreensaverIface.skel 	minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc 	startupid.cpp
++#>- libkdesktop_main_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc 	lockeng.cc lockdlg.cc KDesktopIface.skel 	bgmanager.cc init.cc KScreensaverIface.skel 	minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc 	startupid.cpp
+@@ -290 +292 @@
+-kdesktop_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc 	lockeng.cc lockdlg.cc  	bgmanager.cc init.cc  	minicli.cpp  pixmapserver.cc kcustommenu.cc 	startupid.cpp KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc
++libkdesktop_main_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc 	lockeng.cc lockdlg.cc  	bgmanager.cc init.cc  	minicli.cpp  pixmapserver.cc kcustommenu.cc 	startupid.cpp KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc
+@@ -293 +295,3 @@
+-kdesktop_SOURCES = dummy.cc
++kdesktop_la_SOURCES = kdesktop_main.cc
++
++kdesktop_SOURCES = kdesktop_main.cc
+@@ -325 +329 @@
+-kdesktop_la_DEPENDENCIES =  $(top_builddir)/libkonq/libkonq.la \
++libkdesktop_main_la_DEPENDENCIES =  $(top_builddir)/libkonq/libkonq.la \
+@@ -327,3 +331,3 @@
+-#>- kdesktop_la_OBJECTS =  krootwm.lo xautolock.lo kdiconview.lo desktop.lo \
+-#>- main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo minicli.lo \
+-#>- pixmapserver.lo kcustommenu.lo startupid.lo
++#>- libkdesktop_main_la_OBJECTS =  krootwm.lo xautolock.lo kdiconview.lo \
++#>- desktop.lo main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo \
++#>- minicli.lo pixmapserver.lo kcustommenu.lo startupid.lo
+@@ -331,7 +335,12 @@
+-kdesktop_la_final_OBJECTS = kdesktop_la.all_cpp.lo kdesktop_la.all_cc.lo 
+-kdesktop_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo desktop.lo \
+-main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo minicli.lo \
+-pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo \
+-kdesktop_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kdesktop_la_OBJECTS = $(kdesktop_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kdesktop_la_OBJECTS = $(kdesktop_la_final_OBJECTS)
++libkdesktop_main_la_final_OBJECTS = libkdesktop_main_la.all_cpp.lo libkdesktop_main_la.all_cc.lo 
++libkdesktop_main_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \
++desktop.lo main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo \
++minicli.lo pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo \
++libkdesktop_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_final_OBJECTS)
++kdesktop_la_DEPENDENCIES =  $(top_builddir)/libkonq/libkonq.la \
++$(top_builddir)/kcontrol/background/libbgnd.la
++#>- kdesktop_la_OBJECTS =  kdesktop_main.lo
++#>+ 1
++kdesktop_la_OBJECTS = kdesktop_main.lo
+@@ -341 +350 @@
+-#>- kdesktop_OBJECTS =  dummy.$(OBJEXT)
++#>- kdesktop_OBJECTS =  kdesktop_main.$(OBJEXT)
+@@ -343,2 +352,2 @@
+-kdesktop_OBJECTS = dummy.$(OBJEXT)
+-kdesktop_DEPENDENCIES =  kdesktop.la
++kdesktop_OBJECTS = kdesktop_main.$(OBJEXT)
++kdesktop_DEPENDENCIES =  libkdesktop_main.la
+@@ -376 +385 @@
+-KDE_DIST=kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 DESIGN kcustommenu.h kdiconview.h kdesktopbindings.cpp kdmdesktop.h kdeeject 
++KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h kdiconview.h kdesktopbindings.cpp kdeeject kdmdesktop.h 
+@@ -383,2 +392,2 @@
+-SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES)
+-OBJECTS = $(kdesktop_la_OBJECTS) $(kdesktop_OBJECTS) $(kdmdesktop_OBJECTS)
++SOURCES = $(libkdesktop_main_la_SOURCES) $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES)
++OBJECTS = $(libkdesktop_main_la_OBJECTS) $(kdesktop_la_OBJECTS) $(kdesktop_OBJECTS) $(kdmdesktop_OBJECTS)
+@@ -470,0 +480,3 @@
++libkdesktop_main.la: $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkdesktop_main_la_LDFLAGS) $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_LIBADD) $(LIBS)
++
+@@ -627 +639 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -685,11 +696,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -822,3 +822,0 @@
+-dummy.cc:
+-	echo > dummy.cc
+-
+@@ -915,8 +913,8 @@
+-kdesktop_la_meta_unload.cc:  lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc
+-	@echo 'creating kdesktop_la_meta_unload.cc'
+-	@-rm -f kdesktop_la_meta_unload.cc
+-	@echo 'static const char * _metalist_kdesktop_la[] = {' > kdesktop_la_meta_unload.cc
+-	@cat  lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kdesktop_la_meta_unload.cc
+-	@echo '0};' >> kdesktop_la_meta_unload.cc
+-	@echo '#include <kunload.h>' >> kdesktop_la_meta_unload.cc
+-	@echo '_UNLOAD(kdesktop_la)' >> kdesktop_la_meta_unload.cc
++libkdesktop_main_la_meta_unload.cc:  lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc
++	@echo 'creating libkdesktop_main_la_meta_unload.cc'
++	@-rm -f libkdesktop_main_la_meta_unload.cc
++	@echo 'static const char * _metalist_libkdesktop_main_la[] = {' > libkdesktop_main_la_meta_unload.cc
++	@cat  lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkdesktop_main_la_meta_unload.cc
++	@echo '0};' >> libkdesktop_main_la_meta_unload.cc
++	@echo '#include <kunload.h>' >> libkdesktop_main_la_meta_unload.cc
++	@echo '_UNLOAD(libkdesktop_main_la)' >> libkdesktop_main_la_meta_unload.cc
+@@ -938 +936 @@
+-	-rm -f  kdesktop_la_meta_unload.cc kdmdesktop_meta_unload.cc
++	-rm -f  libkdesktop_main_la_meta_unload.cc kdmdesktop_meta_unload.cc
+@@ -941,4 +939,4 @@
+-kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp  
+-	@echo 'creating kdesktop_la.all_cpp.cpp ...'; \
+-	rm -f kdesktop_la.all_cpp.files kdesktop_la.all_cpp.final; \
+-	echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cpp.final; \
++libkdesktop_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp  
++	@echo 'creating libkdesktop_main_la.all_cpp.cpp ...'; \
++	rm -f libkdesktop_main_la.all_cpp.files libkdesktop_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cpp.final; \
+@@ -946,2 +944,14 @@
+-	  echo "#include \"$$file\"" >> kdesktop_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cpp.final; \
++	  echo "#include \"$$file\"" >> libkdesktop_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cpp.final; \
++	done; \
++	cat libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files  > libkdesktop_main_la.all_cpp.cpp; \
++	rm -f libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files
++
++#>+ 11
++libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/lockdlg.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc   xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc 
++	@echo 'creating libkdesktop_main_la.all_cc.cc ...'; \
++	rm -f libkdesktop_main_la.all_cc.files libkdesktop_main_la.all_cc.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cc.final; \
++	for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc ; do \
++	  echo "#include \"$$file\"" >> libkdesktop_main_la.all_cc.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cc.final; \
+@@ -949,2 +959,2 @@
+-	cat kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files  > kdesktop_la.all_cpp.cpp; \
+-	rm -f kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files
++	cat libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files  > libkdesktop_main_la.all_cc.cc; \
++	rm -f libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files
+@@ -953 +963 @@
+-kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/lockdlg.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc   xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc 
++kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in kdesktop_main.cc  
+@@ -957 +967 @@
+-	for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc lockdlg.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc ; do \
++	for file in kdesktop_main.cc ; do \
+@@ -965 +975 @@
+-kdesktop.all_cc.cc: $(srcdir)/Makefile.in dummy.cc  
++kdesktop.all_cc.cc: $(srcdir)/Makefile.in kdesktop_main.cc  
+@@ -969 +979 @@
+-	for file in dummy.cc ; do \
++	for file in kdesktop_main.cc ; do \
+@@ -990 +1000 @@
+-	-rm -f kdesktop_la.all_cpp.cpp kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cc.cc
++	-rm -f libkdesktop_main_la.all_cpp.cpp libkdesktop_main_la.all_cc.cc kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cc.cc
+@@ -994 +1004 @@
+-	$(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am
++	$(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am
+@@ -997 +1007 @@
+-	$(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am
++	$(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-bj b/x11/kdebase2/patches/patch-bj
new file mode 100644
index 00000000000..5f54f83c659
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bj
@@ -0,0 +1,33 @@
+$NetBSD: patch-bj,v 1.1 2001/10/15 22:46:02 skrll Exp $
+
+--- kdesktop/kdesktop_main.cc.orig	Tue Oct  2 17:50:32 2001
++++ kdesktop/kdesktop_main.cc
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int kdesktop_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kdesktop_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-bk b/x11/kdebase2/patches/patch-bk
new file mode 100644
index 00000000000..afc88ef9cd0
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bk
@@ -0,0 +1,13 @@
+$NetBSD: patch-bk,v 1.1 2001/10/15 22:46:02 skrll Exp $
+
+--- kdesktop/main.cc.orig	Sun Jul 29 05:56:28 2001
++++ kdesktop/main.cc
+@@ -74,7 +74,7 @@
+ 	KApplication::kApplication()->quit(); // turn catchable signals into clean shutdown
+ }
+ 
+-int main( int argc, char **argv )
++int kdesktop_main( int argc, char **argv )
+ {
+     //setup signal handling
+     signal(SIGTERM, signalHandler);
diff --git a/x11/kdebase2/patches/patch-bl b/x11/kdebase2/patches/patch-bl
new file mode 100644
index 00000000000..fe45a82ab8b
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bl
@@ -0,0 +1,33 @@
+$NetBSD: patch-bl,v 1.1 2001/10/15 22:46:02 skrll Exp $
+
+--- khotkeys/khotkeys/Makefile.am.orig	Sat May 19 02:07:18 2001
++++ khotkeys/khotkeys/Makefile.am
+@@ -2,13 +2,17 @@
+ 
+ bin_PROGRAMS = khotkeys
+-lib_LTLIBRARIES = khotkeys.la
++lib_LTLIBRARIES = libkhotkeys_main.la khotkeys.la
+ 
+-khotkeys_la_SOURCES = khkglobalaccel.cpp khotkeys.cpp main.cpp \
++libkhotkeys_main_la_SOURCES = khkglobalaccel.cpp khotkeys.cpp main.cpp \
+ 	khotkeys.skel
+-khotkeys_la_LIBADD   = ../shared/libshared.la -lksycoca
++libkhotkeys_main_la_LIBADD   = ../shared/libshared.la -lksycoca
++libkhotkeys_main_la_LDFLAGS = $(all_libraries)
++
++khotkeys_la_SOURCES = khotkeys_main.cpp
++khotkeys_la_LIBADD  = libkhotkeys_main.la
+ khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+-khotkeys_SOURCES = dummy.cpp 
+-khotkeys_LDADD   = khotkeys.la
++khotkeys_SOURCES = khotkeys_main.cpp
++khotkeys_LDADD   = libkhotkeys_main.la
+ khotkeys_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+@@ -21,5 +25,2 @@
+ 
+ METASOURCES = AUTO
+-
+-dummy.cpp:
+-	echo > dummy.cpp
diff --git a/x11/kdebase2/patches/patch-bm b/x11/kdebase2/patches/patch-bm
new file mode 100644
index 00000000000..03075225a23
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bm
@@ -0,0 +1,131 @@
+$NetBSD: patch-bm,v 1.1 2001/10/15 22:46:02 skrll Exp $
+
+--- khotkeys/khotkeys/Makefile.in.orig	Sat Sep  8 01:36:32 2001
++++ khotkeys/khotkeys/Makefile.in
+@@ -277 +277 @@
+-lib_LTLIBRARIES = khotkeys.la
++lib_LTLIBRARIES = libkhotkeys_main.la khotkeys.la
+@@ -279 +279 @@
+-#>- khotkeys_la_SOURCES = khkglobalaccel.cpp khotkeys.cpp main.cpp 	khotkeys.skel
++#>- libkhotkeys_main_la_SOURCES = khkglobalaccel.cpp khotkeys.cpp main.cpp 	khotkeys.skel
+@@ -281 +281 @@
+-khotkeys_la_SOURCES=khkglobalaccel.cpp khotkeys.cpp main.cpp 	 khotkeys_skel.cpp
++libkhotkeys_main_la_SOURCES=khkglobalaccel.cpp khotkeys.cpp main.cpp 	 khotkeys_skel.cpp
+@@ -283 +283,5 @@
+-khotkeys_la_LIBADD = ../shared/libshared.la -lksycoca
++libkhotkeys_main_la_LIBADD = ../shared/libshared.la -lksycoca
++libkhotkeys_main_la_LDFLAGS = $(all_libraries)
++
++khotkeys_la_SOURCES = khotkeys_main.cpp
++khotkeys_la_LIBADD = libkhotkeys_main.la
+@@ -286,2 +290,2 @@
+-khotkeys_SOURCES = dummy.cpp 
+-khotkeys_LDADD = khotkeys.la
++khotkeys_SOURCES = khotkeys_main.cpp
++khotkeys_LDADD = libkhotkeys_main.la
+@@ -310,2 +314,2 @@
+-khotkeys_la_DEPENDENCIES =  ../shared/libshared.la
+-#>- khotkeys_la_OBJECTS =  khkglobalaccel.lo khotkeys.lo main.lo
++libkhotkeys_main_la_DEPENDENCIES =  ../shared/libshared.la
++#>- libkhotkeys_main_la_OBJECTS =  khkglobalaccel.lo khotkeys.lo main.lo
+@@ -313,5 +317,9 @@
+-khotkeys_la_final_OBJECTS = khotkeys_la.all_cpp.lo 
+-khotkeys_la_nofinal_OBJECTS = khkglobalaccel.lo khotkeys.lo main.lo khotkeys_skel.lo \
+-khotkeys_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@khotkeys_la_OBJECTS = $(khotkeys_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@khotkeys_la_OBJECTS = $(khotkeys_la_final_OBJECTS)
++libkhotkeys_main_la_final_OBJECTS = libkhotkeys_main_la.all_cpp.lo 
++libkhotkeys_main_la_nofinal_OBJECTS = khkglobalaccel.lo khotkeys.lo main.lo khotkeys_skel.lo \
++libkhotkeys_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkhotkeys_main_la_OBJECTS = $(libkhotkeys_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkhotkeys_main_la_OBJECTS = $(libkhotkeys_main_la_final_OBJECTS)
++khotkeys_la_DEPENDENCIES =  libkhotkeys_main.la
++#>- khotkeys_la_OBJECTS =  khotkeys_main.lo
++#>+ 1
++khotkeys_la_OBJECTS = khotkeys_main.lo
+@@ -321 +329 @@
+-#>- khotkeys_OBJECTS =  dummy.$(OBJEXT)
++#>- khotkeys_OBJECTS =  khotkeys_main.$(OBJEXT)
+@@ -323,2 +331,2 @@
+-khotkeys_OBJECTS = dummy.$(OBJEXT)
+-khotkeys_DEPENDENCIES =  khotkeys.la
++khotkeys_OBJECTS = khotkeys_main.$(OBJEXT)
++khotkeys_DEPENDENCIES =  libkhotkeys_main.la
+@@ -352,2 +360,2 @@
+-SOURCES = $(khotkeys_la_SOURCES) $(khotkeys_SOURCES)
+-OBJECTS = $(khotkeys_la_OBJECTS) $(khotkeys_OBJECTS)
++SOURCES = $(libkhotkeys_main_la_SOURCES) $(khotkeys_la_SOURCES) $(khotkeys_SOURCES)
++OBJECTS = $(libkhotkeys_main_la_OBJECTS) $(khotkeys_la_OBJECTS) $(khotkeys_OBJECTS)
+@@ -439,0 +448,3 @@
++libkhotkeys_main.la: $(libkhotkeys_main_la_OBJECTS) $(libkhotkeys_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkhotkeys_main_la_LDFLAGS) $(libkhotkeys_main_la_OBJECTS) $(libkhotkeys_main_la_LIBADD) $(LIBS)
++
+@@ -531,11 +541,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -640,3 +639,0 @@
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+@@ -680,8 +677,8 @@
+-khotkeys_la_meta_unload.cpp:  khotkeys.moc khkglobalaccel.moc
+-	@echo 'creating khotkeys_la_meta_unload.cpp'
+-	@-rm -f khotkeys_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_khotkeys_la[] = {' > khotkeys_la_meta_unload.cpp
+-	@cat  khotkeys.moc khkglobalaccel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> khotkeys_la_meta_unload.cpp
+-	@echo '0};' >> khotkeys_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> khotkeys_la_meta_unload.cpp
+-	@echo '_UNLOAD(khotkeys_la)' >> khotkeys_la_meta_unload.cpp
++libkhotkeys_main_la_meta_unload.cpp:  khotkeys.moc khkglobalaccel.moc
++	@echo 'creating libkhotkeys_main_la_meta_unload.cpp'
++	@-rm -f libkhotkeys_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkhotkeys_main_la[] = {' > libkhotkeys_main_la_meta_unload.cpp
++	@cat  khotkeys.moc khkglobalaccel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkhotkeys_main_la_meta_unload.cpp
++	@echo '0};' >> libkhotkeys_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkhotkeys_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libkhotkeys_main_la)' >> libkhotkeys_main_la_meta_unload.cpp
+@@ -692 +689,13 @@
+-	-rm -f  khotkeys_la_meta_unload.cpp
++	-rm -f  libkhotkeys_main_la_meta_unload.cpp
++
++#>+ 11
++libkhotkeys_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khkglobalaccel.cpp $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp libkhotkeys_main_la_meta_unload.cpp   khotkeys.moc khkglobalaccel.moc 
++	@echo 'creating libkhotkeys_main_la.all_cpp.cpp ...'; \
++	rm -f libkhotkeys_main_la.all_cpp.files libkhotkeys_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkhotkeys_main_la.all_cpp.final; \
++	for file in khkglobalaccel.cpp khotkeys.cpp main.cpp khotkeys_skel.cpp libkhotkeys_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkhotkeys_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkhotkeys_main_la.all_cpp.final; \
++	done; \
++	cat libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files  > libkhotkeys_main_la.all_cpp.cpp; \
++	rm -f libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files
+@@ -695 +704 @@
+-khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khkglobalaccel.cpp $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp khotkeys_la_meta_unload.cpp   khotkeys.moc khkglobalaccel.moc 
++khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys_main.cpp  
+@@ -699 +708 @@
+-	for file in khkglobalaccel.cpp khotkeys.cpp main.cpp khotkeys_skel.cpp khotkeys_la_meta_unload.cpp ; do \
++	for file in khotkeys_main.cpp ; do \
+@@ -707 +716 @@
+-khotkeys.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++khotkeys.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys_main.cpp  
+@@ -711 +720 @@
+-	for file in dummy.cpp ; do \
++	for file in khotkeys_main.cpp ; do \
+@@ -720 +729 @@
+-	-rm -f khotkeys_la.all_cpp.cpp khotkeys.all_cpp.cpp
++	-rm -f libkhotkeys_main_la.all_cpp.cpp khotkeys_la.all_cpp.cpp khotkeys.all_cpp.cpp
+@@ -724 +733 @@
+-	$(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_final_OBJECTS)" all-am
++	$(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_final_OBJECTS)" all-am
+@@ -727 +736 @@
+-	$(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-bn b/x11/kdebase2/patches/patch-bn
new file mode 100644
index 00000000000..cd4e290678a
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bn
@@ -0,0 +1,33 @@
+$NetBSD: patch-bn,v 1.1 2001/10/15 22:46:02 skrll Exp $
+
+--- khotkeys/khotkeys/khotkeys_main.cpp.orig	Tue Oct  2 17:50:33 2001
++++ khotkeys/khotkeys/khotkeys_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int khotkeys_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return khotkeys_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-bo b/x11/kdebase2/patches/patch-bo
new file mode 100644
index 00000000000..4687af0aaae
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bo
@@ -0,0 +1,13 @@
+$NetBSD: patch-bo,v 1.1 2001/10/15 22:46:02 skrll Exp $
+
+--- khotkeys/khotkeys/main.cpp.orig	Fri Feb 23 14:49:27 2001
++++ khotkeys/khotkeys/main.cpp
+@@ -27,7 +27,7 @@
+ int khotkeys_screen_number = 0;
+ 
+ 
+-int main( int argc, char** argv )
++int khotkeys_main( int argc, char** argv )
+ {                             // no need to i18n these, no GUI
+     {
+ 	// multiheaded hotkeys
diff --git a/x11/kdebase2/patches/patch-bp b/x11/kdebase2/patches/patch-bp
new file mode 100644
index 00000000000..f9f1457b282
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bp
@@ -0,0 +1,25 @@
+$NetBSD: patch-bp,v 1.1 2001/10/15 22:46:02 skrll Exp $
+
+--- kicker/Makefile.am.orig	Sat Jun  2 19:01:03 2001
++++ kicker/Makefile.am
+@@ -3,15 +3,15 @@
+ SUBDIRS = share core ui . proxy taskmanager taskbar applets extensions data
+ 
+ bin_PROGRAMS = kicker
+-lib_LTLIBRARIES = kicker.la
++lib_LTLIBRARIES = libkicker.la
+ 
+ CLEANFILES = dummy.cpp
+ 
+-kicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la  ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE)
+-kicker_la_SOURCES = dummy.cpp
+-kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module
++libkicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la  ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE)
++libkicker_la_SOURCES = dummy.cpp
++libkicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module
+ 
+-kicker_LDADD = kicker.la
++kicker_LDADD = libkicker.la
+ kicker_SOURCES = dummy.cpp
+ kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
diff --git a/x11/kdebase2/patches/patch-bq b/x11/kdebase2/patches/patch-bq
new file mode 100644
index 00000000000..707b01575fe
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bq
@@ -0,0 +1,237 @@
+$NetBSD: patch-bq,v 1.1 2001/10/15 22:46:03 skrll Exp $
+
+--- kicker/Makefile.in.orig	Sat Sep  8 01:36:32 2001
++++ kicker/Makefile.in
+@@ -19,10 +18,6 @@
+ VPATH = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-#>- 
+-bindir = @bindir@
+-#>+ 3
+-DEPDIR = .deps
+ 
+ bindir = @bindir@
+ sbindir = @sbindir@
+@@ -276,15 +271,18 @@
+ SUBDIRS = share core ui . proxy taskmanager taskbar applets extensions data
+ 
+ bin_PROGRAMS = kicker
+-lib_LTLIBRARIES = kicker.la
++lib_LTLIBRARIES = kicker.la libkicker.la
+ 
+ CLEANFILES = dummy.cpp
+ 
++libkicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la  ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE)
++libkicker_la_SOURCES = dummy.cpp
++libkicker_la_LDFLAGS = $(KDE_PLUGIN)
++
+ kicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la  ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE)
+ kicker_la_SOURCES = dummy.cpp
+ kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module
+ 
+-kicker_LDADD = kicker.la
+ kicker_SOURCES = dummy.cpp
+ kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+@@ -304,54 +302,38 @@
+ X_LIBS = @X_LIBS@
+ kicker_la_DEPENDENCIES =  share/libkicker_share.la \
+ core/libkicker_core.la ui/libkicker_ui.la
+-#>- kicker_la_OBJECTS =  dummy.lo
+-#>+ 1
+-kicker_la_OBJECTS = dummy.lo
++kicker_la_OBJECTS =  dummy.lo
++libkicker_la_DEPENDENCIES =  share/libkicker_share.la \
++core/libkicker_core.la ui/libkicker_ui.la
++libkicker_la_OBJECTS =  dummy.lo
+ bin_PROGRAMS =  kicker$(EXEEXT)
+ PROGRAMS =  $(bin_PROGRAMS)
+ 
+-#>- kicker_OBJECTS =  dummy.$(OBJEXT)
+-#>+ 1
+-kicker_OBJECTS = dummy.$(OBJEXT)
+-kicker_DEPENDENCIES =  kicker.la
++kicker_OBJECTS =  dummy.$(OBJEXT)
++kicker_LDADD = $(LDADD)
++kicker_DEPENDENCIES = 
+ CXXFLAGS = @CXXFLAGS@
+-#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 1
+-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-#>+ 1
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+-#>+ 1
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+ DATA =  $(autostart_DATA)
+ 
+ DIST_COMMON =  AUTHORS Makefile.am Makefile.in TODO
+ 
+ 
+-#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-#>+ 4
+-KDE_DIST=panel.desktop 
+-
+-DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+-
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ 
+ TAR = tar
+ GZIP_ENV = --best
+-SOURCES = $(kicker_la_SOURCES) $(kicker_SOURCES)
+-OBJECTS = $(kicker_la_OBJECTS) $(kicker_OBJECTS)
++SOURCES = $(kicker_la_SOURCES) $(libkicker_la_SOURCES) $(kicker_SOURCES)
++OBJECTS = $(kicker_la_OBJECTS) $(libkicker_la_OBJECTS) $(kicker_OBJECTS)
+ 
+-#>- all: all-redirect
+-#>+ 1
+-all: docs-am  all-redirect
++all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .S .c .cpp .lo .o .obj .s
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-#>- 	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kicker/Makefile
+-#>+ 2
+ 	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kicker/Makefile
+-	cd $(top_srcdir) && perl admin/am_edit kicker/Makefile.in
+ 
+ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) \
+@@ -427,12 +409,12 @@
+ 
+ maintainer-clean-libtool:
+ 
+-#>- kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES)
+-#>+ 2
+-@KDE_USE_CLOSURE_TRUE@kicker.la: kicker.la.closure $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES)
+-@KDE_USE_CLOSURE_FALSE@kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES)
++kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES)
+ 	$(CXXLINK) -rpath $(libdir) $(kicker_la_LDFLAGS) $(kicker_la_OBJECTS) $(kicker_la_LIBADD) $(LIBS)
+ 
++libkicker.la: $(libkicker_la_OBJECTS) $(libkicker_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkicker_la_LDFLAGS) $(libkicker_la_OBJECTS) $(libkicker_la_LIBADD) $(LIBS)
++
+ mostlyclean-binPROGRAMS:
+ 
+ clean-binPROGRAMS:
+@@ -523,7 +505,7 @@
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  rev="$$subdir $$rev"; \
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+ 	done; \
+ 	test "$$dot_seen" = "no" && rev=". $$rev"; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+@@ -581,17 +563,6 @@
+ subdir = kicker
+ 
+ distdir: $(DISTFILES)
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+@@ -658,17 +629,11 @@
+ 
+ mostlyclean: mostlyclean-recursive
+ 
+-#>- clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
+-#>- 		clean-binPROGRAMS clean-tags clean-generic \
+-#>- 		mostlyclean-am
+-#>+ 3
+-clean-am: clean-closures clean-final   clean-libLTLIBRARIES clean-compile clean-libtool \
++clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
+ 		clean-binPROGRAMS clean-tags clean-generic \
+ 		mostlyclean-am
+ 
+-#>- clean: clean-recursive
+-#>+ 1
+-clean: kde-rpo-clean  clean-recursive
++clean: clean-recursive
+ 
+ distclean-am:  distclean-libLTLIBRARIES distclean-compile \
+ 		distclean-libtool distclean-binPROGRAMS distclean-tags \
+@@ -716,67 +681,3 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+-
+-#>+ 8
+-kicker.la.closure: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES)
+-	@echo "int main() {return 0;}" > kicker_la_closure.cpp
+-	@$(LTCXXCOMPILE) -c kicker_la_closure.cpp
+-	@$(CXXLINK) kicker_la_closure.lo $(kicker_la_LDFLAGS) $(kicker_la_OBJECTS) $(kicker_la_LIBADD) $(LIBS)
+-	@rm -f kicker_la_closure.* kicker.la.closure
+-	@echo "timestamp" > kicker.la.closure
+-
+-
+-#>+ 3
+-clean-closures:
+-	-rm -f  kicker.la.closure
+-
+-#>+ 2
+-docs-am:
+-
+-#>+ 5
+-force-reedit:
+-		cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kicker/Makefile
+-	cd $(top_srcdir) && perl admin/am_edit kicker/Makefile.in
+-
+-
+-#>+ 11
+-kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
+-	@echo 'creating kicker_la.all_cpp.cpp ...'; \
+-	rm -f kicker_la.all_cpp.files kicker_la.all_cpp.final; \
+-	echo "#define KDE_USE_FINAL 1" >> kicker_la.all_cpp.final; \
+-	for file in dummy.cpp ; do \
+-	  echo "#include \"$$file\"" >> kicker_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kicker_la.all_cpp.final; \
+-	done; \
+-	cat kicker_la.all_cpp.final kicker_la.all_cpp.files  > kicker_la.all_cpp.cpp; \
+-	rm -f kicker_la.all_cpp.final kicker_la.all_cpp.files
+-
+-#>+ 11
+-kicker.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
+-	@echo 'creating kicker.all_cpp.cpp ...'; \
+-	rm -f kicker.all_cpp.files kicker.all_cpp.final; \
+-	echo "#define KDE_USE_FINAL 1" >> kicker.all_cpp.final; \
+-	for file in dummy.cpp ; do \
+-	  echo "#include \"$$file\"" >> kicker.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kicker.all_cpp.final; \
+-	done; \
+-	cat kicker.all_cpp.final kicker.all_cpp.files  > kicker.all_cpp.cpp; \
+-	rm -f kicker.all_cpp.final kicker.all_cpp.files
+-
+-#>+ 3
+-clean-final:
+-	-rm -f kicker_la.all_cpp.cpp kicker.all_cpp.cpp
+-
+-#>+ 2
+-final:
+-	$(MAKE) all-am
+-#>+ 2
+-no-final:
+-	$(MAKE) all-am
+-#>+ 3
+-cvs-clean:
+-	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
+-
+-#>+ 3
+-kde-rpo-clean:
+-	-rm -f *.rpo
diff --git a/x11/kdebase2/patches/patch-br b/x11/kdebase2/patches/patch-br
new file mode 100644
index 00000000000..9dba446085a
--- /dev/null
+++ b/x11/kdebase2/patches/patch-br
@@ -0,0 +1,13 @@
+$NetBSD: patch-br,v 1.1 2001/10/15 22:46:03 skrll Exp $
+
+--- kicker/applets/launcher/Makefile.am.orig	Tue Apr 10 22:55:48 2001
++++ kicker/applets/launcher/Makefile.am
+@@ -14,7 +14,7 @@
+ EXTRA_DIST = $(lnk_DATA)
+ 
+ libquicklauncher_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module 
+-libquicklauncher_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) 
++libquicklauncher_la_LIBADD = ../../libkicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) 
+ 
+ messages:
+ 	$(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot
diff --git a/x11/kdebase2/patches/patch-bs b/x11/kdebase2/patches/patch-bs
new file mode 100644
index 00000000000..3e6520d56ea
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bs
@@ -0,0 +1,22 @@
+$NetBSD: patch-bs,v 1.1 2001/10/15 22:46:03 skrll Exp $
+
+--- kicker/applets/launcher/Makefile.in.orig	Sat Sep  8 01:36:33 2001
++++ kicker/applets/launcher/Makefile.in
+@@ -289 +289 @@
+-libquicklauncher_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) 
++libquicklauncher_la_LIBADD = ../../libkicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) 
+@@ -302 +302 @@
+-libquicklauncher_la_DEPENDENCIES =  ../../kicker.la
++libquicklauncher_la_DEPENDENCIES =  ../../libkicker.la
+@@ -489,11 +488,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-bt b/x11/kdebase2/patches/patch-bt
new file mode 100644
index 00000000000..48f88971848
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bt
@@ -0,0 +1,13 @@
+$NetBSD: patch-bt,v 1.1 2001/10/15 22:46:03 skrll Exp $
+
+--- kicker/extensions/childpanel/Makefile.am.orig	Tue Apr 10 22:55:48 2001
++++ kicker/extensions/childpanel/Makefile.am
+@@ -5,7 +5,7 @@
+ libchildpanelextension_la_SOURCES = childpanelextension.cpp childpanelextension.skel
+ libchildpanelextension_la_METASOURCES = AUTO
+ libchildpanelextension_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module 
+-libchildpanelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../kicker.la
++libchildpanelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../libkicker.la
+ 
+ noinst_HEADERS = childpanelextension.h
+ 
diff --git a/x11/kdebase2/patches/patch-bu b/x11/kdebase2/patches/patch-bu
new file mode 100644
index 00000000000..91011a7b056
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bu
@@ -0,0 +1,22 @@
+$NetBSD: patch-bu,v 1.1 2001/10/15 22:46:03 skrll Exp $
+
+--- kicker/extensions/childpanel/Makefile.in.orig	Sat Sep  8 01:36:34 2001
++++ kicker/extensions/childpanel/Makefile.in
+@@ -283 +283 @@
+-libchildpanelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../kicker.la
++libchildpanelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../libkicker.la
+@@ -303 +303 @@
+-libchildpanelextension_la_DEPENDENCIES =  ../../kicker.la
++libchildpanelextension_la_DEPENDENCIES =  ../../libkicker.la
+@@ -488,11 +487,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-bv b/x11/kdebase2/patches/patch-bv
new file mode 100644
index 00000000000..ef4cd80919e
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bv
@@ -0,0 +1,55 @@
+$NetBSD: patch-bv,v 1.1 2001/10/15 22:46:03 skrll Exp $
+
+--- kicker/proxy/Makefile.am.orig	Fri Oct 27 15:32:54 2000
++++ kicker/proxy/Makefile.am
+@@ -3,24 +3,32 @@
+ CLEANFILES = dummy.cpp
+ 
+ bin_PROGRAMS = appletproxy extensionproxy
+-lib_LTLIBRARIES = appletproxy.la extensionproxy.la
++lib_LTLIBRARIES = libappletproxy_sl.la appletproxy.la libextensionproxy_sl.la extensionproxy.la
++
++libappletproxy_sl_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la
++libappletproxy_sl_la_SOURCES = appletproxy.cpp
++libappletproxy_sl_la_METASOURCES = appletproxy.moc
++libappletproxy_sl_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ appletproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la
+-appletproxy_la_SOURCES = appletproxy.cpp
+-appletproxy_la_METASOURCES = appletproxy.moc
++appletproxy_la_SOURCES = appletproxy_main.cpp
+ appletproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
+ 
+-appletproxy_LDADD = appletproxy.la
+-appletproxy_SOURCES = dummy.cpp
++appletproxy_LDADD = libappletproxy_sl.la
++appletproxy_SOURCES = appletproxy_main.cpp
+ appletproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+-extensionproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la
+-extensionproxy_la_SOURCES = extensionproxy.cpp
+-extensionproxy_la_METASOURCES = extensionproxy.moc
++libextensionproxy_sl_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la
++libextensionproxy_sl_la_SOURCES = extensionproxy.cpp
++libextensionproxy_sl_la_METASOURCES = extensionproxy.moc
++libextensionproxy_sl_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++
++extensionproxy_la_LIBADD = libextensionproxy_sl.la
++extensionproxy_la_SOURCES = extensionproxy_main.cpp
+ extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
+ 
+-extensionproxy_LDADD = extensionproxy.la
+-extensionproxy_SOURCES = dummy.cpp
++extensionproxy_LDADD = libextensionproxy_sl.la
++extensionproxy_SOURCES = extensionproxy_main.cpp
+ extensionproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ noinst_HEADERS = appletproxy.h extensionproxy.h
+@@ -28,7 +36,3 @@
+ messages:
+ 	$(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot
+ 	$(XGETTEXT) extensionproxy.cpp -o $(podir)/extensionproxy.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+-
diff --git a/x11/kdebase2/patches/patch-bw b/x11/kdebase2/patches/patch-bw
new file mode 100644
index 00000000000..7e788e6492e
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bw
@@ -0,0 +1,214 @@
+$NetBSD: patch-bw,v 1.1 2001/10/15 22:46:03 skrll Exp $
+
+--- kicker/proxy/Makefile.in.orig	Sat Sep  8 01:36:34 2001
++++ kicker/proxy/Makefile.in
+@@ -279 +279,6 @@
+-lib_LTLIBRARIES = appletproxy.la extensionproxy.la
++lib_LTLIBRARIES = libappletproxy_sl.la appletproxy.la libextensionproxy_sl.la extensionproxy.la
++
++libappletproxy_sl_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la
++libappletproxy_sl_la_SOURCES = appletproxy.cpp
++#>- libappletproxy_sl_la_METASOURCES = appletproxy.moc
++libappletproxy_sl_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+@@ -282,2 +287 @@
+-appletproxy_la_SOURCES = appletproxy.cpp
+-#>- appletproxy_la_METASOURCES = appletproxy.moc
++appletproxy_la_SOURCES = appletproxy_main.cpp
+@@ -286,2 +290,2 @@
+-appletproxy_LDADD = appletproxy.la
+-appletproxy_SOURCES = dummy.cpp
++appletproxy_LDADD = libappletproxy_sl.la
++appletproxy_SOURCES = appletproxy_main.cpp
+@@ -290,3 +294,7 @@
+-extensionproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la
+-extensionproxy_la_SOURCES = extensionproxy.cpp
+-#>- extensionproxy_la_METASOURCES = extensionproxy.moc
++libextensionproxy_sl_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la
++libextensionproxy_sl_la_SOURCES = extensionproxy.cpp
++#>- libextensionproxy_sl_la_METASOURCES = extensionproxy.moc
++libextensionproxy_sl_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++
++extensionproxy_la_LIBADD = libextensionproxy_sl.la
++extensionproxy_la_SOURCES = extensionproxy_main.cpp
+@@ -295,2 +303,2 @@
+-extensionproxy_LDADD = extensionproxy.la
+-extensionproxy_SOURCES = dummy.cpp
++extensionproxy_LDADD = libextensionproxy_sl.la
++extensionproxy_SOURCES = extensionproxy_main.cpp
+@@ -312,2 +320,2 @@
+-appletproxy_la_DEPENDENCIES =  ../share/libkicker_share.la
+-#>- appletproxy_la_OBJECTS =  appletproxy.lo
++libappletproxy_sl_la_DEPENDENCIES =  ../share/libkicker_share.la
++#>- libappletproxy_sl_la_OBJECTS =  appletproxy.lo
+@@ -315,7 +323,11 @@
+-appletproxy_la_final_OBJECTS = appletproxy_la.all_cpp.lo 
+-appletproxy_la_nofinal_OBJECTS = appletproxy.lo \
+-appletproxy_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@appletproxy_la_OBJECTS = $(appletproxy_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@appletproxy_la_OBJECTS = $(appletproxy_la_final_OBJECTS)
+-extensionproxy_la_DEPENDENCIES =  ../share/libkicker_share.la
+-#>- extensionproxy_la_OBJECTS =  extensionproxy.lo
++libappletproxy_sl_la_final_OBJECTS = libappletproxy_sl_la.all_cpp.lo 
++libappletproxy_sl_la_nofinal_OBJECTS = appletproxy.lo \
++libappletproxy_sl_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libappletproxy_sl_la_OBJECTS = $(libappletproxy_sl_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libappletproxy_sl_la_OBJECTS = $(libappletproxy_sl_la_final_OBJECTS)
++appletproxy_la_DEPENDENCIES =  ../share/libkicker_share.la
++#>- appletproxy_la_OBJECTS =  appletproxy_main.lo
++#>+ 1
++appletproxy_la_OBJECTS = appletproxy_main.lo
++libextensionproxy_sl_la_DEPENDENCIES =  ../share/libkicker_share.la
++#>- libextensionproxy_sl_la_OBJECTS =  extensionproxy.lo
+@@ -323,5 +335,9 @@
+-extensionproxy_la_final_OBJECTS = extensionproxy_la.all_cpp.lo 
+-extensionproxy_la_nofinal_OBJECTS = extensionproxy.lo \
+-extensionproxy_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@extensionproxy_la_OBJECTS = $(extensionproxy_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@extensionproxy_la_OBJECTS = $(extensionproxy_la_final_OBJECTS)
++libextensionproxy_sl_la_final_OBJECTS = libextensionproxy_sl_la.all_cpp.lo 
++libextensionproxy_sl_la_nofinal_OBJECTS = extensionproxy.lo \
++libextensionproxy_sl_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libextensionproxy_sl_la_OBJECTS = $(libextensionproxy_sl_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libextensionproxy_sl_la_OBJECTS = $(libextensionproxy_sl_la_final_OBJECTS)
++extensionproxy_la_DEPENDENCIES =  libextensionproxy_sl.la
++#>- extensionproxy_la_OBJECTS =  extensionproxy_main.lo
++#>+ 1
++extensionproxy_la_OBJECTS = extensionproxy_main.lo
+@@ -331 +347 @@
+-#>- appletproxy_OBJECTS =  dummy.$(OBJEXT)
++#>- appletproxy_OBJECTS =  appletproxy_main.$(OBJEXT)
+@@ -333,3 +349,3 @@
+-appletproxy_OBJECTS = dummy.$(OBJEXT)
+-appletproxy_DEPENDENCIES =  appletproxy.la
+-#>- extensionproxy_OBJECTS =  dummy.$(OBJEXT)
++appletproxy_OBJECTS = appletproxy_main.$(OBJEXT)
++appletproxy_DEPENDENCIES =  libappletproxy_sl.la
++#>- extensionproxy_OBJECTS =  extensionproxy_main.$(OBJEXT)
+@@ -337,2 +353,2 @@
+-extensionproxy_OBJECTS = dummy.$(OBJEXT)
+-extensionproxy_DEPENDENCIES =  extensionproxy.la
++extensionproxy_OBJECTS = extensionproxy_main.$(OBJEXT)
++extensionproxy_DEPENDENCIES =  libextensionproxy_sl.la
+@@ -359,2 +375,2 @@
+-SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) $(appletproxy_SOURCES) $(extensionproxy_SOURCES)
+-OBJECTS = $(appletproxy_la_OBJECTS) $(extensionproxy_la_OBJECTS) $(appletproxy_OBJECTS) $(extensionproxy_OBJECTS)
++SOURCES = $(libappletproxy_sl_la_SOURCES) $(appletproxy_la_SOURCES) $(libextensionproxy_sl_la_SOURCES) $(extensionproxy_la_SOURCES) $(appletproxy_SOURCES) $(extensionproxy_SOURCES)
++OBJECTS = $(libappletproxy_sl_la_OBJECTS) $(appletproxy_la_OBJECTS) $(libextensionproxy_sl_la_OBJECTS) $(extensionproxy_la_OBJECTS) $(appletproxy_OBJECTS) $(extensionproxy_OBJECTS)
+@@ -446,0 +463,3 @@
++libappletproxy_sl.la: $(libappletproxy_sl_la_OBJECTS) $(libappletproxy_sl_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libappletproxy_sl_la_LDFLAGS) $(libappletproxy_sl_la_OBJECTS) $(libappletproxy_sl_la_LIBADD) $(LIBS)
++
+@@ -449,0 +469,3 @@
++libextensionproxy_sl.la: $(libextensionproxy_sl_la_OBJECTS) $(libextensionproxy_sl_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libextensionproxy_sl_la_LDFLAGS) $(libextensionproxy_sl_la_OBJECTS) $(libextensionproxy_sl_la_LIBADD) $(LIBS)
++
+@@ -526,11 +547,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -638,3 +648,0 @@
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+@@ -667,8 +675,8 @@
+-appletproxy_la_meta_unload.cpp:  appletproxy.moc
+-	@echo 'creating appletproxy_la_meta_unload.cpp'
+-	@-rm -f appletproxy_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_appletproxy_la[] = {' > appletproxy_la_meta_unload.cpp
+-	@cat  appletproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> appletproxy_la_meta_unload.cpp
+-	@echo '0};' >> appletproxy_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> appletproxy_la_meta_unload.cpp
+-	@echo '_UNLOAD(appletproxy_la)' >> appletproxy_la_meta_unload.cpp
++libappletproxy_sl_la_meta_unload.cpp:  appletproxy.moc
++	@echo 'creating libappletproxy_sl_la_meta_unload.cpp'
++	@-rm -f libappletproxy_sl_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libappletproxy_sl_la[] = {' > libappletproxy_sl_la_meta_unload.cpp
++	@cat  appletproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libappletproxy_sl_la_meta_unload.cpp
++	@echo '0};' >> libappletproxy_sl_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libappletproxy_sl_la_meta_unload.cpp
++	@echo '_UNLOAD(libappletproxy_sl_la)' >> libappletproxy_sl_la_meta_unload.cpp
+@@ -678,8 +686,8 @@
+-extensionproxy_la_meta_unload.cpp:  extensionproxy.moc
+-	@echo 'creating extensionproxy_la_meta_unload.cpp'
+-	@-rm -f extensionproxy_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_extensionproxy_la[] = {' > extensionproxy_la_meta_unload.cpp
+-	@cat  extensionproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> extensionproxy_la_meta_unload.cpp
+-	@echo '0};' >> extensionproxy_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> extensionproxy_la_meta_unload.cpp
+-	@echo '_UNLOAD(extensionproxy_la)' >> extensionproxy_la_meta_unload.cpp
++libextensionproxy_sl_la_meta_unload.cpp:  extensionproxy.moc
++	@echo 'creating libextensionproxy_sl_la_meta_unload.cpp'
++	@-rm -f libextensionproxy_sl_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libextensionproxy_sl_la[] = {' > libextensionproxy_sl_la_meta_unload.cpp
++	@cat  extensionproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libextensionproxy_sl_la_meta_unload.cpp
++	@echo '0};' >> libextensionproxy_sl_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libextensionproxy_sl_la_meta_unload.cpp
++	@echo '_UNLOAD(libextensionproxy_sl_la)' >> libextensionproxy_sl_la_meta_unload.cpp
+@@ -690 +698,13 @@
+-	-rm -f  appletproxy_la_meta_unload.cpp extensionproxy_la_meta_unload.cpp
++	-rm -f  libappletproxy_sl_la_meta_unload.cpp libextensionproxy_sl_la_meta_unload.cpp
++
++#>+ 11
++libappletproxy_sl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy.cpp libappletproxy_sl_la_meta_unload.cpp   appletproxy.moc 
++	@echo 'creating libappletproxy_sl_la.all_cpp.cpp ...'; \
++	rm -f libappletproxy_sl_la.all_cpp.files libappletproxy_sl_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libappletproxy_sl_la.all_cpp.final; \
++	for file in appletproxy.cpp libappletproxy_sl_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libappletproxy_sl_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libappletproxy_sl_la.all_cpp.final; \
++	done; \
++	cat libappletproxy_sl_la.all_cpp.final libappletproxy_sl_la.all_cpp.files  > libappletproxy_sl_la.all_cpp.cpp; \
++	rm -f libappletproxy_sl_la.all_cpp.final libappletproxy_sl_la.all_cpp.files
+@@ -693 +713 @@
+-appletproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy.cpp appletproxy_la_meta_unload.cpp   appletproxy.moc 
++appletproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy_main.cpp  
+@@ -697 +717 @@
+-	for file in appletproxy.cpp appletproxy_la_meta_unload.cpp ; do \
++	for file in appletproxy_main.cpp ; do \
+@@ -705 +725,13 @@
+-extensionproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy.cpp extensionproxy_la_meta_unload.cpp   extensionproxy.moc 
++libextensionproxy_sl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy.cpp libextensionproxy_sl_la_meta_unload.cpp   extensionproxy.moc 
++	@echo 'creating libextensionproxy_sl_la.all_cpp.cpp ...'; \
++	rm -f libextensionproxy_sl_la.all_cpp.files libextensionproxy_sl_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libextensionproxy_sl_la.all_cpp.final; \
++	for file in extensionproxy.cpp libextensionproxy_sl_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libextensionproxy_sl_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libextensionproxy_sl_la.all_cpp.final; \
++	done; \
++	cat libextensionproxy_sl_la.all_cpp.final libextensionproxy_sl_la.all_cpp.files  > libextensionproxy_sl_la.all_cpp.cpp; \
++	rm -f libextensionproxy_sl_la.all_cpp.final libextensionproxy_sl_la.all_cpp.files
++
++#>+ 11
++extensionproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy_main.cpp  
+@@ -709 +741 @@
+-	for file in extensionproxy.cpp extensionproxy_la_meta_unload.cpp ; do \
++	for file in extensionproxy_main.cpp ; do \
+@@ -717 +749 @@
+-appletproxy.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++appletproxy.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy_main.cpp  
+@@ -721 +753 @@
+-	for file in dummy.cpp ; do \
++	for file in appletproxy_main.cpp ; do \
+@@ -729 +761 @@
+-extensionproxy.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++extensionproxy.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy_main.cpp  
+@@ -733 +765 @@
+-	for file in dummy.cpp ; do \
++	for file in extensionproxy_main.cpp ; do \
+@@ -742 +774 @@
+-	-rm -f appletproxy_la.all_cpp.cpp extensionproxy_la.all_cpp.cpp appletproxy.all_cpp.cpp extensionproxy.all_cpp.cpp
++	-rm -f libappletproxy_sl_la.all_cpp.cpp appletproxy_la.all_cpp.cpp libextensionproxy_sl_la.all_cpp.cpp extensionproxy_la.all_cpp.cpp appletproxy.all_cpp.cpp extensionproxy.all_cpp.cpp
+@@ -746 +778 @@
+-	$(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_final_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_final_OBJECTS)" all-am
++	$(MAKE) libappletproxy_sl_la_OBJECTS="$(libappletproxy_sl_la_final_OBJECTS)" libextensionproxy_sl_la_OBJECTS="$(libextensionproxy_sl_la_final_OBJECTS)" all-am
+@@ -749 +781 @@
+-	$(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_nofinal_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libappletproxy_sl_la_OBJECTS="$(libappletproxy_sl_la_nofinal_OBJECTS)" libextensionproxy_sl_la_OBJECTS="$(libextensionproxy_sl_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-bx b/x11/kdebase2/patches/patch-bx
new file mode 100644
index 00000000000..1e9e71fcda6
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bx
@@ -0,0 +1,13 @@
+$NetBSD: patch-bx,v 1.1 2001/10/15 22:46:03 skrll Exp $
+
+--- kicker/proxy/appletproxy.cpp.orig	Tue Feb  6 18:32:06 2001
++++ kicker/proxy/appletproxy.cpp
+@@ -55,7 +55,7 @@
+   { 0, 0, 0}
+ };
+ 
+-int main( int argc, char ** argv )
++int appletproxy_main( int argc, char ** argv )
+ {
+     KAboutData aboutData( "appletproxy", I18N_NOOP("Panel applet proxy.")
+                           , "v0.1.0"
diff --git a/x11/kdebase2/patches/patch-by b/x11/kdebase2/patches/patch-by
new file mode 100644
index 00000000000..54504c52f72
--- /dev/null
+++ b/x11/kdebase2/patches/patch-by
@@ -0,0 +1,33 @@
+$NetBSD: patch-by,v 1.1 2001/10/15 22:46:04 skrll Exp $
+
+--- kicker/proxy/appletproxy_main.cpp.orig	Tue Oct  2 17:50:33 2001
++++ kicker/proxy/appletproxy_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int appletproxy_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return appletproxy_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-bz b/x11/kdebase2/patches/patch-bz
new file mode 100644
index 00000000000..1e8a3896c23
--- /dev/null
+++ b/x11/kdebase2/patches/patch-bz
@@ -0,0 +1,13 @@
+$NetBSD: patch-bz,v 1.1 2001/10/15 22:46:04 skrll Exp $
+
+--- kicker/proxy/extensionproxy.cpp.orig	Tue Feb  6 18:32:06 2001
++++ kicker/proxy/extensionproxy.cpp
+@@ -54,7 +54,7 @@
+   { 0, 0, 0}
+ };
+ 
+-int main( int argc, char ** argv )
++int extensionproxy_main( int argc, char ** argv )
+ {
+     KAboutData aboutData( "extensionproxy", I18N_NOOP("Panel extension proxy.")
+                           , "v0.1.0"
diff --git a/x11/kdebase2/patches/patch-ca b/x11/kdebase2/patches/patch-ca
new file mode 100644
index 00000000000..0402ae65f00
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ca
@@ -0,0 +1,33 @@
+$NetBSD: patch-ca,v 1.1 2001/10/15 22:46:04 skrll Exp $
+
+--- kicker/proxy/extensionproxy_main.cpp.orig	Tue Oct  2 17:50:33 2001
++++ kicker/proxy/extensionproxy_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int extensionproxy_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return extensionproxy_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-cb b/x11/kdebase2/patches/patch-cb
new file mode 100644
index 00000000000..d965917733e
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cb
@@ -0,0 +1,100 @@
+$NetBSD: patch-cb,v 1.1 2001/10/15 22:46:04 skrll Exp $
+
+--- kicker/share/pluginmgr.cpp.orig	Mon Apr  9 12:04:06 2001
++++ kicker/share/pluginmgr.cpp
+@@ -51,27 +51,28 @@
+ 
+     if(!dlregistered){
+ 	dlregistered = true;
+-	lt_dlinit();
++	loader = KLibLoader::self();
+     }
+ 
+-    lt_dlhandle handle = lt_dlopen(QFile::encodeName(libStr));
++    KLibrary* handle = loader->library(QFile::encodeName(libStr));
++
+     if(!handle){
+-	kdWarning() << "cannot open applet: " << libStr << " because of " << lt_dlerror() << endl;
++	kdWarning() << "cannot open applet: " << libStr << " because of " << loader->lastErrorMessage() << endl;
+ 	return(NULL);
+     }
+ 
+-    lt_ptr_t init_func = lt_dlsym(handle, "init");
++    void* init_func = handle->symbol(QString("init").utf8());
+     if(!init_func){
+ 	kdWarning() << libStr << " is not a kicker applet!" << endl;
+-	lt_dlclose(handle);
++        loader->unloadLibrary(QFile::encodeName(libStr));
+ 	return(NULL);
+     }
+ 
+     KPanelApplet* (*init_ptr)(QWidget *, const QString&);
+     init_ptr = (KPanelApplet* (*)(QWidget *, const QString&))init_func;
+     KPanelApplet *w = init_ptr(parent, configFile);
+-    lt_dlhandle *tmp = new lt_dlhandle;
+-    *tmp = handle;
++    QString* tmp = new QString;
++    *tmp = libStr;
+     handleDict.insert((long)w, tmp);
+     return(w);
+ }
+@@ -96,48 +97,42 @@
+ 
+     if(!dlregistered){
+ 	dlregistered = true;
+-	lt_dlinit();
++        loader = KLibLoader::self();
+     }
+ 
+-    lt_dlhandle handle = lt_dlopen(QFile::encodeName(libStr));
++    KLibrary* handle = loader->library(QFile::encodeName(libStr));
+     if(!handle){
+-	kdWarning() << "cannot open extension: " << libStr << " because of " << lt_dlerror() << endl;
++	kdWarning() << "cannot open extension: " << libStr << " because of " << loader->lastErrorMessage() << endl;
+ 	return(NULL);
+     }
+ 
+-    lt_ptr_t init_func = lt_dlsym(handle, "init");
++    void* init_func = handle->symbol(QString("init").utf8());
+     if(!init_func){
+ 	kdWarning() << libStr << " is not a kicker extension!" << endl;
+-	lt_dlclose(handle);
++	loader->unloadLibrary(QFile::encodeName(libStr));
+ 	return(NULL);
+     }
+ 
+     KPanelExtension* (*init_ptr)(QWidget *, const QString&);
+     init_ptr = (KPanelExtension* (*)(QWidget *, const QString&))init_func;
+     KPanelExtension *w = init_ptr(parent, configFile);
+-    lt_dlhandle *tmp = new lt_dlhandle;
+-    *tmp = handle;
++    QString* tmp = new QString;
++    *tmp = libStr;
+     handleDict.insert((long)w, tmp);
+     return(w);
+ }
+ 
+ bool KickerPluginManager::removePlugin(QWidget *w)
+ {
+-  lt_dlhandle *handle = handleDict.find((long)w);
++  QString* handle = handleDict.find((long)w);
+   if(!handle){
+     kdWarning() << "Cannot find handle to remove plugin!" << endl;
+     return(false);
+   }
+   handleDict.remove((long)w);
+   delete w;
+-  if(!lt_dlclose(*handle)){
+-    kdWarning() << "Unable to unload plugin!" << endl;
+-    return(false);
+-  }
++  loader->unloadLibrary(QFile::encodeName(*handle));
++    // kdWarning() << "Unable to unload plugin!" << endl;
++    // return(false);
+   return(true);
+ }
+-
+-
+-
+-
+-
diff --git a/x11/kdebase2/patches/patch-cc b/x11/kdebase2/patches/patch-cc
new file mode 100644
index 00000000000..4799d2419d3
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cc
@@ -0,0 +1,25 @@
+$NetBSD: patch-cc,v 1.1 2001/10/15 22:46:04 skrll Exp $
+
+--- kicker/share/pluginmgr.h.orig	Wed Sep  5 00:16:12 2001
++++ kicker/share/pluginmgr.h
+@@ -26,8 +26,8 @@
+ 
+ #include <qstring.h>
+ #include <qintdict.h>
+-#define LT_NON_POSIX_NAMESPACE // Make sure lt_ptr_t is defined
+-#include <ltdl.h>
++
++#include <klibloader.h>
+ 
+ class KPanelApplet;
+ class KPanelExtension;
+@@ -43,7 +43,8 @@
+     bool removePlugin(QWidget *plugin);
+ 
+ protected:
+-    QIntDict<lt_dlhandle> handleDict;
++    QIntDict<QString> handleDict;
++    KLibLoader* loader;
+ };
+ 
+ #endif
diff --git a/x11/kdebase2/patches/patch-cd b/x11/kdebase2/patches/patch-cd
new file mode 100644
index 00000000000..7e7bf593257
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cd
@@ -0,0 +1,12 @@
+$NetBSD: patch-cd,v 1.1 2001/10/15 22:46:04 skrll Exp $
+
+--- kioslave/info/kde-info2html.conf.orig	Wed Aug  2 11:07:17 2000
++++ kioslave/info/kde-info2html.conf
+@@ -22,6 +22,7 @@
+ 	    "/usr/share/info",
+ 	    "/usr/lib/info",
+ #	    "/usr/lib/teTeX/info",
++	    "@LOCALBASE@/info",
+ 	    "/usr/local/info",
+ 	    "/usr/local/lib/info",
+ 	    "/usr/X11R6/info",
diff --git a/x11/kdebase2/patches/patch-ce b/x11/kdebase2/patches/patch-ce
new file mode 100644
index 00000000000..554cb28783e
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ce
@@ -0,0 +1,41 @@
+$NetBSD: patch-ce,v 1.1 2001/10/15 22:46:04 skrll Exp $
+
+--- klipper/Makefile.am.orig	Wed Sep  5 00:16:17 2001
++++ klipper/Makefile.am
+@@ -1,18 +1,19 @@
+ INCLUDES= $(all_includes)
+ 
+ bin_PROGRAMS = klipper
+-lib_LTLIBRARIES = klipper.la
++lib_LTLIBRARIES = libklipper_main.la klipper.la
+ 
+-CLEANFILES = dummy.cpp
+-
+-klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+-klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp
++libklipper_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libklipper_main_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp
++libklipper_main_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
++klipper_la_LIBADD = libklipper_main.la
++klipper_la_SOURCES = klipper_main.cpp
+ klipper_la_METASOURCES = AUTO
+ klipper_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+-klipper_LDADD = klipper.la $(LIB_KSYCOCA)
+-klipper_SOURCES = dummy.cpp
++klipper_LDADD = libklipper_main.la $(LIB_KSYCOCA)
++klipper_SOURCES = klipper_main.cpp
+ klipper_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ 
+@@ -30,9 +31,6 @@
+ 
+ messages:
+ 	$(XGETTEXT) $(klipper_la_SOURCES) klipperbindings.cpp -o $(podir)/klipper.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+ 
+ # update script:
+ updatedir = $(kde_datadir)/kconf_update
diff --git a/x11/kdebase2/patches/patch-cf b/x11/kdebase2/patches/patch-cf
new file mode 100644
index 00000000000..46bde611abe
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cf
@@ -0,0 +1,136 @@
+$NetBSD: patch-cf,v 1.1 2001/10/15 22:46:04 skrll Exp $
+
+--- klipper/Makefile.in.orig	Sat Sep  8 01:36:37 2001
++++ klipper/Makefile.in
+-lib_LTLIBRARIES = klipper.la
++lib_LTLIBRARIES = libklipper_main.la klipper.la
+@@ -278,4 +278,3 @@
+-CLEANFILES = dummy.cpp
+-
+-klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+-klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp
++libklipper_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
++libklipper_main_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp
++libklipper_main_la_LDFLAGS = $(all_libraries) -module -avoid-version
+@@ -282,0 +282,2 @@
++klipper_la_LIBADD = libklipper_main.la
++klipper_la_SOURCES = klipper_main.cpp
+@@ -286,2 +287,2 @@
+-klipper_LDADD = klipper.la $(LIB_KSYCOCA)
+-klipper_SOURCES = dummy.cpp
++klipper_LDADD = libklipper_main.la $(LIB_KSYCOCA)
++klipper_SOURCES = klipper_main.cpp
+@@ -317,8 +318,14 @@
+-klipper_la_DEPENDENCIES = 
+-#>- klipper_la_OBJECTS =  main.lo toplevel.lo urlgrabber.lo configdialog.lo
+-#>+ 5
+-klipper_la_final_OBJECTS = klipper_la.all_cpp.lo 
+-klipper_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo configdialog.lo \
+-klipper_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@klipper_la_OBJECTS = $(klipper_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@klipper_la_OBJECTS = $(klipper_la_final_OBJECTS)
++libklipper_main_la_DEPENDENCIES = 
++#>- libklipper_main_la_OBJECTS =  main.lo toplevel.lo urlgrabber.lo \
++#>- configdialog.lo
++#>+ 6
++libklipper_main_la_final_OBJECTS = libklipper_main_la.all_cpp.lo 
++libklipper_main_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo \
++configdialog.lo \
++libklipper_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libklipper_main_la_OBJECTS = $(libklipper_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libklipper_main_la_OBJECTS = $(libklipper_main_la_final_OBJECTS)
++klipper_la_DEPENDENCIES =  libklipper_main.la
++#>- klipper_la_OBJECTS =  klipper_main.lo
++#>+ 1
++klipper_la_OBJECTS = klipper_main.lo
+@@ -328 +335 @@
+-#>- klipper_OBJECTS =  dummy.$(OBJEXT)
++#>- klipper_OBJECTS =  klipper_main.$(OBJEXT)
+@@ -330,2 +337,2 @@
+-klipper_OBJECTS = dummy.$(OBJEXT)
+-klipper_DEPENDENCIES =  klipper.la
++klipper_OBJECTS = klipper_main.$(OBJEXT)
++klipper_DEPENDENCIES =  libklipper_main.la
+@@ -350 +357 @@
+-KDE_DIST=klipperrc hi16-app-klipper.png hi32-app-klipper.png klipper-1-2.pl klipperrc.upd klipperbindings.cpp urlgrabber.h toplevel.h klipper.desktop hi48-app-klipper.png configdialog.h 
++KDE_DIST=klipperrc hi48-app-klipper.png toplevel.h hi16-app-klipper.png hi32-app-klipper.png klipperbindings.cpp configdialog.h klipper-1-2.pl klipper.desktop klipperrc.upd urlgrabber.h 
+@@ -357,2 +364,2 @@
+-SOURCES = $(klipper_la_SOURCES) $(klipper_SOURCES)
+-OBJECTS = $(klipper_la_OBJECTS) $(klipper_OBJECTS)
++SOURCES = $(libklipper_main_la_SOURCES) $(klipper_la_SOURCES) $(klipper_SOURCES)
++OBJECTS = $(libklipper_main_la_OBJECTS) $(klipper_la_OBJECTS) $(klipper_OBJECTS)
+@@ -444,0 +452,3 @@
++libklipper_main.la: $(libklipper_main_la_OBJECTS) $(libklipper_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libklipper_main_la_LDFLAGS) $(libklipper_main_la_OBJECTS) $(libklipper_main_la_LIBADD) $(LIBS)
++
+@@ -593,11 +602,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -656 +654,0 @@
+-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+@@ -718,3 +715,0 @@
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+@@ -765,8 +760,8 @@
+-klipper_la_meta_unload.cpp:  urlgrabber.moc toplevel.moc configdialog.moc
+-	@echo 'creating klipper_la_meta_unload.cpp'
+-	@-rm -f klipper_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_klipper_la[] = {' > klipper_la_meta_unload.cpp
+-	@cat  urlgrabber.moc toplevel.moc configdialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klipper_la_meta_unload.cpp
+-	@echo '0};' >> klipper_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> klipper_la_meta_unload.cpp
+-	@echo '_UNLOAD(klipper_la)' >> klipper_la_meta_unload.cpp
++libklipper_main_la_meta_unload.cpp:  urlgrabber.moc toplevel.moc configdialog.moc
++	@echo 'creating libklipper_main_la_meta_unload.cpp'
++	@-rm -f libklipper_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libklipper_main_la[] = {' > libklipper_main_la_meta_unload.cpp
++	@cat  urlgrabber.moc toplevel.moc configdialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklipper_main_la_meta_unload.cpp
++	@echo '0};' >> libklipper_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libklipper_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libklipper_main_la)' >> libklipper_main_la_meta_unload.cpp
+@@ -777 +772,13 @@
+-	-rm -f  klipper_la_meta_unload.cpp
++	-rm -f  libklipper_main_la_meta_unload.cpp
++
++#>+ 11
++libklipper_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp libklipper_main_la_meta_unload.cpp  
++	@echo 'creating libklipper_main_la.all_cpp.cpp ...'; \
++	rm -f libklipper_main_la.all_cpp.files libklipper_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libklipper_main_la.all_cpp.final; \
++	for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp libklipper_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libklipper_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklipper_main_la.all_cpp.final; \
++	done; \
++	cat libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files  > libklipper_main_la.all_cpp.cpp; \
++	rm -f libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files
+@@ -780 +787 @@
+-klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp klipper_la_meta_unload.cpp   urlgrabber.moc toplevel.moc configdialog.moc 
++klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klipper_main.cpp   urlgrabber.moc toplevel.moc configdialog.moc 
+@@ -784 +791 @@
+-	for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp klipper_la_meta_unload.cpp ; do \
++	for file in klipper_main.cpp ; do \
+@@ -792 +799 @@
+-klipper.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++klipper.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klipper_main.cpp  
+@@ -796 +803 @@
+-	for file in dummy.cpp ; do \
++	for file in klipper_main.cpp ; do \
+@@ -805 +812 @@
+-	-rm -f klipper_la.all_cpp.cpp klipper.all_cpp.cpp
++	-rm -f libklipper_main_la.all_cpp.cpp klipper_la.all_cpp.cpp klipper.all_cpp.cpp
+@@ -809 +816 @@
+-	$(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" all-am
++	$(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" all-am
+@@ -812 +819 @@
+-	$(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-cg b/x11/kdebase2/patches/patch-cg
new file mode 100644
index 00000000000..a833abcee4b
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cg
@@ -0,0 +1,33 @@
+$NetBSD: patch-cg,v 1.1 2001/10/15 22:46:04 skrll Exp $
+
+--- klipper/klipper_main.cpp.orig	Tue Oct  2 17:50:34 2001
++++ klipper/klipper_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int klipper_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return klipper_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-ch b/x11/kdebase2/patches/patch-ch
new file mode 100644
index 00000000000..063955a1a59
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ch
@@ -0,0 +1,13 @@
+$NetBSD: patch-ch,v 1.1 2001/10/15 22:46:05 skrll Exp $
+
+--- klipper/main.cpp.orig	Fri Sep  7 20:23:58 2001
++++ klipper/main.cpp
+@@ -25,7 +25,7 @@
+ 
+ static const char *version = "v0.9.1";
+ 
+-int main(int argc, char *argv[])
++int klipper_main(int argc, char *argv[])
+ {
+   KAboutData aboutData("klipper", I18N_NOOP("Klipper"),
+     version, description, KAboutData::License_Artistic,
diff --git a/x11/kdebase2/patches/patch-ci b/x11/kdebase2/patches/patch-ci
new file mode 100644
index 00000000000..de193e3e1e5
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ci
@@ -0,0 +1,30 @@
+$NetBSD: patch-ci,v 1.1 2001/10/15 22:46:05 skrll Exp $
+
+--- kmenuedit/Makefile.am.orig	Thu Jun  7 15:26:30 2001
++++ kmenuedit/Makefile.am
+@@ -1,17 +1,18 @@
+ INCLUDES = $(all_includes)
+ 
+ bin_PROGRAMS = kmenuedit
+-lib_LTLIBRARIES = kmenuedit.la
++lib_LTLIBRARIES = libkmenuedit_main.la kmenuedit.la
+ 
+-CLEANFILES = dummy.cpp
++libkmenuedit_main_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp
++libkmenuedit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
++libkmenuedit_main_la_LDFLAGS = $(all_libraries)
+ 
+-kmenuedit_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp
+-
+-kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
++kmenuedit_la_SOURCES = kmenuedit_main.cpp
++kmenuedit_la_LIBADD = libkmenuedit_main.la
+ kmenuedit_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+-kmenuedit_SOURCES = dummy.cpp
+-kmenuedit_LDADD   = kmenuedit.la
++kmenuedit_SOURCES = kmenuedit_main.cpp
++kmenuedit_LDADD   = libkmenuedit_main.la
+ kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h namedlg.h khotkeys.h
diff --git a/x11/kdebase2/patches/patch-cj b/x11/kdebase2/patches/patch-cj
new file mode 100644
index 00000000000..3a31b6872e8
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cj
@@ -0,0 +1,134 @@
+$NetBSD: patch-cj,v 1.1 2001/10/15 22:46:05 skrll Exp $
+
+--- kmenuedit/Makefile.in.orig	Sat Sep  8 01:36:37 2001
++++ kmenuedit/Makefile.in
+@@ -277 +277 @@
+-lib_LTLIBRARIES = kmenuedit.la
++lib_LTLIBRARIES = libkmenuedit_main.la kmenuedit.la
+@@ -279 +279,3 @@
+-CLEANFILES = dummy.cpp
++libkmenuedit_main_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp
++libkmenuedit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
++libkmenuedit_main_la_LDFLAGS = $(all_libraries)
+@@ -281,3 +283,2 @@
+-kmenuedit_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp
+-
+-kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
++kmenuedit_la_SOURCES = kmenuedit_main.cpp
++kmenuedit_la_LIBADD = libkmenuedit_main.la
+@@ -286,2 +287,2 @@
+-kmenuedit_SOURCES = dummy.cpp
+-kmenuedit_LDADD = kmenuedit.la
++kmenuedit_SOURCES = kmenuedit_main.cpp
++kmenuedit_LDADD = libkmenuedit_main.la
+@@ -317,2 +318,2 @@
+-kmenuedit_la_DEPENDENCIES = 
+-#>- kmenuedit_la_OBJECTS =  namedlg.lo basictab.lo treeview.lo \
++libkmenuedit_main_la_DEPENDENCIES = 
++#>- libkmenuedit_main_la_OBJECTS =  namedlg.lo basictab.lo treeview.lo \
+@@ -321,2 +322,2 @@
+-kmenuedit_la_final_OBJECTS = kmenuedit_la.all_cpp.lo 
+-kmenuedit_la_nofinal_OBJECTS = namedlg.lo basictab.lo treeview.lo \
++libkmenuedit_main_la_final_OBJECTS = libkmenuedit_main_la.all_cpp.lo 
++libkmenuedit_main_la_nofinal_OBJECTS = namedlg.lo basictab.lo treeview.lo \
+@@ -324,3 +325,7 @@
+-kmenuedit_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kmenuedit_la_OBJECTS = $(kmenuedit_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kmenuedit_la_OBJECTS = $(kmenuedit_la_final_OBJECTS)
++libkmenuedit_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_final_OBJECTS)
++kmenuedit_la_DEPENDENCIES =  libkmenuedit_main.la
++#>- kmenuedit_la_OBJECTS =  kmenuedit_main.lo
++#>+ 1
++kmenuedit_la_OBJECTS = kmenuedit_main.lo
+@@ -330 +335 @@
+-#>- kmenuedit_OBJECTS =  dummy.$(OBJEXT)
++#>- kmenuedit_OBJECTS =  kmenuedit_main.$(OBJEXT)
+@@ -332,2 +337,2 @@
+-kmenuedit_OBJECTS = dummy.$(OBJEXT)
+-kmenuedit_DEPENDENCIES =  kmenuedit.la
++kmenuedit_OBJECTS = kmenuedit_main.$(OBJEXT)
++kmenuedit_DEPENDENCIES =  libkmenuedit_main.la
+@@ -354 +359 @@
+-KDE_DIST=kmenueditui.rc hi32-app-kmenuedit.png hi16-app-kmenuedit.png kmenuedit.desktop hi48-app-kmenuedit.png 
++KDE_DIST=hi32-app-kmenuedit.png kmenuedit.desktop hi16-app-kmenuedit.png hi48-app-kmenuedit.png kmenueditui.rc 
+@@ -361,2 +366,2 @@
+-SOURCES = $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES)
+-OBJECTS = $(kmenuedit_la_OBJECTS) $(kmenuedit_OBJECTS)
++SOURCES = $(libkmenuedit_main_la_SOURCES) $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES)
++OBJECTS = $(libkmenuedit_main_la_OBJECTS) $(kmenuedit_la_OBJECTS) $(kmenuedit_OBJECTS)
+@@ -448,0 +454,3 @@
++libkmenuedit_main.la: $(libkmenuedit_main_la_OBJECTS) $(libkmenuedit_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkmenuedit_main_la_LDFLAGS) $(libkmenuedit_main_la_OBJECTS) $(libkmenuedit_main_la_LIBADD) $(LIBS)
++
+@@ -561 +569 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -619,11 +626,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -688 +684,0 @@
+-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+@@ -809,8 +805,8 @@
+-kmenuedit_la_meta_unload.cpp:  basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc
+-	@echo 'creating kmenuedit_la_meta_unload.cpp'
+-	@-rm -f kmenuedit_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_kmenuedit_la[] = {' > kmenuedit_la_meta_unload.cpp
+-	@cat  basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmenuedit_la_meta_unload.cpp
+-	@echo '0};' >> kmenuedit_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> kmenuedit_la_meta_unload.cpp
+-	@echo '_UNLOAD(kmenuedit_la)' >> kmenuedit_la_meta_unload.cpp
++libkmenuedit_main_la_meta_unload.cpp:  basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc
++	@echo 'creating libkmenuedit_main_la_meta_unload.cpp'
++	@-rm -f libkmenuedit_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkmenuedit_main_la[] = {' > libkmenuedit_main_la_meta_unload.cpp
++	@cat  basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmenuedit_main_la_meta_unload.cpp
++	@echo '0};' >> libkmenuedit_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkmenuedit_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libkmenuedit_main_la)' >> libkmenuedit_main_la_meta_unload.cpp
+@@ -821 +817,13 @@
+-	-rm -f  kmenuedit_la_meta_unload.cpp
++	-rm -f  libkmenuedit_main_la_meta_unload.cpp
++
++#>+ 11
++libkmenuedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp libkmenuedit_main_la_meta_unload.cpp   basictab.moc treeview.moc menueditview.moc desktopfileeditor.moc kmenuedit.moc 
++	@echo 'creating libkmenuedit_main_la.all_cpp.cpp ...'; \
++	rm -f libkmenuedit_main_la.all_cpp.files libkmenuedit_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkmenuedit_main_la.all_cpp.final; \
++	for file in namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp libkmenuedit_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkmenuedit_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmenuedit_main_la.all_cpp.final; \
++	done; \
++	cat libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files  > libkmenuedit_main_la.all_cpp.cpp; \
++	rm -f libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files
+@@ -824 +832 @@
+-kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp kmenuedit_la_meta_unload.cpp   basictab.moc treeview.moc menueditview.moc desktopfileeditor.moc kmenuedit.moc 
++kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmenuedit_main.cpp  
+@@ -828 +836 @@
+-	for file in namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp kmenuedit_la_meta_unload.cpp ; do \
++	for file in kmenuedit_main.cpp ; do \
+@@ -836 +844 @@
+-kmenuedit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kmenuedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmenuedit_main.cpp  
+@@ -840 +848 @@
+-	for file in dummy.cpp ; do \
++	for file in kmenuedit_main.cpp ; do \
+@@ -849 +857 @@
+-	-rm -f kmenuedit_la.all_cpp.cpp kmenuedit.all_cpp.cpp
++	-rm -f libkmenuedit_main_la.all_cpp.cpp kmenuedit_la.all_cpp.cpp kmenuedit.all_cpp.cpp
+@@ -853 +861 @@
+-	$(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_final_OBJECTS)" all-am
++	$(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_final_OBJECTS)" all-am
+@@ -856 +864 @@
+-	$(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-ck b/x11/kdebase2/patches/patch-ck
new file mode 100644
index 00000000000..80467950850
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ck
@@ -0,0 +1,33 @@
+$NetBSD: patch-ck,v 1.1 2001/10/15 22:46:05 skrll Exp $
+
+--- kmenuedit/kmenuedit_main.cpp.orig	Tue Oct  2 17:50:34 2001
++++ kmenuedit/kmenuedit_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int kmenuedit_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kmenuedit_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-cl b/x11/kdebase2/patches/patch-cl
new file mode 100644
index 00000000000..9ae5a903792
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cl
@@ -0,0 +1,13 @@
+$NetBSD: patch-cl,v 1.1 2001/10/15 22:46:05 skrll Exp $
+
+--- kmenuedit/main.cpp.orig	Wed Jun  6 16:28:35 2001
++++ kmenuedit/main.cpp
+@@ -30,7 +30,7 @@
+ static const char *description = I18N_NOOP("KDE Menu editor");
+ static const char *version = "0.3";
+ 
+-int main( int argc, char **argv )
++int kmenuedit_main( int argc, char **argv )
+ {
+     KAboutData aboutData("kmenuedit", I18N_NOOP("KDE Menu Editor"),
+ 			 version, description, KAboutData::License_GPL,
diff --git a/x11/kdebase2/patches/patch-cm b/x11/kdebase2/patches/patch-cm
new file mode 100644
index 00000000000..4659921c3cf
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cm
@@ -0,0 +1,51 @@
+$NetBSD: patch-cm,v 1.1 2001/10/15 22:46:05 skrll Exp $
+
+--- konqueror/Makefile.am.orig	Fri Jun 15 09:36:56 2001
++++ konqueror/Makefile.am
+@@ -3,7 +3,7 @@
+ 
+ SUBDIRS = . kfmexec client iconview dirtree listview keditbookmarks kfindpart shellcmdplugin about pics sidebar
+ 
+-lib_LTLIBRARIES = konqueror.la
++lib_LTLIBRARIES = libkonqueror_main.la konqueror.la
+ 
+ konqdatadir = $(kde_datadir)/konqueror
+ konqdata_DATA = konqueror.rc
+@@ -20,7 +20,7 @@
+ 
+ bin_PROGRAMS = konqueror
+ 
+-konqueror_la_SOURCES = konq_main.cc \
++libkonqueror_main_la_SOURCES = konq_main.cc \
+ 	    KonquerorIface.cc KonquerorIface.skel \
+ 	    KonqMainWindowIface.cc KonqMainWindowIface.skel \
+ 	    KonqViewIface.cc KonqViewIface.skel \
+@@ -34,11 +34,15 @@
+ 		konq_combo.cc	\
+ 	    konq_browseriface.cc
+ 
++libkonqueror_main_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libkonqueror_main_la_LIBADD = ../libkonq/libkonq.la
++
++konqueror_la_SOURCES = konqueror_main.cc
+ konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-konqueror_la_LIBADD = ../libkonq/libkonq.la
++konqueror_la_LIBADD = libkonqueror_main.la ../libkonq/libkonq.la
+ 
+-konqueror_SOURCES = dummy.cc
+-konqueror_LDADD = konqueror.la
++konqueror_SOURCES = konqueror_main.cc
++konqueror_LDADD = libkonqueror_main.la
+ konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ # Hmm, this experiment of a static konq failed, don't trust it...
+@@ -52,9 +56,6 @@
+ #konqueror_static_SOURCES = dummy.cc
+ #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la
+ #konqueror_static_LDFLAGS = $(all_libraries) -static
+-
+-dummy.cc:
+-	echo > dummy.cc
+ 
+ messages: rc.cpp
+ 	$(EXTRACTRC) */*.rc >> rc.cpp
diff --git a/x11/kdebase2/patches/patch-cn b/x11/kdebase2/patches/patch-cn
new file mode 100644
index 00000000000..dc339f3461b
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cn
@@ -0,0 +1,139 @@
+$NetBSD: patch-cn,v 1.1 2001/10/15 22:46:05 skrll Exp $
+
+--- konqueror/Makefile.in.orig	Sat Sep  8 01:36:39 2001
++++ konqueror/Makefile.in
+@@ -277 +277 @@
+-lib_LTLIBRARIES = konqueror.la
++lib_LTLIBRARIES = libkonqueror_main.la konqueror.la
+@@ -294 +294 @@
+-#>- konqueror_la_SOURCES = konq_main.cc 	    KonquerorIface.cc KonquerorIface.skel 	    KonqMainWindowIface.cc KonqMainWindowIface.skel 	    KonqViewIface.cc KonqViewIface.skel 	    konq_mainwindow.cc konq_guiclients.cc 	    konq_run.cc konq_view.cc konq_viewmgr.cc 	    konq_misc.cc 	    konq_frame.cc 	    konq_actions.cc 	    konq_profiledlg.cc 	    konq_factory.cc 		konq_combo.cc		    konq_browseriface.cc
++#>- libkonqueror_main_la_SOURCES = konq_main.cc 	    KonquerorIface.cc KonquerorIface.skel 	    KonqMainWindowIface.cc KonqMainWindowIface.skel 	    KonqViewIface.cc KonqViewIface.skel 	    konq_mainwindow.cc konq_guiclients.cc 	    konq_run.cc konq_view.cc konq_viewmgr.cc 	    konq_misc.cc 	    konq_frame.cc 	    konq_actions.cc 	    konq_profiledlg.cc 	    konq_factory.cc 		konq_combo.cc		    konq_browseriface.cc
+@@ -296 +296 @@
+-konqueror_la_SOURCES=konq_main.cc 	    KonquerorIface.cc  	    KonqMainWindowIface.cc  	    KonqViewIface.cc  	    konq_mainwindow.cc konq_guiclients.cc 	    konq_run.cc konq_view.cc konq_viewmgr.cc 	    konq_misc.cc 	    konq_frame.cc 	    konq_actions.cc 	    konq_profiledlg.cc 	    konq_factory.cc 		konq_combo.cc		    konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc
++libkonqueror_main_la_SOURCES=konq_main.cc 	    KonquerorIface.cc  	    KonqMainWindowIface.cc  	    KonqViewIface.cc  	    konq_mainwindow.cc konq_guiclients.cc 	    konq_run.cc konq_view.cc konq_viewmgr.cc 	    konq_misc.cc 	    konq_frame.cc 	    konq_actions.cc 	    konq_profiledlg.cc 	    konq_factory.cc 		konq_combo.cc		    konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc
+@@ -298,0 +299,4 @@
++libkonqueror_main_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libkonqueror_main_la_LIBADD = ../libkonq/libkonq.la
++
++konqueror_la_SOURCES = konqueror_main.cc
+@@ -300 +304 @@
+-konqueror_la_LIBADD = ../libkonq/libkonq.la
++konqueror_la_LIBADD = libkonqueror_main.la ../libkonq/libkonq.la
+@@ -302,2 +306,2 @@
+-konqueror_SOURCES = dummy.cc
+-konqueror_LDADD = konqueror.la
++konqueror_SOURCES = konqueror_main.cc
++konqueror_LDADD = libkonqueror_main.la
+@@ -332,2 +336,2 @@
+-konqueror_la_DEPENDENCIES =  ../libkonq/libkonq.la
+-#>- konqueror_la_OBJECTS =  konq_main.lo KonquerorIface.lo \
++libkonqueror_main_la_DEPENDENCIES =  ../libkonq/libkonq.la
++#>- libkonqueror_main_la_OBJECTS =  konq_main.lo KonquerorIface.lo \
+@@ -339,2 +343,2 @@
+-konqueror_la_final_OBJECTS = konqueror_la.all_cc.lo 
+-konqueror_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \
++libkonqueror_main_la_final_OBJECTS = libkonqueror_main_la.all_cc.lo 
++libkonqueror_main_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \
+@@ -345,3 +349,7 @@
+-konqueror_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@konqueror_la_OBJECTS = $(konqueror_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@konqueror_la_OBJECTS = $(konqueror_la_final_OBJECTS)
++libkonqueror_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_final_OBJECTS)
++konqueror_la_DEPENDENCIES =  libkonqueror_main.la ../libkonq/libkonq.la
++#>- konqueror_la_OBJECTS =  konqueror_main.lo
++#>+ 1
++konqueror_la_OBJECTS = konqueror_main.lo
+@@ -351 +359 @@
+-#>- konqueror_OBJECTS =  dummy.$(OBJEXT)
++#>- konqueror_OBJECTS =  konqueror_main.$(OBJEXT)
+@@ -353,2 +361,2 @@
+-konqueror_OBJECTS = dummy.$(OBJEXT)
+-konqueror_DEPENDENCIES =  konqueror.la
++konqueror_OBJECTS = konqueror_main.$(OBJEXT)
++konqueror_DEPENDENCIES =  libkonqueror_main.la
+@@ -376 +384 @@
+-KDE_DIST=konq_misc.h konq_browseriface.h DESIGN_config konq_viewmgr.h konq_mainwindow.h kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop konq_view.h konq_actions.h Home.desktop konq_profiledlg.h DESIGN convert_kdelnk.sh profile_midnightcommander.desktop konqueror.rc profile_filemanagement.desktop IDEAS konqueror.desktop konq_run.h konq_main.h konquerorsu.desktop konqfilemgr.desktop konqbrowser.desktop profile_filepreview.desktop profile_webbrowsing.desktop konq_openurlrequest.h konqueror_config.desktop konq_guiclients.h KonqMainWindowIface.h konq_frame.h konq_factory.h version.h konq_combo.h KonqViewIface.h 
++KDE_DIST=konqfilemgr.desktop DESIGN convert_kdelnk.sh konq_misc.h konq_browseriface.h DESIGN_config profile_midnightcommander.desktop konqueror_config.desktop konqueror.rc konqbrowser.desktop konq_viewmgr.h konq_guiclients.h profile_filemanagement.desktop konq_mainwindow.h kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop konq_view.h konq_actions.h KonqMainWindowIface.h IDEAS konqueror.desktop konq_frame.h konq_factory.h version.h konq_run.h konq_combo.h konq_main.h profile_filepreview.desktop Home.desktop konquerorsu.desktop profile_webbrowsing.desktop konq_profiledlg.h konq_openurlrequest.h KonqViewIface.h 
+@@ -383,2 +391,2 @@
+-SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES)
+-OBJECTS = $(konqueror_la_OBJECTS) $(konqueror_OBJECTS)
++SOURCES = $(libkonqueror_main_la_SOURCES) $(konqueror_la_SOURCES) $(konqueror_SOURCES)
++OBJECTS = $(libkonqueror_main_la_OBJECTS) $(konqueror_la_OBJECTS) $(konqueror_OBJECTS)
+@@ -470,0 +479,3 @@
++libkonqueror_main.la: $(libkonqueror_main_la_OBJECTS) $(libkonqueror_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkonqueror_main_la_LDFLAGS) $(libkonqueror_main_la_OBJECTS) $(libkonqueror_main_la_LIBADD) $(LIBS)
++
+@@ -674 +685 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -732,11 +742,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -883,3 +882,0 @@
+-dummy.cc:
+-	echo > dummy.cc
+-
+@@ -991,8 +988,8 @@
+-konqueror_la_meta_unload.cc:  konq_view.moc konq_browseriface.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc
+-	@echo 'creating konqueror_la_meta_unload.cc'
+-	@-rm -f konqueror_la_meta_unload.cc
+-	@echo 'static const char * _metalist_konqueror_la[] = {' > konqueror_la_meta_unload.cc
+-	@cat  konq_view.moc konq_browseriface.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konqueror_la_meta_unload.cc
+-	@echo '0};' >> konqueror_la_meta_unload.cc
+-	@echo '#include <kunload.h>' >> konqueror_la_meta_unload.cc
+-	@echo '_UNLOAD(konqueror_la)' >> konqueror_la_meta_unload.cc
++libkonqueror_main_la_meta_unload.cc:  konq_view.moc konq_browseriface.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc
++	@echo 'creating libkonqueror_main_la_meta_unload.cc'
++	@-rm -f libkonqueror_main_la_meta_unload.cc
++	@echo 'static const char * _metalist_libkonqueror_main_la[] = {' > libkonqueror_main_la_meta_unload.cc
++	@cat  konq_view.moc konq_browseriface.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonqueror_main_la_meta_unload.cc
++	@echo '0};' >> libkonqueror_main_la_meta_unload.cc
++	@echo '#include <kunload.h>' >> libkonqueror_main_la_meta_unload.cc
++	@echo '_UNLOAD(libkonqueror_main_la)' >> libkonqueror_main_la_meta_unload.cc
+@@ -1003 +1000,13 @@
+-	-rm -f  konqueror_la_meta_unload.cc
++	-rm -f  libkonqueror_main_la_meta_unload.cc
++
++#>+ 11
++libkonqueror_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc libkonqueror_main_la_meta_unload.cc   konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc 
++	@echo 'creating libkonqueror_main_la.all_cc.cc ...'; \
++	rm -f libkonqueror_main_la.all_cc.files libkonqueror_main_la.all_cc.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkonqueror_main_la.all_cc.final; \
++	for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc libkonqueror_main_la_meta_unload.cc ; do \
++	  echo "#include \"$$file\"" >> libkonqueror_main_la.all_cc.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkonqueror_main_la.all_cc.final; \
++	done; \
++	cat libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files  > libkonqueror_main_la.all_cc.cc; \
++	rm -f libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files
+@@ -1006 +1015 @@
+-konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konqueror_la_meta_unload.cc   konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc 
++konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konqueror_main.cc  
+@@ -1010 +1019 @@
+-	for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konqueror_la_meta_unload.cc ; do \
++	for file in konqueror_main.cc ; do \
+@@ -1018 +1027 @@
+-konqueror.all_cc.cc: $(srcdir)/Makefile.in dummy.cc  
++konqueror.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konqueror_main.cc  
+@@ -1022 +1031 @@
+-	for file in dummy.cc ; do \
++	for file in konqueror_main.cc ; do \
+@@ -1031 +1040 @@
+-	-rm -f konqueror_la.all_cc.cc konqueror.all_cc.cc
++	-rm -f libkonqueror_main_la.all_cc.cc konqueror_la.all_cc.cc konqueror.all_cc.cc
+@@ -1035 +1044 @@
+-	$(MAKE) konqueror_la_OBJECTS="$(konqueror_la_final_OBJECTS)" all-am
++	$(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_final_OBJECTS)" all-am
+@@ -1038 +1047 @@
+-	$(MAKE) konqueror_la_OBJECTS="$(konqueror_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-co b/x11/kdebase2/patches/patch-co
new file mode 100644
index 00000000000..bb952d520fd
--- /dev/null
+++ b/x11/kdebase2/patches/patch-co
@@ -0,0 +1,39 @@
+$NetBSD: patch-co,v 1.1 2001/10/15 22:46:05 skrll Exp $
+
+--- konqueror/client/Makefile.am.orig	Wed Aug  9 18:10:36 2000
++++ konqueror/client/Makefile.am
+@@ -1,12 +1,16 @@
+ AM_CPPFLAGS = -DQT_NO_CAST_ASCII
+ 
+ bin_PROGRAMS = kfmclient
+-lib_LTLIBRARIES = kfmclient.la
++lib_LTLIBRARIES = libkfmclient_main.la kfmclient.la
+ 
+ INCLUDES= -I.. $(all_includes)
++libkfmclient_main_la_LDFLAGS = $(all_libraries)
++libkfmclient_main_la_LIBADD =  $(LIB_KFILE)
++libkfmclient_main_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
++
+ kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kfmclient_la_LIBADD =  $(LIB_KFILE)
+-kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
++kfmclient_la_LIBADD =  libkfmclient_main.la
++kfmclient_la_SOURCES = kfmclient_main.cc
+ 
+ noinst_HEADERS = kfmclient.h
+ METASOURCES = AUTO
+@@ -14,12 +18,9 @@
+ KonquerorIface_DIR =  $(srcdir)/..
+ KDesktopIface_DIR = $(top_srcdir)/kdesktop
+ 
+-kfmclient_SOURCES = dummy.cc
++kfmclient_SOURCES = kfmclient_main.cc
+ kfmclient_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+-kfmclient_LDADD = kfmclient.la
+-
+-dummy.cc:
+-	echo > dummy.cc
++kfmclient_LDADD = libkfmclient_main.la
+ 
+ messages:
+ 	$(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot
diff --git a/x11/kdebase2/patches/patch-cp b/x11/kdebase2/patches/patch-cp
new file mode 100644
index 00000000000..3f91c7a7167
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cp
@@ -0,0 +1,133 @@
+$NetBSD: patch-cp,v 1.1 2001/10/15 22:46:06 skrll Exp $
+
+--- konqueror/client/Makefile.in.orig	Sat Sep  8 01:36:39 2001
++++ konqueror/client/Makefile.in
+@@ -277 +277 @@
+-lib_LTLIBRARIES = kfmclient.la
++lib_LTLIBRARIES = libkfmclient_main.la kfmclient.la
+@@ -280,3 +280,3 @@
+-kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kfmclient_la_LIBADD = $(LIB_KFILE)
+-#>- kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
++libkfmclient_main_la_LDFLAGS = $(all_libraries)
++libkfmclient_main_la_LIBADD = $(LIB_KFILE)
++#>- libkfmclient_main_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
+@@ -284 +284,5 @@
+-kfmclient_la_SOURCES=kfmclient.cc   KonquerorIface_stub.cc KDesktopIface_stub.cc
++libkfmclient_main_la_SOURCES=kfmclient.cc   KonquerorIface_stub.cc KDesktopIface_stub.cc
++
++kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
++kfmclient_la_LIBADD = libkfmclient_main.la
++kfmclient_la_SOURCES = kfmclient_main.cc
+@@ -292 +296 @@
+-kfmclient_SOURCES = dummy.cc
++kfmclient_SOURCES = kfmclient_main.cc
+@@ -294 +298 @@
+-kfmclient_LDADD = kfmclient.la
++kfmclient_LDADD = libkfmclient_main.la
+@@ -307,2 +311,2 @@
+-kfmclient_la_DEPENDENCIES = 
+-#>- kfmclient_la_OBJECTS =  kfmclient.lo
++libkfmclient_main_la_DEPENDENCIES = 
++#>- libkfmclient_main_la_OBJECTS =  kfmclient.lo
+@@ -310,5 +314,9 @@
+-kfmclient_la_final_OBJECTS = kfmclient_la.all_cc.lo 
+-kfmclient_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo \
+-kfmclient_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kfmclient_la_OBJECTS = $(kfmclient_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kfmclient_la_OBJECTS = $(kfmclient_la_final_OBJECTS)
++libkfmclient_main_la_final_OBJECTS = libkfmclient_main_la.all_cc.lo 
++libkfmclient_main_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo \
++libkfmclient_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_final_OBJECTS)
++kfmclient_la_DEPENDENCIES =  libkfmclient_main.la
++#>- kfmclient_la_OBJECTS =  kfmclient_main.lo
++#>+ 1
++kfmclient_la_OBJECTS = kfmclient_main.lo
+@@ -318 +326 @@
+-#>- kfmclient_OBJECTS =  dummy.$(OBJEXT)
++#>- kfmclient_OBJECTS =  kfmclient_main.$(OBJEXT)
+@@ -320,2 +328,2 @@
+-kfmclient_OBJECTS = dummy.$(OBJEXT)
+-kfmclient_DEPENDENCIES =  kfmclient.la
++kfmclient_OBJECTS = kfmclient_main.$(OBJEXT)
++kfmclient_DEPENDENCIES =  libkfmclient_main.la
+@@ -342,2 +350,2 @@
+-SOURCES = $(kfmclient_la_SOURCES) $(kfmclient_SOURCES)
+-OBJECTS = $(kfmclient_la_OBJECTS) $(kfmclient_OBJECTS)
++SOURCES = $(libkfmclient_main_la_SOURCES) $(kfmclient_la_SOURCES) $(kfmclient_SOURCES)
++OBJECTS = $(libkfmclient_main_la_OBJECTS) $(kfmclient_la_OBJECTS) $(kfmclient_OBJECTS)
+@@ -429,0 +438,3 @@
++libkfmclient_main.la: $(libkfmclient_main_la_OBJECTS) $(libkfmclient_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkfmclient_main_la_LDFLAGS) $(libkfmclient_main_la_OBJECTS) $(libkfmclient_main_la_LIBADD) $(LIBS)
++
+@@ -502,11 +512,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -609,3 +608,0 @@
+-dummy.cc:
+-	echo > dummy.cc
+-
+@@ -653,8 +650,8 @@
+-kfmclient_la_meta_unload.cc:  kfmclient.moc
+-	@echo 'creating kfmclient_la_meta_unload.cc'
+-	@-rm -f kfmclient_la_meta_unload.cc
+-	@echo 'static const char * _metalist_kfmclient_la[] = {' > kfmclient_la_meta_unload.cc
+-	@cat  kfmclient.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kfmclient_la_meta_unload.cc
+-	@echo '0};' >> kfmclient_la_meta_unload.cc
+-	@echo '#include <kunload.h>' >> kfmclient_la_meta_unload.cc
+-	@echo '_UNLOAD(kfmclient_la)' >> kfmclient_la_meta_unload.cc
++libkfmclient_main_la_meta_unload.cc:  kfmclient.moc
++	@echo 'creating libkfmclient_main_la_meta_unload.cc'
++	@-rm -f libkfmclient_main_la_meta_unload.cc
++	@echo 'static const char * _metalist_libkfmclient_main_la[] = {' > libkfmclient_main_la_meta_unload.cc
++	@cat  kfmclient.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkfmclient_main_la_meta_unload.cc
++	@echo '0};' >> libkfmclient_main_la_meta_unload.cc
++	@echo '#include <kunload.h>' >> libkfmclient_main_la_meta_unload.cc
++	@echo '_UNLOAD(libkfmclient_main_la)' >> libkfmclient_main_la_meta_unload.cc
+@@ -665 +662,13 @@
+-	-rm -f  kfmclient_la_meta_unload.cc
++	-rm -f  libkfmclient_main_la_meta_unload.cc
++
++#>+ 11
++libkfmclient_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc libkfmclient_main_la_meta_unload.cc   kfmclient.moc 
++	@echo 'creating libkfmclient_main_la.all_cc.cc ...'; \
++	rm -f libkfmclient_main_la.all_cc.files libkfmclient_main_la.all_cc.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkfmclient_main_la.all_cc.final; \
++	for file in kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc libkfmclient_main_la_meta_unload.cc ; do \
++	  echo "#include \"$$file\"" >> libkfmclient_main_la.all_cc.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkfmclient_main_la.all_cc.final; \
++	done; \
++	cat libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files  > libkfmclient_main_la.all_cc.cc; \
++	rm -f libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files
+@@ -668 +677 @@
+-kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient_la_meta_unload.cc   kfmclient.moc 
++kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient_main.cc  
+@@ -672 +681 @@
+-	for file in kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient_la_meta_unload.cc ; do \
++	for file in kfmclient_main.cc ; do \
+@@ -680 +689 @@
+-kfmclient.all_cc.cc: $(srcdir)/Makefile.in dummy.cc  
++kfmclient.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient_main.cc  
+@@ -684 +693 @@
+-	for file in dummy.cc ; do \
++	for file in kfmclient_main.cc ; do \
+@@ -693 +702 @@
+-	-rm -f kfmclient_la.all_cc.cc kfmclient.all_cc.cc
++	-rm -f libkfmclient_main_la.all_cc.cc kfmclient_la.all_cc.cc kfmclient.all_cc.cc
+@@ -697 +706 @@
+-	$(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_final_OBJECTS)" all-am
++	$(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_final_OBJECTS)" all-am
+@@ -700 +709 @@
+-	$(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-cq b/x11/kdebase2/patches/patch-cq
new file mode 100644
index 00000000000..036685f5e6a
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cq
@@ -0,0 +1,13 @@
+$NetBSD: patch-cq,v 1.1 2001/10/15 22:46:06 skrll Exp $
+
+--- konqueror/client/kfmclient.cc.orig	Sun Jul 29 05:56:40 2001
++++ konqueror/client/kfmclient.cc
+@@ -63,7 +63,7 @@
+    {0,0,0}
+ };
+ 
+-int main( int argc, char **argv )
++int kfmclient_main( int argc, char **argv )
+ {
+   KCmdLineArgs::init(argc, argv, appName, description, version, false);
+ 
diff --git a/x11/kdebase2/patches/patch-cr b/x11/kdebase2/patches/patch-cr
new file mode 100644
index 00000000000..cbc160af1b5
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cr
@@ -0,0 +1,33 @@
+$NetBSD: patch-cr,v 1.1 2001/10/15 22:46:06 skrll Exp $
+
+--- konqueror/client/kfmclient_main.cc.orig	Tue Oct  2 17:50:34 2001
++++ konqueror/client/kfmclient_main.cc
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int kfmclient_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kfmclient_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-cs b/x11/kdebase2/patches/patch-cs
new file mode 100644
index 00000000000..e7fb339a186
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cs
@@ -0,0 +1,36 @@
+$NetBSD: patch-cs,v 1.1 2001/10/15 22:46:06 skrll Exp $
+
+--- konqueror/keditbookmarks/Makefile.am.orig	Wed Dec 20 13:51:26 2000
++++ konqueror/keditbookmarks/Makefile.am
+@@ -2,22 +2,23 @@
+ 
+ METASOURCES = AUTO
+ 
+-lib_LTLIBRARIES = keditbookmarks.la
++lib_LTLIBRARIES = libkeditbookmarks_main.la keditbookmarks.la
+ 
+-keditbookmarks_la_SOURCES = main.cpp toplevel.cpp commands.cpp
++libkeditbookmarks_main_la_SOURCES = main.cpp toplevel.cpp commands.cpp
++libkeditbookmarks_main_la_LIBADD  = $(top_builddir)/libkonq/libkonq.la
++libkeditbookmarks_main_la_LDFLAGS = $(all_libraries)
++libkeditbookmarks_main_la_METASOURCES = AUTO
+ 
+-keditbookmarks_la_LIBADD  = $(top_builddir)/libkonq/libkonq.la
++keditbookmarks_la_SOURCES = keditbookmarks_main.cpp
++keditbookmarks_la_LIBADD  = libkeditbookmarks_main.la
+ keditbookmarks_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ keditbookmarks_la_METASOURCES = AUTO
+ 
+ bin_PROGRAMS = keditbookmarks
+ 
+-keditbookmarks_SOURCES = dummy.cpp
+-keditbookmarks_LDADD = keditbookmarks.la
++keditbookmarks_SOURCES = keditbookmarks_main.cpp
++keditbookmarks_LDADD = libkeditbookmarks_main.la
+ keditbookmarks_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-
+-dummy.cpp:
+-	echo > dummy.cpp
+ 
+ rcdir = $(kde_datadir)/keditbookmarks
+ rc_DATA = keditbookmarksui.rc  
diff --git a/x11/kdebase2/patches/patch-ct b/x11/kdebase2/patches/patch-ct
new file mode 100644
index 00000000000..dba648b4aab
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ct
@@ -0,0 +1,149 @@
+$NetBSD: patch-ct,v 1.1 2001/10/15 22:46:06 skrll Exp $
+
+--- konqueror/keditbookmarks/Makefile.in.orig	Sat Sep  8 01:36:40 2001
++++ konqueror/keditbookmarks/Makefile.in
+@@ -277 +277 @@
+-lib_LTLIBRARIES = keditbookmarks.la
++lib_LTLIBRARIES = libkeditbookmarks_main.la keditbookmarks.la
+@@ -279 +279,4 @@
+-keditbookmarks_la_SOURCES = main.cpp toplevel.cpp commands.cpp
++libkeditbookmarks_main_la_SOURCES = main.cpp toplevel.cpp commands.cpp
++libkeditbookmarks_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la
++libkeditbookmarks_main_la_LDFLAGS = $(all_libraries)
++#>- libkeditbookmarks_main_la_METASOURCES = AUTO
+@@ -281 +284,2 @@
+-keditbookmarks_la_LIBADD = $(top_builddir)/libkonq/libkonq.la
++keditbookmarks_la_SOURCES = keditbookmarks_main.cpp
++keditbookmarks_la_LIBADD = libkeditbookmarks_main.la
+@@ -287,2 +291,2 @@
+-keditbookmarks_SOURCES = dummy.cpp
+-keditbookmarks_LDADD = keditbookmarks.la
++keditbookmarks_SOURCES = keditbookmarks_main.cpp
++keditbookmarks_LDADD = libkeditbookmarks_main.la
+@@ -310,2 +314,3 @@
+-keditbookmarks_la_DEPENDENCIES =  $(top_builddir)/libkonq/libkonq.la
+-#>- keditbookmarks_la_OBJECTS =  main.lo toplevel.lo commands.lo
++libkeditbookmarks_main_la_DEPENDENCIES =  \
++$(top_builddir)/libkonq/libkonq.la
++#>- libkeditbookmarks_main_la_OBJECTS =  main.lo toplevel.lo commands.lo
+@@ -313,5 +318,9 @@
+-keditbookmarks_la_final_OBJECTS = keditbookmarks_la.all_cpp.lo 
+-keditbookmarks_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo \
+-keditbookmarks_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_final_OBJECTS)
++libkeditbookmarks_main_la_final_OBJECTS = libkeditbookmarks_main_la.all_cpp.lo 
++libkeditbookmarks_main_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo \
++libkeditbookmarks_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_final_OBJECTS)
++keditbookmarks_la_DEPENDENCIES =  libkeditbookmarks_main.la
++#>- keditbookmarks_la_OBJECTS =  keditbookmarks_main.lo
++#>+ 1
++keditbookmarks_la_OBJECTS = keditbookmarks_main.lo
+@@ -321 +330 @@
+-#>- keditbookmarks_OBJECTS =  dummy.$(OBJEXT)
++#>- keditbookmarks_OBJECTS =  keditbookmarks_main.$(OBJEXT)
+@@ -323,2 +332,2 @@
+-keditbookmarks_OBJECTS = dummy.$(OBJEXT)
+-keditbookmarks_DEPENDENCIES =  keditbookmarks.la
++keditbookmarks_OBJECTS = keditbookmarks_main.$(OBJEXT)
++keditbookmarks_DEPENDENCIES =  libkeditbookmarks_main.la
+@@ -343 +352 @@
+-KDE_DIST=kinsertionsort.h hi32-app-keditbookmarks.png commands.h toplevel.h hi16-app-keditbookmarks.png keditbookmarks.desktop keditbookmarksui.rc 
++KDE_DIST=commands.h kinsertionsort.h keditbookmarks.desktop hi16-app-keditbookmarks.png hi32-app-keditbookmarks.png toplevel.h keditbookmarksui.rc 
+@@ -350,2 +359,2 @@
+-SOURCES = $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES)
+-OBJECTS = $(keditbookmarks_la_OBJECTS) $(keditbookmarks_OBJECTS)
++SOURCES = $(libkeditbookmarks_main_la_SOURCES) $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES)
++OBJECTS = $(libkeditbookmarks_main_la_OBJECTS) $(keditbookmarks_la_OBJECTS) $(keditbookmarks_OBJECTS)
+@@ -437,0 +447,3 @@
++libkeditbookmarks_main.la: $(libkeditbookmarks_main_la_OBJECTS) $(libkeditbookmarks_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkeditbookmarks_main_la_LDFLAGS) $(libkeditbookmarks_main_la_OBJECTS) $(libkeditbookmarks_main_la_LIBADD) $(LIBS)
++
+@@ -548,11 +559,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -663,3 +663,0 @@
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+@@ -678,0 +677,8 @@
++commands.moc: $(srcdir)/commands.h
++	$(MOC) $(srcdir)/commands.h -o commands.moc
++
++#>+ 3
++toplevel.moc: $(srcdir)/toplevel.h
++	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
++
++#>+ 3
+@@ -680 +686 @@
+-	-rm -f  commands.moc toplevel.moc
++	-rm -f  commands.moc toplevel.moc commands.moc toplevel.moc
+@@ -703,8 +709,8 @@
+-keditbookmarks_la_meta_unload.cpp:  commands.moc toplevel.moc
+-	@echo 'creating keditbookmarks_la_meta_unload.cpp'
+-	@-rm -f keditbookmarks_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_keditbookmarks_la[] = {' > keditbookmarks_la_meta_unload.cpp
+-	@cat  commands.moc toplevel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> keditbookmarks_la_meta_unload.cpp
+-	@echo '0};' >> keditbookmarks_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> keditbookmarks_la_meta_unload.cpp
+-	@echo '_UNLOAD(keditbookmarks_la)' >> keditbookmarks_la_meta_unload.cpp
++libkeditbookmarks_main_la_meta_unload.cpp:  commands.moc toplevel.moc
++	@echo 'creating libkeditbookmarks_main_la_meta_unload.cpp'
++	@-rm -f libkeditbookmarks_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkeditbookmarks_main_la[] = {' > libkeditbookmarks_main_la_meta_unload.cpp
++	@cat  commands.moc toplevel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkeditbookmarks_main_la_meta_unload.cpp
++	@echo '0};' >> libkeditbookmarks_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkeditbookmarks_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libkeditbookmarks_main_la)' >> libkeditbookmarks_main_la_meta_unload.cpp
+@@ -715 +721,13 @@
+-	-rm -f  keditbookmarks_la_meta_unload.cpp
++	-rm -f  libkeditbookmarks_main_la_meta_unload.cpp
++
++#>+ 11
++libkeditbookmarks_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp libkeditbookmarks_main_la_meta_unload.cpp   commands.moc toplevel.moc 
++	@echo 'creating libkeditbookmarks_main_la.all_cpp.cpp ...'; \
++	rm -f libkeditbookmarks_main_la.all_cpp.files libkeditbookmarks_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkeditbookmarks_main_la.all_cpp.final; \
++	for file in main.cpp toplevel.cpp commands.cpp libkeditbookmarks_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkeditbookmarks_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkeditbookmarks_main_la.all_cpp.final; \
++	done; \
++	cat libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files  > libkeditbookmarks_main_la.all_cpp.cpp; \
++	rm -f libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files
+@@ -718 +736 @@
+-keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp keditbookmarks_la_meta_unload.cpp   commands.moc toplevel.moc 
++keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keditbookmarks_main.cpp   commands.moc toplevel.moc 
+@@ -722 +740 @@
+-	for file in main.cpp toplevel.cpp commands.cpp keditbookmarks_la_meta_unload.cpp ; do \
++	for file in keditbookmarks_main.cpp ; do \
+@@ -730 +748 @@
+-keditbookmarks.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++keditbookmarks.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keditbookmarks_main.cpp  
+@@ -734 +752 @@
+-	for file in dummy.cpp ; do \
++	for file in keditbookmarks_main.cpp ; do \
+@@ -743 +761 @@
+-	-rm -f keditbookmarks_la.all_cpp.cpp keditbookmarks.all_cpp.cpp
++	-rm -f libkeditbookmarks_main_la.all_cpp.cpp keditbookmarks_la.all_cpp.cpp keditbookmarks.all_cpp.cpp
+@@ -747 +765 @@
+-	$(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_final_OBJECTS)" all-am
++	$(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_final_OBJECTS)" all-am
+@@ -750 +768 @@
+-	$(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_nofinal_OBJECTS)" all-am
+@@ -760,2 +778,2 @@
+-$(srcdir)/toplevel.cpp: toplevel.moc 
+-$(srcdir)/commands.cpp: commands.moc 
++$(srcdir)/toplevel.cpp: toplevel.moc toplevel.moc 
++$(srcdir)/commands.cpp: commands.moc commands.moc 
diff --git a/x11/kdebase2/patches/patch-cu b/x11/kdebase2/patches/patch-cu
new file mode 100644
index 00000000000..47103c70044
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cu
@@ -0,0 +1,33 @@
+$NetBSD: patch-cu,v 1.1 2001/10/15 22:46:06 skrll Exp $
+
+--- konqueror/keditbookmarks/keditbookmarks_main.cpp.orig	Tue Oct  2 17:50:35 2001
++++ konqueror/keditbookmarks/keditbookmarks_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int keditbookmarks_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return keditbookmarks_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-cv b/x11/kdebase2/patches/patch-cv
new file mode 100644
index 00000000000..fd5baf9b3fb
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cv
@@ -0,0 +1,13 @@
+$NetBSD: patch-cv,v 1.1 2001/10/15 22:46:06 skrll Exp $
+
+--- konqueror/keditbookmarks/main.cpp.orig	Mon Feb 12 20:04:52 2001
++++ konqueror/keditbookmarks/main.cpp
+@@ -32,7 +32,7 @@
+   { 0, 0, 0}
+ };
+ 
+-int main(int argc, char ** argv)
++int keditbookmarks_main(int argc, char ** argv)
+ {
+   KLocale::setMainCatalogue("konqueror");
+   KAboutData aboutData( "keditbookmarks", I18N_NOOP("KEditBookmarks"), "1.0",
diff --git a/x11/kdebase2/patches/patch-cw b/x11/kdebase2/patches/patch-cw
new file mode 100644
index 00000000000..1260297f894
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cw
@@ -0,0 +1,13 @@
+$NetBSD: patch-cw,v 1.1 2001/10/15 22:46:06 skrll Exp $
+
+--- konqueror/konq_main.cc.orig	Wed Jun 20 09:35:50 2001
++++ konqueror/konq_main.cc
+@@ -47,7 +47,7 @@
+   { 0, 0, 0}
+ };
+ 
+-int main( int argc, char **argv )
++int konqueror_main( int argc, char **argv )
+ {
+   KCmdLineArgs::init( argc, argv, KonqFactory::aboutData() );
+ 
diff --git a/x11/kdebase2/patches/patch-cx b/x11/kdebase2/patches/patch-cx
new file mode 100644
index 00000000000..14c2db4c411
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cx
@@ -0,0 +1,33 @@
+$NetBSD: patch-cx,v 1.1 2001/10/15 22:46:07 skrll Exp $
+
+--- konqueror/konqueror_main.cc.orig	Tue Oct  2 17:50:35 2001
++++ konqueror/konqueror_main.cc
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int konqueror_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return konqueror_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-cy b/x11/kdebase2/patches/patch-cy
new file mode 100644
index 00000000000..b4d0baeb2d8
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cy
@@ -0,0 +1,65 @@
+$NetBSD: patch-cy,v 1.1 2001/10/15 22:46:07 skrll Exp $
+
+--- konsole/src/Makefile.am.orig	Thu Jun 14 19:53:50 2001
++++ konsole/src/Makefile.am
+@@ -16,7 +16,8 @@
+ 
+ # you can add here more. This one gets installed
+ bin_PROGRAMS = 	konsole konsole_grantpty kwrited #kcmkonsole
+-lib_LTLIBRARIES = libkonsolepart.la kwrited.la konsole.la
++lib_LTLIBRARIES = libkonsolepart.la libkwrited_main.la kwrited.la \
++	libkonsole_main.la konsole.la
+ # libkonsolepart is a part, but konsole.la links directly to it, so we can't
+ # install it under kde_module
+ 
+@@ -34,24 +35,32 @@
+ libkonsolepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ libkonsolepart_la_LIBADD = $(LIB_KPARTS) $(LIBUTEMPTER) $(LIBUTIL)
+ 
++libkwrited_main_la_SOURCES = kwrited.C
++libkwrited_main_la_LIBADD  = libkonsolepart.la
++libkwrited_main_la_LDFLAGS = $(all_libraries)
++
+ # kwrited kdeinit module
+-kwrited_la_SOURCES = kwrited.C
+-kwrited_la_LIBADD  = libkonsolepart.la
++kwrited_la_SOURCES = kwrited_main.cpp
++kwrited_la_LIBADD  = libkwrited_main.la
+ kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+ # kwrited executable
+-kwrited_SOURCES	= dummy.C
+-kwrited_LDADD   = kwrited.la 
++kwrited_SOURCES	= kwrited_main.cpp
++kwrited_LDADD   = libkwrited_main.la 
+ kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
++libkonsole_main_la_SOURCES = main.C konsole.C
++libkonsole_main_la_LIBADD  = libkonsolepart.la
++libkonsole_main_la_LDFLAGS = $(all_libraries)
++
+ # konsole kdeinit module
+-konsole_la_SOURCES = main.C konsole.C
+-konsole_la_LIBADD  = libkonsolepart.la
++konsole_la_SOURCES = konsole_main.cpp
++konsole_la_LIBADD  = libkonsole_main.la
+ konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+ # konsole executable - has all the sources, doesn't link kparts, saves startup time
+ konsole_SOURCES	= TEPty.C BlockArray.C main.C konsole.C schema.C session.C TEWidget.C TEmuVt102.C \
+-                  TEScreen.C TEmulation.C TEHistory.C keytrans.C 
++                  TEScreen.C TEmulation.C TEHistory.C keytrans.C konsole_main.cpp
+ konsole_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIBUTEMPTER) $(LIBUTIL)
+ konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+@@ -88,10 +97,6 @@
+ 	done
+ 	$(XGETTEXT) rc.cpp *.C -o $(podir)/konsole.pot
+ 	rm -f schemas.C
+-
+-dummy.C:
+-	echo > dummy.C
+-
+ 
+ rcdir = $(kde_datadir)/konsole
+ rc_DATA = konsole_part.rc
diff --git a/x11/kdebase2/patches/patch-cz b/x11/kdebase2/patches/patch-cz
new file mode 100644
index 00000000000..16165818517
--- /dev/null
+++ b/x11/kdebase2/patches/patch-cz
@@ -0,0 +1,233 @@
+$NetBSD: patch-cz,v 1.1 2001/10/15 22:46:07 skrll Exp $
+
+--- konsole/src/Makefile.in.orig	Sat Sep  8 01:36:44 2001
++++ konsole/src/Makefile.in
+@@ -292 +292,2 @@
+-lib_LTLIBRARIES = libkonsolepart.la kwrited.la konsole.la
++lib_LTLIBRARIES = libkonsolepart.la libkwrited_main.la kwrited.la 	libkonsole_main.la konsole.la
++
+@@ -301,0 +303,4 @@
++libkwrited_main_la_SOURCES = kwrited.C
++libkwrited_main_la_LIBADD = libkonsolepart.la
++libkwrited_main_la_LDFLAGS = $(all_libraries)
++
+@@ -303,2 +308,2 @@
+-kwrited_la_SOURCES = kwrited.C
+-kwrited_la_LIBADD = libkonsolepart.la
++kwrited_la_SOURCES = kwrited_main.cpp
++kwrited_la_LIBADD = libkwrited_main.la
+@@ -308,2 +313,2 @@
+-kwrited_SOURCES = dummy.C
+-kwrited_LDADD = kwrited.la 
++kwrited_SOURCES = kwrited_main.cpp
++kwrited_LDADD = libkwrited_main.la 
+@@ -311,0 +317,4 @@
++libkonsole_main_la_SOURCES = main.C konsole.C
++libkonsole_main_la_LIBADD = libkonsolepart.la
++libkonsole_main_la_LDFLAGS = $(all_libraries)
++
+@@ -313,2 +322,2 @@
+-konsole_la_SOURCES = main.C konsole.C
+-konsole_la_LIBADD = libkonsolepart.la
++konsole_la_SOURCES = konsole_main.cpp
++konsole_la_LIBADD = libkonsole_main.la
+@@ -318 +327 @@
+-konsole_SOURCES = TEPty.C BlockArray.C main.C konsole.C schema.C session.C TEWidget.C TEmuVt102.C                   TEScreen.C TEmulation.C TEHistory.C keytrans.C 
++konsole_SOURCES = TEPty.C BlockArray.C main.C konsole.C schema.C session.C TEWidget.C TEmuVt102.C                   TEScreen.C TEmulation.C TEHistory.C keytrans.C konsole_main.cpp
+@@ -372,2 +381,2 @@
+-kwrited_la_DEPENDENCIES =  libkonsolepart.la
+-#>- kwrited_la_OBJECTS =  kwrited.lo
++libkwrited_main_la_DEPENDENCIES =  libkonsolepart.la
++#>- libkwrited_main_la_OBJECTS =  kwrited.lo
+@@ -375,7 +384,11 @@
+-kwrited_la_final_OBJECTS = kwrited_la.all_C.lo 
+-kwrited_la_nofinal_OBJECTS = kwrited.lo \
+-kwrited_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kwrited_la_OBJECTS = $(kwrited_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kwrited_la_OBJECTS = $(kwrited_la_final_OBJECTS)
+-konsole_la_DEPENDENCIES =  libkonsolepart.la
+-#>- konsole_la_OBJECTS =  main.lo konsole.lo
++libkwrited_main_la_final_OBJECTS = libkwrited_main_la.all_C.lo 
++libkwrited_main_la_nofinal_OBJECTS = kwrited.lo \
++libkwrited_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkwrited_main_la_OBJECTS = $(libkwrited_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkwrited_main_la_OBJECTS = $(libkwrited_main_la_final_OBJECTS)
++kwrited_la_DEPENDENCIES =  libkwrited_main.la
++#>- kwrited_la_OBJECTS =  kwrited_main.lo
++#>+ 1
++kwrited_la_OBJECTS = kwrited_main.lo
++libkonsole_main_la_DEPENDENCIES =  libkonsolepart.la
++#>- libkonsole_main_la_OBJECTS =  main.lo konsole.lo
+@@ -383,5 +396,9 @@
+-konsole_la_final_OBJECTS = konsole_la.all_C.lo 
+-konsole_la_nofinal_OBJECTS = main.lo konsole.lo \
+-konsole_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@konsole_la_OBJECTS = $(konsole_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@konsole_la_OBJECTS = $(konsole_la_final_OBJECTS)
++libkonsole_main_la_final_OBJECTS = libkonsole_main_la.all_C.lo 
++libkonsole_main_la_nofinal_OBJECTS = main.lo konsole.lo \
++libkonsole_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkonsole_main_la_OBJECTS = $(libkonsole_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkonsole_main_la_OBJECTS = $(libkonsole_main_la_final_OBJECTS)
++konsole_la_DEPENDENCIES =  libkonsole_main.la
++#>- konsole_la_OBJECTS =  konsole_main.lo
++#>+ 1
++konsole_la_OBJECTS = konsole_main.lo
+@@ -395 +412 @@
+-#>- TEHistory.$(OBJEXT) keytrans.$(OBJEXT)
++#>- TEHistory.$(OBJEXT) keytrans.$(OBJEXT) konsole_main.$(OBJEXT)
+@@ -397 +414 @@
+-konsole_final_OBJECTS = konsole.all_C.o 
++konsole_final_OBJECTS = konsole_main.o konsole.all_C.o 
+@@ -401 +418 @@
+-TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \
++TEHistory.$(OBJEXT) keytrans.$(OBJEXT) konsole_main.$(OBJEXT) \
+@@ -411 +428 @@
+-#>- kwrited_OBJECTS =  dummy.$(OBJEXT)
++#>- kwrited_OBJECTS =  kwrited_main.$(OBJEXT)
+@@ -413,2 +430,2 @@
+-kwrited_OBJECTS = dummy.$(OBJEXT)
+-kwrited_DEPENDENCIES =  kwrited.la
++kwrited_OBJECTS = kwrited_main.$(OBJEXT)
++kwrited_DEPENDENCIES =  libkwrited_main.la
+@@ -438 +455 @@
+-KDE_DIST=x-konsole.desktop konsolerc sample.shell konsole_part.rc 
++KDE_DIST=sample.shell konsole_part.rc x-konsole.desktop konsolerc 
+@@ -445,2 +462,2 @@
+-SOURCES = $(libkonsolepart_la_SOURCES) $(kwrited_la_SOURCES) $(konsole_la_SOURCES) $(konsole_SOURCES) $(konsole_grantpty_SOURCES) $(kwrited_SOURCES)
+-OBJECTS = $(libkonsolepart_la_OBJECTS) $(kwrited_la_OBJECTS) $(konsole_la_OBJECTS) $(konsole_OBJECTS) $(konsole_grantpty_OBJECTS) $(kwrited_OBJECTS)
++SOURCES = $(libkonsolepart_la_SOURCES) $(libkwrited_main_la_SOURCES) $(kwrited_la_SOURCES) $(libkonsole_main_la_SOURCES) $(konsole_la_SOURCES) $(konsole_SOURCES) $(konsole_grantpty_SOURCES) $(kwrited_SOURCES)
++OBJECTS = $(libkonsolepart_la_OBJECTS) $(libkwrited_main_la_OBJECTS) $(kwrited_la_OBJECTS) $(libkonsole_main_la_OBJECTS) $(konsole_la_OBJECTS) $(konsole_OBJECTS) $(konsole_grantpty_OBJECTS) $(kwrited_OBJECTS)
+@@ -452 +469 @@
+-.SUFFIXES: .C .S .c .lo .o .obj .s
++.SUFFIXES: .C .S .c .cpp .lo .o .obj .s
+@@ -538,0 +556,3 @@
++libkwrited_main.la: $(libkwrited_main_la_OBJECTS) $(libkwrited_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkwrited_main_la_LDFLAGS) $(libkwrited_main_la_OBJECTS) $(libkwrited_main_la_LIBADD) $(LIBS)
++
+@@ -541,0 +562,3 @@
++libkonsole_main.la: $(libkonsole_main_la_OBJECTS) $(libkonsole_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkonsole_main_la_LDFLAGS) $(libkonsole_main_la_OBJECTS) $(libkonsole_main_la_LIBADD) $(LIBS)
++
+@@ -586,0 +610,6 @@
++.cpp.o:
++	$(CXXCOMPILE) -c $<
++.cpp.obj:
++	$(CXXCOMPILE) -c `cygpath -w $<`
++.cpp.lo:
++	$(LTCXXCOMPILE) -c $<
+@@ -679,11 +707,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -814,3 +831,0 @@
+-dummy.C:
+-	echo > dummy.C
+-
+@@ -891,8 +906,8 @@
+-kwrited_la_meta_unload.C:  kwrited.moc
+-	@echo 'creating kwrited_la_meta_unload.C'
+-	@-rm -f kwrited_la_meta_unload.C
+-	@echo 'static const char * _metalist_kwrited_la[] = {' > kwrited_la_meta_unload.C
+-	@cat  kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrited_la_meta_unload.C
+-	@echo '0};' >> kwrited_la_meta_unload.C
+-	@echo '#include <kunload.h>' >> kwrited_la_meta_unload.C
+-	@echo '_UNLOAD(kwrited_la)' >> kwrited_la_meta_unload.C
++libkwrited_main_la_meta_unload.C:  kwrited.moc
++	@echo 'creating libkwrited_main_la_meta_unload.C'
++	@-rm -f libkwrited_main_la_meta_unload.C
++	@echo 'static const char * _metalist_libkwrited_main_la[] = {' > libkwrited_main_la_meta_unload.C
++	@cat  kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrited_main_la_meta_unload.C
++	@echo '0};' >> libkwrited_main_la_meta_unload.C
++	@echo '#include <kunload.h>' >> libkwrited_main_la_meta_unload.C
++	@echo '_UNLOAD(libkwrited_main_la)' >> libkwrited_main_la_meta_unload.C
+@@ -902,8 +917,8 @@
+-konsole_la_meta_unload.C:  konsole.moc
+-	@echo 'creating konsole_la_meta_unload.C'
+-	@-rm -f konsole_la_meta_unload.C
+-	@echo 'static const char * _metalist_konsole_la[] = {' > konsole_la_meta_unload.C
+-	@cat  konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konsole_la_meta_unload.C
+-	@echo '0};' >> konsole_la_meta_unload.C
+-	@echo '#include <kunload.h>' >> konsole_la_meta_unload.C
+-	@echo '_UNLOAD(konsole_la)' >> konsole_la_meta_unload.C
++libkonsole_main_la_meta_unload.C:  konsole.moc
++	@echo 'creating libkonsole_main_la_meta_unload.C'
++	@-rm -f libkonsole_main_la_meta_unload.C
++	@echo 'static const char * _metalist_libkonsole_main_la[] = {' > libkonsole_main_la_meta_unload.C
++	@cat  konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonsole_main_la_meta_unload.C
++	@echo '0};' >> libkonsole_main_la_meta_unload.C
++	@echo '#include <kunload.h>' >> libkonsole_main_la_meta_unload.C
++	@echo '_UNLOAD(libkonsole_main_la)' >> libkonsole_main_la_meta_unload.C
+@@ -925 +940 @@
+-	-rm -f  libkonsolepart_la_meta_unload.C kwrited_la_meta_unload.C konsole_la_meta_unload.C konsole_meta_unload.C
++	-rm -f  libkonsolepart_la_meta_unload.C libkwrited_main_la_meta_unload.C libkonsole_main_la_meta_unload.C konsole_meta_unload.C
+@@ -940,7 +955,7 @@
+-kwrited_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/kwrited.C kwrited_la_meta_unload.C  
+-	@echo 'creating kwrited_la.all_C.C ...'; \
+-	rm -f kwrited_la.all_C.files kwrited_la.all_C.final; \
+-	echo "#define KDE_USE_FINAL 1" >> kwrited_la.all_C.final; \
+-	for file in kwrited.C kwrited_la_meta_unload.C ; do \
+-	  echo "#include \"$$file\"" >> kwrited_la.all_C.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited_la.all_C.final; \
++libkwrited_main_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/kwrited.C libkwrited_main_la_meta_unload.C  
++	@echo 'creating libkwrited_main_la.all_C.C ...'; \
++	rm -f libkwrited_main_la.all_C.files libkwrited_main_la.all_C.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkwrited_main_la.all_C.final; \
++	for file in kwrited.C libkwrited_main_la_meta_unload.C ; do \
++	  echo "#include \"$$file\"" >> libkwrited_main_la.all_C.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwrited_main_la.all_C.final; \
+@@ -948,2 +963,2 @@
+-	cat kwrited_la.all_C.final kwrited_la.all_C.files  > kwrited_la.all_C.C; \
+-	rm -f kwrited_la.all_C.final kwrited_la.all_C.files
++	cat libkwrited_main_la.all_C.final libkwrited_main_la.all_C.files  > libkwrited_main_la.all_C.C; \
++	rm -f libkwrited_main_la.all_C.final libkwrited_main_la.all_C.files
+@@ -952,7 +967,7 @@
+-konsole_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/main.C $(srcdir)/konsole.C konsole_la_meta_unload.C  
+-	@echo 'creating konsole_la.all_C.C ...'; \
+-	rm -f konsole_la.all_C.files konsole_la.all_C.final; \
+-	echo "#define KDE_USE_FINAL 1" >> konsole_la.all_C.final; \
+-	for file in main.C konsole.C konsole_la_meta_unload.C ; do \
+-	  echo "#include \"$$file\"" >> konsole_la.all_C.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_C.final; \
++libkonsole_main_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/main.C $(srcdir)/konsole.C libkonsole_main_la_meta_unload.C  
++	@echo 'creating libkonsole_main_la.all_C.C ...'; \
++	rm -f libkonsole_main_la.all_C.files libkonsole_main_la.all_C.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkonsole_main_la.all_C.final; \
++	for file in main.C konsole.C libkonsole_main_la_meta_unload.C ; do \
++	  echo "#include \"$$file\"" >> libkonsole_main_la.all_C.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkonsole_main_la.all_C.final; \
+@@ -960,2 +975,2 @@
+-	cat konsole_la.all_C.final konsole_la.all_C.files  > konsole_la.all_C.C; \
+-	rm -f konsole_la.all_C.final konsole_la.all_C.files
++	cat libkonsole_main_la.all_C.final libkonsole_main_la.all_C.files  > libkonsole_main_la.all_C.C; \
++	rm -f libkonsole_main_la.all_C.final libkonsole_main_la.all_C.files
+@@ -975,12 +989,0 @@
+-#>+ 11
+-kwrited.all_C.C: $(srcdir)/Makefile.in dummy.C  
+-	@echo 'creating kwrited.all_C.C ...'; \
+-	rm -f kwrited.all_C.files kwrited.all_C.final; \
+-	echo "#define KDE_USE_FINAL 1" >> kwrited.all_C.final; \
+-	for file in dummy.C ; do \
+-	  echo "#include \"$$file\"" >> kwrited.all_C.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited.all_C.final; \
+-	done; \
+-	cat kwrited.all_C.final kwrited.all_C.files  > kwrited.all_C.C; \
+-	rm -f kwrited.all_C.final kwrited.all_C.files
+-
+@@ -989 +992 @@
+-	-rm -f libkonsolepart_la.all_C.C kwrited_la.all_C.C konsole_la.all_C.C konsole.all_C.C kwrited.all_C.C
++	-rm -f libkonsolepart_la.all_C.C libkwrited_main_la.all_C.C libkonsole_main_la.all_C.C konsole.all_C.C
+@@ -993 +996 @@
+-	$(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_final_OBJECTS)" konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am
++	$(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_final_OBJECTS)" libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am
+@@ -996 +999 @@
+-	$(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_nofinal_OBJECTS)" konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am
++	$(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_nofinal_OBJECTS)" libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-da b/x11/kdebase2/patches/patch-da
new file mode 100644
index 00000000000..932fe4870d1
--- /dev/null
+++ b/x11/kdebase2/patches/patch-da
@@ -0,0 +1,33 @@
+$NetBSD: patch-da,v 1.1 2001/10/15 22:46:07 skrll Exp $
+
+--- konsole/src/konsole_main.cpp.orig	Tue Oct  2 17:50:35 2001
++++ konsole/src/konsole_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int konsole_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return konsole_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-db b/x11/kdebase2/patches/patch-db
new file mode 100644
index 00000000000..75d05ef94a1
--- /dev/null
+++ b/x11/kdebase2/patches/patch-db
@@ -0,0 +1,13 @@
+$NetBSD: patch-db,v 1.1 2001/10/15 22:46:07 skrll Exp $
+
+--- konsole/src/kwrited.C.orig	Sat Mar 17 14:30:43 2001
++++ konsole/src/kwrited.C
+@@ -80,7 +80,7 @@
+     ::exit(0);
+ }
+ 
+-int main(int argc, char* argv[])
++int kwrited_main(int argc, char* argv[])
+ {
+   KLocale::setMainCatalogue("konsole");
+   KCmdLineArgs::init(argc, argv, "kwrited",
diff --git a/x11/kdebase2/patches/patch-dc b/x11/kdebase2/patches/patch-dc
new file mode 100644
index 00000000000..2ff03ee5698
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dc
@@ -0,0 +1,33 @@
+$NetBSD: patch-dc,v 1.1 2001/10/15 22:46:08 skrll Exp $
+
+--- konsole/src/kwrited_main.cpp.orig	Tue Oct  2 17:50:35 2001
++++ konsole/src/kwrited_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int kwrited_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kwrited_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-dd b/x11/kdebase2/patches/patch-dd
new file mode 100644
index 00000000000..2cbafec29f2
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dd
@@ -0,0 +1,13 @@
+$NetBSD: patch-dd,v 1.1 2001/10/15 22:46:08 skrll Exp $
+
+--- konsole/src/main.C.orig	Wed Sep  5 00:16:57 2001
++++ konsole/src/main.C
+@@ -109,7 +109,7 @@
+ 
+ 
+ /* --| main |------------------------------------------------------ */
+-int main(int argc, char* argv[])
++int konsole_main(int argc, char* argv[])
+ {
+   setgid(getgid()); setuid(getuid()); // drop privileges
+ 
diff --git a/x11/kdebase2/patches/patch-de b/x11/kdebase2/patches/patch-de
new file mode 100644
index 00000000000..06e15cb1a84
--- /dev/null
+++ b/x11/kdebase2/patches/patch-de
@@ -0,0 +1,16 @@
+$NetBSD: patch-de,v 1.1 2001/10/15 22:46:08 skrll Exp $
+
+--- ksysguard/ksysguardd/FreeBSD/CPU.c.orig	Tue Aug  8 23:53:56 2000
++++ ksysguard/ksysguardd/FreeBSD/CPU.c
+@@ -25,7 +25,11 @@
+ 
+ #include <kvm.h>
+ #include <nlist.h>
++#ifdef __NetBSD__
++#include <sys/sched.h>		/* CPUSTATES */
++#else
+ #include <devstat.h>
++#endif
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/x11/kdebase2/patches/patch-df b/x11/kdebase2/patches/patch-df
new file mode 100644
index 00000000000..ee039463cc9
--- /dev/null
+++ b/x11/kdebase2/patches/patch-df
@@ -0,0 +1,75 @@
+$NetBSD: patch-df,v 1.1 2001/10/15 22:46:08 skrll Exp $
+
+--- ksysguard/ksysguardd/FreeBSD/Memory.c.orig	Fri Jul 28 00:59:28 2000
++++ ksysguard/ksysguardd/FreeBSD/Memory.c
+@@ -29,7 +29,12 @@
+ 
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
++/* Everything post 1.5.x uses uvm/uvm_* includes */
++#if __NetBSD_Version__ >= 105010000
++#include <uvm/uvm_param.h>
++#else
+ #include <vm/vm_param.h>
++#endif
+ #include <sys/vmmeter.h>
+ #include <string.h>
+ #include <unistd.h>
+@@ -65,9 +70,16 @@
+         struct vmtotal p;
+         FILE *file;
+         char buf[256];
++	int rc;
+ 
+         len = sizeof (Total);
++#ifdef __NetBSD__
++        mib[0] = CTL_HW;
++        mib[1] = HW_PHYSMEM;
++        sysctl(mib, sizeof(mib), &Total, &len, NULL, 0);
++#else
+         sysctlbyname("hw.physmem", &Total, &len, NULL, 0);
++#endif
+         Total /= 1024;
+ 
+         /* Q&D hack for swap display. Borrowed from xsysinfo-1.4 */
+@@ -92,23 +104,40 @@
+ 	}
+ 
+ 
++#ifdef __NetBSD__
++        /* NetBSD doesn't know about vfs.bufspace */
++        Buffers = -1;
++#else
+         len = sizeof (Buffers);
+         if ((sysctlbyname("vfs.bufspace", &Buffers, &len, NULL, 0) == -1) || !len)
+                 Buffers = 0; /* Doesn't work under FreeBSD v2.2.x */
++#endif
+         Buffers /= 1024;
+ 
+ 
++#ifdef __NetBSD__
++	/* NetBSD doesn't know about vm.stats */
++	Cached = -1;
++#else
+         len = sizeof (Cached);
+         if ((sysctlbyname("vm.stats.vm.v_cache_count", &Cached, &len, NULL, 0) == -1) || !len)
+                 Cached = 0; /* Doesn't work under FreeBSD v2.2.x */
++#endif
+         Cached *= getpagesize() / 1024;
+ 
+ 
++#ifdef __NetBSD__
++	/* No idea where to get them right now.
++	 * I don't want to start kmem-digging... */
++	MFree = -1;
++	Used = -1;
++#else
+ 	/* initializes the pointer to the vmmeter struct */
+ 	len = sizeof (p);
+ 	sysctlbyname("vm.vmmeter", &p, &len, NULL, 0);
+         MFree = p.t_free * getpagesize() / 1024;
+         Used = p.t_arm * getpagesize() / 1024 + Buffers + Cached;
++#endif
+ 
+ 	return 0;
+ }
diff --git a/x11/kdebase2/patches/patch-dg b/x11/kdebase2/patches/patch-dg
new file mode 100644
index 00000000000..8351e0371c2
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dg
@@ -0,0 +1,37 @@
+$NetBSD: patch-dg,v 1.1 2001/10/15 22:46:08 skrll Exp $
+
+--- kwin/Makefile.am.orig	Sun Jul 29 05:56:47 2001
++++ kwin/Makefile.am
+@@ -3,14 +3,14 @@
+ SUBDIRS = . pics clients
+ 
+ bin_PROGRAMS = kwin
+-lib_LTLIBRARIES = kwin.la
++lib_LTLIBRARIES = libkwin.la
+ 
+ # workspace.cpp has to be first in order not to break --enable-final
+-kwin_la_SOURCES = workspace.cpp atoms.cpp  client.cpp main.cpp \
++libkwin_la_SOURCES = workspace.cpp atoms.cpp  client.cpp main.cpp \
+ 	tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \
+ 	killwindow.cpp kwinbutton.cpp
+-kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA)
+-kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libkwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA)
++libkwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+ include_HEADERS = KWinInterface.h
+ 
+@@ -18,7 +18,7 @@
+ kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h
+ 
+ kwin_SOURCES = kwin_main.cpp
+-kwin_LDADD = kwin.la 
++kwin_LDADD = libkwin.la 
+ kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ KDE_ICON = kwin
+@@ -34,4 +34,3 @@
+ 
+ sounddir= $(kde_sounddir)
+ sound_DATA = pop.wav
+-
diff --git a/x11/kdebase2/patches/patch-dh b/x11/kdebase2/patches/patch-dh
new file mode 100644
index 00000000000..34273c317ba
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dh
@@ -0,0 +1,118 @@
+$NetBSD: patch-dh,v 1.1 2001/10/15 22:46:08 skrll Exp $
+
+--- kwin/Makefile.in.orig	Sat Sep  8 01:36:48 2001
++++ kwin/Makefile.in
+@@ -278 +278 @@
+-lib_LTLIBRARIES = kwin.la
++lib_LTLIBRARIES = libkwin.la
+@@ -281 +281 @@
+-#>- kwin_la_SOURCES = workspace.cpp atoms.cpp  client.cpp main.cpp 	tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel 	killwindow.cpp kwinbutton.cpp
++#>- libkwin_la_SOURCES = workspace.cpp atoms.cpp  client.cpp main.cpp 	tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel 	killwindow.cpp kwinbutton.cpp
+@@ -283 +283 @@
+-kwin_la_SOURCES=workspace.cpp atoms.cpp  client.cpp main.cpp 	tabbox.cpp options.cpp plugins.cpp events.cpp  	killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp
++libkwin_la_SOURCES=workspace.cpp atoms.cpp  client.cpp main.cpp 	tabbox.cpp options.cpp plugins.cpp events.cpp  	killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp
+@@ -285,2 +285,2 @@
+-kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA)
+-kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
++libkwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA)
++libkwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
+@@ -294 +294 @@
+-kwin_LDADD = kwin.la 
++kwin_LDADD = libkwin.la 
+@@ -319,2 +319,2 @@
+-kwin_la_DEPENDENCIES = 
+-#>- kwin_la_OBJECTS =  workspace.lo atoms.lo client.lo main.lo tabbox.lo \
++libkwin_la_DEPENDENCIES = 
++#>- libkwin_la_OBJECTS =  workspace.lo atoms.lo client.lo main.lo tabbox.lo \
+@@ -323,2 +323,2 @@
+-kwin_la_final_OBJECTS = kwin_la.all_cpp.lo 
+-kwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \
++libkwin_la_final_OBJECTS = libkwin_la.all_cpp.lo 
++libkwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \
+@@ -326,3 +326,3 @@
+-kwin_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kwin_la_OBJECTS = $(kwin_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kwin_la_OBJECTS = $(kwin_la_final_OBJECTS)
++libkwin_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkwin_la_OBJECTS = $(libkwin_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkwin_la_OBJECTS = $(libkwin_la_final_OBJECTS)
+@@ -335 +335 @@
+-kwin_DEPENDENCIES =  kwin.la
++kwin_DEPENDENCIES =  libkwin.la
+@@ -356 +356 @@
+-KDE_DIST=NEWCOLORSCHEME.README stdclient_bitmaps.h tabbox.h hi48-app-kwin.png LICENSE main.h hi32-app-kwin.png pop.wav plugins.h killwindow.h kwinbindings.cpp events.h atoms.h eventsrc hi16-app-kwin.png 
++KDE_DIST=plugins.h LICENSE killwindow.h main.h NEWCOLORSCHEME.README hi32-app-kwin.png tabbox.h hi48-app-kwin.png kwinbindings.cpp pop.wav stdclient_bitmaps.h events.h atoms.h eventsrc hi16-app-kwin.png 
+@@ -363,2 +363,2 @@
+-SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES)
+-OBJECTS = $(kwin_la_OBJECTS) $(kwin_OBJECTS)
++SOURCES = $(libkwin_la_SOURCES) $(kwin_SOURCES)
++OBJECTS = $(libkwin_la_OBJECTS) $(kwin_OBJECTS)
+@@ -451,2 +451,2 @@
+-kwin.la: $(kwin_la_OBJECTS) $(kwin_la_DEPENDENCIES)
+-	$(CXXLINK) -rpath $(libdir) $(kwin_la_LDFLAGS) $(kwin_la_OBJECTS) $(kwin_la_LIBADD) $(LIBS)
++libkwin.la: $(libkwin_la_OBJECTS) $(libkwin_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkwin_la_LDFLAGS) $(libkwin_la_OBJECTS) $(libkwin_la_LIBADD) $(LIBS)
+@@ -593 +593 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -651,11 +650,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -859,8 +848,8 @@
+-kwin_la_meta_unload.cpp:  workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc
+-	@echo 'creating kwin_la_meta_unload.cpp'
+-	@-rm -f kwin_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_kwin_la[] = {' > kwin_la_meta_unload.cpp
+-	@cat  workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwin_la_meta_unload.cpp
+-	@echo '0};' >> kwin_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> kwin_la_meta_unload.cpp
+-	@echo '_UNLOAD(kwin_la)' >> kwin_la_meta_unload.cpp
++libkwin_la_meta_unload.cpp:  workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc
++	@echo 'creating libkwin_la_meta_unload.cpp'
++	@-rm -f libkwin_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkwin_la[] = {' > libkwin_la_meta_unload.cpp
++	@cat  workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwin_la_meta_unload.cpp
++	@echo '0};' >> libkwin_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkwin_la_meta_unload.cpp
++	@echo '_UNLOAD(libkwin_la)' >> libkwin_la_meta_unload.cpp
+@@ -871 +860 @@
+-	-rm -f  kwin_la_meta_unload.cpp
++	-rm -f  libkwin_la_meta_unload.cpp
+@@ -874,7 +863,7 @@
+-kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp   workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc 
+-	@echo 'creating kwin_la.all_cpp.cpp ...'; \
+-	rm -f kwin_la.all_cpp.files kwin_la.all_cpp.final; \
+-	echo "#define KDE_USE_FINAL 1" >> kwin_la.all_cpp.final; \
+-	for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp ; do \
+-	  echo "#include \"$$file\"" >> kwin_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_la.all_cpp.final; \
++libkwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp   workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc 
++	@echo 'creating libkwin_la.all_cpp.cpp ...'; \
++	rm -f libkwin_la.all_cpp.files libkwin_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkwin_la.all_cpp.final; \
++	for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkwin_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwin_la.all_cpp.final; \
+@@ -882,2 +871,2 @@
+-	cat kwin_la.all_cpp.final kwin_la.all_cpp.files  > kwin_la.all_cpp.cpp; \
+-	rm -f kwin_la.all_cpp.final kwin_la.all_cpp.files
++	cat libkwin_la.all_cpp.final libkwin_la.all_cpp.files  > libkwin_la.all_cpp.cpp; \
++	rm -f libkwin_la.all_cpp.final libkwin_la.all_cpp.files
+@@ -899 +888 @@
+-	-rm -f kwin_la.all_cpp.cpp kwin.all_cpp.cpp
++	-rm -f libkwin_la.all_cpp.cpp kwin.all_cpp.cpp
+@@ -903 +892 @@
+-	$(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" all-am
++	$(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" all-am
+@@ -906 +895 @@
+-	$(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-di b/x11/kdebase2/patches/patch-di
new file mode 100644
index 00000000000..54417c432b7
--- /dev/null
+++ b/x11/kdebase2/patches/patch-di
@@ -0,0 +1,13 @@
+$NetBSD: patch-di,v 1.1 2001/10/15 22:46:08 skrll Exp $
+
+--- kwin/clients/b2/Makefile.am.orig	Tue Jun 19 15:32:08 2001
++++ kwin/clients/b2/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinb2.la
+ 
+ libkwinb2_la_SOURCES = b2client.cpp
+-libkwinb2_la_LIBADD = ../../kwin.la
++libkwinb2_la_LIBADD = ../../libkwin.la
+ libkwinb2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-dj b/x11/kdebase2/patches/patch-dj
new file mode 100644
index 00000000000..bd0f1c1f872
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dj
@@ -0,0 +1,25 @@
+$NetBSD: patch-dj,v 1.1 2001/10/15 22:46:08 skrll Exp $
+
+--- kwin/clients/b2/Makefile.in.orig	Sat Sep  8 01:36:48 2001
++++ kwin/clients/b2/Makefile.in
+@@ -279 +279 @@
+-libkwinb2_la_LIBADD = ../../kwin.la
++libkwinb2_la_LIBADD = ../../libkwin.la
+@@ -301 +301 @@
+-libkwinb2_la_DEPENDENCIES =  ../../kwin.la
++libkwinb2_la_DEPENDENCIES =  ../../libkwin.la
+@@ -329 +329 @@
+-KDE_DIST=b2.desktop bitmaps.h 
++KDE_DIST=bitmaps.h b2.desktop 
+@@ -489,11 +488,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-dk b/x11/kdebase2/patches/patch-dk
new file mode 100644
index 00000000000..b950f75910a
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dk
@@ -0,0 +1,13 @@
+$NetBSD: patch-dk,v 1.1 2001/10/15 22:46:09 skrll Exp $
+
+--- kwin/clients/default/Makefile.am.orig	Thu Jun  7 12:35:06 2001
++++ kwin/clients/default/Makefile.am
+@@ -6,7 +6,7 @@
+ kde_module_LTLIBRARIES = libkwindefault.la
+ 
+ libkwindefault_la_SOURCES = kdedefault.cpp
+-libkwindefault_la_LIBADD = ../../kwin.la
++libkwindefault_la_LIBADD = ../../libkwin.la
+ libkwindefault_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-dl b/x11/kdebase2/patches/patch-dl
new file mode 100644
index 00000000000..1701e1cd7de
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dl
@@ -0,0 +1,25 @@
+$NetBSD: patch-dl,v 1.1 2001/10/15 22:46:09 skrll Exp $
+
+--- kwin/clients/default/Makefile.in.orig	Sat Sep  8 01:36:49 2001
++++ kwin/clients/default/Makefile.in
+@@ -281 +281 @@
+-libkwindefault_la_LIBADD = ../../kwin.la
++libkwindefault_la_LIBADD = ../../libkwin.la
+@@ -298 +298 @@
+-libkwindefault_la_DEPENDENCIES =  ../../kwin.la
++libkwindefault_la_DEPENDENCIES =  ../../libkwin.la
+@@ -462 +462 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -520,11 +519,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-dm b/x11/kdebase2/patches/patch-dm
new file mode 100644
index 00000000000..dbe520cf5e4
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dm
@@ -0,0 +1,13 @@
+$NetBSD: patch-dm,v 1.1 2001/10/15 22:46:09 skrll Exp $
+
+--- kwin/clients/icewm/Makefile.am.orig	Mon Apr 16 15:55:07 2001
++++ kwin/clients/icewm/Makefile.am
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = libkwinicewm.la
+ 
+ libkwinicewm_la_SOURCES = icewm.cpp 
+-libkwinicewm_la_LIBADD = ../../kwin.la
++libkwinicewm_la_LIBADD = ../../libkwin.la
+ libkwinicewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-dn b/x11/kdebase2/patches/patch-dn
new file mode 100644
index 00000000000..a87d2013571
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dn
@@ -0,0 +1,25 @@
+$NetBSD: patch-dn,v 1.1 2001/10/15 22:46:09 skrll Exp $
+
+--- kwin/clients/icewm/Makefile.in.orig	Sat Sep  8 01:36:49 2001
++++ kwin/clients/icewm/Makefile.in
+@@ -281 +281 @@
+-libkwinicewm_la_LIBADD = ../../kwin.la
++libkwinicewm_la_LIBADD = ../../libkwin.la
+@@ -303 +303 @@
+-libkwinicewm_la_DEPENDENCIES =  ../../kwin.la
++libkwinicewm_la_DEPENDENCIES =  ../../libkwin.la
+@@ -493 +493 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -551,11 +550,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-do b/x11/kdebase2/patches/patch-do
new file mode 100644
index 00000000000..0b862807b30
--- /dev/null
+++ b/x11/kdebase2/patches/patch-do
@@ -0,0 +1,13 @@
+$NetBSD: patch-do,v 1.1 2001/10/15 22:46:09 skrll Exp $
+
+--- kwin/clients/kde/Makefile.am.orig	Mon Dec  4 18:47:46 2000
++++ kwin/clients/kde/Makefile.am
+@@ -16,7 +16,7 @@
+ TitleBar.cpp \
+ TitleText.cpp \
+ Static.cpp
+-libkwindefault_la_LIBADD = ../../kwin.la
++libkwindefault_la_LIBADD = ../../libkwin.la
+ libkwindefault_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-dp b/x11/kdebase2/patches/patch-dp
new file mode 100644
index 00000000000..ae4d594ac5e
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dp
@@ -0,0 +1,13 @@
+$NetBSD: patch-dp,v 1.1 2001/10/15 22:46:09 skrll Exp $
+
+--- kwin/clients/kde1/Makefile.am.orig	Mon Dec  4 18:47:47 2000
++++ kwin/clients/kde1/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinkde1.la
+ 
+ libkwinkde1_la_SOURCES = kde1client.cpp
+-libkwinkde1_la_LIBADD = ../../kwin.la
++libkwinkde1_la_LIBADD = ../../libkwin.la
+ libkwinkde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-dq b/x11/kdebase2/patches/patch-dq
new file mode 100644
index 00000000000..fb30dc95caf
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dq
@@ -0,0 +1,25 @@
+$NetBSD: patch-dq,v 1.1 2001/10/15 22:46:09 skrll Exp $
+
+--- kwin/clients/kde1/Makefile.in.orig	Sat Sep  8 01:36:49 2001
++++ kwin/clients/kde1/Makefile.in
+@@ -279 +279 @@
+-libkwinkde1_la_LIBADD = ../../kwin.la
++libkwinkde1_la_LIBADD = ../../libkwin.la
+@@ -300 +300 @@
+-libkwinkde1_la_DEPENDENCIES =  ../../kwin.la
++libkwinkde1_la_DEPENDENCIES =  ../../libkwin.la
+@@ -328 +328 @@
+-KDE_DIST=kde1.desktop kde1client_bitmaps.h 
++KDE_DIST=kde1client_bitmaps.h kde1.desktop 
+@@ -488,11 +487,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-dr b/x11/kdebase2/patches/patch-dr
new file mode 100644
index 00000000000..760b28fd7b7
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dr
@@ -0,0 +1,13 @@
+$NetBSD: patch-dr,v 1.1 2001/10/15 22:46:09 skrll Exp $
+
+--- kwin/clients/kstep/Makefile.am.orig	Sun Jun 24 18:12:39 2001
++++ kwin/clients/kstep/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinkstep.la
+ 
+ libkwinkstep_la_SOURCES = nextclient.cpp
+-libkwinkstep_la_LIBADD = ../../kwin.la
++libkwinkstep_la_LIBADD = ../../libkwin.la
+ libkwinkstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-ds b/x11/kdebase2/patches/patch-ds
new file mode 100644
index 00000000000..1a45d5cf0ed
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ds
@@ -0,0 +1,22 @@
+$NetBSD: patch-ds,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/kstep/Makefile.in.orig	Sat Sep  8 01:36:49 2001
++++ kwin/clients/kstep/Makefile.in
+@@ -279 +279 @@
+-libkwinkstep_la_LIBADD = ../../kwin.la
++libkwinkstep_la_LIBADD = ../../libkwin.la
+@@ -301 +301 @@
+-libkwinkstep_la_DEPENDENCIES =  ../../kwin.la
++libkwinkstep_la_DEPENDENCIES =  ../../libkwin.la
+@@ -489,11 +488,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-dt b/x11/kdebase2/patches/patch-dt
new file mode 100644
index 00000000000..60577dbdcd6
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dt
@@ -0,0 +1,13 @@
+$NetBSD: patch-dt,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/kwmtheme/Makefile.am.orig	Sun Jun 24 07:10:59 2001
++++ kwin/clients/kwmtheme/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinkwmtheme.la
+ 
+ libkwinkwmtheme_la_SOURCES = kwmthemeclient.cpp
+-libkwinkwmtheme_la_LIBADD = ../../kwin.la
++libkwinkwmtheme_la_LIBADD = ../../libkwin.la
+ libkwinkwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-du b/x11/kdebase2/patches/patch-du
new file mode 100644
index 00000000000..e730b201c6e
--- /dev/null
+++ b/x11/kdebase2/patches/patch-du
@@ -0,0 +1,25 @@
+$NetBSD: patch-du,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/kwmtheme/Makefile.in.orig	Sat Sep  8 01:36:49 2001
++++ kwin/clients/kwmtheme/Makefile.in
+@@ -280 +280 @@
+-libkwinkwmtheme_la_LIBADD = ../../kwin.la
++libkwinkwmtheme_la_LIBADD = ../../libkwin.la
+@@ -297 +297 @@
+-libkwinkwmtheme_la_DEPENDENCIES =  ../../kwin.la
++libkwinkwmtheme_la_DEPENDENCIES =  ../../libkwin.la
+@@ -466 +466 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -524,11 +523,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-dv b/x11/kdebase2/patches/patch-dv
new file mode 100644
index 00000000000..38039e71bb9
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dv
@@ -0,0 +1,13 @@
+$NetBSD: patch-dv,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/laptop/Makefile.am.orig	Wed Jun 20 12:17:03 2001
++++ kwin/clients/laptop/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinlaptop.la
+ 
+ libkwinlaptop_la_SOURCES = laptopclient.cpp
+-libkwinlaptop_la_LIBADD = ../../kwin.la
++libkwinlaptop_la_LIBADD = ../../libkwin.la
+ libkwinlaptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-dw b/x11/kdebase2/patches/patch-dw
new file mode 100644
index 00000000000..9d7f02f04f4
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dw
@@ -0,0 +1,22 @@
+$NetBSD: patch-dw,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/laptop/Makefile.in.orig	Sat Sep  8 01:36:50 2001
++++ kwin/clients/laptop/Makefile.in
+@@ -279 +279 @@
+-libkwinlaptop_la_LIBADD = ../../kwin.la
++libkwinlaptop_la_LIBADD = ../../libkwin.la
+@@ -301 +301 @@
+-libkwinlaptop_la_DEPENDENCIES =  ../../kwin.la
++libkwinlaptop_la_DEPENDENCIES =  ../../libkwin.la
+@@ -489,11 +488,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-dx b/x11/kdebase2/patches/patch-dx
new file mode 100644
index 00000000000..ac483060950
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dx
@@ -0,0 +1,13 @@
+$NetBSD: patch-dx,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/modernsystem/Makefile.am.orig	Tue Jun 19 16:26:47 2001
++++ kwin/clients/modernsystem/Makefile.am
+@@ -7,7 +7,7 @@
+ kde_module_LTLIBRARIES = libkwinmodernsys.la
+ 
+ libkwinmodernsys_la_SOURCES = modernsys.cpp
+-libkwinmodernsys_la_LIBADD = ../../kwin.la
++libkwinmodernsys_la_LIBADD = ../../libkwin.la
+ libkwinmodernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-dy b/x11/kdebase2/patches/patch-dy
new file mode 100644
index 00000000000..941a43c20f4
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dy
@@ -0,0 +1,28 @@
+$NetBSD: patch-dy,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/modernsystem/Makefile.in.orig	Sat Sep  8 01:36:50 2001
++++ kwin/clients/modernsystem/Makefile.in
+@@ -283 +283 @@
+-libkwinmodernsys_la_LIBADD = ../../kwin.la
++libkwinmodernsys_la_LIBADD = ../../libkwin.la
+@@ -305 +305 @@
+-libkwinmodernsys_la_DEPENDENCIES =  ../../kwin.la
++libkwinmodernsys_la_DEPENDENCIES =  ../../libkwin.la
+@@ -333 +333 @@
+-KDE_DIST=buttondata.h btnhighcolor.h modernsystem.desktop 
++KDE_DIST=btnhighcolor.h modernsystem.desktop buttondata.h 
+@@ -495 +495 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -553,11 +552,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-dz b/x11/kdebase2/patches/patch-dz
new file mode 100644
index 00000000000..334de07e8d0
--- /dev/null
+++ b/x11/kdebase2/patches/patch-dz
@@ -0,0 +1,13 @@
+$NetBSD: patch-dz,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/mwm/Makefile.am.orig	Mon Dec  4 18:47:47 2000
++++ kwin/clients/mwm/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinmwm.la
+ 
+ libkwinmwm_la_SOURCES = mwmclient.cpp
+-libkwinmwm_la_LIBADD = ../../kwin.la
++libkwinmwm_la_LIBADD = ../../libkwin.la
+ libkwinmwm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-ea b/x11/kdebase2/patches/patch-ea
new file mode 100644
index 00000000000..abf653b7419
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ea
@@ -0,0 +1,22 @@
+$NetBSD: patch-ea,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/mwm/Makefile.in.orig	Sat Sep  8 01:36:50 2001
++++ kwin/clients/mwm/Makefile.in
+@@ -279 +279 @@
+-libkwinmwm_la_LIBADD = ../../kwin.la
++libkwinmwm_la_LIBADD = ../../libkwin.la
+@@ -301 +301 @@
+-libkwinmwm_la_DEPENDENCIES =  ../../kwin.la
++libkwinmwm_la_DEPENDENCIES =  ../../libkwin.la
+@@ -489,11 +488,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-eb b/x11/kdebase2/patches/patch-eb
new file mode 100644
index 00000000000..9127691020b
--- /dev/null
+++ b/x11/kdebase2/patches/patch-eb
@@ -0,0 +1,13 @@
+$NetBSD: patch-eb,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/quartz/Makefile.am.orig	Sat May 26 03:34:47 2001
++++ kwin/clients/quartz/Makefile.am
+@@ -6,7 +6,7 @@
+ kde_module_LTLIBRARIES = libkwinquartz.la
+ 
+ libkwinquartz_la_SOURCES = quartz.cpp
+-libkwinquartz_la_LIBADD = ../../kwin.la
++libkwinquartz_la_LIBADD = ../../libkwin.la
+ libkwinquartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-ec b/x11/kdebase2/patches/patch-ec
new file mode 100644
index 00000000000..ed155807c36
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ec
@@ -0,0 +1,25 @@
+$NetBSD: patch-ec,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/quartz/Makefile.in.orig	Sat Sep  8 01:36:50 2001
++++ kwin/clients/quartz/Makefile.in
+@@ -281 +281 @@
+-libkwinquartz_la_LIBADD = ../../kwin.la
++libkwinquartz_la_LIBADD = ../../libkwin.la
+@@ -303 +303 @@
+-libkwinquartz_la_DEPENDENCIES =  ../../kwin.la
++libkwinquartz_la_DEPENDENCIES =  ../../libkwin.la
+@@ -493 +493 @@
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+@@ -551,11 +550,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-ed b/x11/kdebase2/patches/patch-ed
new file mode 100644
index 00000000000..921eb3e6c00
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ed
@@ -0,0 +1,13 @@
+$NetBSD: patch-ed,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/redmond/Makefile.am.orig	Mon Jul 16 07:53:11 2001
++++ kwin/clients/redmond/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinredmond.la
+ 
+ libkwinredmond_la_SOURCES = redmond.cpp
+-libkwinredmond_la_LIBADD = ../../kwin.la
++libkwinredmond_la_LIBADD = ../../libkwin.la
+ libkwinredmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-ee b/x11/kdebase2/patches/patch-ee
new file mode 100644
index 00000000000..9dc88deb897
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ee
@@ -0,0 +1,22 @@
+$NetBSD: patch-ee,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/redmond/Makefile.in.orig	Sat Sep  8 01:36:50 2001
++++ kwin/clients/redmond/Makefile.in
+@@ -279 +279 @@
+-libkwinredmond_la_LIBADD = ../../kwin.la
++libkwinredmond_la_LIBADD = ../../libkwin.la
+@@ -301 +301 @@
+-libkwinredmond_la_DEPENDENCIES =  ../../kwin.la
++libkwinredmond_la_DEPENDENCIES =  ../../libkwin.la
+@@ -489,11 +488,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-ef b/x11/kdebase2/patches/patch-ef
new file mode 100644
index 00000000000..2fe5985db5b
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ef
@@ -0,0 +1,13 @@
+$NetBSD: patch-ef,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/riscos/Makefile.am.orig	Mon Dec  4 18:47:47 2000
++++ kwin/clients/riscos/Makefile.am
+@@ -12,7 +12,7 @@
+ StickyButton.cpp \
+ HelpButton.cpp \
+ Static.cpp
+-libkwinriscos_la_LIBADD = ../../kwin.la
++libkwinriscos_la_LIBADD = ../../libkwin.la
+ libkwinriscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-eg b/x11/kdebase2/patches/patch-eg
new file mode 100644
index 00000000000..3832f6184f1
--- /dev/null
+++ b/x11/kdebase2/patches/patch-eg
@@ -0,0 +1,25 @@
+$NetBSD: patch-eg,v 1.1 2001/10/15 22:46:10 skrll Exp $
+
+--- kwin/clients/riscos/Makefile.in.orig	Sat Sep  8 01:36:50 2001
++++ kwin/clients/riscos/Makefile.in
+@@ -280 +280 @@
+-libkwinriscos_la_LIBADD = ../../kwin.la
++libkwinriscos_la_LIBADD = ../../libkwin.la
+@@ -303 +303 @@
+-libkwinriscos_la_DEPENDENCIES =  ../../kwin.la
++libkwinriscos_la_DEPENDENCIES =  ../../libkwin.la
+@@ -335 +335 @@
+-KDE_DIST=Palette.h riscos.desktop 
++KDE_DIST=riscos.desktop Palette.h 
+@@ -495,11 +494,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-eh b/x11/kdebase2/patches/patch-eh
new file mode 100644
index 00000000000..20f14366121
--- /dev/null
+++ b/x11/kdebase2/patches/patch-eh
@@ -0,0 +1,13 @@
+$NetBSD: patch-eh,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- kwin/clients/system/Makefile.am.orig	Wed Jun 20 12:42:49 2001
++++ kwin/clients/system/Makefile.am
+@@ -4,7 +4,7 @@
+ kde_module_LTLIBRARIES = libkwinsystem.la
+ 
+ libkwinsystem_la_SOURCES = systemclient.cpp
+-libkwinsystem_la_LIBADD = ../../kwin.la
++libkwinsystem_la_LIBADD = ../../libkwin.la
+ libkwinsystem_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+ 
+ METASOURCES = AUTO
diff --git a/x11/kdebase2/patches/patch-ei b/x11/kdebase2/patches/patch-ei
new file mode 100644
index 00000000000..8781283d6c4
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ei
@@ -0,0 +1,22 @@
+$NetBSD: patch-ei,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- kwin/clients/system/Makefile.in.orig	Sat Sep  8 01:36:50 2001
++++ kwin/clients/system/Makefile.in
+@@ -279 +279 @@
+-libkwinsystem_la_LIBADD = ../../kwin.la
++libkwinsystem_la_LIBADD = ../../libkwin.la
+@@ -301 +301 @@
+-libkwinsystem_la_DEPENDENCIES =  ../../kwin.la
++libkwinsystem_la_DEPENDENCIES =  ../../libkwin.la
+@@ -489,11 +488,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-ej b/x11/kdebase2/patches/patch-ej
new file mode 100644
index 00000000000..efa3d2379e7
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ej
@@ -0,0 +1,13 @@
+$NetBSD: patch-ej,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- kwin/clients/web/Makefile.am.orig	Fri May 18 21:22:57 2001
++++ kwin/clients/web/Makefile.am
+@@ -21,7 +21,7 @@
+   WebButtonMaximize.h \
+   WebButtonSticky.h
+ 
+-libkwinweb_la_LIBADD      = ../../kwin.la
++libkwinweb_la_LIBADD      = ../../libkwin.la
+ libkwinweb_la_LDFLAGS     = $(all_libraries) $(KDE_PLUGIN)
+ METASOURCES               = AUTO
+ 
diff --git a/x11/kdebase2/patches/patch-ek b/x11/kdebase2/patches/patch-ek
new file mode 100644
index 00000000000..7b5f95d3395
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ek
@@ -0,0 +1,22 @@
+$NetBSD: patch-ek,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- kwin/clients/web/Makefile.in.orig	Sat Sep  8 01:36:50 2001
++++ kwin/clients/web/Makefile.in
+@@ -283 +283 @@
+-libkwinweb_la_LIBADD = ../../kwin.la
++libkwinweb_la_LIBADD = ../../libkwin.la
+@@ -302 +302 @@
+-libkwinweb_la_DEPENDENCIES =  ../../kwin.la
++libkwinweb_la_DEPENDENCIES =  ../../libkwin.la
+@@ -494,11 +493,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
diff --git a/x11/kdebase2/patches/patch-el b/x11/kdebase2/patches/patch-el
new file mode 100644
index 00000000000..7c74735f0a6
--- /dev/null
+++ b/x11/kdebase2/patches/patch-el
@@ -0,0 +1,101 @@
+$NetBSD: patch-el,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- kwin/plugins.cpp.orig	Thu Jun  7 12:35:06 2001
++++ kwin/plugins.cpp
+@@ -19,10 +19,6 @@
+ 
+ #include "plugins.h"
+ 
+-#if 0
+-#define lt_ptr lt_ptr_t
+-#endif
+-
+ using namespace KWinInternal;
+ 
+ const char* defaultPlugin = "libkwindefault";
+@@ -42,10 +38,10 @@
+ {
+     if(handle) {
+         // Call the plugin's cleanup function
+-	lt_ptr_t deinit_func = lt_dlsym(handle, "deinit");
++	void* deinit_func = handle->symbol(QString("deinit").utf8());
+ 	if (deinit_func)
+ 	    ((void (*)())deinit_func)();
+-        lt_dlclose(handle);
++        loader->unloadLibrary(QFile::encodeName(pluginStr));
+     }
+ }
+ 
+@@ -74,12 +70,13 @@
+ void PluginMgr::loadPlugin(QString nameStr)
+ {
+     static bool dlregistered = false;
+-    lt_dlhandle oldHandle = handle;
++    KLibrary* oldHandle = handle;
++    QString oldPlugin = pluginStr;
+     handle = 0;
+ 
+     if(!dlregistered) {
+        dlregistered = true;
+-       lt_dlinit();
++       loader = KLibLoader::self();
+     }
+ 
+     QString path = KLibLoader::findLibrary(nameStr.latin1());
+@@ -99,14 +96,14 @@
+ 	return;
+ 
+     // Try loading the requested plugin
+-    handle = lt_dlopen(path.latin1());
++    handle = loader->library(path.latin1());
+ 
+     // If that fails, fall back to the default plugin
+     if (!handle) {
+         nameStr = defaultPlugin;
+         path = KLibLoader::findLibrary(nameStr.latin1());
+ 	if (!path.isEmpty())
+-            handle = lt_dlopen(path.latin1());
++            handle = loader->library(path.latin1());
+     }
+ 
+     if (!handle)
+@@ -114,16 +111,16 @@
+                           "and could not be loaded!"));
+ 
+     // Call the plugin's initialisation function
+-    lt_ptr_t init_func = lt_dlsym(handle, "init");
++    void* init_func = handle->symbol(QString("init").utf8());
+     if (init_func)
+         ((void (*)())init_func)();
+ 
+-    lt_ptr_t alloc_func = lt_dlsym(handle, "allocate");
++    void* alloc_func = handle->symbol(QString("allocate").utf8());
+     if(alloc_func) {
+         alloc_ptr = (Client* (*)(Workspace *ws, WId w, int tool))alloc_func;
+     } else {
+         qWarning("KWin: The library %s is not a KWin plugin.", path.latin1());
+-        lt_dlclose(handle);
++        loader->unloadLibrary(QFile::encodeName(pluginStr));
+         exit(1);
+     }
+ 
+@@ -132,16 +129,16 @@
+ 
+     // Call the old plugin's cleanup function
+     if(oldHandle) {
+-	lt_ptr_t deinit_func = lt_dlsym(oldHandle, "deinit");
++	void* deinit_func = oldHandle->symbol(QString("deinit").utf8());
+ 	if (deinit_func)
+ 	    ((void (*)())deinit_func)();
+-        lt_dlclose(oldHandle);
++        loader->unloadLibrary(QFile::encodeName(oldPlugin));
+     }
+ }
+ 
+ void PluginMgr::resetPlugin()
+ {
+-    lt_ptr_t reset_func = lt_dlsym(handle, "reset");
++    void* reset_func = handle->symbol(QString("reset").utf8());
+     if (reset_func)
+        ((void (*)())reset_func)();
+ }
diff --git a/x11/kdebase2/patches/patch-em b/x11/kdebase2/patches/patch-em
new file mode 100644
index 00000000000..9c3c0755ed5
--- /dev/null
+++ b/x11/kdebase2/patches/patch-em
@@ -0,0 +1,25 @@
+$NetBSD: patch-em,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- kwin/plugins.h.orig	Wed Sep  5 00:17:21 2001
++++ kwin/plugins.h
+@@ -8,8 +8,8 @@
+ 
+ #include <qpopupmenu.h>
+ #include <qstringlist.h>
+-#define LT_NON_POSIX_NAMESPACE
+-#include <ltdl.h>
++
++#include <klibloader.h>
+ 
+ class QFileInfo;
+ 
+@@ -35,7 +35,8 @@
+ protected:
+     void shutdownKWin(const QString& error_msg);
+     Client* (*alloc_ptr)(Workspace *ws, WId w, int tool);
+-    lt_dlhandle handle;
++    KLibLoader* loader;
++    KLibrary* handle;
+     QString pluginStr;
+ };
+ 
diff --git a/x11/kdebase2/patches/patch-en b/x11/kdebase2/patches/patch-en
new file mode 100644
index 00000000000..9c264b4f9e8
--- /dev/null
+++ b/x11/kdebase2/patches/patch-en
@@ -0,0 +1,41 @@
+$NetBSD: patch-en,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- kxkb/Makefile.am.orig	Tue May 15 22:36:28 2001
++++ kxkb/Makefile.am
+@@ -3,20 +3,24 @@
+ 
+ bin_PROGRAMS = kxkb
+ 
+-kxkb_SOURCES = dummy.cpp
++kxkb_SOURCES = kxkb_main.cpp
+ kxkb_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+-kxkb_LDADD = kxkb.la
++kxkb_LDADD = libkxkb_main.la
+ 
+-lib_LTLIBRARIES = libkcm_keyboard.la kxkb.la
++lib_LTLIBRARIES = libkcm_keyboard.la libkxkb_main.la kxkb.la
+  
+ libkcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp
+  
+ libkcm_keyboard_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
+ libkcm_keyboard_la_LIBADD = @XTESTLIB@ $(LIB_KFILE)
+ 
+-kxkb_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp
++libkxkb_main_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp
++libkxkb_main_la_LDFLAGS = $(all_libraries)
++libkxkb_main_la_LIBADD = -lX11 -lXext $(LIB_KDEUI)
++ 
++kxkb_la_SOURCES = kxkb_main.cpp
+ kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI)
++kxkb_la_LIBADD = libkxkb_main.la
+  
+ data_DATA = keyboard.desktop
+ datadir = $(kde_appsdir)/Settings/Peripherals
+@@ -31,6 +35,3 @@
+ messages: 
+ 	$(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot
+ 	$(XGETTEXT) $(libkcm_keyboard_la_SOURCES) kxkbbindings.cpp -o $(podir)/kcmlayout.pot 
+-
+-dummy.cpp:
+-	echo > dummy.cpp
diff --git a/x11/kdebase2/patches/patch-eo b/x11/kdebase2/patches/patch-eo
new file mode 100644
index 00000000000..8556e8d3ed1
--- /dev/null
+++ b/x11/kdebase2/patches/patch-eo
@@ -0,0 +1,132 @@
+$NetBSD: patch-eo,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- kxkb/Makefile.in.orig	Sat Sep  8 01:36:51 2001
++++ kxkb/Makefile.in
+@@ -278 +278 @@
+-kxkb_SOURCES = dummy.cpp
++kxkb_SOURCES = kxkb_main.cpp
+@@ -280 +280 @@
+-kxkb_LDADD = kxkb.la
++kxkb_LDADD = libkxkb_main.la
+@@ -282 +282 @@
+-lib_LTLIBRARIES = libkcm_keyboard.la kxkb.la
++lib_LTLIBRARIES = libkcm_keyboard.la libkxkb_main.la kxkb.la
+@@ -289 +289,5 @@
+-kxkb_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp
++libkxkb_main_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp
++libkxkb_main_la_LDFLAGS = $(all_libraries)
++libkxkb_main_la_LIBADD = -lX11 -lXext $(LIB_KDEUI)
++
++kxkb_la_SOURCES = kxkb_main.cpp
+@@ -291 +295 @@
+-kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI)
++kxkb_la_LIBADD = libkxkb_main.la
+@@ -318,2 +322,2 @@
+-kxkb_la_DEPENDENCIES = 
+-#>- kxkb_la_OBJECTS =  rules.lo kxkb.lo extension.lo pixmap.lo
++libkxkb_main_la_DEPENDENCIES = 
++#>- libkxkb_main_la_OBJECTS =  rules.lo kxkb.lo extension.lo pixmap.lo
+@@ -321,5 +325,9 @@
+-kxkb_la_final_OBJECTS = kxkb_la.all_cpp.lo 
+-kxkb_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo \
+-kxkb_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kxkb_la_OBJECTS = $(kxkb_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kxkb_la_OBJECTS = $(kxkb_la_final_OBJECTS)
++libkxkb_main_la_final_OBJECTS = libkxkb_main_la.all_cpp.lo 
++libkxkb_main_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo \
++libkxkb_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkxkb_main_la_OBJECTS = $(libkxkb_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkxkb_main_la_OBJECTS = $(libkxkb_main_la_final_OBJECTS)
++kxkb_la_DEPENDENCIES =  libkxkb_main.la
++#>- kxkb_la_OBJECTS =  kxkb_main.lo
++#>+ 1
++kxkb_la_OBJECTS = kxkb_main.lo
+@@ -329 +337 @@
+-#>- kxkb_OBJECTS =  dummy.$(OBJEXT)
++#>- kxkb_OBJECTS =  kxkb_main.$(OBJEXT)
+@@ -331,2 +339,2 @@
+-kxkb_OBJECTS = dummy.$(OBJEXT)
+-kxkb_DEPENDENCIES =  kxkb.la
++kxkb_OBJECTS = kxkb_main.$(OBJEXT)
++kxkb_DEPENDENCIES =  libkxkb_main.la
+@@ -351 +359 @@
+-KDE_DIST=test.cpp kcmmisc.h configure.in.in kxkbbindings.cpp pixmap.h keyboard.desktop LICENSE kcmlayout.h extension.h uninstall.desktop kxkb.h kxkb.desktop rules.h 
++KDE_DIST=pixmap.h kxkb.h test.cpp kcmmisc.h configure.in.in kcmlayout.h kxkbbindings.cpp extension.h kxkb.desktop LICENSE keyboard.desktop uninstall.desktop rules.h 
+@@ -358,2 +366,2 @@
+-SOURCES = $(libkcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) $(kxkb_SOURCES)
+-OBJECTS = $(libkcm_keyboard_la_OBJECTS) $(kxkb_la_OBJECTS) $(kxkb_OBJECTS)
++SOURCES = $(libkcm_keyboard_la_SOURCES) $(libkxkb_main_la_SOURCES) $(kxkb_la_SOURCES) $(kxkb_SOURCES)
++OBJECTS = $(libkcm_keyboard_la_OBJECTS) $(libkxkb_main_la_OBJECTS) $(kxkb_la_OBJECTS) $(kxkb_OBJECTS)
+@@ -451,0 +460,3 @@
++libkxkb_main.la: $(libkxkb_main_la_OBJECTS) $(libkxkb_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkxkb_main_la_LDFLAGS) $(libkxkb_main_la_OBJECTS) $(libkxkb_main_la_LIBADD) $(LIBS)
++
+@@ -562,11 +572,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -685,3 +684,0 @@
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+@@ -742,8 +739,8 @@
+-kxkb_la_meta_unload.cpp:  kxkb.moc
+-	@echo 'creating kxkb_la_meta_unload.cpp'
+-	@-rm -f kxkb_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_kxkb_la[] = {' > kxkb_la_meta_unload.cpp
+-	@cat  kxkb.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kxkb_la_meta_unload.cpp
+-	@echo '0};' >> kxkb_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> kxkb_la_meta_unload.cpp
+-	@echo '_UNLOAD(kxkb_la)' >> kxkb_la_meta_unload.cpp
++libkxkb_main_la_meta_unload.cpp:  kxkb.moc
++	@echo 'creating libkxkb_main_la_meta_unload.cpp'
++	@-rm -f libkxkb_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkxkb_main_la[] = {' > libkxkb_main_la_meta_unload.cpp
++	@cat  kxkb.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkxkb_main_la_meta_unload.cpp
++	@echo '0};' >> libkxkb_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkxkb_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libkxkb_main_la)' >> libkxkb_main_la_meta_unload.cpp
+@@ -754 +751 @@
+-	-rm -f  libkcm_keyboard_la_meta_unload.cpp kxkb_la_meta_unload.cpp
++	-rm -f  libkcm_keyboard_la_meta_unload.cpp libkxkb_main_la_meta_unload.cpp
+@@ -769 +766,13 @@
+-kxkb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp kxkb_la_meta_unload.cpp  
++libkxkb_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp libkxkb_main_la_meta_unload.cpp  
++	@echo 'creating libkxkb_main_la.all_cpp.cpp ...'; \
++	rm -f libkxkb_main_la.all_cpp.files libkxkb_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkxkb_main_la.all_cpp.final; \
++	for file in rules.cpp kxkb.cpp extension.cpp pixmap.cpp libkxkb_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkxkb_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkxkb_main_la.all_cpp.final; \
++	done; \
++	cat libkxkb_main_la.all_cpp.final libkxkb_main_la.all_cpp.files  > libkxkb_main_la.all_cpp.cpp; \
++	rm -f libkxkb_main_la.all_cpp.final libkxkb_main_la.all_cpp.files
++
++#>+ 11
++kxkb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxkb_main.cpp  
+@@ -773 +782 @@
+-	for file in rules.cpp kxkb.cpp extension.cpp pixmap.cpp kxkb_la_meta_unload.cpp ; do \
++	for file in kxkb_main.cpp ; do \
+@@ -781 +790 @@
+-kxkb.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kxkb.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxkb_main.cpp  
+@@ -785 +794 @@
+-	for file in dummy.cpp ; do \
++	for file in kxkb_main.cpp ; do \
+@@ -794 +803 @@
+-	-rm -f libkcm_keyboard_la.all_cpp.cpp kxkb_la.all_cpp.cpp kxkb.all_cpp.cpp
++	-rm -f libkcm_keyboard_la.all_cpp.cpp libkxkb_main_la.all_cpp.cpp kxkb_la.all_cpp.cpp kxkb.all_cpp.cpp
+@@ -798 +807 @@
+-	$(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_final_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_final_OBJECTS)" all-am
++	$(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_final_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_final_OBJECTS)" all-am
+@@ -801 +810 @@
+-	$(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_nofinal_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_nofinal_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-ep b/x11/kdebase2/patches/patch-ep
new file mode 100644
index 00000000000..9b89a0da06b
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ep
@@ -0,0 +1,13 @@
+$NetBSD: patch-ep,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- kxkb/kxkb.cpp.orig	Fri Jun  1 05:04:36 2001
++++ kxkb/kxkb.cpp
+@@ -216,7 +216,7 @@
+   I18N_NOOP("A utility to switch keyboard maps.");
+ 
+ 
+-int main(int argc, char *argv[])
++int kxkb_main(int argc, char *argv[])
+ {
+   KAboutData about("kxkb", I18N_NOOP("KDE Keyboard Tool"), "0.1",
+                    DESCRIPTION, KAboutData::License_QPL,
diff --git a/x11/kdebase2/patches/patch-eq b/x11/kdebase2/patches/patch-eq
new file mode 100644
index 00000000000..4b82f331b7f
--- /dev/null
+++ b/x11/kdebase2/patches/patch-eq
@@ -0,0 +1,33 @@
+$NetBSD: patch-eq,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- kxkb/kxkb_main.cpp.orig	Tue Oct  2 17:50:38 2001
++++ kxkb/kxkb_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int kxkb_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kxkb_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-er b/x11/kdebase2/patches/patch-er
new file mode 100644
index 00000000000..cdbc758527b
--- /dev/null
+++ b/x11/kdebase2/patches/patch-er
@@ -0,0 +1,37 @@
+$NetBSD: patch-er,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- kxmlrpc/Makefile.am.orig	Thu Sep  7 22:14:17 2000
++++ kxmlrpc/Makefile.am
+@@ -4,15 +4,19 @@
+ INCLUDES         = $(all_includes)
+ 
+ bin_PROGRAMS     = kxmlrpcd
+-kxmlrpcd_LDADD   = kxmlrpcd.la
++kxmlrpcd_LDADD   = libkxmlrpcd_main.la
+ kxmlrpcd_LDFLAGS = $(KDE_RPATH)
+-kxmlrpcd_SOURCES = dummy.cpp
++kxmlrpcd_SOURCES = kxmlrpcd_main.cpp
+ 
+-lib_LTLIBRARIES        = kxmlrpcd.la libkcm_xmlrpcd.la
+-kxmlrpcd_la_LIBADD  = $(LIB_KSYCOCA)
+-kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version 
+-kxmlrpcd_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \
++lib_LTLIBRARIES        = libkxmlrpcd_main.la kxmlrpcd.la libkcm_xmlrpcd.la
++libkxmlrpcd_main_la_LIBADD  = $(LIB_KSYCOCA)
++libkxmlrpcd_main_la_LDFLAGS = $(all_libraries)
++libkxmlrpcd_main_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \
+                          kxmlrpcdaemon.cpp kxmlrpcutil.cpp
++
++kxmlrpcd_la_LIBADD  = libkxmlrpcd_main.la
++kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version 
++kxmlrpcd_la_SOURCES = kxmlrpcd_main.cpp
+ kxmlrpcd_la_METASOURCES = AUTO
+ 
+ libkcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE)
+@@ -26,6 +30,3 @@
+ 
+ messages: rc.cpp
+ 	$(XGETTEXT) *.cpp -o $(podir)/kxmlrpcd.pot
+-
+-dummy.cpp:
+-	echo > dummy.cpp
diff --git a/x11/kdebase2/patches/patch-es b/x11/kdebase2/patches/patch-es
new file mode 100644
index 00000000000..ff3b46982d4
--- /dev/null
+++ b/x11/kdebase2/patches/patch-es
@@ -0,0 +1,134 @@
+$NetBSD: patch-es,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- kxmlrpc/Makefile.in.orig	Sat Sep  8 01:36:51 2001
++++ kxmlrpc/Makefile.in
+@@ -280 +280 @@
+-kxmlrpcd_LDADD = kxmlrpcd.la
++kxmlrpcd_LDADD = libkxmlrpcd_main.la
+@@ -282 +282,6 @@
+-kxmlrpcd_SOURCES = dummy.cpp
++kxmlrpcd_SOURCES = kxmlrpcd_main.cpp
++
++lib_LTLIBRARIES = libkxmlrpcd_main.la kxmlrpcd.la libkcm_xmlrpcd.la
++libkxmlrpcd_main_la_LIBADD = $(LIB_KSYCOCA)
++libkxmlrpcd_main_la_LDFLAGS = $(all_libraries)
++libkxmlrpcd_main_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp                          kxmlrpcdaemon.cpp kxmlrpcutil.cpp
+@@ -284,4 +288,0 @@
+-lib_LTLIBRARIES = kxmlrpcd.la libkcm_xmlrpcd.la
+-kxmlrpcd_la_LIBADD = $(LIB_KSYCOCA)
+-kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version 
+-kxmlrpcd_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp                          kxmlrpcdaemon.cpp kxmlrpcutil.cpp
+@@ -288,0 +290,3 @@
++kxmlrpcd_la_LIBADD = libkxmlrpcd_main.la
++kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version 
++kxmlrpcd_la_SOURCES = kxmlrpcd_main.cpp
+@@ -311,2 +315,2 @@
+-kxmlrpcd_la_DEPENDENCIES = 
+-#>- kxmlrpcd_la_OBJECTS =  kxmlrpcserver.lo kxmlrpcparser.lo \
++libkxmlrpcd_main_la_DEPENDENCIES = 
++#>- libkxmlrpcd_main_la_OBJECTS =  kxmlrpcserver.lo kxmlrpcparser.lo \
+@@ -315,2 +319,2 @@
+-kxmlrpcd_la_final_OBJECTS = kxmlrpcd_la.all_cpp.lo 
+-kxmlrpcd_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \
++libkxmlrpcd_main_la_final_OBJECTS = libkxmlrpcd_main_la.all_cpp.lo 
++libkxmlrpcd_main_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \
+@@ -318,3 +322,7 @@
+-kxmlrpcd_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_final_OBJECTS)
++libkxmlrpcd_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libkxmlrpcd_main_la_OBJECTS = $(libkxmlrpcd_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libkxmlrpcd_main_la_OBJECTS = $(libkxmlrpcd_main_la_final_OBJECTS)
++kxmlrpcd_la_DEPENDENCIES =  libkxmlrpcd_main.la
++#>- kxmlrpcd_la_OBJECTS =  kxmlrpcd_main.lo
++#>+ 1
++kxmlrpcd_la_OBJECTS = kxmlrpcd_main.lo
+@@ -328 +336 @@
+-#>- kxmlrpcd_OBJECTS =  dummy.$(OBJEXT)
++#>- kxmlrpcd_OBJECTS =  kxmlrpcd_main.$(OBJEXT)
+@@ -330,2 +338,2 @@
+-kxmlrpcd_OBJECTS = dummy.$(OBJEXT)
+-kxmlrpcd_DEPENDENCIES =  kxmlrpcd.la
++kxmlrpcd_OBJECTS = kxmlrpcd_main.$(OBJEXT)
++kxmlrpcd_DEPENDENCIES =  libkxmlrpcd_main.la
+@@ -352 +360 @@
+-KDE_DIST=kxmlrpcd.desktop LICENSE 
++KDE_DIST=LICENSE kxmlrpcd.desktop 
+@@ -359,2 +367,2 @@
+-SOURCES = $(kxmlrpcd_la_SOURCES) $(libkcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_SOURCES)
+-OBJECTS = $(kxmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_OBJECTS) $(kxmlrpcd_OBJECTS)
++SOURCES = $(libkxmlrpcd_main_la_SOURCES) $(kxmlrpcd_la_SOURCES) $(libkcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_SOURCES)
++OBJECTS = $(libkxmlrpcd_main_la_OBJECTS) $(kxmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_OBJECTS) $(kxmlrpcd_OBJECTS)
+@@ -446,0 +455,3 @@
++libkxmlrpcd_main.la: $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libkxmlrpcd_main_la_LDFLAGS) $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_LIBADD) $(LIBS)
++
+@@ -544,11 +554,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -656,3 +655,0 @@
+-dummy.cpp:
+-	echo > dummy.cpp
+-
+@@ -694,8 +691,8 @@
+-kxmlrpcd_la_meta_unload.cpp:  kxmlrpcserver.moc
+-	@echo 'creating kxmlrpcd_la_meta_unload.cpp'
+-	@-rm -f kxmlrpcd_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_kxmlrpcd_la[] = {' > kxmlrpcd_la_meta_unload.cpp
+-	@cat  kxmlrpcserver.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kxmlrpcd_la_meta_unload.cpp
+-	@echo '0};' >> kxmlrpcd_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> kxmlrpcd_la_meta_unload.cpp
+-	@echo '_UNLOAD(kxmlrpcd_la)' >> kxmlrpcd_la_meta_unload.cpp
++libkxmlrpcd_main_la_meta_unload.cpp:  kxmlrpcserver.moc
++	@echo 'creating libkxmlrpcd_main_la_meta_unload.cpp'
++	@-rm -f libkxmlrpcd_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libkxmlrpcd_main_la[] = {' > libkxmlrpcd_main_la_meta_unload.cpp
++	@cat  kxmlrpcserver.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkxmlrpcd_main_la_meta_unload.cpp
++	@echo '0};' >> libkxmlrpcd_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libkxmlrpcd_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libkxmlrpcd_main_la)' >> libkxmlrpcd_main_la_meta_unload.cpp
+@@ -706 +703,13 @@
+-	-rm -f  kxmlrpcd_la_meta_unload.cpp
++	-rm -f  libkxmlrpcd_main_la_meta_unload.cpp
++
++#>+ 11
++libkxmlrpcd_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcserver.cpp $(srcdir)/kxmlrpcparser.cpp $(srcdir)/kxmlrpcdaemon.cpp $(srcdir)/kxmlrpcutil.cpp libkxmlrpcd_main_la_meta_unload.cpp  
++	@echo 'creating libkxmlrpcd_main_la.all_cpp.cpp ...'; \
++	rm -f libkxmlrpcd_main_la.all_cpp.files libkxmlrpcd_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libkxmlrpcd_main_la.all_cpp.final; \
++	for file in kxmlrpcserver.cpp kxmlrpcparser.cpp kxmlrpcdaemon.cpp kxmlrpcutil.cpp libkxmlrpcd_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libkxmlrpcd_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkxmlrpcd_main_la.all_cpp.final; \
++	done; \
++	cat libkxmlrpcd_main_la.all_cpp.final libkxmlrpcd_main_la.all_cpp.files  > libkxmlrpcd_main_la.all_cpp.cpp; \
++	rm -f libkxmlrpcd_main_la.all_cpp.final libkxmlrpcd_main_la.all_cpp.files
+@@ -709 +718 @@
+-kxmlrpcd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcserver.cpp $(srcdir)/kxmlrpcparser.cpp $(srcdir)/kxmlrpcdaemon.cpp $(srcdir)/kxmlrpcutil.cpp kxmlrpcd_la_meta_unload.cpp   kxmlrpcserver.moc 
++kxmlrpcd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcd_main.cpp   kxmlrpcserver.moc 
+@@ -713 +722 @@
+-	for file in kxmlrpcserver.cpp kxmlrpcparser.cpp kxmlrpcdaemon.cpp kxmlrpcutil.cpp kxmlrpcd_la_meta_unload.cpp ; do \
++	for file in kxmlrpcd_main.cpp ; do \
+@@ -733 +742 @@
+-kxmlrpcd.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
++kxmlrpcd.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcd_main.cpp  
+@@ -737 +746 @@
+-	for file in dummy.cpp ; do \
++	for file in kxmlrpcd_main.cpp ; do \
+@@ -746 +755 @@
+-	-rm -f kxmlrpcd_la.all_cpp.cpp libkcm_xmlrpcd_la.all_cpp.cpp kxmlrpcd.all_cpp.cpp
++	-rm -f libkxmlrpcd_main_la.all_cpp.cpp kxmlrpcd_la.all_cpp.cpp libkcm_xmlrpcd_la.all_cpp.cpp kxmlrpcd.all_cpp.cpp
+@@ -750 +759 @@
+-	$(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_final_OBJECTS)" all-am
++	$(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_final_OBJECTS)" all-am
+@@ -753 +762 @@
+-	$(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-et b/x11/kdebase2/patches/patch-et
new file mode 100644
index 00000000000..fbe40fbdd17
--- /dev/null
+++ b/x11/kdebase2/patches/patch-et
@@ -0,0 +1,33 @@
+$NetBSD: patch-et,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- kxmlrpc/kxmlrpcd_main.cpp.orig	Tue Oct  2 17:50:38 2001
++++ kxmlrpc/kxmlrpcd_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int kxmlrpcd_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kxmlrpcd_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-eu b/x11/kdebase2/patches/patch-eu
new file mode 100644
index 00000000000..210abaff457
--- /dev/null
+++ b/x11/kdebase2/patches/patch-eu
@@ -0,0 +1,13 @@
+$NetBSD: patch-eu,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- kxmlrpc/kxmlrpcdaemon.cpp.orig	Tue Apr  3 22:20:01 2001
++++ kxmlrpc/kxmlrpcdaemon.cpp
+@@ -356,7 +356,7 @@
+    { 0, 0, 0 }
+ };
+ 
+-int main(int argc, char **argv)
++int kxmlrpcd_main(int argc, char **argv)
+ {
+     KAboutData about("kxmlrpcd", I18N_NOOP("KXmlRpc Daemon"),
+                      version, description, KAboutData::License_BSD);
diff --git a/x11/kdebase2/patches/patch-ev b/x11/kdebase2/patches/patch-ev
new file mode 100644
index 00000000000..4087bd12c1c
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ev
@@ -0,0 +1,28 @@
+$NetBSD: patch-ev,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- legacyimport/Makefile.am.orig	Wed May 16 02:41:36 2001
++++ legacyimport/Makefile.am
+@@ -1,14 +1,18 @@
+ INCLUDES = $(all_includes)
+ 
+ bin_PROGRAMS = klegacyimport
+-lib_LTLIBRARIES = klegacyimport.la
++lib_LTLIBRARIES = libklegacyimport_main.la klegacyimport.la
+ 
+-klegacyimport_la_SOURCES = legacyimport.cpp
+-klegacyimport_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
++libklegacyimport_main_la_SOURCES = legacyimport.cpp
++libklegacyimport_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
++libklegacyimport_main_la_LDFLAGS = $(all_libraries)
++
++klegacyimport_la_SOURCES = klegacyimport_main.cpp
++klegacyimport_la_LIBADD = libklegacyimport_main.la
+ klegacyimport_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
+-klegacyimport_SOURCES = dummy.cpp
+-klegacyimport_LDADD   = klegacyimport.la
++klegacyimport_SOURCES = klegacyimport_main.cpp
++klegacyimport_LDADD   = libklegacyimport_main.la
+ klegacyimport_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ noinst_HEADERS = legacyimport.h
diff --git a/x11/kdebase2/patches/patch-ew b/x11/kdebase2/patches/patch-ew
new file mode 100644
index 00000000000..82e2ea7ded1
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ew
@@ -0,0 +1,126 @@
+$NetBSD: patch-ew,v 1.1 2001/10/15 22:46:11 skrll Exp $
+
+--- legacyimport/Makefile.in.orig	Sat Sep  8 01:36:51 2001
++++ legacyimport/Makefile.in
+@@ -277 +277 @@
+-lib_LTLIBRARIES = klegacyimport.la
++lib_LTLIBRARIES = libklegacyimport_main.la klegacyimport.la
+@@ -279,2 +279,6 @@
+-klegacyimport_la_SOURCES = legacyimport.cpp
+-klegacyimport_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
++libklegacyimport_main_la_SOURCES = legacyimport.cpp
++libklegacyimport_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
++libklegacyimport_main_la_LDFLAGS = $(all_libraries)
++
++klegacyimport_la_SOURCES = klegacyimport_main.cpp
++klegacyimport_la_LIBADD = libklegacyimport_main.la
+@@ -283,2 +287,2 @@
+-klegacyimport_SOURCES = dummy.cpp
+-klegacyimport_LDADD = klegacyimport.la
++klegacyimport_SOURCES = klegacyimport_main.cpp
++klegacyimport_LDADD = libklegacyimport_main.la
+@@ -306,2 +310,2 @@
+-klegacyimport_la_DEPENDENCIES = 
+-#>- klegacyimport_la_OBJECTS =  legacyimport.lo
++libklegacyimport_main_la_DEPENDENCIES = 
++#>- libklegacyimport_main_la_OBJECTS =  legacyimport.lo
+@@ -309,5 +313,9 @@
+-klegacyimport_la_final_OBJECTS = klegacyimport_la.all_cpp.lo 
+-klegacyimport_la_nofinal_OBJECTS = legacyimport.lo \
+-klegacyimport_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@klegacyimport_la_OBJECTS = $(klegacyimport_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@klegacyimport_la_OBJECTS = $(klegacyimport_la_final_OBJECTS)
++libklegacyimport_main_la_final_OBJECTS = libklegacyimport_main_la.all_cpp.lo 
++libklegacyimport_main_la_nofinal_OBJECTS = legacyimport.lo \
++libklegacyimport_main_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libklegacyimport_main_la_OBJECTS = $(libklegacyimport_main_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libklegacyimport_main_la_OBJECTS = $(libklegacyimport_main_la_final_OBJECTS)
++klegacyimport_la_DEPENDENCIES =  libklegacyimport_main.la
++#>- klegacyimport_la_OBJECTS =  klegacyimport_main.lo
++#>+ 1
++klegacyimport_la_OBJECTS = klegacyimport_main.lo
+@@ -317 +325 @@
+-#>- klegacyimport_OBJECTS =  dummy.$(OBJEXT)
++#>- klegacyimport_OBJECTS =  klegacyimport_main.$(OBJEXT)
+@@ -319,2 +327,2 @@
+-klegacyimport_OBJECTS = dummy.$(OBJEXT)
+-klegacyimport_DEPENDENCIES =  klegacyimport.la
++klegacyimport_OBJECTS = klegacyimport_main.$(OBJEXT)
++klegacyimport_DEPENDENCIES =  libklegacyimport_main.la
+@@ -341 +349 @@
+-KDE_DIST=klegacyimport.desktop 
++KDE_DIST=klegacyimport.desktop dummy.cpp 
+@@ -348,2 +356,2 @@
+-SOURCES = $(klegacyimport_la_SOURCES) $(klegacyimport_SOURCES)
+-OBJECTS = $(klegacyimport_la_OBJECTS) $(klegacyimport_OBJECTS)
++SOURCES = $(libklegacyimport_main_la_SOURCES) $(klegacyimport_la_SOURCES) $(klegacyimport_SOURCES)
++OBJECTS = $(libklegacyimport_main_la_OBJECTS) $(klegacyimport_la_OBJECTS) $(klegacyimport_OBJECTS)
+@@ -435,0 +444,3 @@
++libklegacyimport_main.la: $(libklegacyimport_main_la_OBJECTS) $(libklegacyimport_main_la_DEPENDENCIES)
++	$(CXXLINK) -rpath $(libdir) $(libklegacyimport_main_la_LDFLAGS) $(libklegacyimport_main_la_OBJECTS) $(libklegacyimport_main_la_LIBADD) $(LIBS)
++
+@@ -527,11 +537,0 @@
+-#>- 	@for file in $(DISTFILES); do \
+-#>- 	  d=$(srcdir); \
+-#>- 	  if test -d $$d/$$file; then \
+-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
+-#>- 	  else \
+-#>- 	    test -f $(distdir)/$$file \
+-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-#>- 	  fi; \
+-#>- 	done
+-#>+ 10
+@@ -661,8 +661,8 @@
+-klegacyimport_la_meta_unload.cpp:  legacyimport.moc
+-	@echo 'creating klegacyimport_la_meta_unload.cpp'
+-	@-rm -f klegacyimport_la_meta_unload.cpp
+-	@echo 'static const char * _metalist_klegacyimport_la[] = {' > klegacyimport_la_meta_unload.cpp
+-	@cat  legacyimport.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klegacyimport_la_meta_unload.cpp
+-	@echo '0};' >> klegacyimport_la_meta_unload.cpp
+-	@echo '#include <kunload.h>' >> klegacyimport_la_meta_unload.cpp
+-	@echo '_UNLOAD(klegacyimport_la)' >> klegacyimport_la_meta_unload.cpp
++libklegacyimport_main_la_meta_unload.cpp:  legacyimport.moc
++	@echo 'creating libklegacyimport_main_la_meta_unload.cpp'
++	@-rm -f libklegacyimport_main_la_meta_unload.cpp
++	@echo 'static const char * _metalist_libklegacyimport_main_la[] = {' > libklegacyimport_main_la_meta_unload.cpp
++	@cat  legacyimport.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklegacyimport_main_la_meta_unload.cpp
++	@echo '0};' >> libklegacyimport_main_la_meta_unload.cpp
++	@echo '#include <kunload.h>' >> libklegacyimport_main_la_meta_unload.cpp
++	@echo '_UNLOAD(libklegacyimport_main_la)' >> libklegacyimport_main_la_meta_unload.cpp
+@@ -673 +673,13 @@
+-	-rm -f  klegacyimport_la_meta_unload.cpp
++	-rm -f  libklegacyimport_main_la_meta_unload.cpp
++
++#>+ 11
++libklegacyimport_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/legacyimport.cpp libklegacyimport_main_la_meta_unload.cpp   legacyimport.moc 
++	@echo 'creating libklegacyimport_main_la.all_cpp.cpp ...'; \
++	rm -f libklegacyimport_main_la.all_cpp.files libklegacyimport_main_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libklegacyimport_main_la.all_cpp.final; \
++	for file in legacyimport.cpp libklegacyimport_main_la_meta_unload.cpp ; do \
++	  echo "#include \"$$file\"" >> libklegacyimport_main_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklegacyimport_main_la.all_cpp.final; \
++	done; \
++	cat libklegacyimport_main_la.all_cpp.final libklegacyimport_main_la.all_cpp.files  > libklegacyimport_main_la.all_cpp.cpp; \
++	rm -f libklegacyimport_main_la.all_cpp.final libklegacyimport_main_la.all_cpp.files
+@@ -676 +688 @@
+-klegacyimport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/legacyimport.cpp klegacyimport_la_meta_unload.cpp   legacyimport.moc 
++klegacyimport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klegacyimport_main.cpp  
+@@ -680 +692 @@
+-	for file in legacyimport.cpp klegacyimport_la_meta_unload.cpp ; do \
++	for file in klegacyimport_main.cpp ; do \
+@@ -688 +700 @@
+-klegacyimport.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy.cpp  
++klegacyimport.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klegacyimport_main.cpp  
+@@ -692 +704 @@
+-	for file in dummy.cpp ; do \
++	for file in klegacyimport_main.cpp ; do \
+@@ -701 +713 @@
+-	-rm -f klegacyimport_la.all_cpp.cpp klegacyimport.all_cpp.cpp
++	-rm -f libklegacyimport_main_la.all_cpp.cpp klegacyimport_la.all_cpp.cpp klegacyimport.all_cpp.cpp
+@@ -705 +717 @@
+-	$(MAKE) klegacyimport_la_OBJECTS="$(klegacyimport_la_final_OBJECTS)" all-am
++	$(MAKE) libklegacyimport_main_la_OBJECTS="$(libklegacyimport_main_la_final_OBJECTS)" all-am
+@@ -708 +720 @@
+-	$(MAKE) klegacyimport_la_OBJECTS="$(klegacyimport_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libklegacyimport_main_la_OBJECTS="$(libklegacyimport_main_la_nofinal_OBJECTS)" all-am
diff --git a/x11/kdebase2/patches/patch-ex b/x11/kdebase2/patches/patch-ex
new file mode 100644
index 00000000000..5f73a298904
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ex
@@ -0,0 +1,33 @@
+$NetBSD: patch-ex,v 1.1 2001/10/15 22:46:12 skrll Exp $
+
+--- legacyimport/klegacyimport_main.cpp.orig	Tue Oct  2 17:50:38 2001
++++ legacyimport/klegacyimport_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern int klegacyimport_main(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return klegacyimport_main(argc, argv);
++}
diff --git a/x11/kdebase2/patches/patch-ey b/x11/kdebase2/patches/patch-ey
new file mode 100644
index 00000000000..a87b242b4ee
--- /dev/null
+++ b/x11/kdebase2/patches/patch-ey
@@ -0,0 +1,13 @@
+$NetBSD: patch-ey,v 1.1 2001/10/15 22:46:12 skrll Exp $
+
+--- legacyimport/legacyimport.cpp.orig	Sun May 27 01:27:57 2001
++++ legacyimport/legacyimport.cpp
+@@ -161,7 +161,7 @@
+     kapp->quit();
+ }
+ 
+-int main(int argc, char **argv)
++int klegacyimport_main(int argc, char **argv)
+ {
+     KAboutData aboutData("klegacyimport", I18N_NOOP("KLegacyImport"),
+                          "v0.1", I18N_NOOP("Importer for legacy themes"),
diff --git a/x11/kdebase2/pkg/PLIST b/x11/kdebase2/pkg/PLIST
index 48b44b30529..17532b5f7ca 100644
--- a/x11/kdebase2/pkg/PLIST
+++ b/x11/kdebase2/pkg/PLIST
@@ -1,16 +1,19 @@
-@comment $NetBSD: PLIST,v 1.8 2001/09/28 20:18:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/10/15 22:46:12 skrll Exp $
+share/doc/kde/HTML/en/kdm/Daemon.README
+share/kde/icons/Daemon.png
 bin/appletproxy
 bin/chooser
 bin/conttest
 bin/drkonqi
 bin/extensionproxy
 bin/kaccess
+bin/kaddressbook
 bin/kappfinder
+bin/kate
 bin/kbanner.kss
 bin/kblankscrn.kss
 bin/kblob.kss
 bin/kbouboule.kss
-bin/kbsod.kss
 bin/kcheckpass
 bin/kcminit
 bin/kcmshell
@@ -18,20 +21,22 @@ bin/kcontrol
 bin/kdcop
 bin/kdebugdialog
 bin/kdeeject
+bin/kdeprintfax
 bin/kdesktop
 bin/kdesu
 bin/kdesud
 bin/kdm
+bin/kdm_config
+bin/kdm_greet
 bin/kdmdesktop
 bin/keditbookmarks
 bin/keditfiletype
 bin/kfmclient
 bin/kfmexec
 bin/khelpcenter
-bin/khop.kss
 bin/khotkeys
-bin/khtmlindex
 bin/kicker
+bin/kjobviewer
 bin/klegacyimport
 bin/klines.kss
 bin/klipper
@@ -43,8 +48,11 @@ bin/konqueror
 bin/konsole
 bin/konsole_grantpty
 bin/kpager
+bin/kpartsaver.kss
+bin/kpersonalizer
 bin/kpipes.kss
 bin/kpolygon.kss
+bin/kprinter
 bin/kpyro.kss
 bin/krandom.kss
 bin/krdb
@@ -71,17 +79,21 @@ bin/kxkb
 bin/kxmlrpcd
 bin/kxsconfig
 bin/kxsrun
-@comment Only if Motif is installed
-bin/nspluginscan
-@comment Only if Motif is installed
-bin/nspluginviewer
 bin/startkde
+etc/ksysguarddrc
 include/KBackgroundIface.h
 include/KDesktopIface.h
 include/KScreensaverIface.h
 include/KWinInterface.h
 include/KonquerorIface.h
 include/ccont.h
+include/kate/application.h
+include/kate/docmanager.h
+include/kate/document.h
+include/kate/mainwindow.h
+include/kate/plugin.h
+include/kate/view.h
+include/kate/viewmanager.h
 include/kbookmark.h
 include/kbookmarkbar.h
 include/kbookmarkdrag.h
@@ -111,6 +123,7 @@ include/konq_propsview.h
 include/konq_settings.h
 include/konq_undo.h
 include/kwin/client.h
+include/kwin/kwinbutton.h
 include/kwin/options.h
 include/kwin/workspace.h
 include/thumbcreator.h
@@ -120,15 +133,12 @@ lib/appletproxy.so
 lib/extensionproxy.a
 lib/extensionproxy.la
 lib/extensionproxy.so
-lib/kcminit.a
-lib/kcminit.la
-lib/kcminit.so
-lib/kcmshell.a
-lib/kcmshell.la
-lib/kcmshell.so
-lib/kcontrol.a
-lib/kcontrol.la
-lib/kcontrol.so
+lib/kate.a
+lib/kate.la
+lib/kate.so
+lib/kde2/gsthumbnail.a
+lib/kde2/gsthumbnail.la
+lib/kde2/gsthumbnail.so
 lib/kde2/htmlthumbnail.a
 lib/kde2/htmlthumbnail.la
 lib/kde2/htmlthumbnail.so
@@ -138,6 +148,18 @@ lib/kde2/imagethumbnail.so
 lib/kde2/kaccess.a
 lib/kde2/kaccess.la
 lib/kde2/kaccess.so
+lib/kde2/kcminit.a
+lib/kde2/kcminit.la
+lib/kde2/kcminit.so
+lib/kde2/kcmshell.a
+lib/kde2/kcmshell.la
+lib/kde2/kcmshell.so
+lib/kde2/kcontrol.a
+lib/kde2/kcontrol.la
+lib/kde2/kcontrol.so
+lib/kde2/khelpcenter.a
+lib/kde2/khelpcenter.la
+lib/kde2/khelpcenter.so
 lib/kde2/kio_filter.a
 lib/kde2/kio_filter.la
 lib/kde2/kio_filter.so
@@ -150,9 +172,6 @@ lib/kde2/kio_floppy.so
 lib/kde2/kio_gopher.a
 lib/kde2/kio_gopher.la
 lib/kde2/kio_gopher.so
-lib/kde2/kio_help.a
-lib/kde2/kio_help.la
-lib/kde2/kio_help.so
 lib/kde2/kio_imap4.a
 lib/kde2/kio_imap4.la
 lib/kde2/kio_imap4.so
@@ -174,15 +193,17 @@ lib/kde2/kio_pop3.so
 lib/kde2/kio_smb.a
 lib/kde2/kio_smb.la
 lib/kde2/kio_smb.so
-lib/kde2/kio_smtp.a
-lib/kde2/kio_smtp.la
-lib/kde2/kio_smtp.so
 lib/kde2/kio_tar.a
 lib/kde2/kio_tar.la
 lib/kde2/kio_tar.so
 lib/kde2/kio_thumbnail.a
 lib/kde2/kio_thumbnail.la
 lib/kde2/kio_thumbnail.so
+lib/kde2/libkaccess_sl.a
+lib/kde2/libkaccess_sl.la
+lib/kde2/libkaccess_sl.so
+lib/kde2/libkaccess_sl.so.0
+lib/kde2/libkaccess_sl.so.0.0
 lib/kde2/libkcm_access.a
 lib/kde2/libkcm_access.la
 lib/kde2/libkcm_access.so
@@ -204,6 +225,9 @@ lib/kde2/libkcm_colors.so
 lib/kde2/libkcm_crypto.a
 lib/kde2/libkcm_crypto.la
 lib/kde2/libkcm_crypto.so
+lib/kde2/libkcm_css.a
+lib/kde2/libkcm_css.la
+lib/kde2/libkcm_css.so
 lib/kde2/libkcm_email.a
 lib/kde2/libkcm_email.la
 lib/kde2/libkcm_email.so
@@ -224,6 +248,9 @@ lib/kde2/libkcm_info.so
 lib/kde2/libkcm_input.a
 lib/kde2/libkcm_input.la
 lib/kde2/libkcm_input.so
+lib/kde2/libkcm_ioslaveinfo.a
+lib/kde2/libkcm_ioslaveinfo.la
+lib/kde2/libkcm_ioslaveinfo.so
 lib/kde2/libkcm_kdm.a
 lib/kde2/libkcm_kdm.la
 lib/kde2/libkcm_kdm.so
@@ -248,12 +275,23 @@ lib/kde2/libkcm_konq.so
 lib/kde2/libkcm_konqhtml.a
 lib/kde2/libkcm_konqhtml.la
 lib/kde2/libkcm_konqhtml.so
+lib/kde2/libkcm_konsole.a
+lib/kde2/libkcm_konsole.la
+lib/kde2/libkcm_konsole.so
 lib/kde2/libkcm_kurifilt.a
 lib/kde2/libkcm_kurifilt.la
 lib/kde2/libkcm_kurifilt.so
+lib/kde2/libkcm_kwindecoration.a
+lib/kde2/libkcm_kwindecoration.la
+lib/kde2/libkcm_kwindecoration.so
 lib/kde2/libkcm_kwinoptions.a
 lib/kde2/libkcm_kwinoptions.la
 lib/kde2/libkcm_kwinoptions.so
+lib/kde2/libkcm_launch.a
+lib/kde2/libkcm_launch.la
+lib/kde2/libkcm_launch.so
+lib/kde2/libkcm_launch.so.0
+lib/kde2/libkcm_launch.so.0.0
 lib/kde2/libkcm_locale.a
 lib/kde2/libkcm_locale.la
 lib/kde2/libkcm_locale.so
@@ -263,6 +301,9 @@ lib/kde2/libkcm_midi.so
 lib/kde2/libkcm_passwords.a
 lib/kde2/libkcm_passwords.la
 lib/kde2/libkcm_passwords.so
+lib/kde2/libkcm_printmgr.a
+lib/kde2/libkcm_printmgr.la
+lib/kde2/libkcm_printmgr.so
 lib/kde2/libkcm_samba.a
 lib/kde2/libkcm_samba.la
 lib/kde2/libkcm_samba.so
@@ -271,6 +312,12 @@ lib/kde2/libkcm_screensaver.la
 lib/kde2/libkcm_smserver.a
 lib/kde2/libkcm_smserver.la
 lib/kde2/libkcm_smserver.so
+lib/kde2/libkcm_socks.a
+lib/kde2/libkcm_socks.la
+lib/kde2/libkcm_socks.so
+lib/kde2/libkcm_spellchecking.a
+lib/kde2/libkcm_spellchecking.la
+lib/kde2/libkcm_spellchecking.so
 lib/kde2/libkcm_style.a
 lib/kde2/libkcm_style.la
 lib/kde2/libkcm_style.so
@@ -280,15 +327,61 @@ lib/kde2/libkcm_taskbar.so
 lib/kde2/libkcm_themes.a
 lib/kde2/libkcm_themes.la
 lib/kde2/libkcm_themes.so
+lib/kde2/libkcm_usb.a
+lib/kde2/libkcm_usb.la
+lib/kde2/libkcm_usb.so
+lib/kde2/libkcminit_main.a
+lib/kde2/libkcminit_main.la
+lib/kde2/libkcminit_main.so
+lib/kde2/libkcminit_main.so.0
+lib/kde2/libkcminit_main.so.0.0
+lib/kde2/libkcmshell_main.a
+lib/kde2/libkcmshell_main.la
+lib/kde2/libkcmshell_main.so
+lib/kde2/libkcmshell_main.so.0
+lib/kde2/libkcmshell_main.so.0.0
+lib/kde2/libkcontrol_main.a
+lib/kde2/libkcontrol_main.la
+lib/kde2/libkcontrol_main.so
+lib/kde2/libkcontrol_main.so.0
+lib/kde2/libkcontrol_main.so.0.0
+lib/kde2/libkded_favicons.a
+lib/kde2/libkded_favicons.la
+lib/kde2/libkded_favicons.so
 lib/kde2/libkfindpart.a
 lib/kde2/libkfindpart.la
 lib/kde2/libkfindpart.so
+lib/kde2/libkhelpcenterpart.a
+lib/kde2/libkhelpcenterpart.la
+lib/kde2/libkhelpcenterpart.so
 lib/kde2/libkonqiconview.a
 lib/kde2/libkonqiconview.la
 lib/kde2/libkonqiconview.so
 lib/kde2/libkonqlistview.a
 lib/kde2/libkonqlistview.la
 lib/kde2/libkonqlistview.so
+lib/kde2/libkonqsidebar_classic_wrap.a
+lib/kde2/libkonqsidebar_classic_wrap.la
+lib/kde2/libkonqsidebar_classic_wrap.so
+lib/kde2/libkonqsidebar_tree.a
+lib/kde2/libkonqsidebar_tree.la
+lib/kde2/libkonqsidebar_tree.so
+lib/kde2/libkonqsidebartree_bookmarks.a
+lib/kde2/libkonqsidebartree_bookmarks.la
+lib/kde2/libkonqsidebartree_bookmarks.so
+lib/kde2/libkonqsidebartree_bookmarks.so.0
+lib/kde2/libkonqsidebartree_bookmarks.so.0.0
+lib/kde2/libkonqsidebartree_dirtree.a
+lib/kde2/libkonqsidebartree_dirtree.la
+lib/kde2/libkonqsidebartree_dirtree.so
+lib/kde2/libkonqsidebartree_history.a
+lib/kde2/libkonqsidebartree_history.la
+lib/kde2/libkonqsidebartree_history.so
+lib/kde2/libkonqsidebartree_history.so.0
+lib/kde2/libkonqsidebartree_history.so.0.0
+lib/kde2/libkonqsound.a
+lib/kde2/libkonqsound.la
+lib/kde2/libkonqsound.so
 lib/kde2/libkonqtree.a
 lib/kde2/libkonqtree.la
 lib/kde2/libkonqtree.so
@@ -304,12 +397,21 @@ lib/kde2/libkuriikwsfilter.so
 lib/kde2/libkurisearchfilter.a
 lib/kde2/libkurisearchfilter.la
 lib/kde2/libkurisearchfilter.so
-lib/kde2/libkwin2k.a
-lib/kde2/libkwin2k.la
-lib/kde2/libkwin2k.so
 lib/kde2/libkwinb2.a
 lib/kde2/libkwinb2.la
 lib/kde2/libkwinb2.so
+lib/kde2/libkwindefault.a
+lib/kde2/libkwindefault.la
+lib/kde2/libkwindefault.so
+lib/kde2/libkwindefault_config.a
+lib/kde2/libkwindefault_config.la
+lib/kde2/libkwindefault_config.so
+lib/kde2/libkwinicewm.a
+lib/kde2/libkwinicewm.la
+lib/kde2/libkwinicewm.so
+lib/kde2/libkwinicewm_config.a
+lib/kde2/libkwinicewm_config.la
+lib/kde2/libkwinicewm_config.so
 lib/kde2/libkwinkde1.a
 lib/kde2/libkwinkde1.la
 lib/kde2/libkwinkde1.so
@@ -325,12 +427,30 @@ lib/kde2/libkwinlaptop.so
 lib/kde2/libkwinmodernsys.a
 lib/kde2/libkwinmodernsys.la
 lib/kde2/libkwinmodernsys.so
+lib/kde2/libkwinmodernsys_config.a
+lib/kde2/libkwinmodernsys_config.la
+lib/kde2/libkwinmodernsys_config.so
+lib/kde2/libkwinmwm.a
+lib/kde2/libkwinmwm.la
+lib/kde2/libkwinmwm.so
+lib/kde2/libkwinquartz.a
+lib/kde2/libkwinquartz.la
+lib/kde2/libkwinquartz.so
+lib/kde2/libkwinquartz_config.a
+lib/kde2/libkwinquartz_config.la
+lib/kde2/libkwinquartz_config.so
+lib/kde2/libkwinredmond.a
+lib/kde2/libkwinredmond.la
+lib/kde2/libkwinredmond.so
 lib/kde2/libkwinriscos.a
 lib/kde2/libkwinriscos.la
 lib/kde2/libkwinriscos.so
 lib/kde2/libkwinsystem.a
 lib/kde2/libkwinsystem.la
 lib/kde2/libkwinsystem.so
+lib/kde2/libkwinweb.a
+lib/kde2/libkwinweb.la
+lib/kde2/libkwinweb.so
 lib/kde2/textthumbnail.a
 lib/kde2/textthumbnail.la
 lib/kde2/textthumbnail.so
@@ -349,6 +469,9 @@ lib/khotkeys.so
 lib/kicker.a
 lib/kicker.la
 lib/kicker.so
+lib/kjobviewer.a
+lib/kjobviewer.la
+lib/kjobviewer.so
 lib/klegacyimport.a
 lib/klegacyimport.la
 lib/klegacyimport.so
@@ -376,6 +499,11 @@ lib/kxkb.so
 lib/kxmlrpcd.a
 lib/kxmlrpcd.la
 lib/kxmlrpcd.so
+lib/libappletproxy_sl.a
+lib/libappletproxy_sl.la
+lib/libappletproxy_sl.so
+lib/libappletproxy_sl.so.0
+lib/libappletproxy_sl.so.0.0
 lib/libccont.a
 lib/libchildpanelextension.a
 lib/libchildpanelextension.la
@@ -392,37 +520,71 @@ lib/libdockbarextension.la
 lib/libdockbarextension.so
 lib/libdockbarextension.so.1
 lib/libdockbarextension.so.1.0
-lib/libhtmlsearch.a
-lib/libhtmlsearch.la
-lib/libhtmlsearch.so
+lib/libextensionproxy_sl.a
+lib/libextensionproxy_sl.la
+lib/libextensionproxy_sl.so
+lib/libextensionproxy_sl.so.0
+lib/libextensionproxy_sl.so.0.0
 lib/libkasbarextension.a
 lib/libkasbarextension.la
 lib/libkasbarextension.so
 lib/libkasbarextension.so.1
 lib/libkasbarextension.so.1.0
-lib/libkcm_htmlsearch.a
-lib/libkcm_htmlsearch.la
-lib/libkcm_htmlsearch.so
-lib/libkcm_ioslaveinfo.a
-lib/libkcm_ioslaveinfo.la
-lib/libkcm_ioslaveinfo.so
-lib/libkcm_layout.a
-lib/libkcm_layout.la
-lib/libkcm_layout.so
-@comment Only if Motif is installed
-lib/libkcm_nsplugin.a
-@comment Only if Motif is installed
-lib/libkcm_nsplugin.la
-@comment Only if Motif is installed
-lib/libkcm_nsplugin.so
+lib/libkate_main.a
+lib/libkate_main.la
+lib/libkate_main.so
+lib/libkate_main.so.0
+lib/libkate_main.so.0.0
+lib/libkatecore.a
+lib/libkatecore.la
+lib/libkatecore.so
+lib/libkateinterfaces.a
+lib/libkateinterfaces.la
+lib/libkateinterfaces.so
+lib/libkcm_keyboard.a
+lib/libkcm_keyboard.la
+lib/libkcm_keyboard.so
 lib/libkcm_xmlrpcd.a
 lib/libkcm_xmlrpcd.la
 lib/libkcm_xmlrpcd.so
-lib/libkhelpcenter.a
-lib/libkhelpcenter.la
-lib/libkhelpcenter.so
-lib/libkhelpcenter.so.1
-lib/libkhelpcenter.so.1.0
+lib/libkdesktop_main.a
+lib/libkdesktop_main.la
+lib/libkdesktop_main.so
+lib/libkdesktop_main.so.0
+lib/libkdesktop_main.so.0.0
+lib/libkeditbookmarks_main.a
+lib/libkeditbookmarks_main.la
+lib/libkeditbookmarks_main.so
+lib/libkeditbookmarks_main.so.0
+lib/libkeditbookmarks_main.so.0.0
+lib/libkfmclient_main.a
+lib/libkfmclient_main.la
+lib/libkfmclient_main.so
+lib/libkfmclient_main.so.0
+lib/libkfmclient_main.so.0.0
+lib/libkhotkeys_main.a
+lib/libkhotkeys_main.la
+lib/libkhotkeys_main.so
+lib/libkhotkeys_main.so.0
+lib/libkhotkeys_main.so.0.0
+lib/libkicker.a
+lib/libkicker.la
+lib/libkicker.so
+lib/libkjobviewer_main.a
+lib/libkjobviewer_main.la
+lib/libkjobviewer_main.so
+lib/libkjobviewer_main.so.0
+lib/libkjobviewer_main.so.0.0
+lib/libklegacyimport_main.a
+lib/libklegacyimport_main.la
+lib/libklegacyimport_main.so
+lib/libklegacyimport_main.so.0
+lib/libklegacyimport_main.so.0.0
+lib/libkmenuedit_main.a
+lib/libkmenuedit_main.la
+lib/libkmenuedit_main.so
+lib/libkmenuedit_main.so.0
+lib/libkmenuedit_main.so.0.0
 lib/libkminipagerapplet.a
 lib/libkminipagerapplet.la
 lib/libkminipagerapplet.so
@@ -436,6 +598,20 @@ lib/libkonq.so.3.0
 lib/libkonqaboutpage.a
 lib/libkonqaboutpage.la
 lib/libkonqaboutpage.so
+lib/libkonqsidebar.a
+lib/libkonqsidebar.la
+lib/libkonqsidebar.so
+lib/libkonqsidebarplugin.a
+lib/libkonqsidebarplugin.la
+lib/libkonqsidebarplugin.so
+lib/libkonqueror_main.a
+lib/libkonqueror_main.la
+lib/libkonqueror_main.so
+lib/libkonsole_main.a
+lib/libkonsole_main.la
+lib/libkonsole_main.so
+lib/libkonsole_main.so.0
+lib/libkonsole_main.so.0.0
 lib/libkonsolepart.a
 lib/libkonsolepart.la
 lib/libkonsolepart.so
@@ -454,42 +630,49 @@ lib/libksystemtrayapplet.la
 lib/libksystemtrayapplet.so
 lib/libksystemtrayapplet.so.1
 lib/libksystemtrayapplet.so.1.0
-lib/libktaskbarapplet.a
-lib/libktaskbarapplet.la
-lib/libktaskbarapplet.so
-lib/libktaskbarapplet.so.1
-lib/libktaskbarapplet.so.1.0
 lib/libkwin.a
 lib/libkwin.la
 lib/libkwin.so
-lib/libkwindefault.a
-lib/libkwindefault.la
-lib/libkwindefault.so
-lib/libkwindefault.so.0
-lib/libkwindefault.so.0.0
-lib/libkwritepart.a
-lib/libkwritepart.la
-lib/libkwritepart.so
+lib/libkwrite_main.a
+lib/libkwrite_main.la
+lib/libkwrite_main.so
+lib/libkwrite_main.so.0
+lib/libkwrite_main.so.0.0
+lib/libkwrited_main.a
+lib/libkwrited_main.la
+lib/libkwrited_main.so
+lib/libkwrited_main.so.0
+lib/libkwrited_main.so.0.0
+lib/libkxkb_main.a
+lib/libkxkb_main.la
+lib/libkxkb_main.so
+lib/libkxkb_main.so.0
+lib/libkxkb_main.so.0.0
+lib/libkxmlrpcd_main.a
+lib/libkxmlrpcd_main.la
+lib/libkxmlrpcd_main.so
+lib/libkxmlrpcd_main.so.0
+lib/libkxmlrpcd_main.so.0.0
 lib/libnaughtyapplet.a
 lib/libnaughtyapplet.la
 lib/libnaughtyapplet.so
 lib/libnaughtyapplet.so.1
 lib/libnaughtyapplet.so.1.0
-@comment Only if Motif is installed
-lib/libnsplugin.a
-@comment Only if Motif is installed
-lib/libnsplugin.la
-@comment Only if Motif is installed
-lib/libnsplugin.so
-@comment Only if Motif is installed
-lib/libnsplugin.so.1
-@comment Only if Motif is installed
-lib/libnsplugin.so.1.1
 lib/libquicklauncher.a
 lib/libquicklauncher.la
 lib/libquicklauncher.so
 lib/libquicklauncher.so.1
 lib/libquicklauncher.so.1.0
+lib/libtaskbar.a
+lib/libtaskbar.la
+lib/libtaskbar.so
+lib/libtaskbar.so.1
+lib/libtaskbar.so.1.0
+lib/libtaskbarapplet.a
+lib/libtaskbarapplet.la
+lib/libtaskbarapplet.so
+lib/libtaskbarapplet.so.1
+lib/libtaskbarapplet.so.1.0
 lib/libtaskbarextension.a
 lib/libtaskbarextension.la
 lib/libtaskbarextension.so
@@ -503,59 +686,33 @@ lib/libtaskmanager.so.1.0
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
+share/autostart/kpersonalizer.desktop
 share/autostart/ktip.desktop
 share/autostart/kwrited.desktop
 share/autostart/panel.desktop
-share/doc/kde/HTML/en/kcontrol/.anchors
-share/doc/kde/HTML/en/kcontrol/action.html
-share/doc/kde/HTML/en/kcontrol/background.html
-share/doc/kde/HTML/en/kcontrol/batmon.html
-share/doc/kde/HTML/en/kcontrol/bell.html
-share/doc/kde/HTML/en/kcontrol/borders.html
-share/doc/kde/HTML/en/kcontrol/color.html
+share/doc/kde/HTML/en/kaddressbook/common
+share/doc/kde/HTML/en/kaddressbook/index.cache.bz2
+share/doc/kde/HTML/en/kaddressbook/index.docbook
+share/doc/kde/HTML/en/kate/common
+share/doc/kde/HTML/en/kate/index.cache.bz2
+share/doc/kde/HTML/en/kate/index.docbook
 share/doc/kde/HTML/en/kcontrol/common
-share/doc/kde/HTML/en/kcontrol/control-center-exiting.html
-share/doc/kde/HTML/en/kcontrol/control-center-menus.html
-share/doc/kde/HTML/en/kcontrol/control-center-run-indiv.html
-share/doc/kde/HTML/en/kcontrol/control-center-screen.html
-share/doc/kde/HTML/en/kcontrol/control-center.html
-share/doc/kde/HTML/en/kcontrol/cookie.html
-share/doc/kde/HTML/en/kcontrol/credits.html
-share/doc/kde/HTML/en/kcontrol/crypto.html
-share/doc/kde/HTML/en/kcontrol/datetime.html
-share/doc/kde/HTML/en/kcontrol/desktop.html
-share/doc/kde/HTML/en/kcontrol/devices.html
-share/doc/kde/HTML/en/kcontrol/dma.html
-share/doc/kde/HTML/en/kcontrol/ebrowse.html
-share/doc/kde/HTML/en/kcontrol/email.html
-share/doc/kde/HTML/en/kcontrol/energy.html
-share/doc/kde/HTML/en/kcontrol/file-assoc.html
-share/doc/kde/HTML/en/kcontrol/file-manager.html
-share/doc/kde/HTML/en/kcontrol/fonts.html
-share/doc/kde/HTML/en/kcontrol/help-index.html
-share/doc/kde/HTML/en/kcontrol/icons.html
+share/doc/kde/HTML/en/kcontrol/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/index.docbook
-share/doc/kde/HTML/en/kcontrol/index.html
-share/doc/kde/HTML/en/kcontrol/interrupts.html
-share/doc/kde/HTML/en/kcontrol/introduction.html
-share/doc/kde/HTML/en/kcontrol/ioports.html
-share/doc/kde/HTML/en/kcontrol/kbd.html
-share/doc/kde/HTML/en/kcontrol/kblayout.html
 share/doc/kde/HTML/en/kcontrol/kcmaccess.docbook
 share/doc/kde/HTML/en/kcontrol/kcmaction.docbook
 share/doc/kde/HTML/en/kcontrol/kcmbackgnd.docbook
 share/doc/kde/HTML/en/kcontrol/kcmbatmon.docbook
 share/doc/kde/HTML/en/kcontrol/kcmbell.docbook
 share/doc/kde/HTML/en/kcontrol/kcmblockdev.docbook
-share/doc/kde/HTML/en/kcontrol/kcmborders.docbook
 share/doc/kde/HTML/en/kcontrol/kcmcolor.docbook
 share/doc/kde/HTML/en/kcontrol/kcmcookie.docbook
 share/doc/kde/HTML/en/kcontrol/kcmcrypto.docbook
+share/doc/kde/HTML/en/kcontrol/kcmcss.docbook
 share/doc/kde/HTML/en/kcontrol/kcmdatetime.docbook
 share/doc/kde/HTML/en/kcontrol/kcmdesktop.docbook
 share/doc/kde/HTML/en/kcontrol/kcmdeviceinfo.docbook
 share/doc/kde/HTML/en/kcontrol/kcmdmainfo.docbook
-share/doc/kde/HTML/en/kcontrol/kcmdrkonqi.docbook
 share/doc/kde/HTML/en/kcontrol/kcmebrowse.docbook
 share/doc/kde/HTML/en/kcontrol/kcmemail.docbook
 share/doc/kde/HTML/en/kcontrol/kcmenergy.docbook
@@ -564,13 +721,15 @@ share/doc/kde/HTML/en/kcontrol/kcmfileman.docbook
 share/doc/kde/HTML/en/kcontrol/kcmfonts.docbook
 share/doc/kde/HTML/en/kcontrol/kcmhelpindex.docbook
 share/doc/kde/HTML/en/kcontrol/kcmicon.docbook
-share/doc/kde/HTML/en/kcontrol/kcmiconstyle.docbook
 share/doc/kde/HTML/en/kcontrol/kcmintinfo.docbook
 share/doc/kde/HTML/en/kcontrol/kcmioportinfo.docbook
 share/doc/kde/HTML/en/kcontrol/kcmkbd.docbook
-share/doc/kde/HTML/en/kcontrol/kcmkblayout.docbook
 share/doc/kde/HTML/en/kcontrol/kcmkbrowse.docbook
 share/doc/kde/HTML/en/kcontrol/kcmkeybind.docbook
+share/doc/kde/HTML/en/kcontrol/kcmkonsole.docbook
+share/doc/kde/HTML/en/kcontrol/kcmkwintheme.docbook
+share/doc/kde/HTML/en/kcontrol/kcmlaunch.docbook
+share/doc/kde/HTML/en/kcontrol/kcmlisa.docbook
 share/doc/kde/HTML/en/kcontrol/kcmlocate.docbook
 share/doc/kde/HTML/en/kcontrol/kcmloginmanage.docbook
 share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit.docbook
@@ -579,9 +738,7 @@ share/doc/kde/HTML/en/kcontrol/kcmmemoryinfo.docbook
 share/doc/kde/HTML/en/kcontrol/kcmmidi.docbook
 share/doc/kde/HTML/en/kcontrol/kcmmixer.docbook
 share/doc/kde/HTML/en/kcontrol/kcmmouse.docbook
-share/doc/kde/HTML/en/kcontrol/kcmmousebeh.docbook
 share/doc/kde/HTML/en/kcontrol/kcmnetscapeplugins.docbook
-share/doc/kde/HTML/en/kcontrol/kcmnumbername.docbook
 share/doc/kde/HTML/en/kcontrol/kcmpanel.docbook
 share/doc/kde/HTML/en/kcontrol/kcmpartitioninfo.docbook
 share/doc/kde/HTML/en/kcontrol/kcmpasswd.docbook
@@ -596,207 +753,226 @@ share/doc/kde/HTML/en/kcontrol/kcmsessionman.docbook
 share/doc/kde/HTML/en/kcontrol/kcmsmbstat.docbook
 share/doc/kde/HTML/en/kcontrol/kcmsndinfo.docbook
 share/doc/kde/HTML/en/kcontrol/kcmsndsrv.docbook
+share/doc/kde/HTML/en/kcontrol/kcmsocks.docbook
+share/doc/kde/HTML/en/kcontrol/kcmspellchecking.docbook
 share/doc/kde/HTML/en/kcontrol/kcmstyle.docbook
 share/doc/kde/HTML/en/kcontrol/kcmsysnotify.docbook
 share/doc/kde/HTML/en/kcontrol/kcmtalk.docbook
 share/doc/kde/HTML/en/kcontrol/kcmtaskbar.docbook
+share/doc/kde/HTML/en/kcontrol/kcmusb.docbook
 share/doc/kde/HTML/en/kcontrol/kcmuseragent.docbook
 share/doc/kde/HTML/en/kcontrol/kcmwinshare.docbook
 share/doc/kde/HTML/en/kcontrol/kcmxservinfo.docbook
-share/doc/kde/HTML/en/kcontrol/key-bindings.html
 share/doc/kde/HTML/en/kcontrol/kfileman1.png
 share/doc/kde/HTML/en/kcontrol/kfileman2.png
-share/doc/kde/HTML/en/kcontrol/konq-browsing.html
-share/doc/kde/HTML/en/kcontrol/laptop.html
-share/doc/kde/HTML/en/kcontrol/locale.html
-share/doc/kde/HTML/en/kcontrol/login-manager.html
-share/doc/kde/HTML/en/kcontrol/lowbatcrit.html
-share/doc/kde/HTML/en/kcontrol/lowbatwarn.html
-share/doc/kde/HTML/en/kcontrol/memory.html
-share/doc/kde/HTML/en/kcontrol/midi.html
-share/doc/kde/HTML/en/kcontrol/mixer.html
-share/doc/kde/HTML/en/kcontrol/module.html
-share/doc/kde/HTML/en/kcontrol/modules.html
-share/doc/kde/HTML/en/kcontrol/mouse-behav.html
-share/doc/kde/HTML/en/kcontrol/mouse.html
-share/doc/kde/HTML/en/kcontrol/nsplugins.html
-share/doc/kde/HTML/en/kcontrol/panel.html
-share/doc/kde/HTML/en/kcontrol/partitions.html
-share/doc/kde/HTML/en/kcontrol/passwords.html
-share/doc/kde/HTML/en/kcontrol/pci.html
-share/doc/kde/HTML/en/kcontrol/pcmcia.html
-share/doc/kde/HTML/en/kcontrol/powerctrl.html
-share/doc/kde/HTML/en/kcontrol/processor.html
-share/doc/kde/HTML/en/kcontrol/proxies.html
-share/doc/kde/HTML/en/kcontrol/sambastatus.html
-share/doc/kde/HTML/en/kcontrol/screensaver.html
+share/doc/kde/HTML/en/kcontrol/nettimeouts.docbook
+share/doc/kde/HTML/en/kcontrol/printmanager.docbook
+share/doc/kde/HTML/en/kcontrol/printsystem.docbook
+share/doc/kde/HTML/en/kcontrol/protocols.docbook
 share/doc/kde/HTML/en/kcontrol/screenshot.png
-share/doc/kde/HTML/en/kcontrol/scsi.html
-share/doc/kde/HTML/en/kcontrol/sessions.html
-share/doc/kde/HTML/en/kcontrol/sndserver.html
-share/doc/kde/HTML/en/kcontrol/soundinfo.html
-share/doc/kde/HTML/en/kcontrol/style.html
-share/doc/kde/HTML/en/kcontrol/sys-notify.html
-share/doc/kde/HTML/en/kcontrol/taskbar.html
-share/doc/kde/HTML/en/kcontrol/user-agent.html
-share/doc/kde/HTML/en/kcontrol/windows-shares.html
-share/doc/kde/HTML/en/kcontrol/xserver.html
-share/doc/kde/HTML/en/kdebugdialog/.anchors
+share/doc/kde/HTML/en/kcontrol/systemcontrol.docbook
+share/doc/kde/HTML/en/kcontrol/thememgr.docbook
 share/doc/kde/HTML/en/kdebugdialog/common
+share/doc/kde/HTML/en/kdebugdialog/index.cache.bz2
 share/doc/kde/HTML/en/kdebugdialog/index.docbook
-share/doc/kde/HTML/en/kdebugdialog/index.html
-share/doc/kde/HTML/en/kdebugdialog/introduction.html
-share/doc/kde/HTML/en/kdesu/.anchors
-share/doc/kde/HTML/en/kdesu/author.html
+share/doc/kde/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter-2.png
+share/doc/kde/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter.png
+share/doc/kde/HTML/en/kdeprint/PPD-options-for-HP8100mopier.png
+share/doc/kde/HTML/en/kdeprint/PPD-options-for-infotecP450.png
+share/doc/kde/HTML/en/kdeprint/PrintQueue-KJobViewer.png
+share/doc/kde/HTML/en/kdeprint/add-printer-wizard-confirmation-1.png
+share/doc/kde/HTML/en/kdeprint/big-ppd-esppp-gui.png
+share/doc/kde/HTML/en/kdeprint/common
+share/doc/kde/HTML/en/kdeprint/cups-filterarchitecture-kivio-50Percent-scaled.png
+share/doc/kde/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
+share/doc/kde/HTML/en/kdeprint/cups-filterarchitecture-kivio.png
+share/doc/kde/HTML/en/kdeprint/cups-server-configuration-2.png
+share/doc/kde/HTML/en/kdeprint/cups-server-configuration-3.png
+share/doc/kde/HTML/en/kdeprint/cups-server-configuration-4.png
+share/doc/kde/HTML/en/kdeprint/cups-server-configuration.png
+share/doc/kde/HTML/en/kdeprint/cupsaddpostscriptprinter_fromcommandline.png
+share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard1.png
+share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png
+share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png
+share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png
+share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png
+share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard5_networkscan_SMBresults.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_broadcastaddress_add_button.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browserelay_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browseinterval_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browsetimeout_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseaddress_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browsepoll_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseport_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browseshortnames_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browsingonoff_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_implicitclasses_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseallowdeny_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseorder_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalive_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalivetimeout_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_networkclients_maxclients_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_networkgeneral_hostnamelookups_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_networkgeneral_maxrequestsize_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_networkgeneral_portsaddresses_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_networkgeneral_timeout_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_accesspermissions_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_allowfrom_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_authclass_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_authgroupname_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_authtype_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_denyfrom_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_encryption_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_order_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_securityconfig_systemgroup_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_data_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultcharset_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultlanguage.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_documenttroot_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_executables_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_fontpath_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_requestroot_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_serverroot_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_temdir_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverdirectories_tempdir_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_servercertificate_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_serverkey_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servergeneral_group_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servergeneral_remoteroot_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servergeneral_serveradmin_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servergeneral_servername_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servergeneral_user_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultcharset_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultlanguage.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_documenttroot_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverlogging_accesslog_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverlogging_errorlog_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverlogging_loglevel_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverlogging_maxlogsize_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_serverlogging_pagelog_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_filterlimit_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservehistory_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservejobfiles_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_printcap_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_ripcache_blurb.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration2_general.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration3_logging.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration4_directories.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png
+share/doc/kde/HTML/en/kdeprint/cupsserverconfiguration_securityoverview1.png
+share/doc/kde/HTML/en/kdeprint/hi32-action-wizard.png
+share/doc/kde/HTML/en/kdeprint/iconview-printerwindow.png
+share/doc/kde/HTML/en/kdeprint/index.cache.bz2
+share/doc/kde/HTML/en/kdeprint/index.docbook
+share/doc/kde/HTML/en/kdeprint/info-tab.png
+share/doc/kde/HTML/en/kdeprint/ipp-scan-result-1.png
+share/doc/kde/HTML/en/kdeprint/kcontrol-icon.png
+share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
+share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol.png
+share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printmanager-spartanicview.png
+share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printmanager-toolbarplusinfoview.png
+share/doc/kde/HTML/en/kdeprint/kcontrolcenter-printsystem.png
+share/doc/kde/HTML/en/kdeprint/kcron_to_be_printed.png
+share/doc/kde/HTML/en/kdeprint/kdeprint-jobviewer.png
+share/doc/kde/HTML/en/kdeprint/kdeprint_printer.png
+share/doc/kde/HTML/en/kdeprint/kdeprint_printer_class.png
+share/doc/kde/HTML/en/kdeprint/kdeprint_printer_class_stopped.png
+share/doc/kde/HTML/en/kdeprint/kdeprint_printer_remote.png
+share/doc/kde/HTML/en/kdeprint/kdeprint_printer_stopped.png
+share/doc/kde/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png
+share/doc/kde/HTML/en/kdeprint/kprinter-dialog.png
+share/doc/kde/HTML/en/kdeprint/kprinter-fonts.png
+share/doc/kde/HTML/en/kdeprint/kprinter-kivio.png
+share/doc/kde/HTML/en/kdeprint/kprinter.png
+share/doc/kde/HTML/en/kdeprint/kprinter_called_from_run_command.png
+share/doc/kde/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png
+share/doc/kde/HTML/en/kdeprint/kprinter_with_kcron_developer_special_nodeco.png
+share/doc/kde/HTML/en/kdeprint/printericons-meanings.png
+share/doc/kde/HTML/en/kdeprint/ps-boxes.png
+share/doc/kde/HTML/en/kdeprint/selecting-printingsystem.png
+share/doc/kde/HTML/en/kdeprint/smb-scan-result-2.png
+share/doc/kde/HTML/en/kdeprint/smb-scan-result-3.png
+share/doc/kde/HTML/en/kdeprint/steinbruch.png
+share/doc/kde/HTML/en/kdeprint/steinbruch_scaled.png
+share/doc/kde/HTML/en/kdeprint/taskbar-icons.png
+share/doc/kde/HTML/en/kdeprint/test_size_withdecoration.png
+share/doc/kde/HTML/en/kdeprint/test_size_without_decoration.png
+share/doc/kde/HTML/en/kdeprint/xpp-fonts.png
 share/doc/kde/HTML/en/kdesu/common
-share/doc/kde/HTML/en/kdesu/compiling.html
-share/doc/kde/HTML/en/kdesu/configuration.html
+share/doc/kde/HTML/en/kdesu/index.cache.bz2
 share/doc/kde/HTML/en/kdesu/index.docbook
-share/doc/kde/HTML/en/kdesu/index.html
-share/doc/kde/HTML/en/kdesu/installation.html
-share/doc/kde/HTML/en/kdesu/interface-to-su.html
-share/doc/kde/HTML/en/kdesu/internals.html
-share/doc/kde/HTML/en/kdesu/introduction.html
-share/doc/kde/HTML/en/kdesu/password-checking.html
-share/doc/kde/HTML/en/kdesu/sec-password-keeping.html
-share/doc/kde/HTML/en/kdesu/using-kdesu.html
-share/doc/kde/HTML/en/kdm/.anchors
-share/doc/kde/HTML/en/kdm/Daemon.README
-share/doc/kde/HTML/en/kdm/building-and-installing-kdm.html
 share/doc/kde/HTML/en/kdm/common
-share/doc/kde/HTML/en/kdm/configuring-kdm.html
-share/doc/kde/HTML/en/kdm/configuring-your-system-for-kdm.html
-share/doc/kde/HTML/en/kdm/credits.html
-share/doc/kde/HTML/en/kdm/different-window-managers-with-kdm.html
+share/doc/kde/HTML/en/kdm/index.cache.bz2
 share/doc/kde/HTML/en/kdm/index.docbook
-share/doc/kde/HTML/en/kdm/index.html
-share/doc/kde/HTML/en/kdm/introduction.html
-share/doc/kde/HTML/en/kdm/kdmdesktop.html
-share/doc/kde/HTML/en/kdm/lilo.html
-share/doc/kde/HTML/en/kdm/locale.html
-share/doc/kde/HTML/en/kdm/other-information.html
-share/doc/kde/HTML/en/khelpcenter/.anchors
 share/doc/kde/HTML/en/khelpcenter/background.png
 share/doc/kde/HTML/en/khelpcenter/bgtable.png
 share/doc/kde/HTML/en/khelpcenter/common
-share/doc/kde/HTML/en/khelpcenter/contact-developers.html
-share/doc/kde/HTML/en/khelpcenter/contact-more-information.html
-share/doc/kde/HTML/en/khelpcenter/contact-official.html
-share/doc/kde/HTML/en/khelpcenter/contact-the-kde-team.html
 share/doc/kde/HTML/en/khelpcenter/contact.docbook
-share/doc/kde/HTML/en/khelpcenter/credits.html
-share/doc/kde/HTML/en/khelpcenter/faq/.anchors
 share/doc/kde/HTML/en/khelpcenter/faq/TODO
-share/doc/kde/HTML/en/khelpcenter/faq/about.html
-share/doc/kde/HTML/en/khelpcenter/faq/applications.html
+share/doc/kde/HTML/en/khelpcenter/faq/about.docbook
 share/doc/kde/HTML/en/khelpcenter/faq/common
-share/doc/kde/HTML/en/khelpcenter/faq/configure.html
-share/doc/kde/HTML/en/khelpcenter/faq/contribute.html
-share/doc/kde/HTML/en/khelpcenter/faq/credits.html
-share/doc/kde/HTML/en/khelpcenter/faq/desktop.html
-share/doc/kde/HTML/en/khelpcenter/faq/filemanager.html
-share/doc/kde/HTML/en/khelpcenter/faq/getting-kde.html
+share/doc/kde/HTML/en/khelpcenter/faq/configkde.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/contrib.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/desktop.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/filemng.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/getkde.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/index.cache.bz2
 share/doc/kde/HTML/en/khelpcenter/faq/index.docbook
-share/doc/kde/HTML/en/khelpcenter/faq/index.html
-share/doc/kde/HTML/en/khelpcenter/faq/install.html
-share/doc/kde/HTML/en/khelpcenter/faq/introduction.html
-share/doc/kde/HTML/en/khelpcenter/faq/misc.html
-share/doc/kde/HTML/en/khelpcenter/faq/more-info.html
-share/doc/kde/HTML/en/khelpcenter/faq/non-kde-apps.html
-share/doc/kde/HTML/en/khelpcenter/faq/not-kde.html
-share/doc/kde/HTML/en/khelpcenter/faq/panel.html
-share/doc/kde/HTML/en/khelpcenter/faq/tips.html
-share/doc/kde/HTML/en/khelpcenter/faq/windowmanager.html
-share/doc/kde/HTML/en/khelpcenter/help-system-user-manual.html
+share/doc/kde/HTML/en/khelpcenter/faq/index.docbook.old
+share/doc/kde/HTML/en/khelpcenter/faq/install.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/intro.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/kdeapps.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/misc.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/moreinfo.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/nonkdeapps.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/notrelated.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/panel.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/tips.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/winmng.docbook
+share/doc/kde/HTML/en/khelpcenter/glossary/common
+share/doc/kde/HTML/en/khelpcenter/glossary/index.cache.bz2
+share/doc/kde/HTML/en/khelpcenter/glossary/index.docbook
 share/doc/kde/HTML/en/khelpcenter/help.docbook
+share/doc/kde/HTML/en/khelpcenter/index.cache.bz2
 share/doc/kde/HTML/en/khelpcenter/index.docbook
-share/doc/kde/HTML/en/khelpcenter/index.html
-share/doc/kde/HTML/en/khelpcenter/interface-basics.html
-share/doc/kde/HTML/en/khelpcenter/invoking-help.html
 share/doc/kde/HTML/en/khelpcenter/kdelogo2.png
 share/doc/kde/HTML/en/khelpcenter/khelpcenter.png
 share/doc/kde/HTML/en/khelpcenter/konq.css
 share/doc/kde/HTML/en/khelpcenter/lines.png
 share/doc/kde/HTML/en/khelpcenter/lines2.png
 share/doc/kde/HTML/en/khelpcenter/links.docbook
-share/doc/kde/HTML/en/khelpcenter/main.html
-share/doc/kde/HTML/en/khelpcenter/no-html.html
 share/doc/kde/HTML/en/khelpcenter/pointers.png
-share/doc/kde/HTML/en/khelpcenter/quickstart/.anchors
-share/doc/kde/HTML/en/khelpcenter/quickstart/advanced-topics.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/archives-and-networks.html
 share/doc/kde/HTML/en/khelpcenter/quickstart/common
-share/doc/kde/HTML/en/khelpcenter/quickstart/configuration-modules.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/configure.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/credits.html
+share/doc/kde/HTML/en/khelpcenter/quickstart/index.cache.bz2
 share/doc/kde/HTML/en/khelpcenter/quickstart/index.docbook
-share/doc/kde/HTML/en/khelpcenter/quickstart/index.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/introduction.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/kde-an-exciting-journey.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/launching-applications.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/logging-out.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/managing-your-files.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/ready-set-go.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/using-taskbar.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/using-templates.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/using-v-desktops.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/want-command-line-back.html
-share/doc/kde/HTML/en/khelpcenter/quickstart/working-with-windows.html
 share/doc/kde/HTML/en/khelpcenter/shadow1.png
 share/doc/kde/HTML/en/khelpcenter/support.docbook
-share/doc/kde/HTML/en/khelpcenter/supporting-kde-financial-support.html
-share/doc/kde/HTML/en/khelpcenter/supporting-kde-get-started.html
-share/doc/kde/HTML/en/khelpcenter/supporting-kde.html
-share/doc/kde/HTML/en/khelpcenter/userguide/.anchors
-share/doc/kde/HTML/en/khelpcenter/userguide/about-this-preview.html
-share/doc/kde/HTML/en/khelpcenter/userguide/adding-programs.html
-share/doc/kde/HTML/en/khelpcenter/userguide/all-about-your-desktop.html
-share/doc/kde/HTML/en/khelpcenter/userguide/background-of-kde.html
 share/doc/kde/HTML/en/khelpcenter/userguide/common
-share/doc/kde/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
-share/doc/kde/HTML/en/khelpcenter/userguide/desktop-components.html
-share/doc/kde/HTML/en/khelpcenter/userguide/docu-staff.html
-share/doc/kde/HTML/en/khelpcenter/userguide/entertainment-applications.html
-share/doc/kde/HTML/en/khelpcenter/userguide/finding-your-lost-files.html
-share/doc/kde/HTML/en/khelpcenter/userguide/first-impressions.html
-share/doc/kde/HTML/en/khelpcenter/userguide/frequently-asked-questions.html
-share/doc/kde/HTML/en/khelpcenter/userguide/getting-kde.html
-share/doc/kde/HTML/en/khelpcenter/userguide/getting-started.html
-share/doc/kde/HTML/en/khelpcenter/userguide/graphical-applications.html
+share/doc/kde/HTML/en/khelpcenter/userguide/index.cache.bz2
 share/doc/kde/HTML/en/khelpcenter/userguide/index.docbook
-share/doc/kde/HTML/en/khelpcenter/userguide/index.html
-share/doc/kde/HTML/en/khelpcenter/userguide/installation.html
-share/doc/kde/HTML/en/khelpcenter/userguide/installing-debian.html
-share/doc/kde/HTML/en/khelpcenter/userguide/introduction.html
-share/doc/kde/HTML/en/khelpcenter/userguide/kdeadmin-applications.html
-share/doc/kde/HTML/en/khelpcenter/userguide/kdebase-applications.html
-share/doc/kde/HTML/en/khelpcenter/userguide/kdepim-applications.html
-share/doc/kde/HTML/en/khelpcenter/userguide/legal-notices.html
-share/doc/kde/HTML/en/khelpcenter/userguide/legal-status.html
-share/doc/kde/HTML/en/khelpcenter/userguide/license.html
-share/doc/kde/HTML/en/khelpcenter/userguide/linux-installing-rpms.html
-share/doc/kde/HTML/en/khelpcenter/userguide/more-help.html
-share/doc/kde/HTML/en/khelpcenter/userguide/mouse-techniques.html
-share/doc/kde/HTML/en/khelpcenter/userguide/moving-files-with-drag-and-drop.html
-share/doc/kde/HTML/en/khelpcenter/userguide/multimedia-applications.html
-share/doc/kde/HTML/en/khelpcenter/userguide/network-applications.html
-share/doc/kde/HTML/en/khelpcenter/userguide/quitting-kde.html
-share/doc/kde/HTML/en/khelpcenter/userguide/shortcuts.html
-share/doc/kde/HTML/en/khelpcenter/userguide/source-distribution.html
-share/doc/kde/HTML/en/khelpcenter/userguide/sources-of-information-used-during-the-creat.html
-share/doc/kde/HTML/en/khelpcenter/userguide/suse-install.html
-share/doc/kde/HTML/en/khelpcenter/userguide/using-command-line-and-terminals.html
-share/doc/kde/HTML/en/khelpcenter/userguide/using-multiple-desktops.html
-share/doc/kde/HTML/en/khelpcenter/userguide/using-templates.html
-share/doc/kde/HTML/en/khelpcenter/userguide/using-the-trashcan.html
-share/doc/kde/HTML/en/khelpcenter/userguide/utility-applications.html
-share/doc/kde/HTML/en/khelpcenter/userguide/we-still-need-people.html
-share/doc/kde/HTML/en/khelpcenter/visualdict/.anchors
 share/doc/kde/HTML/en/khelpcenter/visualdict/common
-share/doc/kde/HTML/en/khelpcenter/visualdict/credits.html
+share/doc/kde/HTML/en/khelpcenter/visualdict/index.cache.bz2
 share/doc/kde/HTML/en/khelpcenter/visualdict/index.docbook
-share/doc/kde/HTML/en/khelpcenter/visualdict/index.html
 share/doc/kde/HTML/en/khelpcenter/visualdict/pict1.png
 share/doc/kde/HTML/en/khelpcenter/visualdict/pict10.png
 share/doc/kde/HTML/en/khelpcenter/visualdict/pict11.png
@@ -817,77 +993,58 @@ share/doc/kde/HTML/en/khelpcenter/visualdict/pict6.png
 share/doc/kde/HTML/en/khelpcenter/visualdict/pict7.png
 share/doc/kde/HTML/en/khelpcenter/visualdict/pict8.png
 share/doc/kde/HTML/en/khelpcenter/visualdict/pict9.png
-share/doc/kde/HTML/en/khelpcenter/visualdict/visual-dictionary.html
-share/doc/kde/HTML/en/khelpcenter/web.html
-share/doc/kde/HTML/en/khelpcenter/welcome-to-kde.html
 share/doc/kde/HTML/en/khelpcenter/welcome.docbook
-share/doc/kde/HTML/en/khelpcenter/what-is-kde-the-desktop.html
-share/doc/kde/HTML/en/khelpcenter/what-is-kde-the-development-framework.html
-share/doc/kde/HTML/en/khelpcenter/what-is-kde-the-office-suite.html
-share/doc/kde/HTML/en/khelpcenter/what-is-kde.html
 share/doc/kde/HTML/en/khelpcenter/whatiskde.docbook
-share/doc/kde/HTML/en/kicker/.anchors
-share/doc/kde/HTML/en/kicker/applets.html
-share/doc/kde/HTML/en/kicker/application-group.html
-share/doc/kde/HTML/en/kicker/basics.html
-share/doc/kde/HTML/en/kicker/browsers.html
-share/doc/kde/HTML/en/kicker/child-panel-extension.html
-share/doc/kde/HTML/en/kicker/clock-applet.html
-share/doc/kde/HTML/en/kicker/commands.html
+share/doc/kde/HTML/en/kicker/bookmarks_icon.png
 share/doc/kde/HTML/en/kicker/common
-share/doc/kde/HTML/en/kicker/compilation.html
-share/doc/kde/HTML/en/kicker/configuration.html
-share/doc/kde/HTML/en/kicker/configuring-apps.html
-share/doc/kde/HTML/en/kicker/configuring.html
-share/doc/kde/HTML/en/kicker/credits.html
-share/doc/kde/HTML/en/kicker/dock-application-bar-extension.html
-share/doc/kde/HTML/en/kicker/extensions.html
-share/doc/kde/HTML/en/kicker/faq.html
+share/doc/kde/HTML/en/kicker/desktop_icon.png
+share/doc/kde/HTML/en/kicker/index.cache.bz2
 share/doc/kde/HTML/en/kicker/index.docbook
-share/doc/kde/HTML/en/kicker/index.html
-share/doc/kde/HTML/en/kicker/installation.html
-share/doc/kde/HTML/en/kicker/introduction.html
-share/doc/kde/HTML/en/kicker/k-menu.html
 share/doc/kde/HTML/en/kicker/k_menu_icon.png
-share/doc/kde/HTML/en/kicker/kasbar-extension.html
-share/doc/kde/HTML/en/kicker/kfind-advanced.html
-share/doc/kde/HTML/en/kicker/kfind-date-range.html
-share/doc/kde/HTML/en/kicker/kfind.html
-share/doc/kde/HTML/en/kicker/launcher-applet.html
-share/doc/kde/HTML/en/kicker/most-recently-group.html
-share/doc/kde/HTML/en/kicker/naughty-applet.html
-share/doc/kde/HTML/en/kicker/pager-applet.html
-share/doc/kde/HTML/en/kicker/panel-applets.html
-share/doc/kde/HTML/en/kicker/panel-buttons.html
-share/doc/kde/HTML/en/kicker/panel-looknfeel.html
-share/doc/kde/HTML/en/kicker/panel-menus.html
-share/doc/kde/HTML/en/kicker/requirements.html
-share/doc/kde/HTML/en/kicker/run-applet.html
-share/doc/kde/HTML/en/kicker/run-command.html
+share/doc/kde/HTML/en/kicker/recent_docs_icon.png
 share/doc/kde/HTML/en/kicker/screenshot_left.png
 share/doc/kde/HTML/en/kicker/screenshot_right.png
-share/doc/kde/HTML/en/kicker/systemtray-applet.html
-share/doc/kde/HTML/en/kicker/using-kicker.html
+share/doc/kde/HTML/en/kicker/taskbar_group.png
+share/doc/kde/HTML/en/kicker/terminals_icon.png
 share/doc/kde/HTML/en/kicker/windowlist_icon.png
-share/doc/kde/HTML/en/klipper/.anchors
-share/doc/kde/HTML/en/klipper/actions.html
+share/doc/kde/HTML/en/kioslave/audiocd.docbook
+share/doc/kde/HTML/en/kioslave/bzip.docbook
+share/doc/kde/HTML/en/kioslave/bzip2.docbook
+share/doc/kde/HTML/en/kioslave/common
+share/doc/kde/HTML/en/kioslave/file.docbook
+share/doc/kde/HTML/en/kioslave/finger.docbook
+share/doc/kde/HTML/en/kioslave/floppy.docbook
+share/doc/kde/HTML/en/kioslave/ftp.docbook
+share/doc/kde/HTML/en/kioslave/gopher.docbook
+share/doc/kde/HTML/en/kioslave/gzip.docbook
+share/doc/kde/HTML/en/kioslave/help.docbook
+share/doc/kde/HTML/en/kioslave/http.docbook
+share/doc/kde/HTML/en/kioslave/https.docbook
+share/doc/kde/HTML/en/kioslave/imap.docbook
+share/doc/kde/HTML/en/kioslave/imaps.docbook
+share/doc/kde/HTML/en/kioslave/index.cache.bz2
+share/doc/kde/HTML/en/kioslave/index.docbook
+share/doc/kde/HTML/en/kioslave/info.docbook
+share/doc/kde/HTML/en/kioslave/lan.docbook
+share/doc/kde/HTML/en/kioslave/ldap.docbook
+share/doc/kde/HTML/en/kioslave/mailto.docbook
+share/doc/kde/HTML/en/kioslave/man.docbook
+share/doc/kde/HTML/en/kioslave/news.docbook
+share/doc/kde/HTML/en/kioslave/nfs.docbook
+share/doc/kde/HTML/en/kioslave/nntp.docbook
+share/doc/kde/HTML/en/kioslave/pop3.docbook
+share/doc/kde/HTML/en/kioslave/pop3s.docbook
+share/doc/kde/HTML/en/kioslave/rlan.docbook
+share/doc/kde/HTML/en/kioslave/rlogin.docbook
+share/doc/kde/HTML/en/kioslave/smb.docbook
+share/doc/kde/HTML/en/kioslave/tar.docbook
+share/doc/kde/HTML/en/kioslave/telnet.docbook
+share/doc/kde/HTML/en/kioslave/thumbnail.docbook
 share/doc/kde/HTML/en/klipper/common
-share/doc/kde/HTML/en/klipper/compilation.html
-share/doc/kde/HTML/en/klipper/configuration.html
-share/doc/kde/HTML/en/klipper/credits.html
+share/doc/kde/HTML/en/klipper/index.cache.bz2
 share/doc/kde/HTML/en/klipper/index.docbook
-share/doc/kde/HTML/en/klipper/index.html
-share/doc/kde/HTML/en/klipper/installation.html
-share/doc/kde/HTML/en/klipper/introduction.html
-share/doc/kde/HTML/en/klipper/requirements.html
 share/doc/kde/HTML/en/klipper/screenshot.png
-share/doc/kde/HTML/en/klipper/using-klipper.html
-share/doc/kde/HTML/en/kmenuedit/.anchors
 share/doc/kde/HTML/en/kmenuedit/common
-share/doc/kde/HTML/en/kmenuedit/compilation.html
-share/doc/kde/HTML/en/kmenuedit/credits.html
-share/doc/kde/HTML/en/kmenuedit/details-advanced.html
-share/doc/kde/HTML/en/kmenuedit/glossary.html
 share/doc/kde/HTML/en/kmenuedit/i_copy.png
 share/doc/kde/HTML/en/kmenuedit/i_cut.png
 share/doc/kde/HTML/en/kmenuedit/i_delete.png
@@ -897,126 +1054,39 @@ share/doc/kde/HTML/en/kmenuedit/i_new_submenu.png
 share/doc/kde/HTML/en/kmenuedit/i_paste.png
 share/doc/kde/HTML/en/kmenuedit/icon_sets.png
 share/doc/kde/HTML/en/kmenuedit/icons.png
+share/doc/kde/HTML/en/kmenuedit/index.cache.bz2
 share/doc/kde/HTML/en/kmenuedit/index.docbook
-share/doc/kde/HTML/en/kmenuedit/index.html
-share/doc/kde/HTML/en/kmenuedit/installation.html
-share/doc/kde/HTML/en/kmenuedit/introduction.html
-share/doc/kde/HTML/en/kmenuedit/menu-reference.html
-share/doc/kde/HTML/en/kmenuedit/using-kmenuedit.html
-share/doc/kde/HTML/en/konqueror/.anchors
-share/doc/kde/HTML/en/konqueror/basics.html
-share/doc/kde/HTML/en/konqueror/bookmarks.html
-share/doc/kde/HTML/en/konqueror/browser.html
-share/doc/kde/HTML/en/konqueror/bubble.html
 share/doc/kde/HTML/en/konqueror/cmndline.png
-share/doc/kde/HTML/en/konqueror/commandline.html
-share/doc/kde/HTML/en/konqueror/commands.html
 share/doc/kde/HTML/en/konqueror/common
-share/doc/kde/HTML/en/konqueror/config.html
-share/doc/kde/HTML/en/konqueror/configfm.html
-share/doc/kde/HTML/en/konqueror/configure-browser.html
-share/doc/kde/HTML/en/konqueror/configure-enhanced-browsing.html
-share/doc/kde/HTML/en/konqueror/configure-proxy.html
-share/doc/kde/HTML/en/konqueror/configure-user-agent.html
-share/doc/kde/HTML/en/konqueror/cookies.html
-share/doc/kde/HTML/en/konqueror/credits.html
-share/doc/kde/HTML/en/konqueror/crypto.html
-share/doc/kde/HTML/en/konqueror/deleting.html
 share/doc/kde/HTML/en/konqueror/dirtree.png
 share/doc/kde/HTML/en/konqueror/dragdrop.png
-share/doc/kde/HTML/en/konqueror/faq.html
-share/doc/kde/HTML/en/konqueror/file-associations.html
-share/doc/kde/HTML/en/konqueror/filemanager.html
 share/doc/kde/HTML/en/konqueror/filetype1.png
 share/doc/kde/HTML/en/konqueror/filetype3.png
 share/doc/kde/HTML/en/konqueror/filetype4.png
-share/doc/kde/HTML/en/konqueror/ftp.html
+share/doc/kde/HTML/en/konqueror/index.cache.bz2
 share/doc/kde/HTML/en/konqueror/index.docbook
-share/doc/kde/HTML/en/konqueror/index.html
-share/doc/kde/HTML/en/konqueror/installation.html
 share/doc/kde/HTML/en/konqueror/konqorg.png
-share/doc/kde/HTML/en/konqueror/lmb-mmb.html
-share/doc/kde/HTML/en/konqueror/making.html
-share/doc/kde/HTML/en/konqueror/man-info.html
-share/doc/kde/HTML/en/konqueror/moving.html
-share/doc/kde/HTML/en/konqueror/multiple.html
-share/doc/kde/HTML/en/konqueror/newname.html
-share/doc/kde/HTML/en/konqueror/parts.html
 share/doc/kde/HTML/en/konqueror/parts.png
-share/doc/kde/HTML/en/konqueror/plugin.html
-share/doc/kde/HTML/en/konqueror/rmb-menus.html
 share/doc/kde/HTML/en/konqueror/samba.png
-share/doc/kde/HTML/en/konqueror/save-print-web.html
-share/doc/kde/HTML/en/konqueror/save-settings.html
-share/doc/kde/HTML/en/konqueror/surf.html
-share/doc/kde/HTML/en/konsole/.anchors
-share/doc/kde/HTML/en/konsole/command-line-options.html
 share/doc/kde/HTML/en/konsole/common
-share/doc/kde/HTML/en/konsole/credits.html
-share/doc/kde/HTML/en/konsole/history-option.html
+share/doc/kde/HTML/en/konsole/index.cache.bz2
 share/doc/kde/HTML/en/konsole/index.docbook
-share/doc/kde/HTML/en/konsole/index.html
-share/doc/kde/HTML/en/konsole/installation.html
-share/doc/kde/HTML/en/konsole/introduction.html
 share/doc/kde/HTML/en/konsole/konsole.png
 share/doc/kde/HTML/en/konsole/konsole1.gif
 share/doc/kde/HTML/en/konsole/konsole2.gif
-share/doc/kde/HTML/en/konsole/menubar.html
-share/doc/kde/HTML/en/konsole/mousebuttons.html
 share/doc/kde/HTML/en/konsole/techref.html
-share/doc/kde/HTML/en/konsole/toolbar.html
-share/doc/kde/HTML/en/konsole/use-of-konsole.html
 share/doc/kde/HTML/en/konsole/vt100.gif
-share/doc/kde/HTML/en/kpager/.anchors
-share/doc/kde/HTML/en/kpager/commands.html
 share/doc/kde/HTML/en/kpager/common
-share/doc/kde/HTML/en/kpager/compilation.html
-share/doc/kde/HTML/en/kpager/credits.html
-share/doc/kde/HTML/en/kpager/faq.html
+share/doc/kde/HTML/en/kpager/index.cache.bz2
 share/doc/kde/HTML/en/kpager/index.docbook
-share/doc/kde/HTML/en/kpager/index.html
-share/doc/kde/HTML/en/kpager/installation.html
-share/doc/kde/HTML/en/kpager/introduction.html
-share/doc/kde/HTML/en/kpager/kapp-settings.html
-share/doc/kde/HTML/en/kpager/requirements.html
 share/doc/kde/HTML/en/kpager/screenshot.png
 share/doc/kde/HTML/en/kpager/settings.png
-share/doc/kde/HTML/en/kpager/using-kapp.html
-share/doc/kde/HTML/en/ksysguard/.anchors
 share/doc/kde/HTML/en/ksysguard/common
-share/doc/kde/HTML/en/ksysguard/compilationandinstallation.html
-share/doc/kde/HTML/en/ksysguard/credits-and-licenses.html
+share/doc/kde/HTML/en/ksysguard/index.cache.bz2
 share/doc/kde/HTML/en/ksysguard/index.docbook
-share/doc/kde/HTML/en/ksysguard/index.html
-share/doc/kde/HTML/en/ksysguard/installation.html
-share/doc/kde/HTML/en/ksysguard/introduction.html
-share/doc/kde/HTML/en/ksysguard/requirements.html
-share/doc/kde/HTML/en/ksysguard/the-sensor-browser.html
-share/doc/kde/HTML/en/ksysguard/the-workspace.html
-share/doc/kde/HTML/en/ksysguard/usingtheksysguard.html
-share/doc/kde/HTML/en/kwrite/.anchors
-share/doc/kde/HTML/en/kwrite/command-line-options.html
 share/doc/kde/HTML/en/kwrite/common
-share/doc/kde/HTML/en/kwrite/credits.html
-share/doc/kde/HTML/en/kwrite/edit.html
-share/doc/kde/HTML/en/kwrite/go.html
-share/doc/kde/HTML/en/kwrite/help.html
+share/doc/kde/HTML/en/kwrite/index.cache.bz2
 share/doc/kde/HTML/en/kwrite/index.docbook
-share/doc/kde/HTML/en/kwrite/index.html
-share/doc/kde/HTML/en/kwrite/installation.html
-share/doc/kde/HTML/en/kwrite/introduction.html
-share/doc/kde/HTML/en/kwrite/keybindings.html
-share/doc/kde/HTML/en/kwrite/on-screen-fundamentals.html
-share/doc/kde/HTML/en/kwrite/pref-dialog.html
-share/doc/kde/HTML/en/kwrite/pref-edit.html
-share/doc/kde/HTML/en/kwrite/pref-highlighting.html
-share/doc/kde/HTML/en/kwrite/pref-indent.html
-share/doc/kde/HTML/en/kwrite/pref-select.html
-share/doc/kde/HTML/en/kwrite/prefspellchecker.html
-share/doc/kde/HTML/en/kwrite/settings.html
-share/doc/kde/HTML/en/kwrite/the-menu-entries.html
-share/doc/kde/HTML/en/kwrite/tools.html
-share/doc/kde/HTML/en/no-html.html
 share/fonts/9x15.pcf.gz
 share/fonts/console8x16.pcf.gz
 share/fonts/console8x8.pcf.gz
@@ -1027,10 +1097,86 @@ share/kde/apps/drkonqi/debuggers/gdbrc
 share/kde/apps/drkonqi/pics/konqi.png
 share/kde/apps/drkonqi/presets/developerrc
 share/kde/apps/drkonqi/presets/enduserrc
+share/kde/apps/kaddressbook/kaddressbookui.rc
+share/kde/apps/kaddressbook/pics/abentry.xpm
+share/kde/apps/kaddressbook/pics/delete.xpm
+share/kde/apps/kaddressbook/pics/down.xpm
+share/kde/apps/kaddressbook/pics/filemail.xpm
+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/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
+share/kde/apps/kate/icons/hicolor/16x16/actions/null.png
+share/kde/apps/kate/icons/hicolor/16x16/actions/save_all.png
+share/kde/apps/kate/icons/hicolor/22x22/actions/save_all.png
+share/kde/apps/kate/icons/hicolor/32x32/actions/highlighting.png
+share/kde/apps/kate/icons/hicolor/32x32/actions/indent.png
+share/kde/apps/kate/icons/hicolor/32x32/actions/unindent.png
+share/kde/apps/kate/icons/hicolor/48x48/actions/indent.png
+share/kde/apps/kate/icons/hicolor/48x48/actions/unindent.png
+share/kde/apps/kate/icons/locolor/16x16/actions/curfiledir.png
+share/kde/apps/kate/icons/locolor/16x16/actions/indent.png
+share/kde/apps/kate/icons/locolor/16x16/actions/modified.png
+share/kde/apps/kate/icons/locolor/16x16/actions/null.png
+share/kde/apps/kate/icons/locolor/16x16/actions/save_all.png
+share/kde/apps/kate/icons/locolor/16x16/actions/unindent.png
+share/kde/apps/kate/icons/locolor/22x22/actions/indent.png
+share/kde/apps/kate/icons/locolor/22x22/actions/save_all.png
+share/kde/apps/kate/icons/locolor/22x22/actions/unindent.png
+share/kde/apps/kate/katepartbrowserui.rc
+share/kde/apps/kate/katepartui.rc
+share/kde/apps/kate/kateui.rc
+share/kde/apps/kate/pics/fileselector.png
+share/kde/apps/kate/pics/indicator_empty.png
+share/kde/apps/kate/pics/indicator_viewactive.png
+share/kde/apps/kate/pics/openfiles.png
+share/kde/apps/kate/syntax/ada.xml
+share/kde/apps/kate/syntax/bash.xml
+share/kde/apps/kate/syntax/c.xml
+share/kde/apps/kate/syntax/changelog.xml
+share/kde/apps/kate/syntax/cpp.xml
+share/kde/apps/kate/syntax/css.xml
+share/kde/apps/kate/syntax/desktop.xml
+share/kde/apps/kate/syntax/diff.xml
+share/kde/apps/kate/syntax/html.xml
+share/kde/apps/kate/syntax/java.xml
+share/kde/apps/kate/syntax/kbasic.xml
+share/kde/apps/kate/syntax/language.dtd
+share/kde/apps/kate/syntax/latex.xml
+share/kde/apps/kate/syntax/objectivec.xml
+share/kde/apps/kate/syntax/perl.xml
+share/kde/apps/kate/syntax/php.xml
+share/kde/apps/kate/syntax/postscript.xml
+share/kde/apps/kate/syntax/rpmspec.xml
+share/kde/apps/kate/syntax/ruby.xml
+share/kde/apps/kate/syntax/sql.xml
+share/kde/apps/kate/syntax/syntax.template
+share/kde/apps/kate/syntax/vhdl.xml
+share/kde/apps/kate/syntax/xml.xml
 share/kde/apps/kbookmark/directory_bookmarkbar.desktop
+share/kde/apps/kcmcss/template.css
 share/kde/apps/kcminput/cursor_large.pcf.gz
-share/kde/apps/kcmkeys/standard/Unix.kksrc
+share/kde/apps/kcminput/pics/mouse_lh.png
+share/kde/apps/kcminput/pics/mouse_rh.png
+share/kde/apps/kcmkeys/global/global-kde3.kksrc
+share/kde/apps/kcmkeys/global/global-kde4.kksrc
+share/kde/apps/kcmkeys/global/global-mac3.kksrc
+share/kde/apps/kcmkeys/global/global-unix3.kksrc
+share/kde/apps/kcmkeys/global/global-win3.kksrc
+share/kde/apps/kcmkeys/global/global-win4.kksrc
+share/kde/apps/kcmkeys/standard/app-kde3.kksrc
+share/kde/apps/kcmkeys/standard/app-kde4.kksrc
+share/kde/apps/kcmkeys/standard/app-mac3.kksrc
+share/kde/apps/kcmkeys/standard/app-unix3.kksrc
+share/kde/apps/kcmkeys/standard/app-win3.kksrc
 share/kde/apps/kcmlocale/pics/background.png
+share/kde/apps/kcmusb/usb.ids
+share/kde/apps/kconf_update/klipper-1-2.pl
+share/kde/apps/kconf_update/klipperrc.upd
+share/kde/apps/kconf_update/konsole.upd
 share/kde/apps/kcontrol/kcontrolui.rc
 share/kde/apps/kcontrol/pics/energybig.png
 share/kde/apps/kcontrol/pics/lo-energy.png
@@ -1044,6 +1190,10 @@ share/kde/apps/kcontrol/pics/part2.png
 share/kde/apps/kcontrol/pics/part3.png
 share/kde/apps/kcontrol/pics/play.png
 share/kde/apps/kdcop/kdcopui.rc
+share/kde/apps/kdeprintfax/anytops
+share/kde/apps/kdeprintfax/faxfilters
+share/kde/apps/kdeprintfax/icons/hicolor/16x16/actions/abentry.png
+share/kde/apps/kdeprintfax/kdeprintfaxui.rc
 share/kde/apps/kdesktop/DesktopLinks/Home.desktop
 share/kde/apps/kdesktop/directory.autostart
 share/kde/apps/kdesktop/directory.desktop
@@ -1077,8 +1227,10 @@ share/kde/apps/kdisplay/app-defaults/AAAAAAGeneral.ad
 share/kde/apps/kdisplay/app-defaults/AAAMotif.ad
 share/kde/apps/kdisplay/app-defaults/AAATk.ad
 share/kde/apps/kdisplay/app-defaults/AAAXaw.ad
+share/kde/apps/kdisplay/app-defaults/AcroRead.ad
 share/kde/apps/kdisplay/app-defaults/Editres.ad
 share/kde/apps/kdisplay/app-defaults/Emacs.ad
+share/kde/apps/kdisplay/app-defaults/GV.ad
 share/kde/apps/kdisplay/app-defaults/ML.ad
 share/kde/apps/kdisplay/app-defaults/Nedit.ad
 share/kde/apps/kdisplay/app-defaults/Netscape.ad
@@ -1089,6 +1241,7 @@ share/kde/apps/kdisplay/app-defaults/XOsview.ad
 share/kde/apps/kdisplay/app-defaults/XTerm.ad
 share/kde/apps/kdisplay/app-defaults/XV.ad
 share/kde/apps/kdisplay/app-defaults/Xawtv.ad
+share/kde/apps/kdisplay/app-defaults/Xdvi.ad
 share/kde/apps/kdisplay/app-defaults/Xpdf.ad
 share/kde/apps/kdisplay/color-schemes/AtlasGreen.kcsrc
 share/kde/apps/kdisplay/color-schemes/BeOS.kcsrc
@@ -1097,7 +1250,9 @@ share/kde/apps/kdisplay/color-schemes/CDE.kcsrc
 share/kde/apps/kdisplay/color-schemes/DarkBlue.kcsrc
 share/kde/apps/kdisplay/color-schemes/DesertRed.kcsrc
 share/kde/apps/kdisplay/color-schemes/DigitalCDE.kcsrc
+share/kde/apps/kdisplay/color-schemes/EveX.kcsrc
 share/kde/apps/kdisplay/color-schemes/KDEOne.kcsrc
+share/kde/apps/kdisplay/color-schemes/MediaPeach.kcsrc
 share/kde/apps/kdisplay/color-schemes/Next.kcsrc
 share/kde/apps/kdisplay/color-schemes/PaleGray.kcsrc
 share/kde/apps/kdisplay/color-schemes/PointReyesGreen.kcsrc
@@ -1105,6 +1260,7 @@ share/kde/apps/kdisplay/color-schemes/Pumpkin.kcsrc
 share/kde/apps/kdisplay/color-schemes/SolarisCDE.kcsrc
 share/kde/apps/kdisplay/color-schemes/Storm.kcsrc
 share/kde/apps/kdisplay/color-schemes/System.kcsrc
+share/kde/apps/kdisplay/color-schemes/Windows2000.kcsrc
 share/kde/apps/kdisplay/color-schemes/Windows95.kcsrc
 share/kde/apps/kdm/pics/kdeflower.png
 share/kde/apps/kdm/pics/kdelogo.png
@@ -1120,17 +1276,9 @@ share/kde/apps/kfind/icons/locolor/22x22/actions/info.png
 share/kde/apps/kfind/icons/locolor/22x22/actions/openfile.png
 share/kde/apps/kfind/icons/locolor/22x22/actions/save.png
 share/kde/apps/kfind/icons/locolor/22x22/actions/search.png
-share/kde/apps/khelpcenter/en/bad_words
-share/kde/apps/khelpcenter/en/long.html
-share/kde/apps/khelpcenter/en/nomatch.html
-share/kde/apps/khelpcenter/en/short.html
-share/kde/apps/khelpcenter/en/syntax.html
-share/kde/apps/khelpcenter/en/wrapper.html
-share/kde/apps/khelpcenter/icons/locolor/16x16/apps/helpbook_open.png
-share/kde/apps/khelpcenter/pics/checked.xpm
-share/kde/apps/khelpcenter/pics/star.png
-share/kde/apps/khelpcenter/pics/star_blank.png
-share/kde/apps/khelpcenter/pics/unchecked.xpm
+share/kde/apps/khelpcenter/glossary.html.in
+share/kde/apps/khelpcenter/intro.html.in
+share/kde/apps/khelpcenter/khelpcenterui.rc
 share/kde/apps/khelpcenter/plugins/Tutorials/.directory
 share/kde/apps/khelpcenter/plugins/Tutorials/quickstart.desktop
 share/kde/apps/khelpcenter/plugins/Tutorials/visualdict.desktop
@@ -1142,6 +1290,7 @@ share/kde/apps/kicker/applets/ksystemtrayapplet.desktop
 share/kde/apps/kicker/applets/ktaskbarapplet.desktop
 share/kde/apps/kicker/applets/naughtyapplet.desktop
 share/kde/apps/kicker/applets/quicklauncher.desktop
+share/kde/apps/kicker/default-apps
 share/kde/apps/kicker/extensions/childpanelextension.desktop
 share/kde/apps/kicker/extensions/dockbarextension.desktop
 share/kde/apps/kicker/extensions/kasbarextension.desktop
@@ -1263,6 +1412,8 @@ share/kde/apps/kio_finger/kio_finger.css
 share/kde/apps/kio_finger/kio_finger.pl
 share/kde/apps/kio_info/kde-info2html
 share/kde/apps/kio_info/kde-info2html.conf
+share/kde/apps/kioslave/smb.html
+share/kde/apps/kjobviewer/kjobviewerui.rc
 share/kde/apps/kmenuedit/icons/hicolor/22x22/actions/menu_new.png
 share/kde/apps/kmenuedit/icons/hicolor/32x32/actions/menu_new.png
 share/kde/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png
@@ -1274,6 +1425,28 @@ share/kde/apps/konqlistview/konq_detailedlistview.rc
 share/kde/apps/konqlistview/konq_textview.rc
 share/kde/apps/konqlistview/konq_treeview.rc
 share/kde/apps/konqlistview/kpartplugins/kshellcmdplugin.rc
+share/kde/apps/konqsidebartng/add/sidebar_classic_add.desktop
+share/kde/apps/konqsidebartng/add/virtualfolderadd.desktop
+share/kde/apps/konqsidebartng/dirtree/bookmarks_module.desktop
+share/kde/apps/konqsidebartng/dirtree/dirtree_module.desktop
+share/kde/apps/konqsidebartng/dirtree/history_module.desktop
+share/kde/apps/konqsidebartng/entries/.version
+share/kde/apps/konqsidebartng/entries/bookmarks.desktop
+share/kde/apps/konqsidebartng/entries/history.desktop
+share/kde/apps/konqsidebartng/entries/home.desktop
+share/kde/apps/konqsidebartng/entries/remote.desktop
+share/kde/apps/konqsidebartng/entries/root.desktop
+share/kde/apps/konqsidebartng/entries/services.desktop
+share/kde/apps/konqsidebartng/entries/sidebar_classic.desktop
+share/kde/apps/konqsidebartng/virtual_folders/remote/.directory
+share/kde/apps/konqsidebartng/virtual_folders/remote/ftp/.directory
+share/kde/apps/konqsidebartng/virtual_folders/remote/ftp/kde_ftp.desktop
+share/kde/apps/konqsidebartng/virtual_folders/remote/web/.directory
+share/kde/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop
+share/kde/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop
+share/kde/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop
+share/kde/apps/konqsidebartng/virtual_folders/services/.directory
+share/kde/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
 share/kde/apps/konqueror/about/back.png
 share/kde/apps/konqueror/about/background.png
 share/kde/apps/konqueror/about/bgtable.png
@@ -1283,6 +1456,7 @@ share/kde/apps/konqueror/about/intro.html
 share/kde/apps/konqueror/about/kdelogo2.png
 share/kde/apps/konqueror/about/konq.css
 share/kde/apps/konqueror/about/konqueror.png
+share/kde/apps/konqueror/about/lightning.png
 share/kde/apps/konqueror/about/lines.png
 share/kde/apps/konqueror/about/lines2.png
 share/kde/apps/konqueror/about/locationbar_erase.png
@@ -1302,34 +1476,19 @@ share/kde/apps/konqueror/dirtree/remote/.directory
 share/kde/apps/konqueror/dirtree/remote/ftp/.directory
 share/kde/apps/konqueror/dirtree/remote/ftp/kde_ftp.desktop
 share/kde/apps/konqueror/dirtree/remote/web/.directory
+share/kde/apps/konqueror/dirtree/remote/web/apps_web.desktop
+share/kde/apps/konqueror/dirtree/remote/web/dot_web.desktop
 share/kde/apps/konqueror/dirtree/remote/web/kde_web.desktop
 share/kde/apps/konqueror/dirtree/root.desktop
-share/kde/apps/konqueror/icons/hicolor/16x16/actions/remove_view.png
-share/kde/apps/konqueror/icons/hicolor/16x16/actions/view_bottom.png
-share/kde/apps/konqueror/icons/hicolor/16x16/actions/view_left_right.png
-share/kde/apps/konqueror/icons/hicolor/16x16/actions/view_right.png
-share/kde/apps/konqueror/icons/hicolor/16x16/actions/view_top_bottom.png
-share/kde/apps/konqueror/icons/hicolor/22x22/actions/remove_view.png
-share/kde/apps/konqueror/icons/hicolor/22x22/actions/view_bottom.png
-share/kde/apps/konqueror/icons/hicolor/22x22/actions/view_left_right.png
-share/kde/apps/konqueror/icons/hicolor/22x22/actions/view_right.png
-share/kde/apps/konqueror/icons/hicolor/22x22/actions/view_top_bottom.png
-share/kde/apps/konqueror/icons/hicolor/32x32/actions/remove_view.png
-share/kde/apps/konqueror/icons/hicolor/32x32/actions/view_bottom.png
-share/kde/apps/konqueror/icons/hicolor/32x32/actions/view_left_right.png
-share/kde/apps/konqueror/icons/hicolor/32x32/actions/view_right.png
-share/kde/apps/konqueror/icons/hicolor/32x32/actions/view_top_bottom.png
-share/kde/apps/konqueror/icons/locolor/16x16/actions/kde1.png
-share/kde/apps/konqueror/icons/locolor/16x16/actions/kde2.png
-share/kde/apps/konqueror/icons/locolor/16x16/actions/kde3.png
-share/kde/apps/konqueror/icons/locolor/16x16/actions/kde4.png
-share/kde/apps/konqueror/icons/locolor/16x16/actions/kde5.png
-share/kde/apps/konqueror/icons/locolor/16x16/actions/kde6.png
-share/kde/apps/konqueror/icons/locolor/16x16/actions/remove_view.png
-share/kde/apps/konqueror/icons/locolor/16x16/actions/view_bottom.png
-share/kde/apps/konqueror/icons/locolor/16x16/actions/view_left_right.png
-share/kde/apps/konqueror/icons/locolor/16x16/actions/view_right.png
-share/kde/apps/konqueror/icons/locolor/16x16/actions/view_top_bottom.png
+share/kde/apps/konqueror/dirtree/services/.directory
+share/kde/apps/konqueror/dirtree/services/audiocd.desktop
+share/kde/apps/konqueror/icons/hicolor/16x16/actions/history_clear.png
+share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde1.png
+share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde2.png
+share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde3.png
+share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde4.png
+share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde5.png
+share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde6.png
 share/kde/apps/konqueror/konqueror.rc
 share/kde/apps/konqueror/pics/indicator_anchor.png
 share/kde/apps/konqueror/pics/indicator_connect.png
@@ -1364,6 +1523,7 @@ share/kde/apps/konsole/README.KeyTab
 share/kde/apps/konsole/README.Schema
 share/kde/apps/konsole/Transparent.schema
 share/kde/apps/konsole/Transparent_MC.schema
+share/kde/apps/konsole/Transparent_darkbg.schema
 share/kde/apps/konsole/Transparent_lightbg.schema
 share/kde/apps/konsole/WhiteOnBlack.schema
 share/kde/apps/konsole/XTerm.schema
@@ -1378,13 +1538,18 @@ share/kde/apps/konsole/pics/colourness.png
 share/kde/apps/konsole/pics/contrast.png
 share/kde/apps/konsole/shell.desktop
 share/kde/apps/konsole/su.desktop
+share/kde/apps/konsole/sumc.desktop
 share/kde/apps/konsole/syscolor.schema
 share/kde/apps/konsole/vim.schema
 share/kde/apps/konsole/vt100.keytab
 share/kde/apps/konsole/vt420pc.keytab
 share/kde/apps/konsole/x11r5.keytab
-share/kde/apps/kscreensaver/kscience-small.gif
-share/kde/apps/kscreensaver/kscience.gif
+share/kde/apps/kpersonalizer/pics/step1.png
+share/kde/apps/kpersonalizer/pics/step2.png
+share/kde/apps/kpersonalizer/pics/step3.png
+share/kde/apps/kpersonalizer/pics/step4.png
+share/kde/apps/kpersonalizer/pics/step5.png
+share/kde/apps/kscreensaver/kscience.png
 share/kde/apps/ksplash/pics/locolor/splash_active_bar.png
 share/kde/apps/ksplash/pics/locolor/splash_bottom.png
 share/kde/apps/ksplash/pics/locolor/splash_inactive_bar.png
@@ -1396,56 +1561,19 @@ share/kde/apps/ksplash/pics/splash_top.png
 share/kde/apps/ksysguard/KSysGuardApplet.xml
 share/kde/apps/ksysguard/ProcessTable.sgrd
 share/kde/apps/ksysguard/SystemLoad.sgrd
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/X.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/artsd.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/automount.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/bash.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/c++.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/cc.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/computer.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/console.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/csh.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/emacs.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/g++.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/gcc.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/gdb.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/httpd.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/in.identd.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/inetd.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/init.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/kcookiejar.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/kdesktop.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/kflushd.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/kicker.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/kio_file.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/klauncher.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/ksh.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/kswapd.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/ksysguardd.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/kupdate.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/login.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/lpd.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/mingetty.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/mutt.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/nscd.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/pine.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/portmap.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/sendmail.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/sh.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/ssh.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/startkde.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/startx.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/syslogd.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/tcsh.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/unknown.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/xemacs.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/xinit.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/xntpd.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/xterm.png
-share/kde/apps/ksysguard/icons/locolor/16x16/apps/ypbind.png
 share/kde/apps/ksysguard/ksysguardui.rc
+share/kde/apps/ksysguard/pics/X.png
+share/kde/apps/ksysguard/pics/computer.png
+share/kde/apps/ksysguard/pics/daemon.png
+share/kde/apps/ksysguard/pics/kdeapp.png
+share/kde/apps/ksysguard/pics/kernel.png
+share/kde/apps/ksysguard/pics/ksysguardd.png
+share/kde/apps/ksysguard/pics/running.png
+share/kde/apps/ksysguard/pics/shell.png
+share/kde/apps/ksysguard/pics/tools.png
+share/kde/apps/ksysguard/pics/unknownapp.png
+share/kde/apps/ksysguard/pics/waiting.png
 share/kde/apps/kthememgr/Themes/Default.ktheme
-share/kde/apps/kthememgr/Themes/Eclipse.ktheme
 share/kde/apps/kthememgr/Themes/MGBreizh.ktheme
 share/kde/apps/kthememgr/Themes/Nostalgy.ktheme
 share/kde/apps/kthememgr/Themes/Template.themerc
@@ -1453,11 +1581,45 @@ share/kde/apps/kthememgr/Themes/Wood.ktheme
 share/kde/apps/kthememgr/theme.mappings
 share/kde/apps/kwin/b2.desktop
 share/kde/apps/kwin/eventsrc
-share/kde/apps/kwin/kde.desktop
+share/kde/apps/kwin/icewm-themes/closeA.xpm
+share/kde/apps/kwin/icewm-themes/closeI.xpm
+share/kde/apps/kwin/icewm-themes/default.theme
+share/kde/apps/kwin/icewm-themes/depthA.xpm
+share/kde/apps/kwin/icewm-themes/depthI.xpm
+share/kde/apps/kwin/icewm-themes/maximizeA.xpm
+share/kde/apps/kwin/icewm-themes/maximizeI.xpm
+share/kde/apps/kwin/icewm-themes/menuButtonA.xpm
+share/kde/apps/kwin/icewm-themes/menuButtonI.xpm
+share/kde/apps/kwin/icewm-themes/minimizeA.xpm
+share/kde/apps/kwin/icewm-themes/minimizeI.xpm
+share/kde/apps/kwin/icewm-themes/restoreA.xpm
+share/kde/apps/kwin/icewm-themes/restoreI.xpm
+share/kde/apps/kwin/icewm-themes/rolldownA.xpm
+share/kde/apps/kwin/icewm-themes/rolldownI.xpm
+share/kde/apps/kwin/icewm-themes/rollupA.xpm
+share/kde/apps/kwin/icewm-themes/rollupI.xpm
+share/kde/apps/kwin/icewm-themes/titleAB.xpm
+share/kde/apps/kwin/icewm-themes/titleAJ.xpm
+share/kde/apps/kwin/icewm-themes/titleAM.xpm
+share/kde/apps/kwin/icewm-themes/titleAP.xpm
+share/kde/apps/kwin/icewm-themes/titleAQ.xpm
+share/kde/apps/kwin/icewm-themes/titleAR.xpm
+share/kde/apps/kwin/icewm-themes/titleAS.xpm
+share/kde/apps/kwin/icewm-themes/titleAT.xpm
+share/kde/apps/kwin/icewm-themes/titleIB.xpm
+share/kde/apps/kwin/icewm-themes/titleIJ.xpm
+share/kde/apps/kwin/icewm-themes/titleIM.xpm
+share/kde/apps/kwin/icewm-themes/titleIP.xpm
+share/kde/apps/kwin/icewm-themes/titleIQ.xpm
+share/kde/apps/kwin/icewm-themes/titleIR.xpm
+share/kde/apps/kwin/icewm-themes/titleIS.xpm
+share/kde/apps/kwin/icewm-themes/titleIT.xpm
+share/kde/apps/kwin/icewm.desktop
 share/kde/apps/kwin/kde1.desktop
 share/kde/apps/kwin/kstep.desktop
 share/kde/apps/kwin/laptop.desktop
 share/kde/apps/kwin/modernsystem.desktop
+share/kde/apps/kwin/mwm.desktop
 share/kde/apps/kwin/pics/bluesun.png
 share/kde/apps/kwin/pics/close.png
 share/kde/apps/kwin/pics/fog-grey.png
@@ -1471,13 +1633,12 @@ share/kde/apps/kwin/pics/menu.png
 share/kde/apps/kwin/pics/pindown.png
 share/kde/apps/kwin/pics/pinup.png
 share/kde/apps/kwin/pics/unknown.png
+share/kde/apps/kwin/quartz.desktop
+share/kde/apps/kwin/redmond.desktop
 share/kde/apps/kwin/riscos.desktop
 share/kde/apps/kwin/system.desktop
-share/kde/apps/kwin/win2k.desktop
-share/kde/apps/kwrite/kwrite_browser.rc
-share/kde/apps/kwrite/kwrite_shell.rc
+share/kde/apps/kwin/web.desktop
 share/kde/apps/kwrite/kwriteui.rc
-share/kde/apps/kwrite/syntax.xml
 share/kde/apps/naughtyapplet/pics/naughty-happy.png
 share/kde/apps/naughtyapplet/pics/naughty-sad.png
 share/kde/config/antrc
@@ -1503,8 +1664,10 @@ share/kde/config/imsmaprc
 share/kde/config/interferencerc
 share/kde/config/kdesktop_custom_menu1
 share/kde/config/kdesktop_custom_menu2
-share/kde/config/kdmrc
+share/kde/config/kdm/README
+share/kde/config/kdm/kdmrc
 share/kde/config/klipperrc
+share/kde/config/konqsidebartng.rc
 share/kde/config/konsolerc
 share/kde/config/kshorturifilterrc
 share/kde/config/kumpparc
@@ -1514,41 +1677,103 @@ 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
+share/kde/icons/hicolor/16x16/actions/view_multicolumn.png
+share/kde/icons/hicolor/16x16/actions/view_text.png
+share/kde/icons/hicolor/16x16/actions/view_tree.png
 share/kde/icons/hicolor/16x16/apps/access.png
+share/kde/icons/hicolor/16x16/apps/acroread.png
+share/kde/icons/hicolor/16x16/apps/agent.png
+share/kde/icons/hicolor/16x16/apps/alevt.png
+share/kde/icons/hicolor/16x16/apps/applixware.png
+share/kde/icons/hicolor/16x16/apps/arts.png
 share/kde/icons/hicolor/16x16/apps/background.png
 share/kde/icons/hicolor/16x16/apps/bell.png
+share/kde/icons/hicolor/16x16/apps/blender.png
+share/kde/icons/hicolor/16x16/apps/clock.png
+share/kde/icons/hicolor/16x16/apps/colors.png
 share/kde/icons/hicolor/16x16/apps/cookie.png
+share/kde/icons/hicolor/16x16/apps/date.png
+share/kde/icons/hicolor/16x16/apps/designer.png
+share/kde/icons/hicolor/16x16/apps/dlgedit.png
+share/kde/icons/hicolor/16x16/apps/emacs.png
 share/kde/icons/hicolor/16x16/apps/email.png
 share/kde/icons/hicolor/16x16/apps/energy.png
+share/kde/icons/hicolor/16x16/apps/energy_star.png
 share/kde/icons/hicolor/16x16/apps/enhanced_browsing.png
+share/kde/icons/hicolor/16x16/apps/filetypes.png
+share/kde/icons/hicolor/16x16/apps/fonts.png
+share/kde/icons/hicolor/16x16/apps/gimp.png
 share/kde/icons/hicolor/16x16/apps/go.png
+share/kde/icons/hicolor/16x16/apps/gv.png
+share/kde/icons/hicolor/16x16/apps/gvim.png
+share/kde/icons/hicolor/16x16/apps/help_index.png
 share/kde/icons/hicolor/16x16/apps/hwinfo.png
+share/kde/icons/hicolor/16x16/apps/icons.png
+share/kde/icons/hicolor/16x16/apps/iconthemes.png
 share/kde/icons/hicolor/16x16/apps/input_devices_settings.png
+share/kde/icons/hicolor/16x16/apps/kaddressbook.png
 share/kde/icons/hicolor/16x16/apps/kappfinder.png
+share/kde/icons/hicolor/16x16/apps/kate.png
+share/kde/icons/hicolor/16x16/apps/kcmdevices.png
+share/kde/icons/hicolor/16x16/apps/kcmkicker.png
 share/kde/icons/hicolor/16x16/apps/kcmkwm.png
+share/kde/icons/hicolor/16x16/apps/kcmmemory.png
+share/kde/icons/hicolor/16x16/apps/kcmmidi.png
+share/kde/icons/hicolor/16x16/apps/kcmpartitions.png
+share/kde/icons/hicolor/16x16/apps/kcmpci.png
+share/kde/icons/hicolor/16x16/apps/kcmprocessor.png
+share/kde/icons/hicolor/16x16/apps/kcmscsi.png
+share/kde/icons/hicolor/16x16/apps/kcmsound.png
 share/kde/icons/hicolor/16x16/apps/kcmsystem.png
+share/kde/icons/hicolor/16x16/apps/kcmx.png
 share/kde/icons/hicolor/16x16/apps/kcontrol.png
+share/kde/icons/hicolor/16x16/apps/kdeprintfax.png
 share/kde/icons/hicolor/16x16/apps/kdisknav.png
+share/kde/icons/hicolor/16x16/apps/kdmconfig.png
 share/kde/icons/hicolor/16x16/apps/keditbookmarks.png
 share/kde/icons/hicolor/16x16/apps/key_bindings.png
+share/kde/icons/hicolor/16x16/apps/keyboard.png
+share/kde/icons/hicolor/16x16/apps/keyboard_layout.png
 share/kde/icons/hicolor/16x16/apps/kfm.png
 share/kde/icons/hicolor/16x16/apps/kfm_home.png
 share/kde/icons/hicolor/16x16/apps/khelpcenter.png
+share/kde/icons/hicolor/16x16/apps/kicker.png
+share/kde/icons/hicolor/16x16/apps/kjobviewer.png
 share/kde/icons/hicolor/16x16/apps/klipper.png
+share/kde/icons/hicolor/16x16/apps/kmenuedit.png
+share/kde/icons/hicolor/16x16/apps/knotify.png
 share/kde/icons/hicolor/16x16/apps/konqueror.png
 share/kde/icons/hicolor/16x16/apps/konsole.png
+share/kde/icons/hicolor/16x16/apps/kpager.png
+share/kde/icons/hicolor/16x16/apps/kpersonalizer.png
 share/kde/icons/hicolor/16x16/apps/kscreensaver.png
 share/kde/icons/hicolor/16x16/apps/ksysguard.png
+share/kde/icons/hicolor/16x16/apps/kthememgr.png
 share/kde/icons/hicolor/16x16/apps/ktip.png
+share/kde/icons/hicolor/16x16/apps/kwin.png
 share/kde/icons/hicolor/16x16/apps/kwrite.png
+share/kde/icons/hicolor/16x16/apps/licq.png
 share/kde/icons/hicolor/16x16/apps/locale.png
 share/kde/icons/hicolor/16x16/apps/looknfeel.png
+share/kde/icons/hicolor/16x16/apps/lyx.png
+share/kde/icons/hicolor/16x16/apps/mathematica.png
+share/kde/icons/hicolor/16x16/apps/mouse.png
+share/kde/icons/hicolor/16x16/apps/mozilla.png
 share/kde/icons/hicolor/16x16/apps/multimedia.png
+share/kde/icons/hicolor/16x16/apps/nedit.png
 share/kde/icons/hicolor/16x16/apps/netscape.png
 share/kde/icons/hicolor/16x16/apps/package_applications.png
 share/kde/icons/hicolor/16x16/apps/package_development.png
 share/kde/icons/hicolor/16x16/apps/package_editors.png
+share/kde/icons/hicolor/16x16/apps/package_favourite.png
+share/kde/icons/hicolor/16x16/apps/package_games.png
+share/kde/icons/hicolor/16x16/apps/package_games_arcade.png
+share/kde/icons/hicolor/16x16/apps/package_games_board.png
+share/kde/icons/hicolor/16x16/apps/package_games_card.png
+share/kde/icons/hicolor/16x16/apps/package_games_strategy.png
 share/kde/icons/hicolor/16x16/apps/package_graphics.png
 share/kde/icons/hicolor/16x16/apps/package_multimedia.png
 share/kde/icons/hicolor/16x16/apps/package_network.png
@@ -1557,25 +1782,41 @@ share/kde/icons/hicolor/16x16/apps/package_system.png
 share/kde/icons/hicolor/16x16/apps/package_toys.png
 share/kde/icons/hicolor/16x16/apps/package_utilities.png
 share/kde/icons/hicolor/16x16/apps/package_wordprocessing.png
+share/kde/icons/hicolor/16x16/apps/panel.png
+share/kde/icons/hicolor/16x16/apps/panel_settings.png
+share/kde/icons/hicolor/16x16/apps/password.png
+share/kde/icons/hicolor/16x16/apps/penguin.png
+share/kde/icons/hicolor/16x16/apps/personal.png
+share/kde/icons/hicolor/16x16/apps/plan.png
+share/kde/icons/hicolor/16x16/apps/printmgr.png
+share/kde/icons/hicolor/16x16/apps/proxy.png
 share/kde/icons/hicolor/16x16/apps/pybliographic.png
 share/kde/icons/hicolor/16x16/apps/realplayer.png
 share/kde/icons/hicolor/16x16/apps/remote.png
 share/kde/icons/hicolor/16x16/apps/samba.png
 share/kde/icons/hicolor/16x16/apps/style.png
+share/kde/icons/hicolor/16x16/apps/stylesheet.png
+share/kde/icons/hicolor/16x16/apps/terminal.png
+share/kde/icons/hicolor/16x16/apps/usb.png
+share/kde/icons/hicolor/16x16/apps/wabi.png
 share/kde/icons/hicolor/16x16/apps/window_list.png
-share/kde/icons/hicolor/16x16/devices/3floppy_mount.png
-share/kde/icons/hicolor/16x16/devices/3floppy_unmount.png
-share/kde/icons/hicolor/16x16/devices/cdaudio_mount.png
-share/kde/icons/hicolor/16x16/devices/cdaudio_unmount.png
-share/kde/icons/hicolor/16x16/devices/cdrom_mount.png
-share/kde/icons/hicolor/16x16/devices/cdrom_unmount.png
-share/kde/icons/hicolor/16x16/devices/dvd_mount.png
-share/kde/icons/hicolor/16x16/devices/dvd_unmount.png
-share/kde/icons/hicolor/16x16/devices/hdd_mount.png
-share/kde/icons/hicolor/16x16/devices/hdd_unmount.png
-share/kde/icons/hicolor/16x16/devices/nfs_mount.png
-share/kde/icons/hicolor/16x16/devices/nfs_unmount.png
-share/kde/icons/hicolor/16x16/devices/printer1.png
+share/kde/icons/hicolor/16x16/apps/winprops.png
+share/kde/icons/hicolor/16x16/apps/wp.png
+share/kde/icons/hicolor/16x16/apps/xcalc.png
+share/kde/icons/hicolor/16x16/apps/xclipboard.png
+share/kde/icons/hicolor/16x16/apps/xclock.png
+share/kde/icons/hicolor/16x16/apps/xconsole.png
+share/kde/icons/hicolor/16x16/apps/xedit.png
+share/kde/icons/hicolor/16x16/apps/xemacs.png
+share/kde/icons/hicolor/16x16/apps/xeyes.png
+share/kde/icons/hicolor/16x16/apps/xfig.png
+share/kde/icons/hicolor/16x16/apps/xfmail.png
+share/kde/icons/hicolor/16x16/apps/xload.png
+share/kde/icons/hicolor/16x16/apps/xmag.png
+share/kde/icons/hicolor/16x16/apps/xmms.png
+share/kde/icons/hicolor/16x16/apps/xosview.png
+share/kde/icons/hicolor/16x16/apps/xpaint.png
+share/kde/icons/hicolor/16x16/apps/xv.png
 share/kde/icons/hicolor/16x16/filesystems/file_important.png
 share/kde/icons/hicolor/16x16/filesystems/folder_important.png
 share/kde/icons/hicolor/22x22/actions/view_choose.png
@@ -1593,27 +1834,41 @@ share/kde/icons/hicolor/32x32/actions/view_tree.png
 share/kde/icons/hicolor/32x32/apps/access.png
 share/kde/icons/hicolor/32x32/apps/acroread.png
 share/kde/icons/hicolor/32x32/apps/agent.png
+share/kde/icons/hicolor/32x32/apps/alevt.png
+share/kde/icons/hicolor/32x32/apps/applixware.png
+share/kde/icons/hicolor/32x32/apps/background.png
 share/kde/icons/hicolor/32x32/apps/bell.png
 share/kde/icons/hicolor/32x32/apps/blender.png
+share/kde/icons/hicolor/32x32/apps/clanbomber.png
 share/kde/icons/hicolor/32x32/apps/clock.png
 share/kde/icons/hicolor/32x32/apps/colors.png
 share/kde/icons/hicolor/32x32/apps/cookie.png
 share/kde/icons/hicolor/32x32/apps/date.png
 share/kde/icons/hicolor/32x32/apps/designer.png
+share/kde/icons/hicolor/32x32/apps/dlgedit.png
 share/kde/icons/hicolor/32x32/apps/emacs.png
 share/kde/icons/hicolor/32x32/apps/email.png
 share/kde/icons/hicolor/32x32/apps/energy.png
+share/kde/icons/hicolor/32x32/apps/energy_star.png
 share/kde/icons/hicolor/32x32/apps/enhanced_browsing.png
+share/kde/icons/hicolor/32x32/apps/error.png
 share/kde/icons/hicolor/32x32/apps/filetypes.png
 share/kde/icons/hicolor/32x32/apps/fonts.png
+share/kde/icons/hicolor/32x32/apps/gimp.png
 share/kde/icons/hicolor/32x32/apps/go.png
+share/kde/icons/hicolor/32x32/apps/gv.png
+share/kde/icons/hicolor/32x32/apps/gvim.png
 share/kde/icons/hicolor/32x32/apps/help_index.png
 share/kde/icons/hicolor/32x32/apps/hwinfo.png
 share/kde/icons/hicolor/32x32/apps/icons.png
 share/kde/icons/hicolor/32x32/apps/iconthemes.png
+share/kde/icons/hicolor/32x32/apps/input_devices_settings.png
+share/kde/icons/hicolor/32x32/apps/kaddressbook.png
 share/kde/icons/hicolor/32x32/apps/kappfinder.png
+share/kde/icons/hicolor/32x32/apps/kate.png
 share/kde/icons/hicolor/32x32/apps/kcmdevices.png
 share/kde/icons/hicolor/32x32/apps/kcmdrkonqi.png
+share/kde/icons/hicolor/32x32/apps/kcmkicker.png
 share/kde/icons/hicolor/32x32/apps/kcmkwm.png
 share/kde/icons/hicolor/32x32/apps/kcmmemory.png
 share/kde/icons/hicolor/32x32/apps/kcmmidi.png
@@ -1625,36 +1880,48 @@ share/kde/icons/hicolor/32x32/apps/kcmsound.png
 share/kde/icons/hicolor/32x32/apps/kcmsystem.png
 share/kde/icons/hicolor/32x32/apps/kcmx.png
 share/kde/icons/hicolor/32x32/apps/kcontrol.png
+share/kde/icons/hicolor/32x32/apps/kdeprintfax.png
 share/kde/icons/hicolor/32x32/apps/kdisknav.png
 share/kde/icons/hicolor/32x32/apps/kdmconfig.png
 share/kde/icons/hicolor/32x32/apps/keditbookmarks.png
 share/kde/icons/hicolor/32x32/apps/key_bindings.png
+share/kde/icons/hicolor/32x32/apps/keyboard.png
 share/kde/icons/hicolor/32x32/apps/keyboard_layout.png
 share/kde/icons/hicolor/32x32/apps/kfm.png
 share/kde/icons/hicolor/32x32/apps/kfm_home.png
 share/kde/icons/hicolor/32x32/apps/khelpcenter.png
+share/kde/icons/hicolor/32x32/apps/kjobviewer.png
 share/kde/icons/hicolor/32x32/apps/klipper.png
 share/kde/icons/hicolor/32x32/apps/kmenuedit.png
 share/kde/icons/hicolor/32x32/apps/knotify.png
 share/kde/icons/hicolor/32x32/apps/konqueror.png
 share/kde/icons/hicolor/32x32/apps/konsole.png
 share/kde/icons/hicolor/32x32/apps/kpager.png
+share/kde/icons/hicolor/32x32/apps/kpersonalizer.png
 share/kde/icons/hicolor/32x32/apps/kscreensaver.png
 share/kde/icons/hicolor/32x32/apps/ksysguard.png
 share/kde/icons/hicolor/32x32/apps/kthememgr.png
 share/kde/icons/hicolor/32x32/apps/ktip.png
 share/kde/icons/hicolor/32x32/apps/kwin.png
 share/kde/icons/hicolor/32x32/apps/kwrite.png
+share/kde/icons/hicolor/32x32/apps/licq.png
 share/kde/icons/hicolor/32x32/apps/locale.png
 share/kde/icons/hicolor/32x32/apps/looknfeel.png
+share/kde/icons/hicolor/32x32/apps/lyx.png
+share/kde/icons/hicolor/32x32/apps/mathematica.png
 share/kde/icons/hicolor/32x32/apps/mouse.png
 share/kde/icons/hicolor/32x32/apps/multimedia.png
+share/kde/icons/hicolor/32x32/apps/nedit.png
 share/kde/icons/hicolor/32x32/apps/netscape.png
 share/kde/icons/hicolor/32x32/apps/package.png
 share/kde/icons/hicolor/32x32/apps/package_applications.png
 share/kde/icons/hicolor/32x32/apps/package_editors.png
 share/kde/icons/hicolor/32x32/apps/package_favourite.png
 share/kde/icons/hicolor/32x32/apps/package_games.png
+share/kde/icons/hicolor/32x32/apps/package_games_arcade.png
+share/kde/icons/hicolor/32x32/apps/package_games_board.png
+share/kde/icons/hicolor/32x32/apps/package_games_card.png
+share/kde/icons/hicolor/32x32/apps/package_games_strategy.png
 share/kde/icons/hicolor/32x32/apps/package_graphics.png
 share/kde/icons/hicolor/32x32/apps/package_multimedia.png
 share/kde/icons/hicolor/32x32/apps/package_network.png
@@ -1664,44 +1931,41 @@ share/kde/icons/hicolor/32x32/apps/package_toys.png
 share/kde/icons/hicolor/32x32/apps/package_utilities.png
 share/kde/icons/hicolor/32x32/apps/package_wordprocessing.png
 share/kde/icons/hicolor/32x32/apps/password.png
+share/kde/icons/hicolor/32x32/apps/penguin.png
+share/kde/icons/hicolor/32x32/apps/personal.png
+share/kde/icons/hicolor/32x32/apps/plan.png
+share/kde/icons/hicolor/32x32/apps/printmgr.png
 share/kde/icons/hicolor/32x32/apps/proxy.png
 share/kde/icons/hicolor/32x32/apps/pybliographic.png
+share/kde/icons/hicolor/32x32/apps/pysol.png
 share/kde/icons/hicolor/32x32/apps/realplayer.png
+share/kde/icons/hicolor/32x32/apps/samba.png
 share/kde/icons/hicolor/32x32/apps/style.png
+share/kde/icons/hicolor/32x32/apps/stylesheet.png
 share/kde/icons/hicolor/32x32/apps/terminal.png
+share/kde/icons/hicolor/32x32/apps/usb.png
+share/kde/icons/hicolor/32x32/apps/wabi.png
 share/kde/icons/hicolor/32x32/apps/window_list.png
 share/kde/icons/hicolor/32x32/apps/winprops.png
+share/kde/icons/hicolor/32x32/apps/wp.png
+share/kde/icons/hicolor/32x32/apps/x.png
 share/kde/icons/hicolor/32x32/apps/xapp.png
 share/kde/icons/hicolor/32x32/apps/xawtv.png
+share/kde/icons/hicolor/32x32/apps/xcalc.png
+share/kde/icons/hicolor/32x32/apps/xclipboard.png
+share/kde/icons/hicolor/32x32/apps/xclock.png
+share/kde/icons/hicolor/32x32/apps/xconsole.png
 share/kde/icons/hicolor/32x32/apps/xedit.png
 share/kde/icons/hicolor/32x32/apps/xemacs.png
+share/kde/icons/hicolor/32x32/apps/xeyes.png
+share/kde/icons/hicolor/32x32/apps/xfig.png
+share/kde/icons/hicolor/32x32/apps/xfmail.png
+share/kde/icons/hicolor/32x32/apps/xload.png
 share/kde/icons/hicolor/32x32/apps/xmag.png
+share/kde/icons/hicolor/32x32/apps/xmms.png
+share/kde/icons/hicolor/32x32/apps/xosview.png
+share/kde/icons/hicolor/32x32/apps/xpaint.png
 share/kde/icons/hicolor/32x32/apps/xv.png
-share/kde/icons/hicolor/32x32/devices/3floppy_mount.png
-share/kde/icons/hicolor/32x32/devices/3floppy_unmount.png
-share/kde/icons/hicolor/32x32/devices/5floppy_mount.png
-share/kde/icons/hicolor/32x32/devices/5floppy_unmount.png
-share/kde/icons/hicolor/32x32/devices/cdaudio_mount.png
-share/kde/icons/hicolor/32x32/devices/cdaudio_unmount.png
-share/kde/icons/hicolor/32x32/devices/cdrom_mount.png
-share/kde/icons/hicolor/32x32/devices/cdrom_unmount.png
-share/kde/icons/hicolor/32x32/devices/cdwriter_mount.png
-share/kde/icons/hicolor/32x32/devices/cdwriter_unmount.png
-share/kde/icons/hicolor/32x32/devices/dvd_mount.png
-share/kde/icons/hicolor/32x32/devices/dvd_unmount.png
-share/kde/icons/hicolor/32x32/devices/hdd_mount.png
-share/kde/icons/hicolor/32x32/devices/hdd_unmount.png
-share/kde/icons/hicolor/32x32/devices/memory.png
-share/kde/icons/hicolor/32x32/devices/mo_mount.png
-share/kde/icons/hicolor/32x32/devices/mo_unmount.png
-share/kde/icons/hicolor/32x32/devices/nfs_mount.png
-share/kde/icons/hicolor/32x32/devices/nfs_unmount.png
-share/kde/icons/hicolor/32x32/devices/printer1.png
-share/kde/icons/hicolor/32x32/devices/printer2.png
-share/kde/icons/hicolor/32x32/devices/scanner.png
-share/kde/icons/hicolor/32x32/devices/tablet.png
-share/kde/icons/hicolor/32x32/devices/zip_mount.png
-share/kde/icons/hicolor/32x32/devices/zip_unmount.png
 share/kde/icons/hicolor/32x32/filesystems/file_important.png
 share/kde/icons/hicolor/32x32/filesystems/folder_important.png
 share/kde/icons/hicolor/48x48/apps/access.png
@@ -1716,6 +1980,7 @@ share/kde/icons/hicolor/48x48/apps/designer.png
 share/kde/icons/hicolor/48x48/apps/emacs.png
 share/kde/icons/hicolor/48x48/apps/email.png
 share/kde/icons/hicolor/48x48/apps/energy.png
+share/kde/icons/hicolor/48x48/apps/energy_star.png
 share/kde/icons/hicolor/48x48/apps/enhanced_browsing.png
 share/kde/icons/hicolor/48x48/apps/filetypes.png
 share/kde/icons/hicolor/48x48/apps/fonts.png
@@ -1726,7 +1991,9 @@ share/kde/icons/hicolor/48x48/apps/help_index.png
 share/kde/icons/hicolor/48x48/apps/hwinfo.png
 share/kde/icons/hicolor/48x48/apps/icons.png
 share/kde/icons/hicolor/48x48/apps/iconthemes.png
+share/kde/icons/hicolor/48x48/apps/input_devices_settings.png
 share/kde/icons/hicolor/48x48/apps/kappfinder.png
+share/kde/icons/hicolor/48x48/apps/kate.png
 share/kde/icons/hicolor/48x48/apps/kcmdevices.png
 share/kde/icons/hicolor/48x48/apps/kcmdrkonqi.png
 share/kde/icons/hicolor/48x48/apps/kcmkwm.png
@@ -1758,6 +2025,7 @@ share/kde/icons/hicolor/48x48/apps/kthememgr.png
 share/kde/icons/hicolor/48x48/apps/ktip.png
 share/kde/icons/hicolor/48x48/apps/kwin.png
 share/kde/icons/hicolor/48x48/apps/kwrite.png
+share/kde/icons/hicolor/48x48/apps/licq.png
 share/kde/icons/hicolor/48x48/apps/locale.png
 share/kde/icons/hicolor/48x48/apps/looknfeel.png
 share/kde/icons/hicolor/48x48/apps/mouse.png
@@ -1768,6 +2036,10 @@ share/kde/icons/hicolor/48x48/apps/package_applications.png
 share/kde/icons/hicolor/48x48/apps/package_editors.png
 share/kde/icons/hicolor/48x48/apps/package_favourite.png
 share/kde/icons/hicolor/48x48/apps/package_games.png
+share/kde/icons/hicolor/48x48/apps/package_games_arcade.png
+share/kde/icons/hicolor/48x48/apps/package_games_board.png
+share/kde/icons/hicolor/48x48/apps/package_games_card.png
+share/kde/icons/hicolor/48x48/apps/package_games_strategy.png
 share/kde/icons/hicolor/48x48/apps/package_graphics.png
 share/kde/icons/hicolor/48x48/apps/package_multimedia.png
 share/kde/icons/hicolor/48x48/apps/package_network.png
@@ -1777,321 +2049,24 @@ share/kde/icons/hicolor/48x48/apps/package_toys.png
 share/kde/icons/hicolor/48x48/apps/package_utilities.png
 share/kde/icons/hicolor/48x48/apps/package_wordprocessing.png
 share/kde/icons/hicolor/48x48/apps/password.png
+share/kde/icons/hicolor/48x48/apps/personal.png
 share/kde/icons/hicolor/48x48/apps/proxy.png
 share/kde/icons/hicolor/48x48/apps/remote.png
 share/kde/icons/hicolor/48x48/apps/samba.png
 share/kde/icons/hicolor/48x48/apps/style.png
+share/kde/icons/hicolor/48x48/apps/stylesheet.png
 share/kde/icons/hicolor/48x48/apps/terminal.png
+share/kde/icons/hicolor/48x48/apps/usb.png
 share/kde/icons/hicolor/48x48/apps/window_list.png
 share/kde/icons/hicolor/48x48/apps/winprops.png
 share/kde/icons/hicolor/48x48/apps/xedit.png
 share/kde/icons/hicolor/48x48/apps/xemacs.png
 share/kde/icons/hicolor/48x48/apps/xmag.png
 share/kde/icons/hicolor/48x48/apps/xv.png
-share/kde/icons/hicolor/48x48/devices/3floppy_mount.png
-share/kde/icons/hicolor/48x48/devices/3floppy_unmount.png
-share/kde/icons/hicolor/48x48/devices/5floppy_mount.png
-share/kde/icons/hicolor/48x48/devices/5floppy_unmount.png
-share/kde/icons/hicolor/48x48/devices/cdaudio_mount.png
-share/kde/icons/hicolor/48x48/devices/cdaudio_unmount.png
-share/kde/icons/hicolor/48x48/devices/cdrom_mount.png
-share/kde/icons/hicolor/48x48/devices/cdrom_unmount.png
-share/kde/icons/hicolor/48x48/devices/cdwriter_mount.png
-share/kde/icons/hicolor/48x48/devices/cdwriter_unmount.png
-share/kde/icons/hicolor/48x48/devices/dvd_mount.png
-share/kde/icons/hicolor/48x48/devices/dvd_unmount.png
-share/kde/icons/hicolor/48x48/devices/hdd_mount.png
-share/kde/icons/hicolor/48x48/devices/hdd_unmount.png
-share/kde/icons/hicolor/48x48/devices/memory.png
-share/kde/icons/hicolor/48x48/devices/mo_mount.png
-share/kde/icons/hicolor/48x48/devices/mo_unmount.png
-share/kde/icons/hicolor/48x48/devices/nfs_mount.png
-share/kde/icons/hicolor/48x48/devices/nfs_unmount.png
-share/kde/icons/hicolor/48x48/devices/printer1.png
-share/kde/icons/hicolor/48x48/devices/printer2.png
-share/kde/icons/hicolor/48x48/devices/scanner.png
-share/kde/icons/hicolor/48x48/devices/tablet.png
-share/kde/icons/hicolor/48x48/devices/zip_mount.png
-share/kde/icons/hicolor/48x48/devices/zip_unmount.png
 share/kde/icons/hicolor/48x48/filesystems/file_important.png
 share/kde/icons/hicolor/48x48/filesystems/folder_important.png
-share/kde/icons/locolor/16x16/actions/bookmark_folder.png
-share/kde/icons/locolor/16x16/actions/view_choose.png
-share/kde/icons/locolor/16x16/actions/view_detailed.png
-share/kde/icons/locolor/16x16/actions/view_icon.png
-share/kde/icons/locolor/16x16/actions/view_multicolumn.png
-share/kde/icons/locolor/16x16/actions/view_text.png
-share/kde/icons/locolor/16x16/actions/view_tree.png
-share/kde/icons/locolor/16x16/apps/access.png
-share/kde/icons/locolor/16x16/apps/acroread.png
-share/kde/icons/locolor/16x16/apps/agent.png
-share/kde/icons/locolor/16x16/apps/alevt.png
-share/kde/icons/locolor/16x16/apps/applixware.png
-share/kde/icons/locolor/16x16/apps/arts.png
-share/kde/icons/locolor/16x16/apps/background.png
 share/kde/icons/locolor/16x16/apps/bell.png
-share/kde/icons/locolor/16x16/apps/blender.png
-share/kde/icons/locolor/16x16/apps/clock.png
-share/kde/icons/locolor/16x16/apps/colors.png
-share/kde/icons/locolor/16x16/apps/cookie.png
-share/kde/icons/locolor/16x16/apps/date.png
-share/kde/icons/locolor/16x16/apps/dlgedit.png
-share/kde/icons/locolor/16x16/apps/emacs.png
-share/kde/icons/locolor/16x16/apps/email.png
-share/kde/icons/locolor/16x16/apps/energy.png
-share/kde/icons/locolor/16x16/apps/enhanced_browsing.png
-share/kde/icons/locolor/16x16/apps/filetypes.png
-share/kde/icons/locolor/16x16/apps/fonts.png
-share/kde/icons/locolor/16x16/apps/gimp.png
-share/kde/icons/locolor/16x16/apps/go.png
-share/kde/icons/locolor/16x16/apps/gv.png
-share/kde/icons/locolor/16x16/apps/gvim.png
-share/kde/icons/locolor/16x16/apps/help_index.png
-share/kde/icons/locolor/16x16/apps/hwinfo.png
-share/kde/icons/locolor/16x16/apps/icons.png
-share/kde/icons/locolor/16x16/apps/iconthemes.png
-share/kde/icons/locolor/16x16/apps/input_devices_settings.png
-share/kde/icons/locolor/16x16/apps/kappfinder.png
-share/kde/icons/locolor/16x16/apps/kcmdevices.png
-share/kde/icons/locolor/16x16/apps/kcmdrkonqi.png
-share/kde/icons/locolor/16x16/apps/kcmkicker.png
-share/kde/icons/locolor/16x16/apps/kcmkwm.png
-share/kde/icons/locolor/16x16/apps/kcmmemory.png
-share/kde/icons/locolor/16x16/apps/kcmmidi.png
-share/kde/icons/locolor/16x16/apps/kcmpartitions.png
-share/kde/icons/locolor/16x16/apps/kcmpci.png
-share/kde/icons/locolor/16x16/apps/kcmprocessor.png
-share/kde/icons/locolor/16x16/apps/kcmscsi.png
-share/kde/icons/locolor/16x16/apps/kcmsound.png
-share/kde/icons/locolor/16x16/apps/kcmsystem.png
-share/kde/icons/locolor/16x16/apps/kcmx.png
-share/kde/icons/locolor/16x16/apps/kcontrol.png
-share/kde/icons/locolor/16x16/apps/kdisknav.png
-share/kde/icons/locolor/16x16/apps/kdmconfig.png
-share/kde/icons/locolor/16x16/apps/keditbookmarks.png
-share/kde/icons/locolor/16x16/apps/key_bindings.png
-share/kde/icons/locolor/16x16/apps/keyboard.png
-share/kde/icons/locolor/16x16/apps/keyboard_layout.png
-share/kde/icons/locolor/16x16/apps/kfm.png
-share/kde/icons/locolor/16x16/apps/kfm_home.png
-share/kde/icons/locolor/16x16/apps/khelpcenter.png
-share/kde/icons/locolor/16x16/apps/kicker.png
-share/kde/icons/locolor/16x16/apps/klipper.png
-share/kde/icons/locolor/16x16/apps/kmenuedit.png
-share/kde/icons/locolor/16x16/apps/knotify.png
-share/kde/icons/locolor/16x16/apps/konqueror.png
-share/kde/icons/locolor/16x16/apps/konsole.png
-share/kde/icons/locolor/16x16/apps/kpager.png
-share/kde/icons/locolor/16x16/apps/kscreensaver.png
-share/kde/icons/locolor/16x16/apps/ksysguard.png
-share/kde/icons/locolor/16x16/apps/kthememgr.png
-share/kde/icons/locolor/16x16/apps/ktip.png
-share/kde/icons/locolor/16x16/apps/kwin.png
-share/kde/icons/locolor/16x16/apps/kwrite.png
-share/kde/icons/locolor/16x16/apps/locale.png
-share/kde/icons/locolor/16x16/apps/looknfeel.png
-share/kde/icons/locolor/16x16/apps/lyx.png
-share/kde/icons/locolor/16x16/apps/mathematica.png
-share/kde/icons/locolor/16x16/apps/mouse.png
-share/kde/icons/locolor/16x16/apps/mozilla.png
-share/kde/icons/locolor/16x16/apps/multimedia.png
-share/kde/icons/locolor/16x16/apps/nedit.png
-share/kde/icons/locolor/16x16/apps/netscape.png
-share/kde/icons/locolor/16x16/apps/package.png
-share/kde/icons/locolor/16x16/apps/package_applications.png
-share/kde/icons/locolor/16x16/apps/package_editors.png
-share/kde/icons/locolor/16x16/apps/package_favourite.png
-share/kde/icons/locolor/16x16/apps/package_games.png
-share/kde/icons/locolor/16x16/apps/package_graphics.png
-share/kde/icons/locolor/16x16/apps/package_multimedia.png
-share/kde/icons/locolor/16x16/apps/package_network.png
-share/kde/icons/locolor/16x16/apps/package_settings.png
-share/kde/icons/locolor/16x16/apps/package_system.png
-share/kde/icons/locolor/16x16/apps/package_utilities.png
-share/kde/icons/locolor/16x16/apps/panel.png
-share/kde/icons/locolor/16x16/apps/panel_settings.png
-share/kde/icons/locolor/16x16/apps/password.png
-share/kde/icons/locolor/16x16/apps/penguin.png
-share/kde/icons/locolor/16x16/apps/plan.png
-share/kde/icons/locolor/16x16/apps/proxy.png
-share/kde/icons/locolor/16x16/apps/pybliographic.png
-share/kde/icons/locolor/16x16/apps/realplayer.png
-share/kde/icons/locolor/16x16/apps/remote.png
-share/kde/icons/locolor/16x16/apps/samba.png
-share/kde/icons/locolor/16x16/apps/style.png
-share/kde/icons/locolor/16x16/apps/terminal.png
-share/kde/icons/locolor/16x16/apps/wabi.png
-share/kde/icons/locolor/16x16/apps/window_list.png
-share/kde/icons/locolor/16x16/apps/winprops.png
-share/kde/icons/locolor/16x16/apps/wp.png
-share/kde/icons/locolor/16x16/apps/xapp.png
-share/kde/icons/locolor/16x16/apps/xcalc.png
-share/kde/icons/locolor/16x16/apps/xclipboard.png
-share/kde/icons/locolor/16x16/apps/xclock.png
-share/kde/icons/locolor/16x16/apps/xconsole.png
-share/kde/icons/locolor/16x16/apps/xedit.png
-share/kde/icons/locolor/16x16/apps/xemacs.png
-share/kde/icons/locolor/16x16/apps/xeyes.png
-share/kde/icons/locolor/16x16/apps/xfig.png
-share/kde/icons/locolor/16x16/apps/xfmail.png
-share/kde/icons/locolor/16x16/apps/xload.png
-share/kde/icons/locolor/16x16/apps/xmag.png
-share/kde/icons/locolor/16x16/apps/xosview.png
-share/kde/icons/locolor/16x16/apps/xpaint.png
-share/kde/icons/locolor/16x16/apps/xv.png
-share/kde/icons/locolor/16x16/devices/3floppy_mount.png
-share/kde/icons/locolor/16x16/devices/3floppy_unmount.png
-share/kde/icons/locolor/16x16/devices/5floppy_mount.png
-share/kde/icons/locolor/16x16/devices/5floppy_unmount.png
-share/kde/icons/locolor/16x16/devices/cdrom_mount.png
-share/kde/icons/locolor/16x16/devices/cdrom_unmount.png
-share/kde/icons/locolor/16x16/devices/cdwriter_mount.png
-share/kde/icons/locolor/16x16/devices/cdwriter_unmount.png
-share/kde/icons/locolor/16x16/devices/hdd_mount.png
-share/kde/icons/locolor/16x16/devices/hdd_unmount.png
-share/kde/icons/locolor/16x16/devices/memory.png
-share/kde/icons/locolor/16x16/devices/mo_mount.png
-share/kde/icons/locolor/16x16/devices/mo_unmount.png
-share/kde/icons/locolor/16x16/devices/printer1.png
-share/kde/icons/locolor/16x16/devices/printer2.png
-share/kde/icons/locolor/16x16/devices/scanner.png
-share/kde/icons/locolor/16x16/devices/tablet.png
-share/kde/icons/locolor/16x16/devices/zip_mount.png
-share/kde/icons/locolor/16x16/devices/zip_unmount.png
-share/kde/icons/locolor/32x32/apps/access.png
-share/kde/icons/locolor/32x32/apps/acroread.png
-share/kde/icons/locolor/32x32/apps/agent.png
-share/kde/icons/locolor/32x32/apps/alevt.png
-share/kde/icons/locolor/32x32/apps/applixware.png
-share/kde/icons/locolor/32x32/apps/background.png
 share/kde/icons/locolor/32x32/apps/bell.png
-share/kde/icons/locolor/32x32/apps/blender.png
-share/kde/icons/locolor/32x32/apps/clanbomber.png
-share/kde/icons/locolor/32x32/apps/clock.png
-share/kde/icons/locolor/32x32/apps/colors.png
-share/kde/icons/locolor/32x32/apps/cookie.png
-share/kde/icons/locolor/32x32/apps/date.png
-share/kde/icons/locolor/32x32/apps/dlgedit.png
-share/kde/icons/locolor/32x32/apps/emacs.png
-share/kde/icons/locolor/32x32/apps/email.png
-share/kde/icons/locolor/32x32/apps/energy.png
-share/kde/icons/locolor/32x32/apps/enhanced_browsing.png
-share/kde/icons/locolor/32x32/apps/error.png
-share/kde/icons/locolor/32x32/apps/filetypes.png
-share/kde/icons/locolor/32x32/apps/fonts.png
-share/kde/icons/locolor/32x32/apps/gimp.png
-share/kde/icons/locolor/32x32/apps/go.png
-share/kde/icons/locolor/32x32/apps/gv.png
-share/kde/icons/locolor/32x32/apps/gvim.png
-share/kde/icons/locolor/32x32/apps/help_index.png
-share/kde/icons/locolor/32x32/apps/hwinfo.png
-share/kde/icons/locolor/32x32/apps/icons.png
-share/kde/icons/locolor/32x32/apps/iconthemes.png
-share/kde/icons/locolor/32x32/apps/input_devices_settings.png
-share/kde/icons/locolor/32x32/apps/kappfinder.png
-share/kde/icons/locolor/32x32/apps/kcmdevices.png
-share/kde/icons/locolor/32x32/apps/kcmdrkonqi.png
-share/kde/icons/locolor/32x32/apps/kcmkicker.png
-share/kde/icons/locolor/32x32/apps/kcmkwm.png
-share/kde/icons/locolor/32x32/apps/kcmmemory.png
-share/kde/icons/locolor/32x32/apps/kcmmidi.png
-share/kde/icons/locolor/32x32/apps/kcmpartitions.png
-share/kde/icons/locolor/32x32/apps/kcmpci.png
-share/kde/icons/locolor/32x32/apps/kcmprocessor.png
-share/kde/icons/locolor/32x32/apps/kcmscsi.png
-share/kde/icons/locolor/32x32/apps/kcmsound.png
-share/kde/icons/locolor/32x32/apps/kcmsystem.png
-share/kde/icons/locolor/32x32/apps/kcmx.png
-share/kde/icons/locolor/32x32/apps/kcontrol.png
-share/kde/icons/locolor/32x32/apps/kdisknav.png
-share/kde/icons/locolor/32x32/apps/kdmconfig.png
-share/kde/icons/locolor/32x32/apps/key_bindings.png
-share/kde/icons/locolor/32x32/apps/keyboard.png
-share/kde/icons/locolor/32x32/apps/keyboard_layout.png
-share/kde/icons/locolor/32x32/apps/kfm.png
-share/kde/icons/locolor/32x32/apps/kfm_home.png
-share/kde/icons/locolor/32x32/apps/khelpcenter.png
-share/kde/icons/locolor/32x32/apps/klipper.png
-share/kde/icons/locolor/32x32/apps/knotify.png
-share/kde/icons/locolor/32x32/apps/konqueror.png
-share/kde/icons/locolor/32x32/apps/konsole.png
-share/kde/icons/locolor/32x32/apps/kpager.png
-share/kde/icons/locolor/32x32/apps/kscreensaver.png
-share/kde/icons/locolor/32x32/apps/ksysguard.png
-share/kde/icons/locolor/32x32/apps/kthememgr.png
-share/kde/icons/locolor/32x32/apps/ktip.png
-share/kde/icons/locolor/32x32/apps/kwin.png
-share/kde/icons/locolor/32x32/apps/kwrite.png
-share/kde/icons/locolor/32x32/apps/locale.png
-share/kde/icons/locolor/32x32/apps/looknfeel.png
-share/kde/icons/locolor/32x32/apps/lyx.png
-share/kde/icons/locolor/32x32/apps/mathematica.png
-share/kde/icons/locolor/32x32/apps/mouse.png
-share/kde/icons/locolor/32x32/apps/multimedia.png
-share/kde/icons/locolor/32x32/apps/nedit.png
-share/kde/icons/locolor/32x32/apps/netscape.png
-share/kde/icons/locolor/32x32/apps/package.png
-share/kde/icons/locolor/32x32/apps/package_applications.png
-share/kde/icons/locolor/32x32/apps/package_editors.png
-share/kde/icons/locolor/32x32/apps/package_favourite.png
-share/kde/icons/locolor/32x32/apps/package_games.png
-share/kde/icons/locolor/32x32/apps/package_graphics.png
-share/kde/icons/locolor/32x32/apps/package_multimedia.png
-share/kde/icons/locolor/32x32/apps/package_network.png
-share/kde/icons/locolor/32x32/apps/package_settings.png
-share/kde/icons/locolor/32x32/apps/package_system.png
-share/kde/icons/locolor/32x32/apps/package_utilities.png
-share/kde/icons/locolor/32x32/apps/panel_settings.png
-share/kde/icons/locolor/32x32/apps/password.png
-share/kde/icons/locolor/32x32/apps/penguin.png
-share/kde/icons/locolor/32x32/apps/plan.png
-share/kde/icons/locolor/32x32/apps/proxy.png
-share/kde/icons/locolor/32x32/apps/pybliographic.png
-share/kde/icons/locolor/32x32/apps/pysol.png
-share/kde/icons/locolor/32x32/apps/realplayer.png
-share/kde/icons/locolor/32x32/apps/samba.png
-share/kde/icons/locolor/32x32/apps/style.png
-share/kde/icons/locolor/32x32/apps/terminal.png
-share/kde/icons/locolor/32x32/apps/wabi.png
-share/kde/icons/locolor/32x32/apps/window_list.png
-share/kde/icons/locolor/32x32/apps/winprops.png
-share/kde/icons/locolor/32x32/apps/wp.png
-share/kde/icons/locolor/32x32/apps/xapp.png
-share/kde/icons/locolor/32x32/apps/xawtv.png
-share/kde/icons/locolor/32x32/apps/xcalc.png
-share/kde/icons/locolor/32x32/apps/xclipboard.png
-share/kde/icons/locolor/32x32/apps/xclock.png
-share/kde/icons/locolor/32x32/apps/xconsole.png
-share/kde/icons/locolor/32x32/apps/xedit.png
-share/kde/icons/locolor/32x32/apps/xemacs.png
-share/kde/icons/locolor/32x32/apps/xeyes.png
-share/kde/icons/locolor/32x32/apps/xfig.png
-share/kde/icons/locolor/32x32/apps/xfmail.png
-share/kde/icons/locolor/32x32/apps/xload.png
-share/kde/icons/locolor/32x32/apps/xmag.png
-share/kde/icons/locolor/32x32/apps/xmms.png
-share/kde/icons/locolor/32x32/apps/xosview.png
-share/kde/icons/locolor/32x32/apps/xpaint.png
-share/kde/icons/locolor/32x32/apps/xv.png
-share/kde/icons/locolor/32x32/devices/3floppy_mount.png
-share/kde/icons/locolor/32x32/devices/3floppy_unmount.png
-share/kde/icons/locolor/32x32/devices/5floppy_mount.png
-share/kde/icons/locolor/32x32/devices/5floppy_unmount.png
-share/kde/icons/locolor/32x32/devices/cdrom_mount.png
-share/kde/icons/locolor/32x32/devices/cdrom_unmount.png
-share/kde/icons/locolor/32x32/devices/cdwriter_mount.png
-share/kde/icons/locolor/32x32/devices/cdwriter_unmount.png
-share/kde/icons/locolor/32x32/devices/hdd_mount.png
-share/kde/icons/locolor/32x32/devices/hdd_unmount.png
-share/kde/icons/locolor/32x32/devices/memory.png
-share/kde/icons/locolor/32x32/devices/mo_mount.png
-share/kde/icons/locolor/32x32/devices/mo_unmount.png
-share/kde/icons/locolor/32x32/devices/printer1.png
-share/kde/icons/locolor/32x32/devices/printer2.png
-share/kde/icons/locolor/32x32/devices/scanner.png
-share/kde/icons/locolor/32x32/devices/tablet.png
-share/kde/icons/locolor/32x32/devices/zip_mount.png
-share/kde/icons/locolor/32x32/devices/zip_unmount.png
 share/kde/locale/C/entry.desktop
 share/kde/locale/C/flag.png
 share/kde/locale/l10n/C/entry.desktop
@@ -2106,6 +2081,8 @@ share/kde/locale/l10n/at/entry.desktop
 share/kde/locale/l10n/at/flag.png
 share/kde/locale/l10n/au/entry.desktop
 share/kde/locale/l10n/au/flag.png
+share/kde/locale/l10n/az/entry.desktop
+share/kde/locale/l10n/az/flag.png
 share/kde/locale/l10n/bb/entry.desktop
 share/kde/locale/l10n/bb/flag.png
 share/kde/locale/l10n/be/entry.desktop
@@ -2189,9 +2166,10 @@ share/kde/locale/l10n/lv/entry.desktop
 share/kde/locale/l10n/lv/flag.png
 share/kde/locale/l10n/mk/entry.desktop
 share/kde/locale/l10n/mk/flag.png
+share/kde/locale/l10n/mt/entry.desktop
+share/kde/locale/l10n/mt/flag.png
 share/kde/locale/l10n/mx/entry.desktop
 share/kde/locale/l10n/mx/flag.png
-share/kde/locale/l10n/nl/README
 share/kde/locale/l10n/nl/entry.desktop
 share/kde/locale/l10n/nl/flag.png
 share/kde/locale/l10n/no/entry.desktop
@@ -2248,20 +2226,23 @@ share/kde/locale/l10n/westeurope.desktop
 share/kde/locale/l10n/za/entry.desktop
 share/kde/locale/l10n/za/flag.png
 share/kde/mimelnk/application/x-konsole.desktop
+share/kde/mimelnk/application/x-ksysguard.desktop
 share/kde/mimelnk/application/x-ktheme.desktop
 share/kde/services/bzip.protocol
 share/kde/services/bzip2.protocol
 share/kde/services/finger.protocol
 share/kde/services/floppy.protocol
 share/kde/services/gopher.protocol
+share/kde/services/gsthumbnail.desktop
 share/kde/services/gzip.protocol
-share/kde/services/help.protocol
 share/kde/services/htmlthumbnail.desktop
 share/kde/services/imagethumbnail.desktop
 share/kde/services/imap4.protocol
 share/kde/services/imaps.protocol
 share/kde/services/info.protocol
 share/kde/services/kaccess.desktop
+share/kde/services/kate_component.desktop
+share/kde/services/kded/favicons.desktop
 share/kde/services/kfindpart.desktop
 share/kde/services/khelpcenter.desktop
 share/kde/services/konq_aboutpage.desktop
@@ -2269,6 +2250,7 @@ share/kde/services/konq_detailedlistview.desktop
 share/kde/services/konq_dirtree.desktop
 share/kde/services/konq_iconview.desktop
 share/kde/services/konq_multicolumnview.desktop
+share/kde/services/konq_sidebartng.desktop
 share/kde/services/konq_textview.desktop
 share/kde/services/konq_treeview.desktop
 share/kde/services/konqueror.desktop
@@ -2306,17 +2288,37 @@ share/kde/services/searchproviders/realnames.desktop
 share/kde/services/searchproviders/rpmfind.desktop
 share/kde/services/searchproviders/seek.desktop
 share/kde/services/searchproviders/thesaurus.desktop
+share/kde/services/searchproviders/vivisimo.desktop
 share/kde/services/searchproviders/voila.desktop
 share/kde/services/searchproviders/webster.desktop
+share/kde/services/searchproviders/whatis.desktop
 share/kde/services/smb.protocol
-share/kde/services/smtp.protocol
 share/kde/services/tar.protocol
 share/kde/services/textthumbnail.desktop
 share/kde/services/thumbnail.protocol
+share/kde/services/useragentstrings/ie401onwinnt4.desktop
+share/kde/services/useragentstrings/ie45onwinnt5.desktop
+share/kde/services/useragentstrings/ie501onwinnt5.desktop
+share/kde/services/useragentstrings/ie50onppc.desktop
+share/kde/services/useragentstrings/ie50onwin95.desktop
+share/kde/services/useragentstrings/ie55onwin98.desktop
+share/kde/services/useragentstrings/ie55onwinnt5.desktop
+share/kde/services/useragentstrings/lynxoncurrent.desktop
+share/kde/services/useragentstrings/mozm18oncurrent.desktop
+share/kde/services/useragentstrings/mozm18onwinnt4.desktop
+share/kde/services/useragentstrings/nn301oncurrent.desktop
+share/kde/services/useragentstrings/nn475oncurrent.desktop
+share/kde/services/useragentstrings/nn475onwin95.desktop
+share/kde/services/useragentstrings/nn476onppc.desktop
+share/kde/services/useragentstrings/op403onwinnt4.desktop
+share/kde/services/useragentstrings/w3moncurrent.desktop
+share/kde/services/useragentstrings/wgetoncurrent.desktop
 share/kde/servicetypes/findpart.desktop
+share/kde/servicetypes/kate_servicetype.desktop
 share/kde/servicetypes/konqaboutpage.desktop
 share/kde/servicetypes/searchprovider.desktop
 share/kde/servicetypes/thumbcreator.desktop
+share/kde/servicetypes/uasprovider.desktop
 share/kde/sounds/KDE_Beep_Ahem.wav
 share/kde/sounds/KDE_Beep_Beep.wav
 share/kde/sounds/KDE_Beep_Bottles.wav
@@ -2331,12 +2333,28 @@ share/kde/sounds/KDE_Beep_RimShot.wav
 share/kde/sounds/KDE_Beep_RingRing.wav
 share/kde/sounds/KDE_Beep_ShortBeep.wav
 share/kde/sounds/KDE_Beep_Yo.wav
+share/kde/sounds/KDE_Click.wav
 share/kde/sounds/KDE_Close_Window.wav
+share/kde/sounds/KDE_Critical_Error.wav
+share/kde/sounds/KDE_Desktop1.wav
+share/kde/sounds/KDE_Desktop2.wav
+share/kde/sounds/KDE_Desktop3.wav
+share/kde/sounds/KDE_Desktop4.wav
+share/kde/sounds/KDE_Desktop5.wav
+share/kde/sounds/KDE_Desktop6.wav
+share/kde/sounds/KDE_Desktop7.wav
+share/kde/sounds/KDE_Desktop8.wav
+share/kde/sounds/KDE_Dialog_Appear.wav
+share/kde/sounds/KDE_Dialog_Disappear.wav
+share/kde/sounds/KDE_Error.wav
 share/kde/sounds/KDE_Logout.wav
+share/kde/sounds/KDE_Notify.wav
 share/kde/sounds/KDE_Startup.wav
+share/kde/sounds/KDE_Window_Close.wav
 share/kde/sounds/KDE_Window_DeIconify.wav
 share/kde/sounds/KDE_Window_Iconify.wav
 share/kde/sounds/KDE_Window_Maximize.wav
+share/kde/sounds/KDE_Window_Open.wav
 share/kde/sounds/KDE_Window_Shade_Down.wav
 share/kde/sounds/KDE_Window_Shade_Up.wav
 share/kde/sounds/KDE_Window_Sticky.wav
@@ -2345,6 +2363,7 @@ share/kde/sounds/KDE_Window_UnSticky.wav
 share/kde/sounds/pop.wav
 share/kde/templates/.source/CDROM-Device.desktop
 share/kde/templates/.source/Floppy.desktop
+share/kde/templates/.source/HD.desktop
 share/kde/templates/.source/HTMLFile.html
 share/kde/templates/.source/Program.desktop
 share/kde/templates/.source/TextFile.txt
@@ -2354,6 +2373,7 @@ share/kde/templates/HTMLFile.desktop
 share/kde/templates/TextFile.desktop
 share/kde/templates/linkCDROM.desktop
 share/kde/templates/linkFloppy.desktop
+share/kde/templates/linkHD.desktop
 share/kde/templates/linkProgram.desktop
 share/kde/templates/linkURL.desktop
 share/kde/wallpapers/All-Good-People-1.jpg
@@ -2378,6 +2398,7 @@ share/kde/wallpapers/Whirling_Spirit.jpg
 share/kde/wallpapers/Won-Ton-Soup-3.jpg
 share/kde/wallpapers/blue_angle_swirl.jpg
 share/kde/wallpapers/bluegreencrisscross.jpg
+share/kde/wallpapers/default_blue.jpg
 share/kde/wallpapers/gold_crinkle.jpg
 share/kde/wallpapers/kdm_bg.jpg
 share/kde/wallpapers/northbeach.jpg
@@ -2390,10 +2411,8 @@ share/kde/wallpapers/vegetative_fog.jpg
 @dirrm share/kde/templates/.source
 @dirrm share/kde/templates
 @dirrm share/kde/sounds
-@comment kdelibs:dirrm share/kde/servicetypes
+@dirrm share/kde/services/useragentstrings
 @dirrm share/kde/services/searchproviders
-@comment kdelibs:dirrm share/kde/services
-@comment kdelibs:dirrm share/kde/mimelnk/application
 @dirrm share/kde/locale/l10n/za
 @dirrm share/kde/locale/l10n/ve
 @dirrm share/kde/locale/l10n/vc
@@ -2420,6 +2439,7 @@ share/kde/wallpapers/vegetative_fog.jpg
 @dirrm share/kde/locale/l10n/no
 @dirrm share/kde/locale/l10n/nl
 @dirrm share/kde/locale/l10n/mx
+@dirrm share/kde/locale/l10n/mt
 @dirrm share/kde/locale/l10n/mk
 @dirrm share/kde/locale/l10n/lv
 @dirrm share/kde/locale/l10n/lu
@@ -2460,6 +2480,7 @@ share/kde/wallpapers/vegetative_fog.jpg
 @dirrm share/kde/locale/l10n/bg
 @dirrm share/kde/locale/l10n/be
 @dirrm share/kde/locale/l10n/bb
+@dirrm share/kde/locale/l10n/az
 @dirrm share/kde/locale/l10n/au
 @dirrm share/kde/locale/l10n/at
 @dirrm share/kde/locale/l10n/ar
@@ -2468,66 +2489,55 @@ share/kde/wallpapers/vegetative_fog.jpg
 @dirrm share/kde/locale/l10n
 @dirrm share/kde/locale/C
 @dirrm share/kde/locale
-@dirrm share/kde/icons/locolor/32x32/devices
 @dirrm share/kde/icons/locolor/32x32/apps
-@comment kdelibs:dirrm share/kde/icons/locolor/32x32
-@dirrm share/kde/icons/locolor/16x16/devices
+@dirrm share/kde/icons/locolor/32x32
 @dirrm share/kde/icons/locolor/16x16/apps
-@comment kdelibs:dirrm share/kde/icons/locolor/16x16/actions
-@comment kdelibs:dirrm share/kde/icons/locolor/16x16
-@comment kdelibs:dirrm share/kde/icons/hicolor/48x48/filesystems
-@dirrm share/kde/icons/hicolor/48x48/devices
+@dirrm share/kde/icons/locolor/16x16
+@dirrm share/kde/icons/locolor
 @dirrm share/kde/icons/hicolor/48x48/apps
-@comment kdelibs:dirrm share/kde/icons/hicolor/48x48
-@comment kdelibs:dirrm share/kde/icons/hicolor/32x32/filesystems
-@dirrm share/kde/icons/hicolor/32x32/devices
 @dirrm share/kde/icons/hicolor/32x32/apps
-@comment kdelibs:dirrm share/kde/icons/hicolor/32x32/actions
-@comment kdelibs:dirrm share/kde/icons/hicolor/32x32
-@comment kdelibs:dirrm share/kde/icons/hicolor/22x22/actions
-@comment kdelibs:dirrm share/kde/icons/hicolor/16x16/filesystems
-@dirrm share/kde/icons/hicolor/16x16/devices
-@dirrm share/kde/icons/hicolor/16x16/apps
-@comment kdelibs:dirrm share/kde/icons
-@comment kdelibs:dirrm share/kde/config
+@dirrm share/kde/config/kdm
 @dirrm share/kde/apps/naughtyapplet/pics
 @dirrm share/kde/apps/naughtyapplet
 @dirrm share/kde/apps/kwrite
 @dirrm share/kde/apps/kwin/pics
+@dirrm share/kde/apps/kwin/icewm-themes
 @dirrm share/kde/apps/kwin
 @dirrm share/kde/apps/kthememgr/Themes
 @dirrm share/kde/apps/kthememgr
-@dirrm share/kde/apps/ksysguard/icons/locolor/16x16/apps
-@dirrm share/kde/apps/ksysguard/icons/locolor/16x16
-@dirrm share/kde/apps/ksysguard/icons/locolor
-@dirrm share/kde/apps/ksysguard/icons
+@dirrm share/kde/apps/ksysguard/pics
 @dirrm share/kde/apps/ksysguard
 @dirrm share/kde/apps/ksplash/pics/locolor
 @dirrm share/kde/apps/ksplash/pics
 @dirrm share/kde/apps/ksplash
 @dirrm share/kde/apps/kscreensaver
+@dirrm share/kde/apps/kpersonalizer/pics
+@dirrm share/kde/apps/kpersonalizer
 @dirrm share/kde/apps/konsole/pics
 @dirrm share/kde/apps/konsole
 @dirrm share/kde/apps/konqueror/tiles
 @dirrm share/kde/apps/konqueror/profiles
 @dirrm share/kde/apps/konqueror/pics
-@dirrm share/kde/apps/konqueror/icons/locolor/16x16/actions
-@dirrm share/kde/apps/konqueror/icons/locolor/16x16
-@dirrm share/kde/apps/konqueror/icons/locolor
-@dirrm share/kde/apps/konqueror/icons/hicolor/32x32/actions
-@dirrm share/kde/apps/konqueror/icons/hicolor/32x32
-@dirrm share/kde/apps/konqueror/icons/hicolor/22x22/actions
-@dirrm share/kde/apps/konqueror/icons/hicolor/22x22
 @dirrm share/kde/apps/konqueror/icons/hicolor/16x16/actions
 @dirrm share/kde/apps/konqueror/icons/hicolor/16x16
 @dirrm share/kde/apps/konqueror/icons/hicolor
 @dirrm share/kde/apps/konqueror/icons
+@dirrm share/kde/apps/konqueror/dirtree/services
 @dirrm share/kde/apps/konqueror/dirtree/remote/web
 @dirrm share/kde/apps/konqueror/dirtree/remote/ftp
 @dirrm share/kde/apps/konqueror/dirtree/remote
 @dirrm share/kde/apps/konqueror/dirtree
 @dirrm share/kde/apps/konqueror/about
 @dirrm share/kde/apps/konqueror
+@dirrm share/kde/apps/konqsidebartng/virtual_folders/services
+@dirrm share/kde/apps/konqsidebartng/virtual_folders/remote/web
+@dirrm share/kde/apps/konqsidebartng/virtual_folders/remote/ftp
+@dirrm share/kde/apps/konqsidebartng/virtual_folders/remote
+@dirrm share/kde/apps/konqsidebartng/virtual_folders
+@dirrm share/kde/apps/konqsidebartng/entries
+@dirrm share/kde/apps/konqsidebartng/dirtree
+@dirrm share/kde/apps/konqsidebartng/add
+@dirrm share/kde/apps/konqsidebartng
 @dirrm share/kde/apps/konqlistview/kpartplugins
 @dirrm share/kde/apps/konqlistview
 @dirrm share/kde/apps/konqiconview/kpartplugins
@@ -2542,6 +2552,8 @@ share/kde/wallpapers/vegetative_fog.jpg
 @dirrm share/kde/apps/kmenuedit/icons/hicolor
 @dirrm share/kde/apps/kmenuedit/icons
 @dirrm share/kde/apps/kmenuedit
+@dirrm share/kde/apps/kjobviewer
+@dirrm share/kde/apps/kioslave
 @dirrm share/kde/apps/kio_info
 @dirrm share/kde/apps/kio_finger
 @dirrm share/kde/apps/kicker/wallpapers
@@ -2559,12 +2571,6 @@ share/kde/wallpapers/vegetative_fog.jpg
 @dirrm share/kde/apps/kicker
 @dirrm share/kde/apps/khelpcenter/plugins/Tutorials
 @dirrm share/kde/apps/khelpcenter/plugins
-@dirrm share/kde/apps/khelpcenter/pics
-@dirrm share/kde/apps/khelpcenter/icons/locolor/16x16/apps
-@dirrm share/kde/apps/khelpcenter/icons/locolor/16x16
-@dirrm share/kde/apps/khelpcenter/icons/locolor
-@dirrm share/kde/apps/khelpcenter/icons
-@dirrm share/kde/apps/khelpcenter/en
 @dirrm share/kde/apps/khelpcenter
 @dirrm share/kde/apps/kfind/icons/locolor/22x22/actions
 @dirrm share/kde/apps/kfind/icons/locolor/22x22
@@ -2585,24 +2591,50 @@ share/kde/wallpapers/vegetative_fog.jpg
 @dirrm share/kde/apps/kdesktop/patterns
 @dirrm share/kde/apps/kdesktop/DesktopLinks
 @dirrm share/kde/apps/kdesktop
+@dirrm share/kde/apps/kdeprintfax/icons/hicolor/16x16/actions
+@dirrm share/kde/apps/kdeprintfax/icons/hicolor/16x16
+@dirrm share/kde/apps/kdeprintfax/icons/hicolor
+@dirrm share/kde/apps/kdeprintfax/icons
+@dirrm share/kde/apps/kdeprintfax
 @dirrm share/kde/apps/kdcop
 @dirrm share/kde/apps/kcontrol/pics
 @dirrm share/kde/apps/kcontrol
+@dirrm share/kde/apps/kcmusb
 @dirrm share/kde/apps/kcmlocale/pics
 @dirrm share/kde/apps/kcmlocale
 @dirrm share/kde/apps/kcmkeys/standard
+@dirrm share/kde/apps/kcmkeys/global
 @dirrm share/kde/apps/kcmkeys
+@dirrm share/kde/apps/kcminput/pics
 @dirrm share/kde/apps/kcminput
+@dirrm share/kde/apps/kcmcss
 @dirrm share/kde/apps/kbookmark
+@dirrm share/kde/apps/kate/syntax
+@dirrm share/kde/apps/kate/pics
+@dirrm share/kde/apps/kate/icons/locolor/22x22/actions
+@dirrm share/kde/apps/kate/icons/locolor/22x22
+@dirrm share/kde/apps/kate/icons/locolor/16x16/actions
+@dirrm share/kde/apps/kate/icons/locolor/16x16
+@dirrm share/kde/apps/kate/icons/locolor
+@dirrm share/kde/apps/kate/icons/hicolor/48x48/actions
+@dirrm share/kde/apps/kate/icons/hicolor/48x48
+@dirrm share/kde/apps/kate/icons/hicolor/32x32/actions
+@dirrm share/kde/apps/kate/icons/hicolor/32x32
+@dirrm share/kde/apps/kate/icons/hicolor/22x22/actions
+@dirrm share/kde/apps/kate/icons/hicolor/22x22
+@dirrm share/kde/apps/kate/icons/hicolor/16x16/actions
+@dirrm share/kde/apps/kate/icons/hicolor/16x16
+@dirrm share/kde/apps/kate/icons/hicolor
+@dirrm share/kde/apps/kate/icons
+@dirrm share/kde/apps/kate
+@dirrm share/kde/apps/kaddressbook/pics
+@dirrm share/kde/apps/kaddressbook
 @dirrm share/kde/apps/drkonqi/presets
 @dirrm share/kde/apps/drkonqi/pics
 @dirrm share/kde/apps/drkonqi/debuggers
 @dirrm share/kde/apps/drkonqi
 @dirrm share/kde/apps/clockapplet/pics
 @dirrm share/kde/apps/clockapplet
-@comment kdelibs:dirrm share/kde/apps
-@comment kdelibs:dirrm share/kde
-@dirrm share/fonts/override
 @dirrm share/doc/kde/HTML/en/kwrite
 @dirrm share/doc/kde/HTML/en/ksysguard
 @dirrm share/doc/kde/HTML/en/kpager
@@ -2610,17 +2642,21 @@ share/kde/wallpapers/vegetative_fog.jpg
 @dirrm share/doc/kde/HTML/en/konqueror
 @dirrm share/doc/kde/HTML/en/kmenuedit
 @dirrm share/doc/kde/HTML/en/klipper
+@dirrm share/doc/kde/HTML/en/kioslave
 @dirrm share/doc/kde/HTML/en/kicker
 @dirrm share/doc/kde/HTML/en/khelpcenter/visualdict
 @dirrm share/doc/kde/HTML/en/khelpcenter/userguide
 @dirrm share/doc/kde/HTML/en/khelpcenter/quickstart
+@dirrm share/doc/kde/HTML/en/khelpcenter/glossary
 @dirrm share/doc/kde/HTML/en/khelpcenter/faq
 @dirrm share/doc/kde/HTML/en/khelpcenter
 @dirrm share/doc/kde/HTML/en/kdm
 @dirrm share/doc/kde/HTML/en/kdesu
+@dirrm share/doc/kde/HTML/en/kdeprint
 @dirrm share/doc/kde/HTML/en/kdebugdialog
 @dirrm share/doc/kde/HTML/en/kcontrol
-@comment kdelibs:dirrm share/doc/kde/HTML/en
+@dirrm share/doc/kde/HTML/en/kate
+@dirrm share/doc/kde/HTML/en/kaddressbook
 @dirrm share/autostart
-@comment kdelibs:dirrm lib/kde2
 @dirrm include/kwin
+@dirrm include/kate
author	skrll <skrll@pkgsrc.org>	2001-10-15 22:45:55 +0000
committer	skrll <skrll@pkgsrc.org>	2001-10-15 22:45:55 +0000
commit	a62b3e67a68598fb0fe4dc2e4d5c5c9e4b884cb3 (patch)
tree	49e414584e7255669c95e2837a22f79f3eb9d507 /x11/kdebase2
parent	0fd50d6c14cb246a43399f14bb57be000010fcc8 (diff)
download	pkgsrc-a62b3e67a68598fb0fe4dc2e4d5c5c9e4b884cb3.tar.gz