15 files changed, 152 insertions, 46 deletions

diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index b686c7c02ca1..d2a8b1c1613f 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	3
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -18,7 +17,7 @@ COMMENT=	Utilities for the KDE integrated X11 desktop
 
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		netsnmp:${PORTSDIR}/net-mgmt/net-snmp
-RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 
 CONFLICTS=	kgpg-[0-9]* superkaramba-[0-9]*
 
@@ -35,7 +34,7 @@ DO_NOT_COMPILE+=klaptopdaemon kmilo
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE}
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index cdaf81b48169..eecf40517f6e 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e
-SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457
-SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542
+MD5 (KDE/kdeutils-3.5.6.tar.bz2) = e0ea2c15ccf2bd3d8be5f2bf57cfe14a
+SHA256 (KDE/kdeutils-3.5.6.tar.bz2) = 7efc558fca536a0b86abd51d7b0b9ca168e8364c222115e29424662acb0e473b
+SIZE (KDE/kdeutils-3.5.6.tar.bz2) = 2989659
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index bcd5d9ba088a..782d19b830c1 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@@ -123,7 +123,6 @@ share/applications/kde/kdf.desktop
 share/applications/kde/kgpg.desktop
 share/applications/kde/khexedit.desktop
 share/applications/kde/kregexpeditor.desktop
-share/applications/kde/ksim.desktop
 share/applications/kde/ktimer.desktop
 share/applications/kde/kwalletconfig.desktop
 share/applications/kde/kwalletmanager-kwalletd.desktop
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index ae9edf470430..4a32a7510277 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils mail news palm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -17,7 +16,6 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Personal Information Management tools for KDE
 
 LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
-		mal:${PORTSDIR}/palm/libmal \
 		pisock:${PORTSDIR}/palm/pilot-link \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2
 
@@ -32,7 +30,7 @@ USE_OPENSSL=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 CONFIGURE_ARGS=	--with-gpg=${LOCALBASE}/bin/gpg \
 		--with-gpgsm=${LOCALBASE}/bin/gpgsm \
diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo
index 77abe98678d3..9c9fc308da19 100644
--- a/deskutils/kdepim3/distinfo
+++ b/deskutils/kdepim3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-3.5.5.tar.bz2) = 3f2127f74cb496899bb3f1f6f702353b
-SHA256 (KDE/kdepim-3.5.5.tar.bz2) = 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047
-SIZE (KDE/kdepim-3.5.5.tar.bz2) = 12908968
+MD5 (KDE/kdepim-3.5.6.tar.bz2) = e37e6173fe9fd7f242c9502a4ae1d7de
+SHA256 (KDE/kdepim-3.5.6.tar.bz2) = 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55
+SIZE (KDE/kdepim-3.5.6.tar.bz2) = 13643798
diff --git a/deskutils/kdepim3/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc b/deskutils/kdepim3/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc
new file mode 100644
index 000000000000..24c411f06150
--- /dev/null
+++ b/deskutils/kdepim3/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc
@@ -0,0 +1,19 @@
+--- kpilot/conduits/vcalconduit/vcalRecord.cc.orig	Sun Mar  4 13:37:15 2007
++++ kpilot/conduits/vcalconduit/vcalRecord.cc	Sun Mar  4 13:38:35 2007
+@@ -584,7 +584,7 @@
+ 	if (eventCategories.size() < 1)
+ 	{
+ 		// This event has no categories.
+-		de->setCategory(Pilot::Unfiled);
++		((PilotRecordBase *)de)->setCategory(Pilot::Unfiled);
+ 		return;
+ 	}
+ 
+@@ -623,6 +623,6 @@
+ 		}
+ 	}
+ 
+-	de->setCategory(Pilot::Unfiled);
++	((PilotRecordBase *)de)->setCategory(Pilot::Unfiled);
+ }
+ 
diff --git a/deskutils/kdepim3/pkg-plist b/deskutils/kdepim3/pkg-plist
index be431fcaa3d6..3f4096274627 100644
--- a/deskutils/kdepim3/pkg-plist
+++ b/deskutils/kdepim3/pkg-plist
@@ -171,13 +171,13 @@ include/kontact/summary.h
 include/korganizer/baseview.h
 include/korganizer/calendarviewbase.h
 include/korganizer/calprinter.h
