bl3ify and update to kde3.2.2.

Changes:
* kwalletmanager: Fix no popup for kwallet in system tray
* kwalletmanager: Fix kwallet in system tray does not provide configure
  option
* kwalletmanager: Fix "Launch wallet manager" in kwalletmanager prefs does
  not make sense
* kwalletmanager: Fix When changing a value the 'Save' button is not
  activated
* kgpg: Fix kgpg exports gpg warnings within public key
* kgpg: Fix not possible to store keys/config in a different location
* kgpg: Fix kgpg editor doesn't use KDE's default fixed width font. Breaks
  layout
* kgpg: Fix Qtrl+Q must QUIT the application and not hide it to system tray
  icon
* configure: Fix Extraneous message in admin/Makefile.common using --prefix

4 files changed, 39 insertions, 16 deletions

diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 5a77dfe73f1..305cdf18bb0 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.37 2004/04/14 16:15:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.38 2004/04/20 13:19:56 markd Exp $
 
 DISTNAME=	kdeutils-${_KDE_VERSION}
-PKGREVISION=	1
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 USE_PKGINSTALL=		YES
 
@@ -32,7 +31,8 @@ CPPFLAGS+=		-DARK_TAR=\"\\\"${PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar\\\"\"
 CPPFLAGS+=             -D__NetBSD_APM__
 .endif
 
-.include "../../meta-pkgs/kde3/buildlink2.mk"
-.include "../../x11/kdebase3/buildlink2.mk"
+.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../x11/kdebase3/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index 398629ffce4..5b3eefeedf5 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.21 2004/03/09 12:04:40 markd Exp $
+$NetBSD: distinfo,v 1.22 2004/04/20 13:19:56 markd Exp $
 
-SHA1 (kdeutils-3.2.1.tar.bz2) = 67bf2fe09e7b021ad026f996362c35c102b165a7
-Size (kdeutils-3.2.1.tar.bz2) = 2577558 bytes
+SHA1 (kdeutils-3.2.2.tar.bz2) = 8ff615e0d1fa3b17488f28a70564ecfbfa7f6bae
+Size (kdeutils-3.2.2.tar.bz2) = 2549521 bytes
 SHA1 (patch-aa) = 01c0d686ea0f92fb4dbc5ac04591031dff1137de
+SHA1 (patch-ab) = 3ea156545a1e9e3bd601e4152ca4942d18b18353
 SHA1 (patch-an) = e13957a9fa0d23aebbe149ecaca7b9dacde5c9fb
-SHA1 (patch-ao) = dde26f89bcef1d728aca23053a9afb4e990bb3db
+SHA1 (patch-ao) = 84cbdcbfbd6c81f88695926ed01b678276b1abfa
 SHA1 (patch-ap) = 0bfa5bfeb6551791ea6311bbf1223732d3dfa482
diff --git a/misc/kdeutils3/patches/patch-ab b/misc/kdeutils3/patches/patch-ab
new file mode 100644
index 00000000000..f45da2b19ae
--- /dev/null
+++ b/misc/kdeutils3/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.9 2004/04/20 13:19:56 markd Exp $
+
+--- ark/tar.cpp.orig	2004-04-04 21:16:08.000000000 +1200
++++ ark/tar.cpp
+@@ -81,7 +81,7 @@ TarArch::TarArch( ArkSettings *_settings
+ 
+     m_fileMimeType = _openAsMimeType;
+     if ( m_fileMimeType.isNull() )
+-        m_fileMimeType = KMimeType::findByFileContent( _filename )->name();
++        m_fileMimeType = KMimeType::findByPath( _filename )->name();
+ 
+     kdDebug(1601) << "TarArch::TarArch:  mimetype is " << m_fileMimeType << endl;
+ 
diff --git a/misc/kdeutils3/patches/patch-ao b/misc/kdeutils3/patches/patch-ao
index c00f96a9482..163fff92b5e 100644
--- a/misc/kdeutils3/patches/patch-ao
+++ b/misc/kdeutils3/patches/patch-ao
@@ -1,15 +1,14 @@
-$NetBSD: patch-ao,v 1.8 2004/02/04 20:38:00 markd Exp $
+$NetBSD: patch-ao,v 1.9 2004/04/20 13:19:56 markd Exp $
 
---- configure.orig	2004-02-01 14:43:19.000000000 +1300
+--- configure.orig	2004-04-06 02:55:31.000000000 +1200
 +++ configure
-@@ -24850,63 +24850,6 @@ _ACEOF
+@@ -26498,72 +26498,6 @@ _ACEOF
  
  
  
 -  echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
 -echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
 -  cat >conftest.$ac_ext <<_ACEOF
--/* #line $LINENO "configure" */
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
@@ -30,11 +29,21 @@ $NetBSD: patch-ao,v 1.8 2004/02/04 20:38:00 markd Exp $
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
+-  (eval $ac_compile) 2>conftest.er1
 -  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--         { ac_try='test -s conftest.$ac_objext'
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -60,7 +69,7 @@ $NetBSD: patch-ao,v 1.8 2004/02/04 20:38:00 markd Exp $
 -   { (exit 1); exit 1; }; }
 -
 -fi
--rm -f conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -
 -
  # darwin needs this to initialize the environment