bl3ify and update to kde3.2.2.

Changes:
* kappfinder: Fixed button order
* kdesktop: Fix switching desktops incurrs (seemingly) unrequired cpu load
* konqueror: Fix textposition of bookmark toolbar not saved
* konqueror: Fix [testcase] HTTP-EQUIV="refresh" not working with weird
  formating.
* konqueror (khtml): Fix When dragging a URL link with an image, the image
  is pasted and not the link URL
* konqueror (khtml): Basic support for the HTML ACCESSKEY attribute.
* konqueror (khtml): Ctrl only suspends Shift+arrows scrolling.
* konqueror (khtml event): Fix dragging an attachment icon to desktop copies
  icon!
* konqueror: No "Actions" submenu with only one entry
* konqueror: Shift inverses "open tabs in background" setting for
  Ctrl+left mouse button and "Open in New Tab" in context menu
* kicker: Fix tooltips sometimes not disappearing.
* konsole: Added support for Scroll Up (SU) and Scroll Down (SD)
* konsole: Better compatibility with xterm/XF86 4.4.0
* konsole: Fixed sending of large blocks
* konsole: Show session menu when you move the mouse.
* Make various scripts install with the executable bit set
* Fix various libraries' install locations and versioning

6 files changed, 50 insertions, 71 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index a373ff9d5f2..7f8362291e6 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2004/04/14 16:15:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.48 2004/04/20 12:33:56 markd Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
-PKGREVISION=	2
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
@@ -11,7 +10,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 USE_PKGINSTALL=		YES
 
@@ -156,11 +155,11 @@ post-install:
 	${CP} -f ${WRKDIR}/kdmrc.ad kdmrc
 .endif
 
-.include "../../databases/openldap/buildlink2.mk"
-.include "../../fonts/fontconfig/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../meta-pkgs/kde3/buildlink2.mk"
-.include "../../x11/qt3-tools/buildlink2.mk"
-.include "../../x11/kdelibs3/buildlink2.mk"
+.include "../../meta-pkgs/kde3/kde3.mk"
+
+.include "../../databases/openldap/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST
index b8f7233f32d..ed728ecf15c 100644
--- a/x11/kdebase3/PLIST
+++ b/x11/kdebase3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2004/03/10 21:15:43 markd Exp $
+@comment $NetBSD: PLIST,v 1.17 2004/04/20 12:33:56 markd Exp $
 bin/appletproxy
 bin/drkonqi
 bin/extensionproxy
@@ -46,6 +46,7 @@ bin/kpersonalizer
 bin/kpm
 bin/kprinter
 bin/krandom.kss
+${HAVE_RANDR}bin/krandrinithack
 ${HAVE_RANDR}bin/krandrtray
 bin/krdb
 bin/kreadconfig
@@ -383,6 +384,8 @@ lib/kde3/konsole.la
 lib/kde3/konsole.so
 lib/kde3/kprinter.la
 lib/kde3/kprinter.so
+${HAVE_RANDR}lib/kde3/krandrinithack.la
+${HAVE_RANDR}lib/kde3/krandrinithack.so
 lib/kde3/ksmserver.la
 lib/kde3/ksmserver.so
 lib/kde3/ksplashdefault.la
@@ -471,8 +474,6 @@ lib/kde3/taskbar_panelextension.la
 lib/kde3/taskbar_panelextension.so
 lib/kde3/textthumbnail.la
 lib/kde3/textthumbnail.so
-${HAVE_RANDR}lib/krandrinithack.la
-${HAVE_RANDR}lib/krandrinithack.so
 lib/libkateinterfaces.la
 lib/libkateinterfaces.so
 lib/libkateinterfaces.so.0
@@ -523,6 +524,8 @@ lib/libkdeinit_konsole.la
 lib/libkdeinit_konsole.so
 lib/libkdeinit_kprinter.la
 lib/libkdeinit_kprinter.so
+${HAVE_RANDR}lib/libkdeinit_krandrinithack.la
+${HAVE_RANDR}lib/libkdeinit_krandrinithack.so
 lib/libkdeinit_ksmserver.la
 lib/libkdeinit_ksmserver.so
 lib/libkdeinit_kwin.la
@@ -1951,7 +1954,6 @@ share/kde/apps/konqueror/pics/indicator_noconnect.png
 share/kde/apps/konqueror/pics/indicator_viewactive.png
 share/kde/apps/konqueror/pics/thumbnailfont_7x4.png
 share/kde/apps/konqueror/profiles/filemanagement
-share/kde/apps/konqueror/profiles/filepreview
 share/kde/apps/konqueror/profiles/midnightcommander
 share/kde/apps/konqueror/profiles/webbrowsing
 share/kde/apps/konqueror/servicemenus/konsolehere.desktop