-include/korganizer/calprinthelper.h
 include/korganizer/calprintpluginbase.h
 include/korganizer/corehelper.h
 include/korganizer/mainwindow.h
 include/korganizer/part.h
 include/korganizer/printplugin.h
 include/kpilot/kpilotlink.h
+include/kpilot/pilot.h
 include/kpilot/pilotDatabase.h
 include/kpilot/pilotLinkVersion.h
 include/kpilot/pilotLocalDatabase.h
@@ -291,9 +291,6 @@ lib/kde3/conduit_doc.so
 lib/kde3/conduit_knotes.a
 lib/kde3/conduit_knotes.la
 lib/kde3/conduit_knotes.so
-lib/kde3/conduit_mal.a
-lib/kde3/conduit_mal.la
-lib/kde3/conduit_mal.so
 lib/kde3/conduit_memofile.a
 lib/kde3/conduit_memofile.la
 lib/kde3/conduit_memofile.so
@@ -588,6 +585,9 @@ lib/kde3/libkorg_hebrew.so
 lib/kde3/libkorg_journalprint.a
 lib/kde3/libkorg_journalprint.la
 lib/kde3/libkorg_journalprint.so
+lib/kde3/libkorg_yearlyprint.a
+lib/kde3/libkorg_yearlyprint.la
+lib/kde3/libkorg_yearlyprint.so
 lib/kde3/libkorganizerpart.a
 lib/kde3/libkorganizerpart.la
 lib/kde3/libkorganizerpart.so
@@ -1696,6 +1696,7 @@ share/apps/libkholidays/holiday_fi
 share/apps/libkholidays/holiday_fr
 share/apps/libkholidays/holiday_frswiss
 share/apps/libkholidays/holiday_gb
+share/apps/libkholidays/holiday_gr
 share/apps/libkholidays/holiday_gt
 share/apps/libkholidays/holiday_hu
 share/apps/libkholidays/holiday_ie
@@ -1736,6 +1737,7 @@ share/autostart/korgac.desktop
 share/config.kcfg/abbrowserconduit.kcfg
 share/config.kcfg/akregator.kcfg
 share/config.kcfg/custommimeheader.kcfg
+share/config.kcfg/customtemplates_kfg.kcfg
 share/config.kcfg/docconduit.kcfg
 share/config.kcfg/egroupware.kcfg
 share/config.kcfg/groupwise.kcfg
@@ -1750,7 +1752,6 @@ share/config.kcfg/korganizer.kcfg
 share/config.kcfg/kpalmdoc.kcfg
 share/config.kcfg/kpilot.kcfg
 share/config.kcfg/kpilotlib.kcfg
-share/config.kcfg/malconduit.kcfg
 share/config.kcfg/memofileconduit.kcfg
 share/config.kcfg/mk4config.kcfg
 share/config.kcfg/pimemoticons.kcfg
@@ -1758,14 +1759,33 @@ share/config.kcfg/popmail.kcfg
 share/config.kcfg/replyphrases.kcfg
 share/config.kcfg/slox.kcfg
 share/config.kcfg/sysinfoconduit.kcfg
+share/config.kcfg/templatesconfiguration_kfg.kcfg
 share/config.kcfg/timeconduit.kcfg
 share/config.kcfg/vcalconduitbase.kcfg
 share/config/kmail.antispamrc
 share/config/kmail.antivirusrc
 share/config/libkleopatrarc
