bl3ify and update to kde3.2.2.

Changes:
* kalarm: Fix Ctrl+Q must QUIT the application and not hide it to system
  tray
* kalarm: Update time entry field after editing when mouse cursor leaves
  it.
* kalarm: Prevent undeleted recurring alarms being triggered immediately.
* kalarm: Do not allow alarms to be undeleted if they are completely
  expired.
* kmail: Improved look with other styles than Keramik.
* KNode: Don't save accounts before they have a valid id
* KNotes:
  o lots of fixes
  o finished rich text support
  o use KConfig XT for default values
  o use XML GUI for all actions
* Make various scripts install with the executable bit set

6 files changed, 79 insertions, 19 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 2fa31688152..2975973263d 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.28 2004/04/14 16:15:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.29 2004/04/20 13:29:12 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
+USE_PERL=		run
 
 REPLACE_PERL=	kmail/kmail-3.1-update-new-mail-notification-settings.pl \
 		kmail/kmail-3.1-use-UOID-for-identities.pl \
@@ -19,7 +19,9 @@ REPLACE_PERL=	kmail/kmail-3.1-update-new-mail-notification-settings.pl \
 		kmail/upgrade-transport.pl \
 		libkdenetwork/kpgp-3.1-upgrade-address-data.pl
 
-.include "../../comms/pilot-link-libs/buildlink2.mk"
-.include "../../meta-pkgs/kde3/buildlink2.mk"
-.include "../../x11/kdebase3/buildlink2.mk"
+.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../comms/libmal/buildlink3.mk"
+.include "../../comms/pilot-link-libs/buildlink3.mk"
+.include "../../x11/kdebase3/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index 6e5f832d01f..061c3047781 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/02/04 22:50:18 markd Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/04/20 13:29:12 markd Exp $
 bin/ghns
 bin/ical2vcal
 bin/kabc2mutt
@@ -170,6 +170,8 @@ lib/kde3/conduit_doc.la
 lib/kde3/conduit_doc.so
 lib/kde3/conduit_knotes.la
 lib/kde3/conduit_knotes.so
+lib/kde3/conduit_mal.la
+lib/kde3/conduit_mal.so
 lib/kde3/conduit_popmail.la
 lib/kde3/conduit_popmail.so
 lib/kde3/conduit_sysinfo.la
@@ -922,10 +924,10 @@ share/kde/apps/ktnef/icons/locolor/16x16/actions/ktnef_extract_all_to.png
 share/kde/apps/ktnef/icons/locolor/16x16/actions/ktnef_extract_to.png
 share/kde/apps/ktnef/ktnefui.rc
 share/kde/config.kcfg/kandy.kcfg
+share/kde/config.kcfg/knotes.kcfg
 share/kde/config.kcfg/kontact.kcfg
 share/kde/config.kcfg/korganizer.kcfg
 share/kde/config/khotnewstuffrc
-share/kde/config/knotesrc
 share/kde/icons/crystalsvg/128x128/apps/kaddressbook.png
 share/kde/icons/crystalsvg/128x128/apps/karm.png
 share/kde/icons/crystalsvg/128x128/apps/kmail.png
@@ -1056,6 +1058,7 @@ share/kde/services/kresources/kcal/local.desktop
 share/kde/services/kresources/kcal/localdir.desktop
 share/kde/services/kresources/kcal/remote.desktop
 share/kde/services/ldifvcardthumbnail.desktop
+share/kde/services/mal_conduit.desktop
 share/kde/services/popmail-conduit.desktop
 share/kde/services/sieve.protocol
 share/kde/services/sysinfo_conduit.desktop
diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk
new file mode 100644
index 00000000000..c2018bd7cd0
--- /dev/null
+++ b/misc/kdepim3/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/20 13:29:12 markd Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+KDEPIM_BUILDLINK3_MK:=	${KDEPIM_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	kdepim
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdepim}
+BUILDLINK_PACKAGES+=	kdepim
+
+.if !empty(KDEPIM_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.kdepim+=	kdepim>=3.2.2
+BUILDLINK_PKGSRCDIR.kdepim?=	../../misc/kdepim3
+.endif	# KDEPIM_BUILDLINK3_MK
+
+.include "../../comms/libmal/buildlink3.mk"
+.include "../../comms/pilot-link-libs/buildlink3.mk"
+.include "../../x11/kdebase3/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index be3e4bc449e..fc3d703e357 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.18 2004/03/09 12:13:45 markd Exp $
+$NetBSD: distinfo,v 1.19 2004/04/20 13:29:12 markd Exp $
 
-SHA1 (kdepim-3.2.1.tar.bz2) = 697400b43aeae6dcff04a098e606ba290e107827
-Size (kdepim-3.2.1.tar.bz2) = 7754558 bytes
-SHA1 (patch-ai) = 6ff4270a5fd119e7d9c7240f40e60e868e691c3b
+SHA1 (kdepim-3.2.2.tar.bz2) = 933950722e47eaaa8229aef1d77533fe6a5b0d03
+Size (kdepim-3.2.2.tar.bz2) = 7721918 bytes
+SHA1 (patch-aa) = c8e038288e8f4f94f927cf36d95acbd07f77fd85
+SHA1 (patch-ai) = 83772554377643ecfe38dd96103a2ad2deb9136e
diff --git a/misc/kdepim3/patches/patch-aa b/misc/kdepim3/patches/patch-aa
new file mode 100644
index 00000000000..c0e293bd6c3
--- /dev/null
+++ b/misc/kdepim3/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.7 2004/04/20 13:29:12 markd Exp $
+
+--- kpilot/conduits/malconduit/mal-conduit.cc.orig	2003-10-26 23:57:55.000000000 +1300
++++ kpilot/conduits/malconduit/mal-conduit.cc
+@@ -41,7 +41,7 @@
+ #include "mal-factory.h"
+ #include "mal-conduit.moc"
+ #include <libmal.h>
+-
++#include <stdarg.h>
+ 
+ // Something to allow us to check what revision
+ // the modules are that make up a binary distribution.
diff --git a/misc/kdepim3/patches/patch-ai b/misc/kdepim3/patches/patch-ai
index ff56d6dad21..3440eca8c2e 100644
--- a/misc/kdepim3/patches/patch-ai
+++ b/misc/kdepim3/patches/patch-ai
@@ -1,15 +1,14 @@
-$NetBSD: patch-ai,v 1.8 2004/02/04 22:50:18 markd Exp $
+$NetBSD: patch-ai,v 1.9 2004/04/20 13:29:12 markd Exp $
 
---- configure.orig	2004-01-26 08:17:44.000000000 +1300
+--- configure.orig	2004-04-06 03:02:35.000000000 +1200
 +++ configure
-@@ -24859,63 +24859,6 @@ _ACEOF
+@@ -26507,72 +26507,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-ai,v 1.8 2004/02/04 22:50:18 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,9 +69,18 @@ $NetBSD: patch-ai,v 1.8 2004/02/04 22:50:18 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
  
  for ac_header in crt_externs.h
+@@ -39902,7 +39836,7 @@ echo "${ECHO_T}searched but not found" >
+   kde_save_CFLAGS="$CFLAGS"
+   kde_save_CPPFLAGS="$CPPFLAGS"
+   kde_save_LDFLAGS="$LDFLAGS"
+-  LIBS="$LIBS $PISOCK_LIB $MAL_LIB -ldl"
++  LIBS="$LIBS $PISOCK_LIB $MAL_LIB"
+   CFLAGS="$CFLAGS $MAL_INCLUDE"
+   CPPFLAGS="$CPPFLAGS $all_includes $PISOCK_INCLUDE $MAL_INCLUDE"
+   LDFLAGS="$LDFLAGS $all_libraries"