@@ -2187,6 +2189,7 @@ share/kde/icons/crystalsvg/128x128/apps/wp.png
 share/kde/icons/crystalsvg/128x128/apps/xclock.png
 share/kde/icons/crystalsvg/128x128/apps/xfmail.png
 share/kde/icons/crystalsvg/128x128/apps/xmag.png
+share/kde/icons/crystalsvg/16x16/actions/newfont.png
 share/kde/icons/crystalsvg/16x16/apps/access.png
 share/kde/icons/crystalsvg/16x16/apps/acroread.png
 share/kde/icons/crystalsvg/16x16/apps/agent.png
@@ -2343,12 +2346,14 @@ share/kde/icons/crystalsvg/16x16/apps/xpaint.png
 share/kde/icons/crystalsvg/16x16/apps/xv.png
 share/kde/icons/crystalsvg/16x16/devices/print_printer.png
 share/kde/icons/crystalsvg/16x16/filesystems/folder_print2.png
+share/kde/icons/crystalsvg/22x22/actions/newfont.png
 share/kde/icons/crystalsvg/22x22/apps/klipper.png
 share/kde/icons/crystalsvg/22x22/apps/konqueror.png
 share/kde/icons/crystalsvg/22x22/apps/ksplash.png
 share/kde/icons/crystalsvg/22x22/apps/kvirc.png
 share/kde/icons/crystalsvg/22x22/apps/nedit.png
 share/kde/icons/crystalsvg/22x22/apps/randr.png
+share/kde/icons/crystalsvg/32x32/actions/newfont.png
 share/kde/icons/crystalsvg/32x32/apps/access.png
 share/kde/icons/crystalsvg/32x32/apps/acroread.png
 share/kde/icons/crystalsvg/32x32/apps/agent.png
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
new file mode 100644
index 00000000000..376eb6cebc8
--- /dev/null
+++ b/x11/kdebase3/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/20 12:33:56 markd Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+KDEBASE_BUILDLINK3_MK:=	${KDEBASE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	kdebase
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdebase}
+BUILDLINK_PACKAGES+=	kdebase
+
+.if !empty(KDEBASE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.kdebase+=	kdebase>=3.2.0
+BUILDLINK_RECOMMENDED.kdebase?=	kdebase>=3.2.2
+BUILDLINK_PKGSRCDIR.kdebase?=	../../x11/kdebase3
+.endif	# KDEBASE_BUILDLINK3_MK
+
+.include "../../databases/openldap/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index f07bb0567f1..8f98ee7bc50 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.44 2004/03/14 18:30:31 jdolecek Exp $
+$NetBSD: distinfo,v 1.45 2004/04/20 12:33:56 markd Exp $
 
-SHA1 (kdebase-3.2.1.tar.bz2) = 84c8d1f3f0f48870790a66a5c1f4cff981161277
-Size (kdebase-3.2.1.tar.bz2) = 17131336 bytes
+SHA1 (kdebase-3.2.2.tar.bz2) = bc941b3faa4440ca2048d9332371c974d0e17f5b
+Size (kdebase-3.2.2.tar.bz2) = 17216476 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 Size (Daemon.png) = 15725 bytes
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
@@ -10,7 +10,8 @@ SHA1 (patch-aa) = fcb678ef0112e2d39f2d7ced126c88f2862b3351
 SHA1 (patch-ab) = 5ddff11c04fb004a8ddaedbec2655fdd3cf3d466
 SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb
 SHA1 (patch-ad) = 031e5622acb376ce1867d08b35c55bce101e8855
-SHA1 (patch-bb) = 37698647ac7f2e0ffcad2702d53b953759e89e45
+SHA1 (patch-ae) = 5d9902de9990efc1883f11563f49ac8639fe743d
+SHA1 (patch-bb) = 1b6c717a1bedafbeae0037ee382795d8aa59f081
 SHA1 (patch-bc) = 2d54d0700b30f5471eb60d104148ecf5ac835f58
 SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
 SHA1 (patch-ep) = 10e341753321415043b08cad0494a269f8d19643
@@ -24,4 +25,3 @@ SHA1 (patch-fd) = 0005eaf7eaecb6377da5342c27effd798f425c95
 SHA1 (patch-fe) = 3da89e7228d5246e98a244d7f52d9052c3dbcfa2
 SHA1 (patch-ff) = a027ccd5f578d41560e970aa54fca9b5760da0ac
 SHA1 (patch-fg) = 31219a3d9b45f143dc76ffebd75bbb9b140fcdfa
-SHA1 (patch-fh) = 2c3488b20c9ae2710227bd790684b1b7abcc0578
diff --git a/x11/kdebase3/patches/patch-bb b/x11/kdebase3/patches/patch-bb
index 4aaa547619b..8a3aafe244d 100644
--- a/x11/kdebase3/patches/patch-bb
+++ b/x11/kdebase3/patches/patch-bb
@@ -1,6 +1,6 @@
-$NetBSD: patch-bb,v 1.3 2004/02/04 14:25:59 markd Exp $
+$NetBSD: patch-bb,v 1.4 2004/04/20 12:33:56 markd Exp $
 
---- kdesktop/init.cc.orig	2003-02-20 21:51:34.000000000 +1300
+--- kdesktop/init.cc.orig	2004-04-04 19:42:34.000000000 +1200
 +++ kdesktop/init.cc
 @@ -81,6 +81,9 @@ static void copyDirectoryFile(const QStr
      cmd += " ";
@@ -12,9 +12,9 @@ $NetBSD: patch-bb,v 1.3 2004/02/04 14:25:59 markd Exp $
    }
  }
  
