update to 2.1.1: bugfixes and language support

4 files changed, 8 insertions, 41 deletions

diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 192077d66dd..fae5af58be5 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2001/08/26 10:32:24 skrll Exp $
+# $NetBSD: Makefile,v 1.24 2001/09/07 14:34:33 drochner Exp $
 
-DISTNAME=	kdebase-2.1
+DISTNAME=	kdebase-2.1.1
 CATEGORIES=	x11 kde
 .include "../../x11/kde2/Makefile.part1"
 COMMENT=	Base modules for the KDE 2 integrated X11 desktop
@@ -77,7 +77,6 @@ pre-install:
 
 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}
diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo
index e30b6fc8318..59d940139dc 100644
--- a/x11/kdebase2/distinfo
+++ b/x11/kdebase2/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.4 2001/07/05 23:41:27 jlam Exp $
+$NetBSD: distinfo,v 1.5 2001/09/07 14:34:33 drochner Exp $
 
-SHA1 (kdebase-2.1.tar.bz2) = 08c1e42b5f7616c5d9b8fbe9f26f2b98a7c77a1f
-Size (kdebase-2.1.tar.bz2) = 9010018 bytes
+SHA1 (kdebase-2.1.1.tar.bz2) = af38d452c957715fa6ae59e99af3e7da2c3369b0
+Size (kdebase-2.1.1.tar.bz2) = 9188425 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 Size (Daemon.README) = 2191 bytes
 SHA1 (patch-aa) = 8979e74b64e614071bffa3f9ce168b8b2e2bf456
-SHA1 (patch-ab) = 06386d9f87a4782265b00375f4847517be48c1fc
 SHA1 (patch-ac) = 535455e9b978c48ac4230b3b9aebec3920674ed9
 SHA1 (patch-ad) = a5d2c077a2239b6cfbd56cc8299fa7545f2e4c3e
 SHA1 (patch-af) = b91246a123ade7fc354308839e1363a4ee513c7f
diff --git a/x11/kdebase2/patches/patch-ab b/x11/kdebase2/patches/patch-ab
deleted file mode 100644
index f031673f0f4..00000000000
--- a/x11/kdebase2/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/14 16:03:11 skrll Exp $
-
---- kcontrol/info/info_netbsd.cpp.orig	Tue Jun  6 15:29:57 2000
-+++ kcontrol/info/info_netbsd.cpp
-@@ -181,14 +181,15 @@
- 	}
- 
- 	pos = s.find(" irq ");
--	irqnum = (pos < 0) ? 0 : atoi(&(((const char *)s)[pos+5]));
-+	irqnum = (pos < 0) ? 0 : atoi(&(s.ascii()[pos+5]));
-+
- 	if (irqnum) {
--		s.sprintf("%02d%s", irqnum, (const char *)s);
-+		s.sprintf("%02d%s", irqnum, s.ascii());
- 	}
- 	else {
--		s.sprintf("??%s", (const char *)s);
-+		s.sprintf("??%s", s.ascii());
- 	}
--	strlist->inSort(s);
-+	strlist->inSort(s.ascii());
- }
- 
- bool GetInfo_IRQ (QListView *lBox)
-@@ -284,7 +285,7 @@
- 
- 	QListViewItem *olditem = 0;
- 	while ((s = t->readLine()) != "") {
--		orig_line = line = strdup(s);
-+		orig_line = line = strdup(s.ascii());
- 
- 		device = strsep(&line, " ");
- 
diff --git a/x11/kdebase2/pkg/PLIST b/x11/kdebase2/pkg/PLIST
index 79f8ba1f08f..a83cc525d98 100644
--- a/x11/kdebase2/pkg/PLIST
+++ b/x11/kdebase2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2001/05/11 17:43:22 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/09/07 14:34:34 drochner Exp $
 bin/appletproxy
 bin/chooser
 bin/conttest
@@ -1515,6 +1515,7 @@ share/kde/config/penroserc
 share/kde/config/rocksrc
 share/kde/config/sliprc
 share/kde/icons/Daemon.png
+share/kde/icons/hicolor/16x16/apps/access.png
 share/kde/icons/hicolor/16x16/apps/background.png
 share/kde/icons/hicolor/16x16/apps/bell.png
 share/kde/icons/hicolor/16x16/apps/cookie.png
@@ -1530,6 +1531,7 @@ share/kde/icons/hicolor/16x16/apps/kcmsystem.png
 share/kde/icons/hicolor/16x16/apps/kcontrol.png
 share/kde/icons/hicolor/16x16/apps/kdisknav.png
 share/kde/icons/hicolor/16x16/apps/keditbookmarks.png
+share/kde/icons/hicolor/16x16/apps/key_bindings.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