this compiles...

This commit is contained in:
espie 2010-06-20 20:29:10 +00:00
parent b82af78a6c
commit 967fc9e071
20 changed files with 638 additions and 1259 deletions

View File

@ -1,67 +1,65 @@
# $OpenBSD: Makefile,v 1.2 2007/09/15 20:04:22 merdely Exp $
# $OpenBSD: Makefile,v 1.3 2010/06/20 20:29:10 espie Exp $
COMMENT= K Desktop Environment, pim
DISTNAME= kdepim-${VERSION}
PKGNAME= ${DISTNAME}
HOMEPAGE= http://pim.kde.org/
SHARED_LIBS += akonadi 0.0 # .1.0
SHARED_LIBS += akonadicomponents 0.0 # .1.0
SHARED_LIBS += akonadiprivate 0.0 # .1.0
SHARED_LIBS += akonadiresources 0.0 # .1.0
SHARED_LIBS += akonadisearchprovider 0.0 # .1.0
SHARED_LIBS += akonadi-kcal_next 0.0
SHARED_LIBS += akonadi_next 0.0
SHARED_LIBS += akregatorinterfaces 0.0
SHARED_LIBS += gwsoap 0.0
SHARED_LIBS += kabc_groupdav 0.0
SHARED_LIBS += kabcgroupwise 0.0
SHARED_LIBS += kabckolab 0.0
SHARED_LIBS += kaddressbookprivate 0.0
SHARED_LIBS += kalarm_calendar 0.0
SHARED_LIBS += kcal_groupdav 0.0
SHARED_LIBS += kcal_resourceblog 0.0
SHARED_LIBS += kcalgroupwise 0.0
SHARED_LIBS += kcalkolab 0.0
SHARED_LIBS += kleo 0.0
SHARED_LIBS += knoteskolab 0.0
SHARED_LIBS += kontactprivate 0.0
SHARED_LIBS += korganizer_core 0.0
SHARED_LIBS += korganizerprivate 0.0
SHARED_LIBS += messagecore 0.0
SHARED_LIBS += messagelist 0.0
SHARED_LIBS += messageviewer 0.0
SHARED_LIBS += akregatorprivate 0.0 # .1.0
SHARED_LIBS += gpgme++ 4.0 # .1.0
SHARED_LIBS += index 2.0 # .1.0
SHARED_LIBS += kabc_slox 2.0 # .1.0
SHARED_LIBS += kabc_xmlrpc 3.0 # .1.0
SHARED_LIBS += kabinterfaces 3.0 # .1.0
SHARED_LIBS += kaddressbook 2.0 # .1.0
SHARED_LIBS += kalarm_resources 0.0 # .1.0
SHARED_LIBS += kcal_resourceremote 3.0 # .1.0
SHARED_LIBS += kcal_slox 2.0 # .1.0
SHARED_LIBS += kcal_xmlrpc 3.0 # .1.0
SHARED_LIBS += kdepim 3.0 # .1.0
SHARED_LIBS += kgroupwarebase 2.0 # .1.0
SHARED_LIBS += kgroupwaredav 2.0 # .1.0
SHARED_LIBS += kholidays 3.0 # .1.0
SHARED_LIBS += kholidays_ng 0.0 # .1.0
SHARED_LIBS += kleopatra 3.0 # .1.0
SHARED_LIBS += kmailprivate 0.0 # .1.0
SHARED_LIBS += knodecommon 0.0 # .1.0
SHARED_LIBS += knotes_xmlrpc 0.0 # .1.0
SHARED_LIBS += kocorehelper 3.0 # .1.0
SHARED_LIBS += kode 3.0 # .1.0
SHARED_LIBS += kontact 3.0 # .1.0
SHARED_LIBS += korg_stdprinting 3.0 # .1.0
SHARED_LIBS += korganizer 3.0 # .1.0
SHARED_LIBS += korganizer_calendar 3.0 # .1.0
SHARED_LIBS += korganizer_eventviewer 3.0 # .1.0
SHARED_LIBS += korganizer_interfaces 0.0 # .1.0
SHARED_LIBS += kpgp 6.0 # .2.2
SHARED_LIBS += kpimidentities 3.0 # .1.0
SHARED_LIBS += kpinterfaces 3.0 # .1.0
SHARED_LIBS += kschema 0.0 # .1.0
SHARED_LIBS += kschemawidgets 0.0 # .1.0
SHARED_LIBS += ksieve 2.0 # .0.0
SHARED_LIBS += kslox 2.0 # .1.0
SHARED_LIBS += kxmlcommon 0.0 # .1.0
SHARED_LIBS += mailtransport 0.0 # .1.0
SHARED_LIBS += mimelib 0.0 # .1.1
SHARED_LIBS += qgpgme 2.0 # .1.0
SHARED_LIBS += schema 0.0 # .1.0
SHARED_LIBS += wscl 0.0 # .1.0
SHARED_LIBS += wsdl 0.0 # .1.0
LIB_DEPENDS+= kdecore.>=8,kde3support,kdefakes,kdefx,kdeprint,kdesu,kdeui,khtml,kimproxy,kio,kjs,knewstuff,knotifyconfig,kparts,ktexteditor,phononcore,sonnetcore,sonnetui,threadweaver::x11/kde4/libs \
kabc.>=5,emailfunctions,kabc_file_core,kcal,kldap,kmime,kresources,ktnef,kutils,kwalletclient,syndication::x11/kde4/pimlibs \
gpgme::security/gpgme
BUILD_DEPENDS += ::x11/kde4/automoc
LIB_DEPENDS+= kdecore.>=8,kde3support,kdeui,khtml,kimproxy,kio,kjs,knotifyconfig,kparts,ktexteditor,threadweaver,solid,nepomuk,kdnssd,kfile,knewstuff2::x11/kde4/libs \
kabc.>=5,kcal,kldap,kmime,kresources,ktnef,kutils,syndication,qgpgme,mailtransport,akonadi-contact,akonadi-kcal,akonadi-kde,akonadi-kmime,gpgme++,gpgme++-pthread,kblog,kholidays,kimap,kontactinterface,kpimidentities,kpimtextedit,kpimutils::x11/kde4/pimlibs
WANTLIB += ICE SM X11 Xau Xcursor Xdmcp Xext Xft Xi Xinerama Xpm
WANTLIB += Xrandr Xrender Xss Xtst bz2 c fontconfig freetype gif
WANTLIB += gpg-error iconv intl jpeg m pcre pcreposix png pthread
WANTLIB += sasl2 stdc++ util z
WANTLIB += X11
WANTLIB += Xss c
WANTLIB += gpg-error iconv intl m pthread
WANTLIB += stdc++ z
WANTLIB += Qt3Support QtDBus QtDesigner QtGui QtNetwork QtSql QtSvg QtXml
WANTLIB += akonadiprotocolinternals streamanalyzer streams phonon
WANTLIB += gpgme-pthread
# these come from libs in real case
pre-install:
mkdir -p ${PREFIX}/share/doc/HTML/en/common
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (kde/kdepim-3.80.3.tar.bz2) = B9TP2+UeUrFhN2CUGWSGcA==
RMD160 (kde/kdepim-3.80.3.tar.bz2) = tat+FCNtlMUcAFyy6ePf20zrQbM=
SHA1 (kde/kdepim-3.80.3.tar.bz2) = C3yG5eh0Tgd7bvZT/D882+UbnDc=
SHA256 (kde/kdepim-3.80.3.tar.bz2) = l4ob7vmz9xeRjq4i/kIONVAbNbVFWmnyD86z1Q0x59s=
SIZE (kde/kdepim-3.80.3.tar.bz2) = 9356602
MD5 (kde/kdepim-4.4.4.tar.bz2) = quabv1T/rDVj8ZpysG9gsw==
RMD160 (kde/kdepim-4.4.4.tar.bz2) = SaHUcRSTIvQVZjTn557VOlxCu+k=
SHA1 (kde/kdepim-4.4.4.tar.bz2) = jt0Kv0edKbVUY9j4xphHf2YSDtY=
SHA256 (kde/kdepim-4.4.4.tar.bz2) = W+40caW0Z3deyLYgG9kaFKON5lHoPDDpV3ICktFZYhg=
SIZE (kde/kdepim-4.4.4.tar.bz2) = 9354818

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kalarm_birthdaydlg_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kalarm/birthdaydlg.cpp.orig Tue Apr 3 01:53:48 2007
+++ kalarm/birthdaydlg.cpp Tue Apr 3 01:53:52 2007
@@ -249,7 +249,7 @@ QList<KAEvent> BirthdayDlg::events() const
KDateTime todayStart(today, KDateTime::ClockTime);
int thisYear = today.year();
int reminder = mReminder->minutes();
- BirthdaySortModel* model = static_cast<const BirthdaySortModel*>(indexes[0].model());
+ const BirthdaySortModel* model = static_cast<const BirthdaySortModel*>(indexes[0].model());
for (int i = 0; i < count; ++i)
{
BirthdayModel::Data* data = model->rowData(indexes[i]);

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-kmail_compactionjob_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/compactionjob.cpp.orig Tue Apr 3 11:43:35 2007
+++ kmail/compactionjob.cpp Tue Apr 3 11:45:10 2007
@@ -27,8 +27,8 @@
*/
#include "config.h"
-#include "compactionjob.h"
#include "kmfolder.h"
+#include "compactionjob.h"
#include "broadcaststatus.h"
using KPIM::BroadcastStatus;
#include "kmfoldermbox.h"
@@ -43,6 +43,7 @@ using KPIM::BroadcastStatus;
#include <sys/types.h>
#include <sys/stat.h>
+#include <unistd.h>
#include <errno.h>
using namespace KMail;

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-kmail_copyfolderjob_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/copyfolderjob.cpp.orig Tue Apr 3 11:52:45 2007
+++ kmail/copyfolderjob.cpp Tue Apr 3 11:52:51 2007
@@ -26,11 +26,11 @@
* your version.
*/
+#include "kmfolder.h"
#include "copyfolderjob.h"
#include "folderstorage.h"
#include "kmacctcachedimap.h"
#include "kmfoldercachedimap.h"
-#include "kmfolder.h"
#include "kmfolderdir.h"
#include "kmfoldertype.h"
#include "kmfoldermgr.h"

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-kmail_expirejob_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/expirejob.cpp.orig Tue Apr 3 11:40:40 2007
+++ kmail/expirejob.cpp Tue Apr 3 11:40:49 2007
@@ -28,8 +28,8 @@
#include "config.h"
-#include "expirejob.h"
#include "kmfolder.h"
+#include "expirejob.h"
#include "globalsettings.h"
#include "folderstorage.h"
#include "broadcaststatus.h"

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-kmail_folderdiaacltab_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/folderdiaacltab.cpp.orig Tue Apr 3 11:36:09 2007
+++ kmail/folderdiaacltab.cpp Tue Apr 3 11:36:17 2007
@@ -32,12 +32,12 @@
#include <config.h>
+#include "kmfolder.h"
#include "folderdiaacltab.h"
#include "acljobs.h"
#include "kmfolderimap.h"
#include "kmfoldercachedimap.h"
#include "kmacctcachedimap.h"
-#include "kmfolder.h"
#include "kmfolderdir.h"
#include <addressesdialog.h>

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-kmail_folderdiaquotatab_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/folderdiaquotatab.cpp.orig Tue Apr 3 11:51:01 2007
+++ kmail/folderdiaquotatab.cpp Tue Apr 3 11:51:06 2007
@@ -30,8 +30,8 @@
* your version.
*/
-#include "folderdiaquotatab.h"
#include "kmfolder.h"
+#include "folderdiaquotatab.h"
#include "kmfoldertype.h"
#include "kmfolderimap.h"
#include "kmfoldercachedimap.h"

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-kmail_headeritem_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/headeritem.cpp.orig Tue Apr 3 02:29:07 2007
+++ kmail/headeritem.cpp Tue Apr 3 02:29:11 2007
@@ -29,8 +29,8 @@
#include "config.h"
#include "headeritem.h"
-#include "kmheaders.h"
#include "kmfolder.h"
+#include "kmheaders.h"
#include <klocale.h>
#include <kio/netaccess.h>

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-kmail_jobscheduler_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/jobscheduler.cpp.orig Tue Apr 3 11:46:01 2007
+++ kmail/jobscheduler.cpp Tue Apr 3 11:46:06 2007
@@ -28,8 +28,8 @@
#include "config.h"
-#include "jobscheduler.h"
#include "kmfolder.h"
+#include "jobscheduler.h"
#include "folderstorage.h"
#include "kmfoldermgr.h"
#include <kdebug.h>

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-kmail_klistviewindexedsearchline_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/klistviewindexedsearchline.cpp.orig Tue Apr 3 02:22:04 2007
+++ kmail/klistviewindexedsearchline.cpp Tue Apr 3 02:22:10 2007
@@ -34,8 +34,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "headeritem.h"
-#include "kmheaders.h"
#include "kmfolder.h"
+#include "kmheaders.h"
#include "index.h"
using KMail::HeaderListQuickSearch;

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-kmail_kmailicalifaceimpl_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/kmailicalifaceimpl.cpp.orig Tue Apr 3 02:52:05 2007
+++ kmail/kmailicalifaceimpl.cpp Tue Apr 3 02:52:21 2007
@@ -36,8 +36,8 @@
#include <config.h>
#endif
-#include "kmailicalifaceimpl.h"
#include "kmfolder.h"
+#include "kmailicalifaceimpl.h"
#include "kmfoldertree.h"
#include "kmfolderdir.h"
#include "kmgroupware.h"

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-kmail_kmfilteraction_h,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/kmfilteraction.h.orig Tue Apr 3 02:11:10 2007
+++ kmail/kmfilteraction.h Tue Apr 3 02:11:25 2007
@@ -398,7 +398,7 @@ class KMFilterActionWithFolder : public KMFilterAction
quick test. Eg., actions that have a mail address as parameter
shouldn't try real address validation, but only check if the
string representation is empty. */
- virtual bool isEmpty() const { return (!mFolder && mFolderName.isEmpty()); }
+ virtual bool isEmpty() const { return (!mFolder.isNull() && mFolderName.isEmpty()); }
/** Creates a widget for setting the filter action parameter. Also
sets the value of the widget. */

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-kmail_kmfolderdia_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/kmfolderdia.cpp.orig Tue Apr 3 02:24:29 2007
+++ kmail/kmfolderdia.cpp Tue Apr 3 02:24:57 2007
@@ -32,13 +32,13 @@
#include <config.h>
+#include "kmfolder.h"
#include "kmfolderdia.h"
#include "kmacctfolder.h"
#include "kmfoldermgr.h"
#include <libkpimidentities/identitycombo.h>
#include "kmfolderimap.h"
#include "kmfoldercachedimap.h"
-#include "kmfolder.h"
#include "kmheaders.h"
#include "kmcommands.h"
#include "kmfoldertree.h"

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-kmail_kmheaders_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/kmheaders.cpp.orig Tue Apr 3 02:26:58 2007
+++ kmail/kmheaders.cpp Tue Apr 3 02:27:55 2007
@@ -3,6 +3,7 @@
#include <config.h>
+#include "kmfolder.h"
#include "kmheaders.h"
#include "headeritem.h"
using KMail::HeaderItem;
@@ -67,6 +68,7 @@ using namespace KPIM;
#include <stdlib.h>
#include <errno.h>
+#include <unistd.h>
#include "textsource.h"

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-kmail_kmmainwidget_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/kmmainwidget.cpp.orig Tue Apr 3 02:48:16 2007
+++ kmail/kmmainwidget.cpp Tue Apr 3 02:48:38 2007
@@ -56,6 +56,7 @@
#include "broadcaststatus.h"
using KPIM::BroadcastStatus;
#include "kmfoldermgr.h"
+#include "kmfolder.h"
#include "kmfolderdia.h"
#include "accountmanager.h"
using KMail::AccountManager;

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-kmail_kmpopfiltercnfrmdlg_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/kmpopfiltercnfrmdlg.cpp.orig Tue Apr 3 02:42:55 2007
+++ kmail/kmpopfiltercnfrmdlg.cpp Tue Apr 3 02:42:59 2007
@@ -10,8 +10,8 @@
#include <config.h>
#include "kmpopfiltercnfrmdlg.h"
-#include "kmheaders.h"
#include "kmfolder.h"
+#include "kmheaders.h"
#include <QLayout>
#include <QLabel>

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-kmail_renamejob_cpp,v 1.1.1.1 2007/04/03 19:44:04 espie Exp $
--- kmail/renamejob.cpp.orig Tue Apr 3 11:47:05 2007
+++ kmail/renamejob.cpp Tue Apr 3 11:47:14 2007
@@ -26,12 +26,12 @@
* your version.
*/
+#include "kmfolder.h"
#include "renamejob.h"
#include "copyfolderjob.h"
#include "kmfolderimap.h"
#include "kmfoldercachedimap.h"
#include "folderstorage.h"
-#include "kmfolder.h"
#include "kmfolderdir.h"
#include "kmfoldermgr.h"
#include "imapaccountbase.h"

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-kresources_groupwise_soap_stdsoap2_h,v 1.1 2010/06/20 20:29:10 espie Exp $
--- kresources/groupwise/soap/stdsoap2.h.orig Sun Jun 20 19:29:08 2010
+++ kresources/groupwise/soap/stdsoap2.h Sun Jun 20 19:59:38 2010
@@ -251,7 +251,7 @@ A commercial use license is available from Genivia, In
# define HAVE_LOCALTIME_R
# define HAVE_WCTOMB
# define HAVE_MBTOWC
-# elif defined(FREEBSD) || defined(__FreeBSD__) || defined(__DragonFly__)
+# elif defined(FREEBSD) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
# define HAVE_STRRCHR
# define HAVE_STRTOD
# define HAVE_SSCANF
@@ -553,7 +553,7 @@ extern "C" {
/* Portability: define SOAP_SOCKLEN_T */
#if defined(SOCKLEN_T)
# define SOAP_SOCKLEN_T SOCKLEN_T
-#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(_AIX) || defined(__NetBSD__) || defined(__DragonFly__)
+#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(_AIX) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
# define SOAP_SOCKLEN_T socklen_t
#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS)
# define SOAP_SOCKLEN_T int

File diff suppressed because it is too large Load Diff