5 files changed, 28 insertions, 36 deletions

diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 4d35da801976..0a4e06a44c7d 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
@@ -36,7 +35,7 @@ INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 CONFIGURE_ARGS=	--with-gpg=${LOCALBASE}/bin/gpg \
 		--with-gpgsm=${LOCALBASE}/bin/gpgsm \
-		--with-ssl-dir=/
+		--with-ssl-dir=${OPENSSLBASE}
 
 OPTIONS=	GNOKII "KAdressbook import/export for Nokia phones" off
 
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 62e1062bff72..4c40f026b0ae 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-3.5.2.tar.bz2) = ac6b3b503e27a65a7b883c1e0a57262e
-SHA256 (KDE/kdepim-3.5.2.tar.bz2) = 9c038a80912894b3ec132b2c7219ec5549ca80dcdeec88555928d2e038966539
-SIZE (KDE/kdepim-3.5.2.tar.bz2) = 12887336
+MD5 (KDE/kdepim-3.5.3.tar.bz2) = 2b83885854a5953bca59508d9a7cf5ef
+SHA256 (KDE/kdepim-3.5.3.tar.bz2) = 460f9104c63c8a57801f5405be7c709e8604abf93c7f35ee9d60d20e0e0e5adb
+SIZE (KDE/kdepim-3.5.3.tar.bz2) = 12912017
diff --git a/deskutils/kdepim4/files/patch-kdegantt_KDGanttView.cpp b/deskutils/kdepim4/files/patch-kdegantt_KDGanttView.cpp
deleted file mode 100644
index 4b53f326f2fb..000000000000
--- a/deskutils/kdepim4/files/patch-kdegantt_KDGanttView.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- kdgantt/KDGanttView.cpp.orig	Thu May  4 09:19:43 2006
-+++ kdgantt/KDGanttView.cpp	Tue May  2 10:07:59 2006
-@@ -323,7 +323,12 @@
-   bool block = myTimeTable->blockUpdating();
-   myTimeTable->setBlockUpdating( false );
-   myTimeTable->updateMyContent();
--  qApp->processEvents();
-+  /* The below causes recursive calls to various size updating methods, which
-+   * cause QCanvas to hide and show items like mad, which is very slow. If
-+   * there is a legitimate gui updating issue here somewhere, it will need
-+   * to be solved differently.
-+   */
-+  //qApp->processEvents();
-   int hintHeight = myTimeHeader->height();
-   int legendHeight = 0;
-   if ( showLegendButton() )
diff --git a/deskutils/kdepim4/files/patch-kioslaves_imap4-imapparser.cc b/deskutils/kdepim4/files/patch-kioslaves_imap4-imapparser.cc
deleted file mode 100644
index cdbca5e288b9..000000000000
--- a/deskutils/kdepim4/files/patch-kioslaves_imap4-imapparser.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: kioslaves/imap4/imapparser.cc
-===================================================================
---- kioslaves/imap4/imapparser.cc	(revision 537000)
-+++ kioslaves/imap4/imapparser.cc	(revision 537001)
-@@ -949,7 +949,9 @@ QAsciiDict < QString > imapParser::parse
- 
-     while (!inWords.isEmpty () && inWords[0] != ')')
-     {
--      retVal.insert (parseLiteralC(inWords), new QString(parseLiteralC(inWords)));
-+      QCString l1 = parseLiteralC(inWords);
-+      QCString l2 = parseLiteralC(inWords);
-+      retVal.insert (l1, new QString(l2));
-     }
- 
-     if (inWords[0] != ')')
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index 0aa3c5a713c8..87c64101eca7 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -1346,6 +1346,7 @@ share/apps/libical/zoneinfo/America/Cordoba.ics
 share/apps/libical/zoneinfo/America/Costa_Rica.ics
 share/apps/libical/zoneinfo/America/Cuiaba.ics
 share/apps/libical/zoneinfo/America/Curacao.ics
+share/apps/libical/zoneinfo/America/Danmarkshavn.ics
 share/apps/libical/zoneinfo/America/Dawson.ics
 share/apps/libical/zoneinfo/America/Dawson_Creek.ics
 share/apps/libical/zoneinfo/America/Denver.ics