+share/doc/HTML/en/akregator/add-feed.png
+share/doc/HTML/en/akregator/add-feed2.png
+share/doc/HTML/en/akregator/add-folder.png
+share/doc/HTML/en/akregator/add-folder2.png
+share/doc/HTML/en/akregator/advanced-tab.png
+share/doc/HTML/en/akregator/appearance-tab.png
+share/doc/HTML/en/akregator/archive-tab.png
+share/doc/HTML/en/akregator/browser-tab.png
 share/doc/HTML/en/akregator/common
+share/doc/HTML/en/akregator/general-tab.png
 share/doc/HTML/en/akregator/index.cache.bz2
 share/doc/HTML/en/akregator/index.docbook
+share/doc/HTML/en/akregator/konq.png
+share/doc/HTML/en/akregator/konq2.png
+share/doc/HTML/en/akregator/main-window.png
+share/doc/HTML/en/akregator/main-window2.png
+share/doc/HTML/en/akregator/main-window3.png
+share/doc/HTML/en/akregator/main-window4.png
+share/doc/HTML/en/akregator/quick-filter.png
+share/doc/HTML/en/akregator/rss.png
+share/doc/HTML/en/akregator/rss3.png
 share/doc/HTML/en/kaddressbook/addhost.png
 share/doc/HTML/en/kaddressbook/common
 share/doc/HTML/en/kaddressbook/conf.png
@@ -2247,6 +2267,7 @@ share/services/korganizer/hebrew.desktop
 share/services/korganizer/holidays.desktop
 share/services/korganizer/journalprint.desktop
 share/services/korganizer/webexport.desktop
+share/services/korganizer/yearprint.desktop
 share/services/korganizer_configcolors.desktop
 share/services/korganizer_configdesignerfields.desktop
 share/services/korganizer_configfonts.desktop
@@ -2295,7 +2316,6 @@ share/services/kresources/konnector/qtopia.desktop
 share/services/kresources/konnector/remotekonnector.desktop
 share/services/kresources/konnector_manager.desktop
 share/services/ldifvcardthumbnail.desktop
-share/services/mal_conduit.desktop
 share/services/mbox.protocol
 share/services/memofile-conduit.desktop
 share/services/notepad-conduit.desktop
@@ -2695,7 +2715,6 @@ share/servicetypes/kpilotconduit.desktop
 @dirrm share/apps/akregator/pics
 @dirrm share/apps/akregator/about
 @dirrm share/apps/akregator
-@dirrm lib/kconf_update_bin
 @dirrm include/qgpgme
 @dirrm include/mimelib
 @dirrm include/libkcal
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index ae9edf470430..4a32a7510277 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils mail news palm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -17,7 +16,6 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Personal Information Management tools for KDE
 
 LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
-		mal:${PORTSDIR}/palm/libmal \
 		pisock:${PORTSDIR}/palm/pilot-link \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2
 
@@ -32,7 +30,7 @@ USE_OPENSSL=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 CONFIGURE_ARGS=	--with-gpg=${LOCALBASE}/bin/gpg \
 		--with-gpgsm=${LOCALBASE}/bin/gpgsm \
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 77abe98678d3..9c9fc308da19 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-3.5.5.tar.bz2) = 3f2127f74cb496899bb3f1f6f702353b
-SHA256 (KDE/kdepim-3.5.5.tar.bz2) = 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047
-SIZE (KDE/kdepim-3.5.5.tar.bz2) = 12908968
+MD5 (KDE/kdepim-3.5.6.tar.bz2) = e37e6173fe9fd7f242c9502a4ae1d7de
+SHA256 (KDE/kdepim-3.5.6.tar.bz2) = 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55
+SIZE (KDE/kdepim-3.5.6.tar.bz2) = 13643798
diff --git a/deskutils/kdepim4/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc b/deskutils/kdepim4/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc
new file mode 100644
index 000000000000..24c411f06150
--- /dev/null
+++ b/deskutils/kdepim4/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc
@@ -0,0 +1,19 @@
+--- kpilot/conduits/vcalconduit/vcalRecord.cc.orig	Sun Mar  4 13:37:15 2007
++++ kpilot/conduits/vcalconduit/vcalRecord.cc	Sun Mar  4 13:38:35 2007
+@@ -584,7 +584,7 @@
+ 	if (eventCategories.size() < 1)
+ 	{
+ 		// This event has no categories.
+-		de->setCategory(Pilot::Unfiled);
++		((PilotRecordBase *)de)->setCategory(Pilot::Unfiled);
+ 		return;
+ 	}
+ 
+@@ -623,6 +623,6 @@
+ 		}
+ 	}
+ 
+-	de->setCategory(Pilot::Unfiled);
++	((PilotRecordBase *)de)->setCategory(Pilot::Unfiled);
+ }
+ 
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index be431fcaa3d6..3f4096274627 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -171,13 +171,13 @@ include/kontact/summary.h
 include/korganizer/baseview.h
 include/korganizer/calendarviewbase.h
 include/korganizer/calprinter.h
