aboutsummaryrefslogtreecommitdiffstats
path: root/deskutils/kdepim44
diff options
context:
space:
mode:
Diffstat (limited to 'deskutils/kdepim44')
-rw-r--r--deskutils/kdepim44/Makefile3
-rw-r--r--deskutils/kdepim44/distinfo4
-rw-r--r--deskutils/kdepim44/files/patch-kmail-partNode.cpp19
-rw-r--r--deskutils/kdepim44/files/patch-kmail-smimeconfiguration.ui10
-rw-r--r--deskutils/kdepim44/files/patch-kmailcvt-filter_oe.cxx49
-rw-r--r--deskutils/kdepim44/files/patch-kmailcvt-filter_oe.hxx18
-rw-r--r--deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.cxx15
-rw-r--r--deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.hxx19
-rw-r--r--deskutils/kdepim44/files/patch-kmailcvt-filters.hxx63
-rw-r--r--deskutils/kdepim44/files/patch-korn_kornboxcfg.ui10
-rw-r--r--deskutils/kdepim44/files/patch-korn_korncfg.ui10
-rw-r--r--deskutils/kdepim44/pkg-plist1
12 files changed, 4 insertions, 217 deletions
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 7a48c225af78..c721487a01cf 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
@@ -43,7 +42,7 @@ OPTIONS= GNOKII "KAdressbook import/export for Nokia phones" off
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
-RUN_DEPENDS+= ${LOCALBASE}/lib/libssl.so:${PORTSDIR}/security/openssl
+RUN_DEPENDS+= ${LOCALBASE}/lib/libssl.so:${PORTSDIR}/security/openssl-stable
.endif
.if exists(${LOCALBASE}/bin/gnokii)
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index c1e27b1c440e..8256b0e271ed 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdepim-3.4.2.tar.bz2) = e7bd012faa559bcf2a949b6a8ed5ff7f
-SIZE (KDE/kdepim-3.4.2.tar.bz2) = 11368492
+MD5 (KDE/kdepim-3.4.3.tar.bz2) = b2c145f3779578c9208dcbec9a4a5aea
+SIZE (KDE/kdepim-3.4.3.tar.bz2) = 11327132
diff --git a/deskutils/kdepim44/files/patch-kmail-partNode.cpp b/deskutils/kdepim44/files/patch-kmail-partNode.cpp
deleted file mode 100644
index c15a8f6f5a9c..000000000000
--- a/deskutils/kdepim44/files/patch-kmail-partNode.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- kmail/partNode.cpp.orig Tue Aug 2 00:59:57 2005
-+++ kmail/partNode.cpp Tue Aug 2 01:01:06 2005
-@@ -36,6 +36,7 @@
- #include "kmmimeparttree.h"
- #include <mimelib/utility.h>
- #include <qregexp.h>
-+#include <kasciistricmp.h>
-
- /*
- ===========================================================================
-@@ -414,7 +415,7 @@
- partNode* partNode::findNodeForDwPart( DwBodyPart* part )
- {
- partNode* found = 0;
-- if( dwPart()->partId() == part->partId() )
-+ if( kasciistricmp( dwPart()->partId(), part->partId() ) == 0 )
- return this;
- if( mChild )
- found = mChild->findNodeForDwPart( part );
diff --git a/deskutils/kdepim44/files/patch-kmail-smimeconfiguration.ui b/deskutils/kdepim44/files/patch-kmail-smimeconfiguration.ui
deleted file mode 100644
index 935e29924235..000000000000
--- a/deskutils/kdepim44/files/patch-kmail-smimeconfiguration.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- kmail/smimeconfiguration.ui.orig Thu Sep 15 19:26:25 2005
-+++ kmail/smimeconfiguration.ui Thu Sep 15 19:26:51 2005
-@@ -410,7 +410,4 @@
- </connection>
- </connections>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
-- <includehint>kleo::keyrequester.h</includehint>
--</includehints>
- </UI>
diff --git a/deskutils/kdepim44/files/patch-kmailcvt-filter_oe.cxx b/deskutils/kdepim44/files/patch-kmailcvt-filter_oe.cxx
deleted file mode 100644
index 5fa379673746..000000000000
--- a/deskutils/kdepim44/files/patch-kmailcvt-filter_oe.cxx
+++ /dev/null
@@ -1,49 +0,0 @@
---- kmailcvt/filter_oe.cxx Mon May 23 14:12:15 2005
-+++ kmailcvt/filter_oe.cxx Tue Jun 21 14:50:03 2005
-@@ -389,20 +389,20 @@
- {
- bool found = false;
- bool foundFilename = false;
-- QString folder = "";
-+ QString folder;
- // we must do this because folder with more than one upper letter
- // at start have maybe not a file named like the folder !!!
- QString search = filename.lower();
-
- while (!found)
- {
-- for ( QValueList<QString[4]>::Iterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
-- QString tmp[4] = *it;
-+ for ( FolderStructureIterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
-+ FolderStructure tmp = *it;
- if(foundFilename == false) {
- QString _tmpFileName = tmp[1];
- _tmpFileName = _tmpFileName.lower();
- if(_tmpFileName == search) {
-- folder.prepend( "-" + tmp[0]);
-+ folder.prepend( tmp[0] + QString::fromLatin1("-") );
- search = tmp[3];
- foundFilename = true;
- }
-@@ -410,18 +410,18 @@
- QString _currentID = tmp[2];
- QString _parentID = tmp[3];
- if(_currentID == search) {
-- if(_parentID == "") { // this is the root of the folder
-+ if(_parentID.isEmpty()) { // this is the root of the folder
- found = true;
- break;
- } else {
-- folder.prepend( "-" + tmp[0]);
-+ folder.prepend( tmp[0] + QString::fromLatin1("-") );
- search = tmp[3];
- }
- }
- }
- }
- // need to break the while loop maybe in some cases
-- if((foundFilename == false) && (folder == "")) return folder;
-+ if((foundFilename == false) && (folder.isEmpty())) return folder;
- }
- return folder;
- }
diff --git a/deskutils/kdepim44/files/patch-kmailcvt-filter_oe.hxx b/deskutils/kdepim44/files/patch-kmailcvt-filter_oe.hxx
deleted file mode 100644
index 4abb9299b210..000000000000
--- a/deskutils/kdepim44/files/patch-kmailcvt-filter_oe.hxx
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: filter_oe.hxx
-===================================================================
---- kmailcvt/filter_oe.hxx (revision 427509)
-+++ kmailcvt/filter_oe.hxx (working copy)
-@@ -63,8 +63,12 @@
- bool parsedFolder;
- /** true if the current parsing file is the folder file */
- bool currentIsFolderFile;
-+
-+ /** Folder structure here has 4 entries. */
-+ typedef FolderStructureBase<4> FolderStructure;
- /** matrix with information about the folder structure*/
-- QValueList<QString[4]> folderStructure;
-+ QValueList<FolderStructure> folderStructure;
-+ typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
-
- /** name of the current folder */
- QString folderName;
diff --git a/deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.cxx b/deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.cxx
deleted file mode 100644
index 2536ed1244ff..000000000000
--- a/deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: filter_pmail.cxx
-===================================================================
---- kmailcvt/filter_pmail.cxx (revision 427509)
-+++ kmailcvt/filter_pmail.cxx (working copy)
-@@ -325,8 +325,8 @@
-
- while (!found)
- {
-- for ( QValueList<QString[5]>::Iterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
-- QString tmp[5] = *it;
-+ for ( FolderStructureIterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
-+ FolderStructure tmp = *it;
-
- QString _ID = tmp[2];
- if(_ID == search) { \ No newline at end of file
diff --git a/deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.hxx b/deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.hxx
deleted file mode 100644
index ac1e772c28ea..000000000000
--- a/deskutils/kdepim44/files/patch-kmailcvt-filter_pmail.hxx
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: filter_pmail.hxx
-===================================================================
---- kmailcvt/filter_pmail.hxx (revision 427509)
-+++ kmailcvt/filter_pmail.hxx (working copy)
-@@ -50,8 +50,12 @@
- QDir dir;
- /** pointer to the info */
- FilterInfo * inf;
-- /** QStringList with the foldernames, First String contains the ID, the second the folder */
-- QValueList<QString[5]> folderMatrix;
-+
-+ /** Folder structure here has 5 entries. */
-+ typedef FolderStructureBase<5> FolderStructure;
-+ /** List with the foldernames, First String contains the ID, the second the folder. Rest have no semantics at all but are essential anyway. */
-+ QValueList<FolderStructure> folderMatrix;
-+ typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
-
- bool folderParsed;
- \ No newline at end of file
diff --git a/deskutils/kdepim44/files/patch-kmailcvt-filters.hxx b/deskutils/kdepim44/files/patch-kmailcvt-filters.hxx
deleted file mode 100644
index 44a41ff10007..000000000000
--- a/deskutils/kdepim44/files/patch-kmailcvt-filters.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: filters.hxx
-===================================================================
---- kmailcvt/filters.hxx (revision 427509)
-+++ kmailcvt/filters.hxx (working copy)
-@@ -86,7 +86,58 @@
- QString m_info;
- };
-
-+/** Glorified QString[N] for (a) understandability (b) older gcc
-+* compatibility, see for instance
-+* http://mail.kde.org/pipermail/kmail-devel/2005-April/017690.html
-+*/
-+template <unsigned int size> class FolderStructureBase
-+{
-+public:
-+ typedef QString NString[size];
-+ /** Constructor. Need a default constructor for QValueList. */
-+ FolderStructureBase() {} ;
-
-+ /** Constructor. Turn N QStrings into a folder structure
-+ * description.
-+ */
-+ FolderStructureBase(const NString &s)
-+ {
-+ for(unsigned int i=0; i<size; i++) d[i]=s[i];
-+ } ;
-+
-+ /** Copy Constructor. */
-+ FolderStructureBase(const FolderStructureBase &s)
-+ {
-+ for(unsigned int i=0; i<size; i++) d[i]=s[i];
-+ } ;
-+
-+ /** Assignment operator. Does the same thing as
-+ * the copy constructor.
-+ */
-+ FolderStructureBase &operator =(const FolderStructureBase &s)
-+ {
-+ for(unsigned int i=0; i<size; i++) d[i]=s[i];
-+ return *this;
-+ } ;
-+
-+ /** Access the different fields. There doesn't seem to
-+ * be a real semantics for the fields.
-+ */
-+ const QString operator [](unsigned int i) const
-+ {
-+ if (i<size) return d[i]; else return QString::null;
-+ } ;
-+
-+ /** Access the different fields, for writing. */
-+ QString &operator [](unsigned int i)
-+ {
-+ Q_ASSERT(i<size);
-+ if (i<size) return d[i]; else return d[0];
-+ } ;
-+private:
-+ QString d[size];
-+} ;
-+
- #endif
-
- // vim: ts=2 sw=2 et \ No newline at end of file
diff --git a/deskutils/kdepim44/files/patch-korn_kornboxcfg.ui b/deskutils/kdepim44/files/patch-korn_kornboxcfg.ui
deleted file mode 100644
index c73d644ffc18..000000000000
--- a/deskutils/kdepim44/files/patch-korn_kornboxcfg.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- korn/kornboxcfg.ui.orig Thu Sep 15 12:20:01 2005
-+++ korn/kornboxcfg.ui Thu Sep 15 12:21:14 2005
-@@ -1692,7 +1692,6 @@
- <includehint>kurlrequester.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kpushbutton.h</includehint>
-- <includehint>keditlistboxmanager.h</includehint>
- <includehint>keditlistbox.h</includehint>
- <includehint>klineedit.h</includehint>
- </includehints>
diff --git a/deskutils/kdepim44/files/patch-korn_korncfg.ui b/deskutils/kdepim44/files/patch-korn_korncfg.ui
deleted file mode 100644
index deae9936a864..000000000000
--- a/deskutils/kdepim44/files/patch-korn_korncfg.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- korn/korncfg.ui.orig Thu Sep 15 12:21:41 2005
-+++ korn/korncfg.ui Thu Sep 15 12:22:00 2005
-@@ -162,7 +162,4 @@
- <slot access="protected">slotEditBox()</slot>
- </slots>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
-- <includehint>keditlistboxmanager.h</includehint>
--</includehints>
- </UI>
diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist
index d18df4b0febd..d9360af2a768 100644
--- a/deskutils/kdepim44/pkg-plist
+++ b/deskutils/kdepim44/pkg-plist
@@ -1073,6 +1073,7 @@ share/apps/libkholidays/holiday_co
share/apps/libkholidays/holiday_cz
share/apps/libkholidays/holiday_de
share/apps/libkholidays/holiday_dk
+share/apps/libkholidays/holiday_ee
share/apps/libkholidays/holiday_es
share/apps/libkholidays/holiday_fi
share/apps/libkholidays/holiday_fr
generated by cgit (git 2.34.1) at 2024-10-30 09:24:28 +0800