-@@ -107,6 +110,9 @@ void copyDesktopLinks()
+@@ -114,6 +117,9 @@ void copyDesktopLinks()
  	cmd += " ";
- 	cmd += QFile::encodeName(KProcess::quote(desktopPath + desk.readName()));
+ 	cmd += QFile::encodeName(KProcess::quote(desktopPath));
  	system( cmd );
 +	cmd = "chmod u+w ";
 +	cmd += QFile::encodeName(KProcess::quote(desktopPath + desk.readName()));
diff --git a/x11/kdebase3/patches/patch-fh b/x11/kdebase3/patches/patch-fh
deleted file mode 100644
index b215441c2f9..00000000000
--- a/x11/kdebase3/patches/patch-fh
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-fh,v 1.1 2004/03/14 18:30:31 jdolecek Exp $
-
---- kcontrol/info/memory_netbsd.cpp.orig	2004-03-14 19:16:08.000000000 +0100
-+++ kcontrol/info/memory_netbsd.cpp	2004-03-14 19:16:39.000000000 +0100
-@@ -26,7 +26,7 @@
-   struct  uvmexp uvmexp;
- #else
-   struct swapent *swaplist;
--  int nswap, rnswap, totalswap, freeswap, usedswap;
-+  int64_t nswap, rnswap, totalswap, freeswap, usedswap;
- #endif
-   
-   /* memory */
-@@ -38,9 +38,6 @@
-   else
-     Memory_Info[TOTAL_MEM]    = memory;
- 
--#warning "FIXME: Memory_Info[CACHED_MEM]"
--    Memory_Info[CACHED_MEM] = NO_MEMORY_INFO; // cached memory in ram
--    
- #ifdef UVM
-   mib[0] = CTL_VM;
-   mib[1] = VM_UVMEXP;
-@@ -51,13 +48,19 @@
-     Memory_Info[INACTIVE_MEM] = NO_MEMORY_INFO;
-     Memory_Info[SWAP_MEM]     = NO_MEMORY_INFO;
-     Memory_Info[FREESWAP_MEM] = NO_MEMORY_INFO;
-+    Memory_Info[CACHED_MEM] = NO_MEMORY_INFO;
-   } else {
--    Memory_Info[FREE_MEM] = MEMORY(uvmexp.free * uvmexp.pagesize);
--    Memory_Info[ACTIVE_MEM] = MEMORY(uvmexp.active * uvmexp.pagesize);
--    Memory_Info[INACTIVE_MEM] = MEMORY(uvmexp.inactive * uvmexp.pagesize);
--    Memory_Info[SWAP_MEM] = MEMORY(uvmexp.swpages * uvmexp.pagesize);
--    Memory_Info[FREESWAP_MEM] = MEMORY((uvmexp.swpages - uvmexp.swpginuse) *
--							uvmexp.pagesize);
-+    t_memsize pgsz = uvmexp.pagesize;
-+    Memory_Info[FREE_MEM] = MEMORY(pgsz * uvmexp.free);
-+    Memory_Info[ACTIVE_MEM] = MEMORY(pgsz * uvmexp.active);
-+    Memory_Info[INACTIVE_MEM] = MEMORY(pgsz * uvmexp.inactive);
-+    Memory_Info[SWAP_MEM] = MEMORY(pgsz * uvmexp.swpages);
-+    Memory_Info[FREESWAP_MEM] = MEMORY(pgsz * (uvmexp.swpages - uvmexp.swpginuse));
-+#if __NetBSD_Version__ > 106000000
-+    Memory_Info[CACHED_MEM] = MEMORY(pgsz * (uvmexp.filepages + uvmexp.execpages));
-+#else
-+    Memory_Info[CACHED_MEM] = NO_MEMORY_INFO;
-+#endif
-     }
- #else
-   Memory_Info[FREE_MEM] = NO_MEMORY_INFO;