-include/korganizer/calprinthelper.h
 include/korganizer/calprintpluginbase.h
 include/korganizer/corehelper.h
 include/korganizer/mainwindow.h
 include/korganizer/part.h
 include/korganizer/printplugin.h
 include/kpilot/kpilotlink.h
+include/kpilot/pilot.h
 include/kpilot/pilotDatabase.h
 include/kpilot/pilotLinkVersion.h
 include/kpilot/pilotLocalDatabase.h
@@ -291,9 +291,6 @@ lib/kde3/conduit_doc.so
 lib/kde3/conduit_knotes.a
 lib/kde3/conduit_knotes.la
 lib/kde3/conduit_knotes.so
-lib/kde3/conduit_mal.a
-lib/kde3/conduit_mal.la
-lib/kde3/conduit_mal.so
 lib/kde3/conduit_memofile.a
 lib/kde3/conduit_memofile.la
 lib/kde3/conduit_memofile.so
@@ -588,6 +585,9 @@ lib/kde3/libkorg_hebrew.so
 lib/kde3/libkorg_journalprint.a
 lib/kde3/libkorg_journalprint.la
 lib/kde3/libkorg_journalprint.so
+lib/kde3/libkorg_yearlyprint.a
+lib/kde3/libkorg_yearlyprint.la
+lib/kde3/libkorg_yearlyprint.so
 lib/kde3/libkorganizerpart.a
 lib/kde3/libkorganizerpart.la
 lib/kde3/libkorganizerpart.so
@@ -1696,6 +1696,7 @@ share/apps/libkholidays/holiday_fi
 share/apps/libkholidays/holiday_fr
 share/apps/libkholidays/holiday_frswiss
 share/apps/libkholidays/holiday_gb
+share/apps/libkholidays/holiday_gr
 share/apps/libkholidays/holiday_gt
 share/apps/libkholidays/holiday_hu
 share/apps/libkholidays/holiday_ie
@@ -1736,6 +1737,7 @@ share/autostart/korgac.desktop
 share/config.kcfg/abbrowserconduit.kcfg
 share/config.kcfg/akregator.kcfg
 share/config.kcfg/custommimeheader.kcfg
+share/config.kcfg/customtemplates_kfg.kcfg
 share/config.kcfg/docconduit.kcfg
 share/config.kcfg/egroupware.kcfg
 share/config.kcfg/groupwise.kcfg
@@ -1750,7 +1752,6 @@ share/config.kcfg/korganizer.kcfg
 share/config.kcfg/kpalmdoc.kcfg
 share/config.kcfg/kpilot.kcfg
 share/config.kcfg/kpilotlib.kcfg
-share/config.kcfg/malconduit.kcfg
 share/config.kcfg/memofileconduit.kcfg
 share/config.kcfg/mk4config.kcfg
 share/config.kcfg/pimemoticons.kcfg
