diff options
author | Michael Nottebrock <lofi@FreeBSD.org> | 2004-03-09 19:41:12 +0000 |
---|---|---|
committer | Michael Nottebrock <lofi@FreeBSD.org> | 2004-03-09 19:41:12 +0000 |
commit | f64c6af4f4d0803346188ad60d5055ea8b8d63dc (patch) | |
tree | a4ccebaea6c27a0834589e8629dbcdc5ee328c8b /deskutils/kdepim3 | |
parent | . Build and install API documentation if NOPORTDOCS isn't set. (diff) |
Update to KDE 3.2.1 / QT 3.3.1
Important changes:
==================
KDE:
- Audio/arts does not install artswrapper anymore, instead it is provided by
audio/artswrapper. See UPDATING.
- misc/kdeaddons3 is now a metaport with
editors/kate-plugins
editors/vimpart
games/atlantikdesigner
misc/kaddressbook-plugins
misc/kfile-plugins
misc/kicker-applets
misc/knewsticker-scripts
misc/konq-plugins
misc/ksig
misc/renamedlgplugins
multimedia/noatun-plugins
net/kontact-plugins
as slave ports.
- A number of KDE ports now uses OPTIONS do make various WITH_* options more
visible.
- Plist fixes
- devel/kdevelop should be able to detect FreeBSD's autoconf/automake now for
newly created projects.
- kdebase will no longer remove previous KDM configurations. This won't take
effect during the update from 3.2.0 to 3.2.1 (as deinstalling 3.2.0 will still
remove the configuration), but subsequent updates will merge old configs.
QT:
- Previous versions of QT could be compiled with debugging-support enabled by
defining DEBUG. This switch has been renamed to the more unambiguous
WANT_QT_DEBUG (similar to WANT_KDE_DEBUG in the KDE ports).
Notes
Notes:
svn path=/head/; revision=103453
Diffstat (limited to 'deskutils/kdepim3')
-rw-r--r-- | deskutils/kdepim3/Makefile | 44 | ||||
-rw-r--r-- | deskutils/kdepim3/distinfo | 3 | ||||
-rw-r--r-- | deskutils/kdepim3/files/patch-kmail-kmfilter.cpp | 44 | ||||
-rw-r--r-- | deskutils/kdepim3/files/patch-kmail-kmfolderimap.cpp | 33 |
4 files changed, 37 insertions, 87 deletions
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile index 755b6d1ad517..5ad99ec867b3 100644 --- a/deskutils/kdepim3/Makefile +++ b/deskutils/kdepim3/Makefile @@ -7,16 +7,15 @@ PORTNAME= kdepim PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= deskutils mail news kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Personal Information Management tools for KDE -CONFLICTS= kdenetwork-3.1* +CONFLICTS= kdenetwork-3.1.* USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} @@ -31,27 +30,54 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 KDE_BUILD_PLIST=yes -.if exists(${LOCALBASE}/bin/pilot-link) +OPTIONS= KPILOT "Build KPilot, hotsync software for KDE" off \ + GNOKII "KAdressbook import/export for Nokia phones" off + +.include "${.CURDIR}/../../x11/kde3/Makefile.kde" +.include <bsd.port.pre.mk> + +.if exists(${LOCALBASE}/bin/pilot-xfer) +. if !defined(WITH_KPILOT) +KPILOT_OVERRIDE=yes WITH_KPILOT= yes +. endif .endif .if exists(${LOCALBASE}/bin/gnokii) +. if !defined(WITH_GNOKII) +GNOKII_OVERRIDE=yes WITH_GNOKII= yes +. endif .endif -.include "${.CURDIR}/../../x11/kde3/Makefile.kde" -.include <bsd.port.pre.mk> - .if defined(WITH_GNOKII) -LIB_DEPENDS+= gnokii.1:${PORTSDIR}/comms/gnokii +LIB_DEPENDS+= gnokii:${PORTSDIR}/comms/gnokii .endif # defined ($(WITH_GNOKII)) .if defined(WITH_KPILOT) -LIB_DEPENDS= mal:${PORTSDIR}/palm/libmal \ +LIB_DEPENDS+= mal:${PORTSDIR}/palm/libmal \ pisock:${PORTSDIR}/palm/pilot-link PLIST_APPEND+= plist.kpilot .endif # defined ($(WITH_KPILOT)) +pre-everything:: +.if defined(KPILOT_OVERRIDE) + @${ECHO_MSG} + @${ECHO_MSG} "*******************************************************" + @${ECHO_MSG} "* pilot-link is installed but WITH_KPILOT is not set! *" + @${ECHO_MSG} "* WITH_KPILOT has been enabled automatically. *" + @${ECHO_MSG} "*******************************************************" + @${ECHO_MSG} +.endif +.if defined(GNOKII_OVERRIDE) + @${ECHO_MSG} + @${ECHO_MSG} "*******************************************************" + @${ECHO_MSG} "* gnokii is installed but WITH_GNOKII is not set! *" + @${ECHO_MSG} "* WITH_GNOKII has been enabled automatically. *" + @${ECHO_MSG} "*******************************************************" + @${ECHO_MSG} +.endif + pre-configure: ${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/configure ${REINPLACE_CMD} -e 's|-lgnokii|-lgnokii -liconv -lintl|' ${WRKSRC}/configure diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo index 3146352b8068..37c9dede25a2 100644 --- a/deskutils/kdepim3/distinfo +++ b/deskutils/kdepim3/distinfo @@ -1 +1,2 @@ -MD5 (KDE/kdepim-3.2.0.tar.bz2) = 657a61e0f3d90d2afec3820e77f81306 +MD5 (KDE/kdepim-3.2.1.tar.bz2) = 362bec23869328a85845e0501020c938 +SIZE (KDE/kdepim-3.2.1.tar.bz2) = 7754558 diff --git a/deskutils/kdepim3/files/patch-kmail-kmfilter.cpp b/deskutils/kdepim3/files/patch-kmail-kmfilter.cpp deleted file mode 100644 index a2f23954cf93..000000000000 --- a/deskutils/kdepim3/files/patch-kmail-kmfilter.cpp +++ /dev/null @@ -1,44 +0,0 @@ ---- kmail/kmfilter.cpp.orig Sun Nov 30 10:49:22 2003 -+++ kmail/kmfilter.cpp Thu Feb 5 13:33:53 2004 -@@ -147,9 +147,18 @@ - // that the pattern is purified. - mPattern.readConfig(config); - -- if (bPopFilter) -+ if (bPopFilter) { - // get the action description... -- mAction = (KMPopFilterAction) config->readNumEntry( "action" ); -+ QString action = config->readEntry( "action" ); -+ if ( action == "down" ) -+ mAction = Down; -+ else if ( action == "later" ) -+ mAction = Later; -+ else if ( action == "delete" ) -+ mAction = Delete; -+ else -+ mAction = NoAction; -+ } - else { - QStringList sets = config->readListEntry("apply-on"); - if ( sets.isEmpty() && !config->hasKey("apply-on") ) { -@@ -210,7 +219,19 @@ - mPattern.writeConfig(config); - - if (bPopFilter) { -- config->writeEntry( "action", mAction ); -+ switch ( mAction ) { -+ case Down: -+ config->writeEntry( "action", "down" ); -+ break; -+ case Later: -+ config->writeEntry( "action", "later" ); -+ break; -+ case Delete: -+ config->writeEntry( "action", "delete" ); -+ break; -+ default: -+ config->writeEntry( "action", "" ); -+ } - } else { - QStringList sets; - if ( bApplyOnInbound ) diff --git a/deskutils/kdepim3/files/patch-kmail-kmfolderimap.cpp b/deskutils/kdepim3/files/patch-kmail-kmfolderimap.cpp deleted file mode 100644 index c27ffe4117aa..000000000000 --- a/deskutils/kdepim3/files/patch-kmail-kmfolderimap.cpp +++ /dev/null @@ -1,33 +0,0 @@ ---- kmail/kmfolderimap.cpp.orig Sat Jan 17 13:55:08 2004 -+++ kmail/kmfolderimap.cpp Thu Feb 5 13:33:38 2004 -@@ -1207,7 +1207,16 @@ - { - KURL url = mAccount->getUrl(); - KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msg->parent()); -- url.setPath(msg_parent->imapPath() + ";UID=" + msg->headerField("X-UID")); -+ QString uid = msg->headerField("X-UID"); -+ /* If the uid is empty the delete job below will nuke all mail in the -+ folder, so we better safeguard against that. See ::expungeFolder, as -+ to why. :( */ -+ if ( uid.isEmpty() ) { -+ kdDebug( 5006 ) << "KMFolderImap::deleteMessage: Attempt to delete " -+ "an empty UID. Aborting." << endl; -+ return; -+ } -+ url.setPath(msg_parent->imapPath() + ";UID=" + uid ); - if ( mAccount->makeConnection() != ImapAccountBase::Connected ) - return; - KIO::SimpleJob *job = KIO::file_delete(url, FALSE); -@@ -1228,7 +1237,11 @@ - KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msgList.first()->parent()); - for ( QStringList::Iterator it = sets.begin(); it != sets.end(); ++it ) - { -- url.setPath(msg_parent->imapPath() + ";UID=" + *it); -+ QString uid = *it; -+ // Don't delete with no uid, that nukes the folder. Should not happen, but -+ // better safe than sorry. -+ if ( uid.isEmpty() ) continue; -+ url.setPath(msg_parent->imapPath() + ";UID=" + uid); - if ( mAccount->makeConnection() != ImapAccountBase::Connected ) - return; - KIO::SimpleJob *job = KIO::file_delete(url, FALSE); |