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.

4 files changed, 18 insertions, 34 deletions

diff --git a/devel/kdebindings2/Makefile b/devel/kdebindings2/Makefile
index a551ab32c8e..031038f411e 100644
--- a/devel/kdebindings2/Makefile
+++ b/devel/kdebindings2/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.5 2001/07/27 10:50:13 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/15 22:46:17 skrll Exp $
 #
 
-DISTNAME=		kdebindings-2.1
+DISTNAME=		kdebindings-2.2.1
 CATEGORIES=		devel kde
 .include "../../x11/kde2/Makefile.part1"
 COMMENT=		Additional language bindings for KDE integrated X11 desktop
 
-DEPENDS+=		kdebase-2.1:../../x11/kdebase2
+DEPENDS+=		kdebase-2.2.1:../../x11/kdebase2
 DEPENDS+=		gtk+>=1.2.9:../../x11/gtk
-DEPENDS+=		python>=2.0:../../lang/python
+DEPENDS+=		python21>=2.1:../../lang/python21
 
 .include "../../x11/kde2/Makefile.part2"
 
 CONFIGURE_ENV+=		PYTHONDIR=${LOCALBASE} \
-			LIBPYTHON="-lpython2.0 -lutil"
+			LIBPYTHON="-lpython2.1 -lutil"
 
-PLIST_SUBST+=		PYTHON_LIBDIR=lib/python2.0
+PLIST_SUBST+=		PYTHON_LIBDIR=lib/python2.1
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdebindings2/distinfo b/devel/kdebindings2/distinfo
index 1482bf35ea5..6c513f2d1d7 100644
--- a/devel/kdebindings2/distinfo
+++ b/devel/kdebindings2/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:25 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/10/15 22:46:17 skrll Exp $
 
-SHA1 (kdebindings-2.1.tar.bz2) = 47fcfc5702a6bef77a8e6bd4b779331cc639870a
-Size (kdebindings-2.1.tar.bz2) = 341534 bytes
-SHA1 (patch-aa) = d28ca0faa30beb473c56d443d80c0d0efb2b125b
+SHA1 (kdebindings-2.2.1.tar.bz2) = fefb3c419228f465ed0ca01368bae9092a51ac2a
+Size (kdebindings-2.2.1.tar.bz2) = 2457858 bytes
 SHA1 (patch-ab) = c0df84f1d1a7dd26dbe79b76babe249001365f37
diff --git a/devel/kdebindings2/patches/patch-aa b/devel/kdebindings2/patches/patch-aa
deleted file mode 100644
index 3bec74069fa..00000000000
--- a/devel/kdebindings2/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/14 17:33:12 skrll Exp $
-
---- configure.orig	Sun Mar  4 15:47:02 2001
-+++ configure
-@@ -7625,6 +7625,7 @@
- else
-   version="1.5"
- fi
-+version="2.0"
- 
- echo $ac_n "checking for Python$version""... $ac_c" 1>&6
- echo "configure:7631: checking for Python$version" >&5
diff --git a/devel/kdebindings2/pkg/PLIST b/devel/kdebindings2/pkg/PLIST
index c0b288c64ac..bd9c4dbde6d 100644
--- a/devel/kdebindings2/pkg/PLIST
+++ b/devel/kdebindings2/pkg/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/14 17:33:12 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/10/15 22:46:18 skrll Exp $
+bin/shell_xparthost
+bin/xp_notepad
 include/dcopc/dcopc.h
 include/dcopc/dcopobject.h
 include/dcopc/marshal.h
 include/dcopc/util.h
 include/xkparts/gtkbrowserextension.h
 include/xkparts/gtkpart.h
-include/xkparts/kparthost.h
 include/xkparts/xpart.h
 include/xkparts/xparthost.h
 lib/libdcopc.a
@@ -23,15 +24,11 @@ lib/libkdexparts.la
 lib/libkdexparts.so
 lib/libkdexparts.so.1
 lib/libkdexparts.so.1.0
+lib/libxp_notepadpart.a
+lib/libxp_notepadpart.la
+lib/libxp_notepadpart.so
+lib/libxp_notepadpart.so.0
+lib/libxp_notepadpart.so.0.0
+share/kde/services/xp_notepad.desktop
 @dirrm include/xkparts
 @dirrm include/dcopc
-@cwd ${LOCALBASE}
-@cwd ${LOCALBASE}
-${PYTHON_LIBDIR}/site-packages/pcop.la
-${PYTHON_LIBDIR}/site-packages/pcop.a
-${PYTHON_LIBDIR}/site-packages/libpyqt.so
-${PYTHON_LIBDIR}/site-packages/libpyqt.la
-${PYTHON_LIBDIR}/site-packages/libpyqt.a
-${PYTHON_LIBDIR}/site-packages/pcop.so
-${PYTHON_LIBDIR}/dcop.py
-${PYTHON_LIBDIR}/qt.py