@@ -1758,14 +1759,33 @@ share/config.kcfg/popmail.kcfg
 share/config.kcfg/replyphrases.kcfg
 share/config.kcfg/slox.kcfg
 share/config.kcfg/sysinfoconduit.kcfg
+share/config.kcfg/templatesconfiguration_kfg.kcfg
 share/config.kcfg/timeconduit.kcfg
 share/config.kcfg/vcalconduitbase.kcfg
 share/config/kmail.antispamrc
 share/config/kmail.antivirusrc
 share/config/libkleopatrarc
+share/doc/HTML/en/akregator/add-feed.png
+share/doc/HTML/en/akregator/add-feed2.png
+share/doc/HTML/en/akregator/add-folder.png
+share/doc/HTML/en/akregator/add-folder2.png
+share/doc/HTML/en/akregator/advanced-tab.png
+share/doc/HTML/en/akregator/appearance-tab.png
+share/doc/HTML/en/akregator/archive-tab.png
+share/doc/HTML/en/akregator/browser-tab.png
 share/doc/HTML/en/akregator/common
+share/doc/HTML/en/akregator/general-tab.png
 share/doc/HTML/en/akregator/index.cache.bz2
 share/doc/HTML/en/akregator/index.docbook
+share/doc/HTML/en/akregator/konq.png
+share/doc/HTML/en/akregator/konq2.png
+share/doc/HTML/en/akregator/main-window.png
+share/doc/HTML/en/akregator/main-window2.png
+share/doc/HTML/en/akregator/main-window3.png
+share/doc/HTML/en/akregator/main-window4.png
+share/doc/HTML/en/akregator/quick-filter.png
+share/doc/HTML/en/akregator/rss.png
+share/doc/HTML/en/akregator/rss3.png
 share/doc/HTML/en/kaddressbook/addhost.png
 share/doc/HTML/en/kaddressbook/common
 share/doc/HTML/en/kaddressbook/conf.png
@@ -2247,6 +2267,7 @@ share/services/korganizer/hebrew.desktop
 share/services/korganizer/holidays.desktop
 share/services/korganizer/journalprint.desktop
 share/services/korganizer/webexport.desktop
+share/services/korganizer/yearprint.desktop
 share/services/korganizer_configcolors.desktop
 share/services/korganizer_configdesignerfields.desktop
 share/services/korganizer_configfonts.desktop
@@ -2295,7 +2316,6 @@ share/services/kresources/konnector/qtopia.desktop
 share/services/kresources/konnector/remotekonnector.desktop
 share/services/kresources/konnector_manager.desktop
 share/services/ldifvcardthumbnail.desktop
-share/services/mal_conduit.desktop
 share/services/mbox.protocol
 share/services/memofile-conduit.desktop
 share/services/notepad-conduit.desktop
@@ -2695,7 +2715,6 @@ share/servicetypes/kpilotconduit.desktop
 @dirrm share/apps/akregator/pics
 @dirrm share/apps/akregator/about
 @dirrm share/apps/akregator
-@dirrm lib/kconf_update_bin
 @dirrm include/qgpgme
 @dirrm include/mimelib
 @dirrm include/libkcal
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index ae9edf470430..4a32a7510277 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils mail news palm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -17,7 +16,6 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Personal Information Management tools for KDE
 
 LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
-		mal:${PORTSDIR}/palm/libmal \
 		pisock:${PORTSDIR}/palm/pilot-link \
 		sasl2:${PORTSDIR}/security/cyrus-sasl2
 
