Update to KDE 3.3.2

5 files changed, 8 insertions, 64 deletions

diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 90a18a3ec540..a8047ada97b4 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kdepim
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	deskutils mail news palm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -16,7 +15,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Personal Information Management tools for KDE
 
-LIB_DEPENDS=	mal:${PORTSDIR}/palm/libmal \
+LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
+		mal:${PORTSDIR}/palm/libmal \
 		pisock:${PORTSDIR}/palm/pilot-link
 
 CONFLICTS=	kdenetwork-3.1.* kdeaddons-kontact-plugins-[0-9]* kdepim-kpilot-3.2.3
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 4b6226dbb381..78ac98bebf7c 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdepim-3.3.1.tar.bz2) = 5aed63aed6b7c1ad9232cb30aa124a40
-SIZE (KDE/kdepim-3.3.1.tar.bz2) = 10007944
+MD5 (KDE/kdepim-3.3.2.tar.bz2) = 73852792762c4f229e870314c51c081a
+SIZE (KDE/kdepim-3.3.2.tar.bz2) = 9994033
diff --git a/deskutils/kdepim4/files/patch-korganizer_plugins_holidays_holidays.cpp b/deskutils/kdepim4/files/patch-korganizer_plugins_holidays_holidays.cpp
deleted file mode 100644
index f45af6e70a48..000000000000
--- a/deskutils/kdepim4/files/patch-korganizer_plugins_holidays_holidays.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- korganizer/plugins/holidays/holidays.cpp.orig	Tue Nov  9 21:00:17 2004
-+++ korganizer/plugins/holidays/holidays.cpp	Tue Nov  9 21:01:01 2004
-@@ -91,7 +91,7 @@
-   //static int lastYear = 0;
-   int lastYear = 0;
- 
--  if (mHolidayFile.isEmpty()) return QString::null;
-+  if (mHolidayFile.isEmpty() || qd.isNull()) return QString::null;
- 
-   //if ((lastYear == 0) || (qd.year() != lastYear)) {
-   if ((yearLast == 0) || (qd.year() != yearLast)) {
diff --git a/deskutils/kdepim4/files/patch-kresources_slox_webdavhandler.cpp b/deskutils/kdepim4/files/patch-kresources_slox_webdavhandler.cpp
deleted file mode 100644
index b76c3270bdfc..000000000000
--- a/deskutils/kdepim4/files/patch-kresources_slox_webdavhandler.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-===================================================================
-RCS file: /usr/repos/kde/kdepim/kresources/slox/webdavhandler.cpp,v
-retrieving revision 1.8.2.1
-retrieving revision 1.8.2.2
-diff -u -p -r1.8.2.1 -r1.8.2.2
---- kresources/slox/webdavhandler.cpp	2004/09/28 14:25:44	1.8.2.1
-+++ kresources/slox/webdavhandler.cpp	2004/10/07 23:35:53	1.8.2.2
-@@ -20,7 +20,13 @@
- 
- #include "webdavhandler.h"
- 
-+#ifdef HAVE_VALUES_H
- #include <values.h>
-+#else
-+#ifdef HAVE_SYS_LIMITS_H
-+#include <sys/limits.h>
-+#endif
-+#endif
- 
- #include <libkdepim/kpimprefs.h>
- 
-@@ -150,9 +156,9 @@ QDateTime WebdavHandler::sloxToQDateTime
- 
-   if (preEpoch) {
-     dt.setTime_t( 0, Qt::UTC );
--    if (ticks > MAXINT) {
--      dt = dt.addSecs(-MAXINT);
--      ticks -= MAXINT;
-+    if (ticks > INT_MAX) {
-+      dt = dt.addSecs(-INT_MAX);
-+      ticks -= INT_MAX;
-     }
-     dt = dt.addSecs(-((long) ticks));
-   }
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index 91a4adaf3cea..825459e25db1 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -32,6 +32,7 @@ bin/ksync
 bin/ktnef
 bin/kwatchgnupg
 bin/sloxwizard
+include/KNotesAppIface.h
 include/KNotesIface.h
 include/calendar/calendardecoration.h
 include/calendar/plugin.h
@@ -168,6 +169,7 @@ include/libkcal/icaldrag.h
 include/libkcal/icalformat.h
 include/libkcal/incidence.h
 include/libkcal/incidencebase.h
+include/libkcal/incidenceformatter.h
 include/libkcal/journal.h
 include/libkcal/kcalversion.h
 include/libkcal/listbase.h
@@ -414,7 +416,7 @@ lib/libdummykonnector.la
 lib/libdummykonnector.so
 lib/libgpgme++.la
 lib/libgpgme++.so
-lib/libgpgme++.so.0
+lib/libgpgme++.so.1
 lib/libkabc_imap.la
 lib/libkabc_imap.so
 lib/libkabc_imap.so.0
@@ -766,6 +768,7 @@ share/apps/knotes/icons/crystalsvg/16x16/actions/knotes_delete.png
 share/apps/knotes/icons/crystalsvg/16x16/actions/text_sub.png
 share/apps/knotes/icons/crystalsvg/16x16/actions/text_super.png
 share/apps/knotes/knotes_part.rc
+share/apps/knotes/knotesappui.rc
 share/apps/knotes/knotesui.rc
 share/apps/kontact/kontact.setdlg
 share/apps/kontact/kontactui.rc
@@ -1531,14 +1534,6 @@ share/servicetypes/kpilotconduit.desktop
 @dirrm share/services/kitchensync
 @dirrm share/services/kaddressbook
 @dirrm share/mimelnk/kdedevice
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/crystalsvg/22x22/apps
 @dirrm share/doc/HTML/en/kwatchgnupg
 @dirrm share/doc/HTML/en/ktnef
 @dirrm share/doc/HTML/en/kpilot
@@ -1600,12 +1595,10 @@ share/servicetypes/kpilotconduit.desktop
 @dirrm share/doc/HTML/en/kdepim-apidocs/certmanager
 @dirrm share/doc/HTML/en/kdepim-apidocs
 @dirrm share/doc/HTML/en/kcontrol/kalarmd
-@dirrm share/doc/HTML/en/kcontrol
 @dirrm share/doc/HTML/en/karm
 @dirrm share/doc/HTML/en/kandy
 @dirrm share/doc/HTML/en/kalarm
 @dirrm share/doc/HTML/en/kaddressbook
-@dirrm share/config.kcfg
 @dirrm share/apps/libkleopatra/pics
 @dirrm share/apps/libkleopatra
 @dirrm share/apps/kwatchgnupg/pics
@@ -1727,10 +1720,6 @@ share/servicetypes/kpilotconduit.desktop
 @dirrm share/apps/kaddressbook/csv-templates
 @dirrm share/apps/kaddressbook/contacteditorpages
 @dirrm share/apps/kaddressbook
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/Applications
-@dirrm share/applnk/.hidden
-@dirrm share/applnk
 @dirrm include/qgpgme
 @dirrm include/mimelib
 @dirrm include/libkcal