@@ -1402,6 +1403,7 @@ share/apps/libical/zoneinfo/America/New_York.ics
 share/apps/libical/zoneinfo/America/Nipigon.ics
 share/apps/libical/zoneinfo/America/Nome.ics
 share/apps/libical/zoneinfo/America/Noronha.ics
+share/apps/libical/zoneinfo/America/North_Dakota/Center.ics
 share/apps/libical/zoneinfo/America/Panama.ics
 share/apps/libical/zoneinfo/America/Pangnirtung.ics
 share/apps/libical/zoneinfo/America/Paramaribo.ics
@@ -1462,6 +1464,8 @@ share/apps/libical/zoneinfo/Asia/Beirut.ics
 share/apps/libical/zoneinfo/Asia/Bishkek.ics
 share/apps/libical/zoneinfo/Asia/Brunei.ics
 share/apps/libical/zoneinfo/Asia/Calcutta.ics
+share/apps/libical/zoneinfo/Asia/Choibalsan.ics
+share/apps/libical/zoneinfo/Asia/Chongqing.ics
 share/apps/libical/zoneinfo/Asia/Chungking.ics
 share/apps/libical/zoneinfo/Asia/Colombo.ics
 share/apps/libical/zoneinfo/Asia/Damascus.ics
@@ -1501,6 +1505,7 @@ share/apps/libical/zoneinfo/Asia/Qatar.ics
 share/apps/libical/zoneinfo/Asia/Rangoon.ics
 share/apps/libical/zoneinfo/Asia/Riyadh.ics
 share/apps/libical/zoneinfo/Asia/Saigon.ics
+share/apps/libical/zoneinfo/Asia/Sakhalin.ics
 share/apps/libical/zoneinfo/Asia/Samarkand.ics
 share/apps/libical/zoneinfo/Asia/Seoul.ics
 share/apps/libical/zoneinfo/Asia/Shanghai.ics
@@ -2376,6 +2381,15 @@ share/servicetypes/kpilotconduit.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/certmanager/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/certmanager/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/certmanager/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/akregator/src/librss/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/akregator/src/librss/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/akregator/src/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/akregator/src/librss/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/akregator/src/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/akregator/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/akregator/src/librss/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/akregator/src/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/akregator/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kdgantt/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kgantt/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/libemailfunctions/html
@@ -2400,6 +2414,9 @@ share/servicetypes/kpilotconduit.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kandy/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kalarm/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/akregator/src/librss/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/akregator/src/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/akregator/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kmail/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/korganizer/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdepim-apidocs/kaddressbook/html
@@ -2483,6 +2500,12 @@ share/servicetypes/kpilotconduit.desktop
 @dirrm share/doc/HTML/en/kdepim-apidocs/certmanager/lib
 @dirrm share/doc/HTML/en/kdepim-apidocs/certmanager/html
 @dirrm share/doc/HTML/en/kdepim-apidocs/certmanager
+@dirrm share/doc/HTML/en/kdepim-apidocs/akregator/src/librss/html
+@dirrm share/doc/HTML/en/kdepim-apidocs/akregator/src/librss
+@dirrm share/doc/HTML/en/kdepim-apidocs/akregator/src/html
+@dirrm share/doc/HTML/en/kdepim-apidocs/akregator/src
+@dirrm share/doc/HTML/en/kdepim-apidocs/akregator/html
+@dirrm share/doc/HTML/en/kdepim-apidocs/akregator
 @dirrm share/doc/HTML/en/kdepim-apidocs
 @dirrm share/doc/HTML/en/karm
 @dirrm share/doc/HTML/en/kandy
@@ -2513,6 +2536,7 @@ share/servicetypes/kpilotconduit.desktop
 @dirrm share/apps/libical/zoneinfo/Asia
 @dirrm share/apps/libical/zoneinfo/Arctic
 @dirrm share/apps/libical/zoneinfo/Antarctica
+@dirrm share/apps/libical/zoneinfo/America/North_Dakota
 @dirrm share/apps/libical/zoneinfo/America/Kentucky
 @dirrm share/apps/libical/zoneinfo/America/Indiana
 @dirrm share/apps/libical/zoneinfo/America