@@ -32,7 +30,7 @@ USE_OPENSSL=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 CONFIGURE_ARGS=	--with-gpg=${LOCALBASE}/bin/gpg \
 		--with-gpgsm=${LOCALBASE}/bin/gpgsm \
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index 77abe98678d3..9c9fc308da19 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-3.5.5.tar.bz2) = 3f2127f74cb496899bb3f1f6f702353b
-SHA256 (KDE/kdepim-3.5.5.tar.bz2) = 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047
-SIZE (KDE/kdepim-3.5.5.tar.bz2) = 12908968
+MD5 (KDE/kdepim-3.5.6.tar.bz2) = e37e6173fe9fd7f242c9502a4ae1d7de
+SHA256 (KDE/kdepim-3.5.6.tar.bz2) = 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55
+SIZE (KDE/kdepim-3.5.6.tar.bz2) = 13643798
diff --git a/deskutils/kdepim44/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc b/deskutils/kdepim44/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc
new file mode 100644
index 000000000000..24c411f06150
--- /dev/null
+++ b/deskutils/kdepim44/files/patch-kpilot_conduits_vcalconduit-vcalRecord.cc
@@ -0,0 +1,19 @@
+--- kpilot/conduits/vcalconduit/vcalRecord.cc.orig	Sun Mar  4 13:37:15 2007
++++ kpilot/conduits/vcalconduit/vcalRecord.cc	Sun Mar  4 13:38:35 2007
+@@ -584,7 +584,7 @@
+ 	if (eventCategories.size() < 1)
+ 	{
+ 		// This event has no categories.
+-		de->setCategory(Pilot::Unfiled);
++		((PilotRecordBase *)de)->setCategory(Pilot::Unfiled);
+ 		return;
+ 	}
+ 
+@@ -623,6 +623,6 @@
+ 		}
+ 	}
+ 
+-	de->setCategory(Pilot::Unfiled);
++	((PilotRecordBase *)de)->setCategory(Pilot::Unfiled);
+ }
+ 
diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist
index be431fcaa3d6..3f4096274627 100644
--- a/deskutils/kdepim44/pkg-plist
+++ b/deskutils/kdepim44/pkg-plist
@@ -171,13 +171,13 @@ include/kontact/summary.h
 include/korganizer/baseview.h
 include/korganizer/calendarviewbase.h
 include/korganizer/calprinter.h
-include/korganizer/calprinthelper.h
 include/korganizer/calprintpluginbase.h
 include/korganizer/corehelper.h
 include/korganizer/mainwindow.h
 include/korganizer/part.h
 include/korganizer/printplugin.h
 include/kpilot/kpilotlink.h
+include/kpilot/pilot.h
 include/kpilot/pilotDatabase.h
 include/kpilot/pilotLinkVersion.h
 include/kpilot/pilotLocalDatabase.h
@@ -291,9 +291,6 @@ lib/kde3/conduit_doc.so
 lib/kde3/conduit_knotes.a
 lib/kde3/conduit_knotes.la
 lib/kde3/conduit_knotes.so
-lib/kde3/conduit_mal.a
-lib/kde3/conduit_mal.la
-lib/kde3/conduit_mal.so
 lib/kde3/conduit_memofile.a
 lib/kde3/conduit_memofile.la
 lib/kde3/conduit_memofile.so
@@ -588,6 +585,9 @@ lib/kde3/libkorg_hebrew.so
 lib/kde3/libkorg_journalprint.a
 lib/kde3/libkorg_journalprint.la
 lib/kde3/libkorg_journalprint.so
+lib/kde3/libkorg_yearlyprint.a
+lib/kde3/libkorg_yearlyprint.la
+lib/kde3/libkorg_yearlyprint.so
 lib/kde3/libkorganizerpart.a
 lib/kde3/libkorganizerpart.la
 lib/kde3/libkorganizerpart.so
@@ -1696,6 +1696,7 @@ share/apps/libkholidays/holiday_fi
 share/apps/libkholidays/holiday_fr
 share/apps/libkholidays/holiday_frswiss
 share/apps/libkholidays/holiday_gb
+share/apps/libkholidays/holiday_gr
 share/apps/libkholidays/holiday_gt
 share/apps/libkholidays/holiday_hu
 share/apps/libkholidays/holiday_ie
@@ -1736,6 +1737,7 @@ share/autostart/korgac.desktop
 share/config.kcfg/abbrowserconduit.kcfg
 share/config.kcfg/akregator.kcfg
 share/config.kcfg/custommimeheader.kcfg
