diff --git a/x11/kde/admin3/Makefile b/x11/kde/admin3/Makefile index 32a3999cf38..5c7b2c27a46 100644 --- a/x11/kde/admin3/Makefile +++ b/x11/kde/admin3/Makefile @@ -1,19 +1,19 @@ -# $OpenBSD: Makefile,v 1.28 2008/03/26 10:04:21 espie Exp $ +# $OpenBSD: Makefile,v 1.29 2008/08/27 12:25:14 espie Exp $ -COMMENT= K Desktop Environment, admin tools -CATEGORIES= x11 x11/kde -VERSION= 3.5.9 -DISTNAME= kdeadmin-${VERSION} -PKGNAME= ${DISTNAME} -MODKDE_VERSION?= 3.5.8 +COMMENT = K Desktop Environment, admin tools +CATEGORIES = x11 x11/kde +VERSION = 3.5.10 +DISTNAME = kdeadmin-${VERSION} +PKGNAME = ${DISTNAME} +MODKDE_VERSION ?= 3.5.8 -RUN_DEPENDS+= :desktop-file-utils-*:devel/desktop-file-utils -LIB_DEPENDS= DCOP,kdecore.>=6,kdefx,kdeprint,kdesu,kdeui,kio,kparts,kntlm::x11/kde/libs3 -FLAVORS= debug +RUN_DEPENDS += :desktop-file-utils-*:devel/desktop-file-utils +LIB_DEPENDS = DCOP,kdecore.>=6,kdefx,kdeprint,kdesu,kdeui,kio,kparts,kntlm::x11/kde/libs3 +FLAVORS = debug -SEPARATE_BUILD= flavored +SEPARATE_BUILD = flavored -WANTLIB= ICE SM X11 Xext Xrender art_lgpl_2 c jpeg kabc kresources \ +WANTLIB = ICE SM X11 Xext Xrender art_lgpl_2 c jpeg kabc kresources \ kwalletclient m png pthread stdc++ util vcard z iconv idn \ Xau Xdmcp fam rpcsvc intl diff --git a/x11/kde/admin3/distinfo b/x11/kde/admin3/distinfo index f00911600da..40e0c499cbd 100644 --- a/x11/kde/admin3/distinfo +++ b/x11/kde/admin3/distinfo @@ -1,5 +1,5 @@ -MD5 (kde/kdeadmin-3.5.9.tar.bz2) = 5mB+onszJhbSD0VkZWy4hQ== -RMD160 (kde/kdeadmin-3.5.9.tar.bz2) = /zd88JG74LU8l1UUIbu4n9Vn4es= -SHA1 (kde/kdeadmin-3.5.9.tar.bz2) = DFFvAahPa6svWjLO1qYKmPgpOsk= -SHA256 (kde/kdeadmin-3.5.9.tar.bz2) = mgmKrj7WKCM2q6mPU4GuBIsLa6MSjXcINywT632LET4= -SIZE (kde/kdeadmin-3.5.9.tar.bz2) = 2123973 +MD5 (kde/kdeadmin-3.5.10.tar.bz2) = 6yPFLJRfMaSPLJ30MwoSYg== +RMD160 (kde/kdeadmin-3.5.10.tar.bz2) = 8nHZKXUsiSdUYmEYTukFCU6K48k= +SHA1 (kde/kdeadmin-3.5.10.tar.bz2) = lS6bqbvWuS46Wko0/jp419Qbxxk= +SHA256 (kde/kdeadmin-3.5.10.tar.bz2) = 67f3YIpY6ocH9t6qkdb70p9HFzgqPppCKU0osyW9TfQ= +SIZE (kde/kdeadmin-3.5.10.tar.bz2) = 2124067 diff --git a/x11/kde/admin3/pkg/PLIST b/x11/kde/admin3/pkg/PLIST index 7462b08861f..1963c278597 100644 --- a/x11/kde/admin3/pkg/PLIST +++ b/x11/kde/admin3/pkg/PLIST @@ -1,8 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.12 2007/12/15 23:47:40 ajacoutot Exp $ -bin/kcron -bin/kpackage -bin/kuser -bin/secpolicy +@comment $OpenBSD: PLIST,v 1.13 2008/08/27 12:25:14 espie Exp $ +@bin bin/kcron +@bin bin/kpackage +@bin bin/kuser +@bin bin/secpolicy ${KDE}/kcm_knetworkconfmodule.la ${KDE}/kcm_knetworkconfmodule.so ${KDE}/kfile_deb.la diff --git a/x11/kde/pim3/Makefile b/x11/kde/pim3/Makefile index 70a83bbfde0..566b8800a24 100644 --- a/x11/kde/pim3/Makefile +++ b/x11/kde/pim3/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.56 2008/05/29 11:58:52 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.57 2008/08/27 12:25:14 espie Exp $ -COMMENT= KDE personal information applications -COMMENT-kpilot= KDE interface to sync with Palm Pilot -CATEGORIES= x11 x11/kde productivity -VERSION= 3.5.9 -DISTNAME= kdepim-${VERSION} -PKGNAME= ${DISTNAME}p0 -MODKDE_VERSION= 3.5.8 +COMMENT = KDE personal information applications +COMMENT-kpilot = KDE interface to sync with Palm Pilot +CATEGORIES = x11 x11/kde productivity +VERSION = 3.5.10 +DISTNAME = kdepim-${VERSION} +PKGNAME = ${DISTNAME} +MODKDE_VERSION = 3.5.8 SHARED_LIBS += index 1.0 # .0.0 SHARED_LIBS += kgantt 1.0 # .0.2 SHARED_LIBS += kode 2.0 # .1.0 @@ -63,22 +63,22 @@ SHARED_LIBS += knotesscalix 0.0 # .0.0 SHARED_LIBS += kpinterfaces 2.0 # .1.0 SHARED_LIBS += kontact 2.0 # .1.0 -LIB_DEPENDS+= kdecore.>=6,artskde,kmedia2_idl,knewstuff,DCOP,kabc,kabc_file,kimproxy,kdefakes,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kparts,kresources,kspell,kutils,kwalletclient,vcard::x11/kde/libs3 +LIB_DEPENDS += kdecore.>=6,artskde,kmedia2_idl,knewstuff,DCOP,kabc,kabc_file,kimproxy,kdefakes,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kparts,kresources,kspell,kutils,kwalletclient,vcard::x11/kde/libs3 -WANTLIB= Xss audiofile stdc++ ossaudio X11 jpeg util m \ +WANTLIB = Xss audiofile stdc++ ossaudio X11 jpeg util m \ vorbisfile gmodule-2.0 gthread-2.0 \ pcreposix intl vorbisenc qui SM pthread \ c artsflow ogg mcop png iconv Xext \ artsflow_idl art_lgpl_2 mad qtmcop \ glib-2.0 ICE soundserver_idl Xrender \ gpg-error vorbis pcre esd z sasl2 idn \ - Xau Xdmcp fam rpcsvc Xpm usb + Xau Xdmcp fam rpcsvc Xpm usb ical -FLAVORS= debug -LIB_DEPENDS+= pisock::comms/pilot-link -RUN_DEPENDS+= ::x11/kde/base3 \ +FLAVORS = debug +LIB_DEPENDS += pisock::comms/pilot-link +RUN_DEPENDS += ::x11/kde/base3 \ :desktop-file-utils-*:devel/desktop-file-utils -LIB_DEPENDS+= gpgme:gpgme->=0.4.5:security/gpgme \ +LIB_DEPENDS += gpgme:gpgme->=0.4.5:security/gpgme \ sasl2::security/cyrus-sasl2 \ mal.>=1::comms/libmal \ gnokii::comms/gnokii @@ -99,9 +99,13 @@ FULLPKGNAME-kpilot = kpilot-${VERSION}p0 #.endif # make sure we do not grab boost on the way -CONFIGURE_ENV+= ac_cv_header_boost_format_hpp=no +CONFIGURE_ENV += ac_cv_header_boost_format_hpp=no -SEPARATE_BUILD= flavored +# kde 3.5.10 does not even compile without it, upstream maintainer recommends +# this. +CONFIGURE_ARGS += --disable-newdistrlists + +SEPARATE_BUILD = flavored .include CONFIGURE_ARGS += --disable-final diff --git a/x11/kde/pim3/distinfo b/x11/kde/pim3/distinfo index e3f175e8617..0af98380120 100644 --- a/x11/kde/pim3/distinfo +++ b/x11/kde/pim3/distinfo @@ -1,5 +1,5 @@ -MD5 (kde/kdepim-3.5.9.tar.bz2) = uiewZZlVbFcqJvA2CEce4g== -RMD160 (kde/kdepim-3.5.9.tar.bz2) = fCy9W1+QdbyNzHmY/AS/myl7/VQ= -SHA1 (kde/kdepim-3.5.9.tar.bz2) = U6tljFzfLm+DbS4S47xOL+O5bxU= -SHA256 (kde/kdepim-3.5.9.tar.bz2) = 7j8CrIKPGRXAm4wKEonvz7rjYyHNB7wHHfi+BB3hDTo= -SIZE (kde/kdepim-3.5.9.tar.bz2) = 14497974 +MD5 (kde/kdepim-3.5.10.tar.bz2) = /JPkWKjuyBMe3lbP8wwosg== +RMD160 (kde/kdepim-3.5.10.tar.bz2) = Uqg03I6zd9OXQEoWoJyKWbVoswU= +SHA1 (kde/kdepim-3.5.10.tar.bz2) = U32mD+NWTswO0oAudE+/ljhpCak= +SHA256 (kde/kdepim-3.5.10.tar.bz2) = leySAjol5IaOVTifpGSLM3/thw10TTtjAi7Zg4/5tCk= +SIZE (kde/kdepim-3.5.10.tar.bz2) = 14559901 diff --git a/x11/kde/pim3/patches/patch-kalarm_kalarmapp_cpp b/x11/kde/pim3/patches/patch-kalarm_kalarmapp_cpp index 93c161e2d01..9e9e44b58cc 100644 --- a/x11/kde/pim3/patches/patch-kalarm_kalarmapp_cpp +++ b/x11/kde/pim3/patches/patch-kalarm_kalarmapp_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-kalarm_kalarmapp_cpp,v 1.6 2007/05/25 09:49:55 espie Exp $ ---- kalarm/kalarmapp.cpp.orig Mon May 14 09:54:42 2007 -+++ kalarm/kalarmapp.cpp Tue May 15 00:44:39 2007 -@@ -65,6 +65,7 @@ +$OpenBSD: patch-kalarm_kalarmapp_cpp,v 1.7 2008/08/27 12:25:14 espie Exp $ +--- kalarm/kalarmapp.cpp.orig Tue Aug 19 20:15:50 2008 ++++ kalarm/kalarmapp.cpp Thu Aug 21 21:46:37 2008 +@@ -66,6 +66,7 @@ #include "kalarmapp.moc" #include diff --git a/x11/kde/pim3/patches/patch-kmail_kmfoldertree_cpp b/x11/kde/pim3/patches/patch-kmail_kmfoldertree_cpp deleted file mode 100644 index 0eb92e45310..00000000000 --- a/x11/kde/pim3/patches/patch-kmail_kmfoldertree_cpp +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-kmail_kmfoldertree_cpp,v 1.1 2008/05/29 11:58:52 ajacoutot Exp $ ---- kmail/kmfoldertree.cpp.orig Fri Apr 18 17:42:59 2008 -+++ kmail/kmfoldertree.cpp Fri Apr 18 17:43:49 2008 -@@ -1540,8 +1540,8 @@ void KMFolderTree::slotFolderExpanded( QListViewItem * - { - KMFolderImap *folder = static_cast( fti->folder()->storage() ); - // if we should list all folders we limit this to the root folder -- if ( !folder->account()->listOnlyOpenFolders() && -- fti->parent() ) -+ if ( !folder->account() || ( !folder->account()->listOnlyOpenFolders() && -+ fti->parent() ) ) - return; - if ( folder->getSubfolderState() == KMFolderImap::imapNoInformation ) - { diff --git a/x11/kde/pim3/patches/patch-kmail_kmmainwidget_cpp b/x11/kde/pim3/patches/patch-kmail_kmmainwidget_cpp deleted file mode 100644 index 62f244a5c0f..00000000000 --- a/x11/kde/pim3/patches/patch-kmail_kmmainwidget_cpp +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-kmail_kmmainwidget_cpp,v 1.1 2008/05/29 11:58:52 ajacoutot Exp $ ---- kmail/kmmainwidget.cpp.orig Fri Apr 18 17:47:56 2008 -+++ kmail/kmmainwidget.cpp Fri Apr 18 17:49:33 2008 -@@ -152,6 +152,7 @@ KMMainWidget::KMMainWidget(QWidget *parent, const char - mQuickSearchLine( 0 ), - mShowBusySplashTimer( 0 ), - mShowingOfflineScreen( false ), -+ mMsgActions( 0 ), - mVacationIndicatorActive( false ) - { - // must be the first line of the constructor: -@@ -642,6 +643,9 @@ void KMMainWidget::createWidgets(void) - - if (mReaderWindowActive) { - mMsgView = new KMReaderWin(messageParent, this, actionCollection(), 0 ); -+ if ( mMsgActions ) { -+ mMsgActions->setMessageView( mMsgView ); -+ } - - connect(mMsgView, SIGNAL(replaceMsgByUnencryptedVersion()), - this, SLOT(slotReplaceMsgByUnencryptedVersion())); diff --git a/x11/kde/pim3/patches/patch-kmail_newfolderdialog_cpp b/x11/kde/pim3/patches/patch-kmail_newfolderdialog_cpp deleted file mode 100644 index 32ff49912b7..00000000000 --- a/x11/kde/pim3/patches/patch-kmail_newfolderdialog_cpp +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-kmail_newfolderdialog_cpp,v 1.1 2008/05/29 11:58:52 ajacoutot Exp $ ---- kmail/newfolderdialog.cpp.orig Fri Apr 18 17:51:33 2008 -+++ kmail/newfolderdialog.cpp Fri Apr 18 17:53:44 2008 -@@ -148,7 +148,7 @@ NewFolderDialog::NewFolderDialog( QWidget* parent, KMF - } - if ( mFolder->folderType() == KMFolderTypeCachedImap ) { - ImapAccountBase* ai = static_cast(mFolder->storage())->account(); -- if ( mFolder->storage() == ai->rootFolder() ) { -+ if ( ai && mFolder->storage() == ai->rootFolder() ) { - rootFolder = true; - namespaces = ai->namespaces()[ImapAccountBase::PersonalNS]; - } -@@ -212,10 +212,12 @@ void NewFolderDialog::slotOk() - QString delimiter; - if ( mFolder->folderType() == KMFolderTypeImap ) { - KMAcctImap* ai = static_cast( mFolder->storage() )->account(); -- delimiter = ai->delimiterForFolder( mFolder->storage() ); -+ if ( ai ) -+ delimiter = ai->delimiterForFolder( mFolder->storage() ); - } else { - KMAcctCachedImap* ai = static_cast( mFolder->storage() )->account(); -- delimiter = ai->delimiterForFolder( mFolder->storage() ); -+ if ( ai ) -+ delimiter = ai->delimiterForFolder( mFolder->storage() ); - } - if ( !delimiter.isEmpty() && fldName.find( delimiter ) != -1 ) { - KMessageBox::error( this, i18n( "Your IMAP server does not allow the character '%1'; please choose another folder name." ).arg( delimiter ) ); diff --git a/x11/kde/pim3/pkg/PLIST b/x11/kde/pim3/pkg/PLIST index 6e086497e01..1d2c49d4f8d 100644 --- a/x11/kde/pim3/pkg/PLIST +++ b/x11/kde/pim3/pkg/PLIST @@ -1,47 +1,47 @@ -@comment $OpenBSD: PLIST,v 1.30 2008/03/26 09:15:47 espie Exp $ +@comment $OpenBSD: PLIST,v 1.31 2008/08/27 12:25:14 espie Exp $ @conflict kdelibs-<3.4 @conflict kdebase-<3.4 @conflict kpilot-* -bin/akregator -bin/egroupwarewizard -bin/exchangewizard -bin/groupwarewizard -bin/groupwisewizard +@bin bin/akregator +@bin bin/egroupwarewizard +@bin bin/exchangewizard +@bin bin/groupwarewizard +@bin bin/groupwisewizard bin/ical2vcal bin/indexlib-config -bin/kabc2mutt -bin/kaddressbook -bin/kalarm -bin/kalarmd -bin/kandy -bin/kandy_client -bin/karm -bin/kleopatra -bin/kmail +@bin bin/kabc2mutt +@bin bin/kaddressbook +@bin bin/kalarm +@bin bin/kalarmd +@bin bin/kandy +@bin bin/kandy_client +@bin bin/karm +@bin bin/kleopatra +@bin bin/kmail bin/kmail_antivir.sh bin/kmail_clamav.sh bin/kmail_fprot.sh bin/kmail_sav.sh -bin/kmailcvt -bin/knode -bin/knotes -bin/kode -bin/kolabwizard -bin/konsolekalendar -bin/kontact -bin/korgac -bin/korganizer -bin/korn -bin/kpalmdoc -bin/kpilot -bin/kpilotDaemon -bin/ktnef -bin/kwatchgnupg -bin/kxml_compiler -bin/networkstatustestservice -bin/scalixadmin -bin/scalixwizard -bin/sloxwizard +@bin bin/kmailcvt +@bin bin/knode +@bin bin/knotes +@bin bin/kode +@bin bin/kolabwizard +@bin bin/konsolekalendar +@bin bin/kontact +@bin bin/korgac +@bin bin/korganizer +@bin bin/korn +@bin bin/kpalmdoc +@bin bin/kpilot +@bin bin/kpilotDaemon +@bin bin/ktnef +@bin bin/kwatchgnupg +@bin bin/kxml_compiler +@bin bin/networkstatustestservice +@bin bin/scalixadmin +@bin bin/scalixwizard +@bin bin/sloxwizard include/KNotesAppIface.h include/KNotesIface.h include/akregator/ @@ -273,7 +273,7 @@ include/mimelib/uuencode.h include/qgpgme/ include/qgpgme/dataprovider.h include/qgpgme/eventloopinteractor.h -lib/kconf_update_bin/korn-3-4-config_change +@bin lib/kconf_update_bin/korn-3-4-config_change ${KDE}/conduit_address.la ${KDE}/conduit_address.so ${KDE}/conduit_doc.la @@ -886,6 +886,8 @@ share/apps/kmail/kmcomposerui.rc share/apps/kmail/kmmainwin.rc share/apps/kmail/kmreadermainwin.rc share/apps/kmail/pics/ +share/apps/kmail/pics/attachmentQuicklistClosed.png +share/apps/kmail/pics/attachmentQuicklistOpened.png share/apps/kmail/pics/enterprise_bottom.png share/apps/kmail/pics/enterprise_bottom_left.png share/apps/kmail/pics/enterprise_bottom_right.png @@ -1250,6 +1252,7 @@ share/apps/libical/zoneinfo/America/Argentina/La_Rioja.ics share/apps/libical/zoneinfo/America/Argentina/Mendoza.ics share/apps/libical/zoneinfo/America/Argentina/Rio_Gallegos.ics share/apps/libical/zoneinfo/America/Argentina/San_Juan.ics +share/apps/libical/zoneinfo/America/Argentina/San_Luis.ics share/apps/libical/zoneinfo/America/Argentina/Tucuman.ics share/apps/libical/zoneinfo/America/Argentina/Ushuaia.ics share/apps/libical/zoneinfo/America/Aruba.ics @@ -1318,6 +1321,7 @@ share/apps/libical/zoneinfo/America/Los_Angeles.ics share/apps/libical/zoneinfo/America/Maceio.ics share/apps/libical/zoneinfo/America/Managua.ics share/apps/libical/zoneinfo/America/Manaus.ics +share/apps/libical/zoneinfo/America/Marigot.ics share/apps/libical/zoneinfo/America/Martinique.ics share/apps/libical/zoneinfo/America/Mazatlan.ics share/apps/libical/zoneinfo/America/Menominee.ics @@ -1356,6 +1360,7 @@ share/apps/libical/zoneinfo/America/Santo_Domingo.ics share/apps/libical/zoneinfo/America/Sao_Paulo.ics share/apps/libical/zoneinfo/America/Scoresbysund.ics share/apps/libical/zoneinfo/America/Shiprock.ics +share/apps/libical/zoneinfo/America/St_Barthelemy.ics share/apps/libical/zoneinfo/America/St_Johns.ics share/apps/libical/zoneinfo/America/St_Kitts.ics share/apps/libical/zoneinfo/America/St_Lucia.ics @@ -1412,6 +1417,7 @@ share/apps/libical/zoneinfo/Asia/Dubai.ics share/apps/libical/zoneinfo/Asia/Dushanbe.ics share/apps/libical/zoneinfo/Asia/Gaza.ics share/apps/libical/zoneinfo/Asia/Harbin.ics +share/apps/libical/zoneinfo/Asia/Ho_Chi_Minh.ics share/apps/libical/zoneinfo/Asia/Hong_Kong.ics share/apps/libical/zoneinfo/Asia/Hovd.ics share/apps/libical/zoneinfo/Asia/Irkutsk.ics @@ -1424,6 +1430,7 @@ share/apps/libical/zoneinfo/Asia/Kamchatka.ics share/apps/libical/zoneinfo/Asia/Karachi.ics share/apps/libical/zoneinfo/Asia/Kashgar.ics share/apps/libical/zoneinfo/Asia/Katmandu.ics +share/apps/libical/zoneinfo/Asia/Kolkata.ics share/apps/libical/zoneinfo/Asia/Krasnoyarsk.ics share/apps/libical/zoneinfo/Asia/Kuala_Lumpur.ics share/apps/libical/zoneinfo/Asia/Kuching.ics @@ -1623,12 +1630,14 @@ share/apps/libkdepim/about/kde_infopage_rtl.css share/apps/libkdepim/about/top-left.png share/apps/libkdepim/about/top-middle.png share/apps/libkholidays/ +share/apps/libkholidays/holiday_BelgiumDutch +share/apps/libkholidays/holiday_BelgiumFrench +share/apps/libkholidays/holiday_BelgiumWalloon share/apps/libkholidays/holiday_Suedtirol share/apps/libkholidays/holiday_ar share/apps/libkholidays/holiday_at share/apps/libkholidays/holiday_au share/apps/libkholidays/holiday_bavarian -share/apps/libkholidays/holiday_be share/apps/libkholidays/holiday_br share/apps/libkholidays/holiday_ca share/apps/libkholidays/holiday_catalan