+share/config.kcfg/customtemplates_kfg.kcfg
 share/config.kcfg/docconduit.kcfg
 share/config.kcfg/egroupware.kcfg
 share/config.kcfg/groupwise.kcfg
@@ -1750,7 +1752,6 @@ share/config.kcfg/korganizer.kcfg
 share/config.kcfg/kpalmdoc.kcfg
 share/config.kcfg/kpilot.kcfg
 share/config.kcfg/kpilotlib.kcfg
-share/config.kcfg/malconduit.kcfg
 share/config.kcfg/memofileconduit.kcfg
 share/config.kcfg/mk4config.kcfg
 share/config.kcfg/pimemoticons.kcfg
@@ -1758,14 +1759,33 @@ share/config.kcfg/popmail.kcfg
 share/config.kcfg/replyphrases.kcfg
 share/config.kcfg/slox.kcfg
 share/config.kcfg/sysinfoconduit.kcfg
+share/config.kcfg/templatesconfiguration_kfg.kcfg
 share/config.kcfg/timeconduit.kcfg
 share/config.kcfg/vcalconduitbase.kcfg
 share/config/kmail.antispamrc
 share/config/kmail.antivirusrc
 share/config/libkleopatrarc
+share/doc/HTML/en/akregator/add-feed.png
+share/doc/HTML/en/akregator/add-feed2.png
+share/doc/HTML/en/akregator/add-folder.png
+share/doc/HTML/en/akregator/add-folder2.png
+share/doc/HTML/en/akregator/advanced-tab.png
+share/doc/HTML/en/akregator/appearance-tab.png
+share/doc/HTML/en/akregator/archive-tab.png
+share/doc/HTML/en/akregator/browser-tab.png
 share/doc/HTML/en/akregator/common
+share/doc/HTML/en/akregator/general-tab.png
 share/doc/HTML/en/akregator/index.cache.bz2
 share/doc/HTML/en/akregator/index.docbook
+share/doc/HTML/en/akregator/konq.png
+share/doc/HTML/en/akregator/konq2.png
+share/doc/HTML/en/akregator/main-window.png
+share/doc/HTML/en/akregator/main-window2.png
+share/doc/HTML/en/akregator/main-window3.png
+share/doc/HTML/en/akregator/main-window4.png
+share/doc/HTML/en/akregator/quick-filter.png
+share/doc/HTML/en/akregator/rss.png
+share/doc/HTML/en/akregator/rss3.png
 share/doc/HTML/en/kaddressbook/addhost.png
 share/doc/HTML/en/kaddressbook/common
 share/doc/HTML/en/kaddressbook/conf.png
@@ -2247,6 +2267,7 @@ share/services/korganizer/hebrew.desktop
 share/services/korganizer/holidays.desktop
 share/services/korganizer/journalprint.desktop
 share/services/korganizer/webexport.desktop
+share/services/korganizer/yearprint.desktop
 share/services/korganizer_configcolors.desktop
 share/services/korganizer_configdesignerfields.desktop
 share/services/korganizer_configfonts.desktop
@@ -2295,7 +2316,6 @@ share/services/kresources/konnector/qtopia.desktop
 share/services/kresources/konnector/remotekonnector.desktop
 share/services/kresources/konnector_manager.desktop
 share/services/ldifvcardthumbnail.desktop
-share/services/mal_conduit.desktop
 share/services/mbox.protocol
 share/services/memofile-conduit.desktop
 share/services/notepad-conduit.desktop
@@ -2695,7 +2715,6 @@ share/servicetypes/kpilotconduit.desktop
 @dirrm share/apps/akregator/pics
 @dirrm share/apps/akregator/about
 @dirrm share/apps/akregator
-@dirrm lib/kconf_update_bin
 @dirrm include/qgpgme
 @dirrm include/mimelib
 @dirrm include/libkcal