diff options
75 files changed, 673 insertions, 394 deletions
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile index 754cde48049..1dfa385a690 100644 --- a/devel/kdesdk4/Makefile +++ b/devel/kdesdk4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:30:38 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $ DISTNAME= kdesdk-${_KDE_VERSION} CATEGORIES= devel @@ -11,8 +11,6 @@ CONFLICTS+= umbrello-[0-9]* # BUILD_MAKE_FLAGS+= VERBOSE=1 -PKG_DESTDIR_SUPPORT= user-destdir - CMAKE_ARGS+= -DBUILD_kmtrace:BOOL=OFF # disable for the moment till sort out -ldl diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo index add4686e862..9fcefae1b28 100644 --- a/devel/kdesdk4/distinfo +++ b/devel/kdesdk4/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:30:38 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:38 markd Exp $ -SHA1 (kdesdk-4.3.1.tar.bz2) = ded236a12002b824f97856ce5dc882161ed437d2 -RMD160 (kdesdk-4.3.1.tar.bz2) = f440815ae8f00b61f39f4f86e5023be64b69afb6 -Size (kdesdk-4.3.1.tar.bz2) = 5611514 bytes +SHA1 (kdesdk-4.3.2.tar.bz2) = eabd284791cd4315b743389bddb13848c47bf287 +RMD160 (kdesdk-4.3.2.tar.bz2) = 0841bb34e41261a8786e07e9ea8ea46d4f078091 +Size (kdesdk-4.3.2.tar.bz2) = 5618797 bytes SHA1 (patch-aa) = ab73e4306efb33344012f95c059ea0ed0adfafd1 SHA1 (patch-ab) = af132807eaca326ad0c5fe87ffced9e8b813f3f9 diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile index 3cd55913c50..ef105e43985 100644 --- a/games/kdegames4/Makefile +++ b/games/kdegames4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:34:10 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $ DISTNAME= kdegames-${_KDE_VERSION} CATEGORIES= games @@ -8,8 +8,6 @@ COMMENT= Games for the KDE integrated X11 desktop # BUILD_MAKE_FLAGS+= VERBOSE=1 -PKG_DESTDIR_SUPPORT= user-destdir - .include "../../meta-pkgs/kde4/kde4.mk" .include "../../games/ggz-client-libs/buildlink3.mk" diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo index 582d10da91b..916ef916c7e 100644 --- a/games/kdegames4/distinfo +++ b/games/kdegames4/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:34:10 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:38 markd Exp $ -SHA1 (kdegames-4.3.1.tar.bz2) = 576255ce66a0c089e0840bd90ea89d5705872bc8 -RMD160 (kdegames-4.3.1.tar.bz2) = 711b43963755e960498c53cf704168fc451ee889 -Size (kdegames-4.3.1.tar.bz2) = 50567545 bytes +SHA1 (kdegames-4.3.2.tar.bz2) = cc3eee96fdd3aabb7230a675b877fde98a04e35d +RMD160 (kdegames-4.3.2.tar.bz2) = 02a5b742c8343fc6a9a841275563c556de02ea5c +Size (kdegames-4.3.2.tar.bz2) = 50566391 bytes SHA1 (patch-aa) = 248ac75a6e76dae6f5648a10e7f73dfa5eb0944b SHA1 (patch-ab) = 8f36bf07bf41905dda2da518c8930ffb2fc328bf diff --git a/games/kdetoys4/Makefile b/games/kdetoys4/Makefile index 82194744cf0..82fae63ba58 100644 --- a/games/kdetoys4/Makefile +++ b/games/kdetoys4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:36:43 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $ DISTNAME= kdetoys-${_KDE_VERSION} CATEGORIES= games @@ -8,8 +8,6 @@ COMMENT= Toys for the KDE integrated X11 desktop # BUILD_MAKE_FLAGS+= VERBOSE=1 -PKG_DESTDIR_SUPPORT= user-destdir - .include "../../meta-pkgs/kde4/kde4.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/games/kdetoys4/distinfo b/games/kdetoys4/distinfo index 3d374ed2046..261817e77c8 100644 --- a/games/kdetoys4/distinfo +++ b/games/kdetoys4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:36:43 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:38 markd Exp $ -SHA1 (kdetoys-4.3.1.tar.bz2) = 31a60deafef34a02fb7de5339eed1c750a456d3b -RMD160 (kdetoys-4.3.1.tar.bz2) = 1bc8f43b397e8b450b971467ceb9d8deb3571dd5 -Size (kdetoys-4.3.1.tar.bz2) = 1307700 bytes +SHA1 (kdetoys-4.3.2.tar.bz2) = 7557b1c808a6378beb450d16293cb743c34a1fb7 +RMD160 (kdetoys-4.3.2.tar.bz2) = c9683a0aed3adc290afbec650acfea96af366619 +Size (kdetoys-4.3.2.tar.bz2) = 1305686 bytes diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index 61e7642e49d..867adf701db 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:11:00 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $ DISTNAME= kdegraphics-${_KDE_VERSION} CATEGORIES= graphics @@ -8,8 +8,6 @@ COMMENT= Graphical tools for the KDE desktop # BUILD_MAKE_FLAGS+= VERBOSE=1 -PKG_DESTDIR_SUPPORT= user-destdir - CHECK_PORTABILITY_SKIP+=ktimetracker/test/booktime-baddate.sh \ ktimetracker/test/booktime-badduration.sh \ ktimetracker/test/booktime-badtime.sh \ diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo index 8dbc80b1c31..ba288ebd622 100644 --- a/graphics/kdegraphics4/distinfo +++ b/graphics/kdegraphics4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:11:00 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:38 markd Exp $ -SHA1 (kdegraphics-4.3.1.tar.bz2) = d57d9007b95607c0ee925cc963d7e14798fc69f9 -RMD160 (kdegraphics-4.3.1.tar.bz2) = fd374878206e30ee0b5de43197c4643496650df3 -Size (kdegraphics-4.3.1.tar.bz2) = 3618073 bytes +SHA1 (kdegraphics-4.3.2.tar.bz2) = 142fccc4f6f7d1f059f79e0fc9fd6694ed3a7b0e +RMD160 (kdegraphics-4.3.2.tar.bz2) = 094219e8012db889612d1bda484bed15b64dec7b +Size (kdegraphics-4.3.2.tar.bz2) = 3621437 bytes diff --git a/graphics/oxygen-icons/Makefile b/graphics/oxygen-icons/Makefile index 0130c89867f..47f2dfaf4bc 100644 --- a/graphics/oxygen-icons/Makefile +++ b/graphics/oxygen-icons/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:06:06 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:41 markd Exp $ -DISTNAME= oxygen-icons-4.3.1 +DISTNAME= oxygen-icons-4.3.2 CATEGORIES= graphics kde -MASTER_SITES= ${MASTER_SITE_KDE:=4.3.1/src/} +MASTER_SITES= ${MASTER_SITE_KDE:=4.3.2/src/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= markd@NetBSD.org diff --git a/graphics/oxygen-icons/PLIST b/graphics/oxygen-icons/PLIST index dc274bd7648..417409670c0 100644 --- a/graphics/oxygen-icons/PLIST +++ b/graphics/oxygen-icons/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 20:06:18 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:41 markd Exp $ share/icons/oxygen/128x128/actions/address-book-new.png share/icons/oxygen/128x128/actions/application-exit.png share/icons/oxygen/128x128/actions/appointment-new.png @@ -49,6 +49,7 @@ share/icons/oxygen/128x128/actions/mail-reply-list.png share/icons/oxygen/128x128/actions/mail-reply-sender.png share/icons/oxygen/128x128/actions/mail-send.png share/icons/oxygen/128x128/actions/page-zoom.png +share/icons/oxygen/128x128/actions/resource-group.png share/icons/oxygen/128x128/actions/roll.png share/icons/oxygen/128x128/actions/svn-commit.png share/icons/oxygen/128x128/actions/svn-update.png @@ -619,6 +620,7 @@ share/icons/oxygen/16x16/actions/code-block.png share/icons/oxygen/16x16/actions/code-class.png share/icons/oxygen/16x16/actions/code-context.png share/icons/oxygen/16x16/actions/code-function.png +share/icons/oxygen/16x16/actions/code-typedef.png share/icons/oxygen/16x16/actions/code-variable.png share/icons/oxygen/16x16/actions/color-picker-black.png share/icons/oxygen/16x16/actions/color-picker-grey.png @@ -629,6 +631,9 @@ share/icons/oxygen/16x16/actions/configure-toolbars.png share/icons/oxygen/16x16/actions/configure.png share/icons/oxygen/16x16/actions/contact-new.png share/icons/oxygen/16x16/actions/dashboard-show.png +share/icons/oxygen/16x16/actions/debug-execute-from-cursor.png +share/icons/oxygen/16x16/actions/debug-execute-to-cursor.png +share/icons/oxygen/16x16/actions/debug-run-cursor.png share/icons/oxygen/16x16/actions/debug-step-instruction.png share/icons/oxygen/16x16/actions/debug-step-into-instruction.png share/icons/oxygen/16x16/actions/debug-step-into.png @@ -842,27 +847,44 @@ share/icons/oxygen/16x16/actions/irc-remove-operator.png share/icons/oxygen/16x16/actions/irc-unvoice.png share/icons/oxygen/16x16/actions/irc-voice.png share/icons/oxygen/16x16/actions/kmix-master.png +share/icons/oxygen/16x16/actions/layer-visible-off.png +share/icons/oxygen/16x16/actions/layer-visible-on.png share/icons/oxygen/16x16/actions/list-add-font.png share/icons/oxygen/16x16/actions/list-add-user.png share/icons/oxygen/16x16/actions/list-add.png share/icons/oxygen/16x16/actions/list-remove-user.png share/icons/oxygen/16x16/actions/list-remove.png +share/icons/oxygen/16x16/actions/list-resource-add.png +share/icons/oxygen/16x16/actions/mail-encrypted-full.png +share/icons/oxygen/16x16/actions/mail-encrypted-part.png +share/icons/oxygen/16x16/actions/mail-encrypted.png share/icons/oxygen/16x16/actions/mail-flag.png share/icons/oxygen/16x16/actions/mail-forward.png +share/icons/oxygen/16x16/actions/mail-forwarded-replied.png +share/icons/oxygen/16x16/actions/mail-forwarded.png share/icons/oxygen/16x16/actions/mail-mark-important.png share/icons/oxygen/16x16/actions/mail-mark-junk.png share/icons/oxygen/16x16/actions/mail-mark-notjunk.png share/icons/oxygen/16x16/actions/mail-mark-read.png -share/icons/oxygen/16x16/actions/mail-mark-task.png share/icons/oxygen/16x16/actions/mail-mark-unread-new.png share/icons/oxygen/16x16/actions/mail-mark-unread.png share/icons/oxygen/16x16/actions/mail-message-new.png share/icons/oxygen/16x16/actions/mail-queue.png share/icons/oxygen/16x16/actions/mail-receive.png +share/icons/oxygen/16x16/actions/mail-replied.png share/icons/oxygen/16x16/actions/mail-reply-all.png +share/icons/oxygen/16x16/actions/mail-reply-custom-all.png +share/icons/oxygen/16x16/actions/mail-reply-custom.png share/icons/oxygen/16x16/actions/mail-reply-list.png share/icons/oxygen/16x16/actions/mail-reply-sender.png share/icons/oxygen/16x16/actions/mail-send.png +share/icons/oxygen/16x16/actions/mail-signature-unknown.png +share/icons/oxygen/16x16/actions/mail-signed-full.png +share/icons/oxygen/16x16/actions/mail-signed-fully.png +share/icons/oxygen/16x16/actions/mail-signed-part.png +share/icons/oxygen/16x16/actions/mail-signed-verified.png +share/icons/oxygen/16x16/actions/mail-signed.png +share/icons/oxygen/16x16/actions/mail-tagged.png share/icons/oxygen/16x16/actions/measure.png share/icons/oxygen/16x16/actions/media-eject.png share/icons/oxygen/16x16/actions/media-playback-pause.png @@ -923,6 +945,10 @@ share/icons/oxygen/16x16/actions/quickopen-file.png share/icons/oxygen/16x16/actions/quickopen-function.png share/icons/oxygen/16x16/actions/quickopen.png share/icons/oxygen/16x16/actions/rating.png +share/icons/oxygen/16x16/actions/resource-calendar-child-insert.png +share/icons/oxygen/16x16/actions/resource-calendar-insert.png +share/icons/oxygen/16x16/actions/resource-group-new.png +share/icons/oxygen/16x16/actions/resource-group.png share/icons/oxygen/16x16/actions/roll.png share/icons/oxygen/16x16/actions/run-build-clean.png share/icons/oxygen/16x16/actions/run-build-configure.png @@ -991,14 +1017,18 @@ share/icons/oxygen/16x16/actions/user-group-delete.png share/icons/oxygen/16x16/actions/user-group-new.png share/icons/oxygen/16x16/actions/user-group-properties.png share/icons/oxygen/16x16/actions/user-properties.png +share/icons/oxygen/16x16/actions/view-calendar-birthday.png share/icons/oxygen/16x16/actions/view-calendar-day.png +share/icons/oxygen/16x16/actions/view-calendar-holiday.png share/icons/oxygen/16x16/actions/view-calendar-list.png share/icons/oxygen/16x16/actions/view-calendar-month.png +share/icons/oxygen/16x16/actions/view-calendar-special-occasion.png share/icons/oxygen/16x16/actions/view-calendar-tasks.png share/icons/oxygen/16x16/actions/view-calendar-time-spent.png share/icons/oxygen/16x16/actions/view-calendar-timeline.png share/icons/oxygen/16x16/actions/view-calendar-upcoming-days.png share/icons/oxygen/16x16/actions/view-calendar-upcoming-events.png +share/icons/oxygen/16x16/actions/view-calendar-wedding-anniversary.png share/icons/oxygen/16x16/actions/view-calendar-week.png share/icons/oxygen/16x16/actions/view-calendar-workweek.png share/icons/oxygen/16x16/actions/view-calendar.png @@ -1037,6 +1067,7 @@ share/icons/oxygen/16x16/actions/view-process-system.png share/icons/oxygen/16x16/actions/view-process-tree.png share/icons/oxygen/16x16/actions/view-process-users.png share/icons/oxygen/16x16/actions/view-refresh.png +share/icons/oxygen/16x16/actions/view-resource-calendar.png share/icons/oxygen/16x16/actions/view-restore.png share/icons/oxygen/16x16/actions/view-right-close.png share/icons/oxygen/16x16/actions/view-right-new.png @@ -1046,6 +1077,9 @@ share/icons/oxygen/16x16/actions/view-sort-descending.png share/icons/oxygen/16x16/actions/view-split-left-right.png share/icons/oxygen/16x16/actions/view-split-top-bottom.png share/icons/oxygen/16x16/actions/view-statistics.png +share/icons/oxygen/16x16/actions/view-time-schedule-child-insert.png +share/icons/oxygen/16x16/actions/view-time-schedule-edit.png +share/icons/oxygen/16x16/actions/view-time-schedule.png share/icons/oxygen/16x16/actions/view-web-browser-dom-tree.png share/icons/oxygen/16x16/actions/window-close.png share/icons/oxygen/16x16/actions/window-duplicate.png @@ -1570,6 +1604,9 @@ share/icons/oxygen/16x16/status/mail-attachment.png share/icons/oxygen/16x16/status/mail-queued.png share/icons/oxygen/16x16/status/mail-read.png share/icons/oxygen/16x16/status/mail-replied.png +share/icons/oxygen/16x16/status/mail-sent.png +share/icons/oxygen/16x16/status/mail-tagged.png +share/icons/oxygen/16x16/status/mail-task.png share/icons/oxygen/16x16/status/mail-unread-new.png share/icons/oxygen/16x16/status/mail-unread.png share/icons/oxygen/16x16/status/media-playlist-repeat.png @@ -1656,6 +1693,7 @@ share/icons/oxygen/22x22/actions/code-block.png share/icons/oxygen/22x22/actions/code-class.png share/icons/oxygen/22x22/actions/code-context.png share/icons/oxygen/22x22/actions/code-function.png +share/icons/oxygen/22x22/actions/code-typedef.png share/icons/oxygen/22x22/actions/code-variable.png share/icons/oxygen/22x22/actions/color-picker-black.png share/icons/oxygen/22x22/actions/color-picker-grey.png @@ -1666,6 +1704,9 @@ share/icons/oxygen/22x22/actions/configure-toolbars.png share/icons/oxygen/22x22/actions/configure.png share/icons/oxygen/22x22/actions/contact-new.png share/icons/oxygen/22x22/actions/dashboard-show.png +share/icons/oxygen/22x22/actions/debug-execute-from-cursor.png +share/icons/oxygen/22x22/actions/debug-execute-to-cursor.png +share/icons/oxygen/22x22/actions/debug-run-cursor.png share/icons/oxygen/22x22/actions/debug-step-instruction.png share/icons/oxygen/22x22/actions/debug-step-into-instruction.png share/icons/oxygen/22x22/actions/debug-step-into.png @@ -1872,13 +1913,20 @@ share/icons/oxygen/22x22/actions/irc-operator.png share/icons/oxygen/22x22/actions/irc-remove-operator.png share/icons/oxygen/22x22/actions/irc-unvoice.png share/icons/oxygen/22x22/actions/irc-voice.png +share/icons/oxygen/22x22/actions/layer-visible-off.png +share/icons/oxygen/22x22/actions/layer-visible-on.png share/icons/oxygen/22x22/actions/list-add-font.png share/icons/oxygen/22x22/actions/list-add-user.png share/icons/oxygen/22x22/actions/list-add.png share/icons/oxygen/22x22/actions/list-remove-user.png share/icons/oxygen/22x22/actions/list-remove.png +share/icons/oxygen/22x22/actions/list-resource-add.png +share/icons/oxygen/22x22/actions/mail-encrypted-full.png +share/icons/oxygen/22x22/actions/mail-encrypted-part.png +share/icons/oxygen/22x22/actions/mail-encrypted.png share/icons/oxygen/22x22/actions/mail-flag.png share/icons/oxygen/22x22/actions/mail-forward.png +share/icons/oxygen/22x22/actions/mail-forwarded.png share/icons/oxygen/22x22/actions/mail-mark-important.png share/icons/oxygen/22x22/actions/mail-mark-notjunk.png share/icons/oxygen/22x22/actions/mail-mark-read.png @@ -1888,10 +1936,19 @@ share/icons/oxygen/22x22/actions/mail-mark-unread.png share/icons/oxygen/22x22/actions/mail-message-new.png share/icons/oxygen/22x22/actions/mail-queue.png share/icons/oxygen/22x22/actions/mail-receive.png +share/icons/oxygen/22x22/actions/mail-replied.png share/icons/oxygen/22x22/actions/mail-reply-all.png +share/icons/oxygen/22x22/actions/mail-reply-custom-all.png +share/icons/oxygen/22x22/actions/mail-reply-custom.png share/icons/oxygen/22x22/actions/mail-reply-list.png share/icons/oxygen/22x22/actions/mail-reply-sender.png share/icons/oxygen/22x22/actions/mail-send.png +share/icons/oxygen/22x22/actions/mail-signature-unknown.png +share/icons/oxygen/22x22/actions/mail-signed-full.png +share/icons/oxygen/22x22/actions/mail-signed-part.png +share/icons/oxygen/22x22/actions/mail-signed-verified.png +share/icons/oxygen/22x22/actions/mail-signed.png +share/icons/oxygen/22x22/actions/mail-tagged.png share/icons/oxygen/22x22/actions/measure.png share/icons/oxygen/22x22/actions/media-eject.png share/icons/oxygen/22x22/actions/media-playback-pause.png @@ -1966,6 +2023,10 @@ share/icons/oxygen/22x22/actions/quickopen-file.png share/icons/oxygen/22x22/actions/quickopen-function.png share/icons/oxygen/22x22/actions/quickopen.png share/icons/oxygen/22x22/actions/rating.png +share/icons/oxygen/22x22/actions/resource-calendar-child-insert.png +share/icons/oxygen/22x22/actions/resource-calendar-insert.png +share/icons/oxygen/22x22/actions/resource-group-new.png +share/icons/oxygen/22x22/actions/resource-group.png share/icons/oxygen/22x22/actions/roll.png share/icons/oxygen/22x22/actions/run-build-clean.png share/icons/oxygen/22x22/actions/run-build-configure.png @@ -1979,6 +2040,12 @@ share/icons/oxygen/22x22/actions/services.png share/icons/oxygen/22x22/actions/show-menu.png share/icons/oxygen/22x22/actions/speaker.png share/icons/oxygen/22x22/actions/story-editor.png +share/icons/oxygen/22x22/actions/stroke-cap-bevel.png +share/icons/oxygen/22x22/actions/stroke-cap-butt.png +share/icons/oxygen/22x22/actions/stroke-cap-miter.png +share/icons/oxygen/22x22/actions/stroke-cap-round.png +share/icons/oxygen/22x22/actions/stroke-cap-square.png +share/icons/oxygen/22x22/actions/stroke-join-round.png share/icons/oxygen/22x22/actions/svn-commit.png share/icons/oxygen/22x22/actions/svn-update.png share/icons/oxygen/22x22/actions/system-lock-screen.png @@ -2023,14 +2090,18 @@ share/icons/oxygen/22x22/actions/user-group-delete.png share/icons/oxygen/22x22/actions/user-group-new.png share/icons/oxygen/22x22/actions/user-group-properties.png share/icons/oxygen/22x22/actions/user-properties.png +share/icons/oxygen/22x22/actions/view-calendar-birthday.png share/icons/oxygen/22x22/actions/view-calendar-day.png +share/icons/oxygen/22x22/actions/view-calendar-holiday.png share/icons/oxygen/22x22/actions/view-calendar-list.png share/icons/oxygen/22x22/actions/view-calendar-month.png +share/icons/oxygen/22x22/actions/view-calendar-special-occasion.png share/icons/oxygen/22x22/actions/view-calendar-tasks.png share/icons/oxygen/22x22/actions/view-calendar-time-spent.png share/icons/oxygen/22x22/actions/view-calendar-timeline.png share/icons/oxygen/22x22/actions/view-calendar-upcoming-days.png share/icons/oxygen/22x22/actions/view-calendar-upcoming-events.png +share/icons/oxygen/22x22/actions/view-calendar-wedding-anniversary.png share/icons/oxygen/22x22/actions/view-calendar-week.png share/icons/oxygen/22x22/actions/view-calendar-workweek.png share/icons/oxygen/22x22/actions/view-calendar.png @@ -2068,6 +2139,7 @@ share/icons/oxygen/22x22/actions/view-process-own.png share/icons/oxygen/22x22/actions/view-process-system.png share/icons/oxygen/22x22/actions/view-process-users.png share/icons/oxygen/22x22/actions/view-refresh.png +share/icons/oxygen/22x22/actions/view-resource-calendar.png share/icons/oxygen/22x22/actions/view-restore.png share/icons/oxygen/22x22/actions/view-right-close.png share/icons/oxygen/22x22/actions/view-right-new.png @@ -2079,6 +2151,9 @@ share/icons/oxygen/22x22/actions/view-split-top-bottom.png share/icons/oxygen/22x22/actions/view-statistics.png share/icons/oxygen/22x22/actions/view-table-of-contents-ltr.png share/icons/oxygen/22x22/actions/view-table-of-contents-rtl.png +share/icons/oxygen/22x22/actions/view-time-schedule-child-insert.png +share/icons/oxygen/22x22/actions/view-time-schedule-edit.png +share/icons/oxygen/22x22/actions/view-time-schedule.png share/icons/oxygen/22x22/actions/view-web-browser-dom-tree.png share/icons/oxygen/22x22/actions/window-close.png share/icons/oxygen/22x22/actions/window-duplicate.png @@ -2641,6 +2716,7 @@ share/icons/oxygen/22x22/status/mail-attachment.png share/icons/oxygen/22x22/status/mail-queued.png share/icons/oxygen/22x22/status/mail-read.png share/icons/oxygen/22x22/status/mail-replied.png +share/icons/oxygen/22x22/status/mail-task.png share/icons/oxygen/22x22/status/mail-unread-new.png share/icons/oxygen/22x22/status/mail-unread.png share/icons/oxygen/22x22/status/media-playlist-repeat.png @@ -2846,6 +2922,7 @@ share/icons/oxygen/32x32/actions/code-block.png share/icons/oxygen/32x32/actions/code-class.png share/icons/oxygen/32x32/actions/code-context.png share/icons/oxygen/32x32/actions/code-function.png +share/icons/oxygen/32x32/actions/code-typedef.png share/icons/oxygen/32x32/actions/code-variable.png share/icons/oxygen/32x32/actions/color-picker-black.png share/icons/oxygen/32x32/actions/color-picker-grey.png @@ -2856,6 +2933,9 @@ share/icons/oxygen/32x32/actions/configure-toolbars.png share/icons/oxygen/32x32/actions/configure.png share/icons/oxygen/32x32/actions/contact-new.png share/icons/oxygen/32x32/actions/dashboard-show.png +share/icons/oxygen/32x32/actions/debug-execute-from-cursor.png +share/icons/oxygen/32x32/actions/debug-execute-to-cursor.png +share/icons/oxygen/32x32/actions/debug-run-cursor.png share/icons/oxygen/32x32/actions/debug-step-instruction.png share/icons/oxygen/32x32/actions/debug-step-into-instruction.png share/icons/oxygen/32x32/actions/debug-step-into.png @@ -2869,9 +2949,9 @@ share/icons/oxygen/32x32/actions/distribute-horizontal-center.png share/icons/oxygen/32x32/actions/distribute-horizontal-equal.png share/icons/oxygen/32x32/actions/distribute-horizontal-left.png share/icons/oxygen/32x32/actions/distribute-horizontal-margin.png +share/icons/oxygen/32x32/actions/distribute-horizontal-page.png share/icons/oxygen/32x32/actions/distribute-horizontal-right.png share/icons/oxygen/32x32/actions/distribute-horizontal-x.png -share/icons/oxygen/32x32/actions/distribute-horozontal-page.png share/icons/oxygen/32x32/actions/distribute-vertical-bottom.png share/icons/oxygen/32x32/actions/distribute-vertical-center.png share/icons/oxygen/32x32/actions/distribute-vertical-equal.png @@ -3064,13 +3144,20 @@ share/icons/oxygen/32x32/actions/irc-remove-operator.png share/icons/oxygen/32x32/actions/irc-unvoice.png share/icons/oxygen/32x32/actions/irc-voice.png share/icons/oxygen/32x32/actions/journal-new.png +share/icons/oxygen/32x32/actions/layer-visible-off.png +share/icons/oxygen/32x32/actions/layer-visible-on.png share/icons/oxygen/32x32/actions/list-add-font.png share/icons/oxygen/32x32/actions/list-add-user.png share/icons/oxygen/32x32/actions/list-add.png share/icons/oxygen/32x32/actions/list-remove-user.png share/icons/oxygen/32x32/actions/list-remove.png +share/icons/oxygen/32x32/actions/list-resource-add.png +share/icons/oxygen/32x32/actions/mail-encrypted-full.png +share/icons/oxygen/32x32/actions/mail-encrypted-part.png +share/icons/oxygen/32x32/actions/mail-encrypted.png share/icons/oxygen/32x32/actions/mail-flag.png share/icons/oxygen/32x32/actions/mail-forward.png +share/icons/oxygen/32x32/actions/mail-forwarded.png share/icons/oxygen/32x32/actions/mail-mark-important.png share/icons/oxygen/32x32/actions/mail-mark-junk.png share/icons/oxygen/32x32/actions/mail-mark-notjunk.png @@ -3081,10 +3168,19 @@ share/icons/oxygen/32x32/actions/mail-mark-unread.png share/icons/oxygen/32x32/actions/mail-message-new.png share/icons/oxygen/32x32/actions/mail-queue.png share/icons/oxygen/32x32/actions/mail-receive.png +share/icons/oxygen/32x32/actions/mail-replied.png share/icons/oxygen/32x32/actions/mail-reply-all.png +share/icons/oxygen/32x32/actions/mail-reply-custom-all.png +share/icons/oxygen/32x32/actions/mail-reply-custom.png share/icons/oxygen/32x32/actions/mail-reply-list.png share/icons/oxygen/32x32/actions/mail-reply-sender.png share/icons/oxygen/32x32/actions/mail-send.png +share/icons/oxygen/32x32/actions/mail-signature-unknown.png +share/icons/oxygen/32x32/actions/mail-signed-full.png +share/icons/oxygen/32x32/actions/mail-signed-part.png +share/icons/oxygen/32x32/actions/mail-signed-verified.png +share/icons/oxygen/32x32/actions/mail-signed.png +share/icons/oxygen/32x32/actions/mail-tagged.png share/icons/oxygen/32x32/actions/measure.png share/icons/oxygen/32x32/actions/media-eject.png share/icons/oxygen/32x32/actions/media-playback-pause.png @@ -3138,6 +3234,10 @@ share/icons/oxygen/32x32/actions/quickopen-file.png share/icons/oxygen/32x32/actions/quickopen-function.png share/icons/oxygen/32x32/actions/quickopen.png share/icons/oxygen/32x32/actions/rating.png +share/icons/oxygen/32x32/actions/resource-calendar-child-insert.png +share/icons/oxygen/32x32/actions/resource-calendar-insert.png +share/icons/oxygen/32x32/actions/resource-group-new.png +share/icons/oxygen/32x32/actions/resource-group.png share/icons/oxygen/32x32/actions/roll.png share/icons/oxygen/32x32/actions/run-build-clean.png share/icons/oxygen/32x32/actions/run-build-configure.png @@ -3152,6 +3252,12 @@ share/icons/oxygen/32x32/actions/shapes.png share/icons/oxygen/32x32/actions/show-menu.png share/icons/oxygen/32x32/actions/speaker.png share/icons/oxygen/32x32/actions/story-editor.png +share/icons/oxygen/32x32/actions/stroke-cap-butt.png +share/icons/oxygen/32x32/actions/stroke-cap-round.png +share/icons/oxygen/32x32/actions/stroke-cap-square.png +share/icons/oxygen/32x32/actions/stroke-join-bevel.png +share/icons/oxygen/32x32/actions/stroke-join-miter.png +share/icons/oxygen/32x32/actions/stroke-join-round.png share/icons/oxygen/32x32/actions/svn-commit.png share/icons/oxygen/32x32/actions/svn-update.png share/icons/oxygen/32x32/actions/system-lock-screen.png @@ -3198,14 +3304,18 @@ share/icons/oxygen/32x32/actions/user-group-delete.png share/icons/oxygen/32x32/actions/user-group-new.png share/icons/oxygen/32x32/actions/user-group-properties.png share/icons/oxygen/32x32/actions/user-properties.png +share/icons/oxygen/32x32/actions/view-calendar-birthday.png share/icons/oxygen/32x32/actions/view-calendar-day.png +share/icons/oxygen/32x32/actions/view-calendar-holiday.png share/icons/oxygen/32x32/actions/view-calendar-list.png share/icons/oxygen/32x32/actions/view-calendar-month.png +share/icons/oxygen/32x32/actions/view-calendar-special-occasion.png share/icons/oxygen/32x32/actions/view-calendar-tasks.png share/icons/oxygen/32x32/actions/view-calendar-time-spent.png share/icons/oxygen/32x32/actions/view-calendar-timeline.png share/icons/oxygen/32x32/actions/view-calendar-upcoming-days.png share/icons/oxygen/32x32/actions/view-calendar-upcoming-events.png +share/icons/oxygen/32x32/actions/view-calendar-wedding-anniversary.png share/icons/oxygen/32x32/actions/view-calendar-week.png share/icons/oxygen/32x32/actions/view-calendar-workweek.png share/icons/oxygen/32x32/actions/view-calendar.png @@ -3243,6 +3353,7 @@ share/icons/oxygen/32x32/actions/view-process-own.png share/icons/oxygen/32x32/actions/view-process-system.png share/icons/oxygen/32x32/actions/view-process-users.png share/icons/oxygen/32x32/actions/view-refresh.png +share/icons/oxygen/32x32/actions/view-resource-calendar.png share/icons/oxygen/32x32/actions/view-restore.png share/icons/oxygen/32x32/actions/view-right-close.png share/icons/oxygen/32x32/actions/view-right-new.png @@ -3254,6 +3365,9 @@ share/icons/oxygen/32x32/actions/view-split-top-bottom.png share/icons/oxygen/32x32/actions/view-statistics.png share/icons/oxygen/32x32/actions/view-table-of-contents-ltr.png share/icons/oxygen/32x32/actions/view-table-of-contents-rtl.png +share/icons/oxygen/32x32/actions/view-time-schedule-child-insert.png +share/icons/oxygen/32x32/actions/view-time-schedule-edit.png +share/icons/oxygen/32x32/actions/view-time-schedule.png share/icons/oxygen/32x32/actions/view-web-browser-dom-tree.png share/icons/oxygen/32x32/actions/window-close.png share/icons/oxygen/32x32/actions/window-duplicate.png @@ -3779,6 +3893,7 @@ share/icons/oxygen/32x32/status/mail-attachment.png share/icons/oxygen/32x32/status/mail-queued.png share/icons/oxygen/32x32/status/mail-read.png share/icons/oxygen/32x32/status/mail-replied.png +share/icons/oxygen/32x32/status/mail-tagged.png share/icons/oxygen/32x32/status/mail-unread-new.png share/icons/oxygen/32x32/status/mail-unread.png share/icons/oxygen/32x32/status/media-playlist-repeat.png @@ -3862,6 +3977,7 @@ share/icons/oxygen/48x48/actions/code-block.png share/icons/oxygen/48x48/actions/code-class.png share/icons/oxygen/48x48/actions/code-context.png share/icons/oxygen/48x48/actions/code-function.png +share/icons/oxygen/48x48/actions/code-typedef.png share/icons/oxygen/48x48/actions/code-variable.png share/icons/oxygen/48x48/actions/color-picker-black.png share/icons/oxygen/48x48/actions/color-picker-grey.png @@ -3872,6 +3988,9 @@ share/icons/oxygen/48x48/actions/configure-toolbars.png share/icons/oxygen/48x48/actions/configure.png share/icons/oxygen/48x48/actions/contact-new.png share/icons/oxygen/48x48/actions/dashboard-show.png +share/icons/oxygen/48x48/actions/debug-execute-from-cursor.png +share/icons/oxygen/48x48/actions/debug-execute-to-cursor.png +share/icons/oxygen/48x48/actions/debug-run-cursor.png share/icons/oxygen/48x48/actions/debug-step-instruction.png share/icons/oxygen/48x48/actions/debug-step-into-instruction.png share/icons/oxygen/48x48/actions/debug-step-into.png @@ -4005,8 +4124,8 @@ share/icons/oxygen/48x48/actions/go-bottom.png share/icons/oxygen/48x48/actions/go-down-search.png share/icons/oxygen/48x48/actions/go-down.png share/icons/oxygen/48x48/actions/go-first-view-page.png +share/icons/oxygen/48x48/actions/go-first-view.png share/icons/oxygen/48x48/actions/go-first.png -share/icons/oxygen/48x48/actions/go-frist-view.png share/icons/oxygen/48x48/actions/go-home.png share/icons/oxygen/48x48/actions/go-jump-declaration.png share/icons/oxygen/48x48/actions/go-jump-definition.png @@ -4052,13 +4171,21 @@ share/icons/oxygen/48x48/actions/irc-operator.png share/icons/oxygen/48x48/actions/irc-remove-operator.png share/icons/oxygen/48x48/actions/irc-unvoice.png share/icons/oxygen/48x48/actions/irc-voice.png +share/icons/oxygen/48x48/actions/layer-visible-off.png +share/icons/oxygen/48x48/actions/layer-visible-on.png share/icons/oxygen/48x48/actions/list-add-font.png share/icons/oxygen/48x48/actions/list-add-user.png share/icons/oxygen/48x48/actions/list-add.png share/icons/oxygen/48x48/actions/list-remove-user.png share/icons/oxygen/48x48/actions/list-remove.png +share/icons/oxygen/48x48/actions/list-resource-add.png +share/icons/oxygen/48x48/actions/mail-encrypted-full.png +share/icons/oxygen/48x48/actions/mail-encrypted-part.png +share/icons/oxygen/48x48/actions/mail-encrypted.png share/icons/oxygen/48x48/actions/mail-flag.png share/icons/oxygen/48x48/actions/mail-forward.png +share/icons/oxygen/48x48/actions/mail-forwarded-replied.png +share/icons/oxygen/48x48/actions/mail-forwarded.png share/icons/oxygen/48x48/actions/mail-mark-important.png share/icons/oxygen/48x48/actions/mail-mark-junk.png share/icons/oxygen/48x48/actions/mail-mark-notjunk.png @@ -4069,10 +4196,19 @@ share/icons/oxygen/48x48/actions/mail-mark-unread.png share/icons/oxygen/48x48/actions/mail-message-new.png share/icons/oxygen/48x48/actions/mail-queue.png share/icons/oxygen/48x48/actions/mail-receive.png +share/icons/oxygen/48x48/actions/mail-replied.png share/icons/oxygen/48x48/actions/mail-reply-all.png +share/icons/oxygen/48x48/actions/mail-reply-custom-all.png +share/icons/oxygen/48x48/actions/mail-reply-custom.png share/icons/oxygen/48x48/actions/mail-reply-list.png share/icons/oxygen/48x48/actions/mail-reply-sender.png share/icons/oxygen/48x48/actions/mail-send.png +share/icons/oxygen/48x48/actions/mail-signature-unknown.png +share/icons/oxygen/48x48/actions/mail-signed-full.png +share/icons/oxygen/48x48/actions/mail-signed-part.png +share/icons/oxygen/48x48/actions/mail-signed-verified.png +share/icons/oxygen/48x48/actions/mail-signed.png +share/icons/oxygen/48x48/actions/mail-tagged.png share/icons/oxygen/48x48/actions/measure.png share/icons/oxygen/48x48/actions/media-eject.png share/icons/oxygen/48x48/actions/media-playback-pause.png @@ -4120,6 +4256,10 @@ share/icons/oxygen/48x48/actions/quickopen-file.png share/icons/oxygen/48x48/actions/quickopen-function.png share/icons/oxygen/48x48/actions/quickopen.png share/icons/oxygen/48x48/actions/rating.png +share/icons/oxygen/48x48/actions/resource-calendar-child-insert.png +share/icons/oxygen/48x48/actions/resource-calendar-insert.png +share/icons/oxygen/48x48/actions/resource-group-new.png +share/icons/oxygen/48x48/actions/resource-group.png share/icons/oxygen/48x48/actions/roll.png share/icons/oxygen/48x48/actions/run-build-clean.png share/icons/oxygen/48x48/actions/run-build-configure.png @@ -4133,6 +4273,12 @@ share/icons/oxygen/48x48/actions/services.png share/icons/oxygen/48x48/actions/show-menu.png share/icons/oxygen/48x48/actions/speaker.png share/icons/oxygen/48x48/actions/story-editor.png +share/icons/oxygen/48x48/actions/stroke-cap-butt.png +share/icons/oxygen/48x48/actions/stroke-cap-round.png +share/icons/oxygen/48x48/actions/stroke-cap-square.png +share/icons/oxygen/48x48/actions/stroke-join-bevel.png +share/icons/oxygen/48x48/actions/stroke-join-miter.png +share/icons/oxygen/48x48/actions/stroke-join-round.png share/icons/oxygen/48x48/actions/svn-commit.png share/icons/oxygen/48x48/actions/svn-update.png share/icons/oxygen/48x48/actions/system-lock-screen.png @@ -4177,14 +4323,18 @@ share/icons/oxygen/48x48/actions/user-group-delete.png share/icons/oxygen/48x48/actions/user-group-new.png share/icons/oxygen/48x48/actions/user-group-properties.png share/icons/oxygen/48x48/actions/user-properties.png +share/icons/oxygen/48x48/actions/view-calendar-birthday.png share/icons/oxygen/48x48/actions/view-calendar-day.png +share/icons/oxygen/48x48/actions/view-calendar-holiday.png share/icons/oxygen/48x48/actions/view-calendar-list.png share/icons/oxygen/48x48/actions/view-calendar-month.png +share/icons/oxygen/48x48/actions/view-calendar-special-occasion.png share/icons/oxygen/48x48/actions/view-calendar-tasks.png share/icons/oxygen/48x48/actions/view-calendar-time-spent.png share/icons/oxygen/48x48/actions/view-calendar-timeline.png share/icons/oxygen/48x48/actions/view-calendar-upcoming-days.png share/icons/oxygen/48x48/actions/view-calendar-upcoming-events.png +share/icons/oxygen/48x48/actions/view-calendar-wedding-anniversary.png share/icons/oxygen/48x48/actions/view-calendar-week.png share/icons/oxygen/48x48/actions/view-calendar-workweek.png share/icons/oxygen/48x48/actions/view-calendar.png @@ -4219,6 +4369,7 @@ share/icons/oxygen/48x48/actions/view-process-own.png share/icons/oxygen/48x48/actions/view-process-system.png share/icons/oxygen/48x48/actions/view-process-users.png share/icons/oxygen/48x48/actions/view-refresh.png +share/icons/oxygen/48x48/actions/view-resource-calendar.png share/icons/oxygen/48x48/actions/view-restore.png share/icons/oxygen/48x48/actions/view-right-close.png share/icons/oxygen/48x48/actions/view-right-new.png @@ -4230,6 +4381,9 @@ share/icons/oxygen/48x48/actions/view-split-top-bottom.png share/icons/oxygen/48x48/actions/view-statistics.png share/icons/oxygen/48x48/actions/view-table-of-contents-ltr.png share/icons/oxygen/48x48/actions/view-table-of-contents-rtl.png +share/icons/oxygen/48x48/actions/view-time-schedule-child-insert.png +share/icons/oxygen/48x48/actions/view-time-schedule-edit.png +share/icons/oxygen/48x48/actions/view-time-schedule.png share/icons/oxygen/48x48/actions/view-web-browser-dom-tree.png share/icons/oxygen/48x48/actions/window-close.png share/icons/oxygen/48x48/actions/window-duplicate.png @@ -4712,7 +4866,7 @@ share/icons/oxygen/48x48/places/folder-yellow.png share/icons/oxygen/48x48/places/folder.png share/icons/oxygen/48x48/places/mail-folder-inbox.png share/icons/oxygen/48x48/places/mail-folder-outbox.png -share/icons/oxygen/48x48/places/mail-folder-sent +share/icons/oxygen/48x48/places/mail-folder-sent.png share/icons/oxygen/48x48/places/mail-message.png share/icons/oxygen/48x48/places/network-server-database.png share/icons/oxygen/48x48/places/network-server.png @@ -4753,6 +4907,7 @@ share/icons/oxygen/48x48/status/mail-attachment.png share/icons/oxygen/48x48/status/mail-queued.png share/icons/oxygen/48x48/status/mail-read.png share/icons/oxygen/48x48/status/mail-replied.png +share/icons/oxygen/48x48/status/mail-tagged.png share/icons/oxygen/48x48/status/mail-unread-new.png share/icons/oxygen/48x48/status/mail-unread.png share/icons/oxygen/48x48/status/media-playlist-repeat.png @@ -4848,6 +5003,7 @@ share/icons/oxygen/64x64/actions/mail-reply-list.png share/icons/oxygen/64x64/actions/mail-reply-sender.png share/icons/oxygen/64x64/actions/mail-send.png share/icons/oxygen/64x64/actions/page-zoom.png +share/icons/oxygen/64x64/actions/resource-group.png share/icons/oxygen/64x64/actions/roll.png share/icons/oxygen/64x64/actions/svn-commit.png share/icons/oxygen/64x64/actions/svn-update.png @@ -5329,7 +5485,7 @@ share/icons/oxygen/64x64/places/folder-violet.png share/icons/oxygen/64x64/places/folder-yellow.png share/icons/oxygen/64x64/places/folder.png share/icons/oxygen/64x64/places/mail-folder-outbox.png -share/icons/oxygen/64x64/places/mail-folder-sent +share/icons/oxygen/64x64/places/mail-folder-sent.png share/icons/oxygen/64x64/places/network-server-database.png share/icons/oxygen/64x64/places/network-server.png share/icons/oxygen/64x64/places/network-workgroup.png diff --git a/graphics/oxygen-icons/distinfo b/graphics/oxygen-icons/distinfo index c0b4f6bffee..3a00d2c2169 100644 --- a/graphics/oxygen-icons/distinfo +++ b/graphics/oxygen-icons/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:06:18 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:41 markd Exp $ -SHA1 (oxygen-icons-4.3.1.tar.bz2) = 75a82d2e80d946333f63e32db56767c3ed17ba33 -RMD160 (oxygen-icons-4.3.1.tar.bz2) = f71a4d051e3201dbb57e78389539cb069b5c4ab7 -Size (oxygen-icons-4.3.1.tar.bz2) = 115327590 bytes +SHA1 (oxygen-icons-4.3.2.tar.bz2) = 8257c799ac8e5a3b284c0048b6ce821e1e25647c +RMD160 (oxygen-icons-4.3.2.tar.bz2) = 83b46bceefab27fe4cbbd6531bced03fb7bd2116 +Size (oxygen-icons-4.3.2.tar.bz2) = 120005798 bytes diff --git a/meta-pkgs/kde4/Makefile b/meta-pkgs/kde4/Makefile index 4737049ac46..a476ec689cd 100644 --- a/meta-pkgs/kde4/Makefile +++ b/meta-pkgs/kde4/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 21:43:12 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $ -DISTNAME= kde4-4.3.1 +DISTNAME= kde4-4.3.2 CATEGORIES= meta-pkgs x11 kde MASTER_SITES= # empty DISTFILES= # empty @@ -9,28 +9,28 @@ MAINTAINER= markd@NetBSD.org HOMEPAGE= http://www.kde.org/ COMMENT= "meta-package" for the KDE4 integrated X11 desktop -DEPENDS+= oxygen-icons-4.3.1{,nb[0-9]*}:../../graphics/oxygen-icons -DEPENDS+= kdelibs4-4.3.1{,nb[0-9]*}:../../x11/kdelibs4 -DEPENDS+= kdelibs-experimental4-4.3.1{,nb[0-9]*}:../../x11/kdelibs-experimental4 -DEPENDS+= kdepimlibs4-4.3.1{,nb[0-9]*}:../../misc/kdepimlibs4 -DEPENDS+= kdebase-runtime4-4.3.1{,nb[0-9]*}:../../x11/kdebase-runtime4 -DEPENDS+= kdebase4-4.3.1{,nb[0-9]*}:../../x11/kdebase4 -DEPENDS+= kdebase-workspace4-4.3.1{,nb[0-9]*}:../../x11/kdebase-workspace4 -DEPENDS+= kdeaccessibility4-4.3.1{,nb[0-9]*}:../../misc/kdeaccessibility4 -DEPENDS+= kdeadmin4-4.3.1{,nb[0-9]*}:../../misc/kdeadmin4 -DEPENDS+= kdeartwork4-4.3.1{,nb[0-9]*}:../../misc/kdeartwork4 -DEPENDS+= kdeedu4-4.3.1{,nb[0-9]*}:../../misc/kdeedu4 -DEPENDS+= kdegames4-4.3.1{,nb[0-9]*}:../../games/kdegames4 -DEPENDS+= kdegraphics4-4.3.1{,nb[0-9]*}:../../graphics/kdegraphics4 -DEPENDS+= kdemultimedia4-4.3.1{,nb[0-9]*}:../../multimedia/kdemultimedia4 -DEPENDS+= kdenetwork4-4.3.1{,nb[0-9]*}:../../net/kdenetwork4 -DEPENDS+= kdepim4-4.3.1{,nb[0-9]*}:../../misc/kdepim4 -DEPENDS+= kdepim-runtime4-4.3.1{,nb[0-9]*}:../../misc/kdepim-runtime4 -DEPENDS+= kdeplasma-addons4-4.3.1{,nb[0-9]*}:../../misc/kdeplasma-addons4 -DEPENDS+= kdesdk4-4.3.1{,nb[0-9]*}:../../devel/kdesdk4 -DEPENDS+= kdetoys4-4.3.1{,nb[0-9]*}:../../games/kdetoys4 -DEPENDS+= kdeutils4-4.3.1{,nb[0-9]*}:../../misc/kdeutils4 -DEPENDS+= kdewebdev4-4.3.1{,nb[0-9]*}:../../www/kdewebdev4 +DEPENDS+= oxygen-icons-4.3.2{,nb[0-9]*}:../../graphics/oxygen-icons +DEPENDS+= kdelibs4-4.3.2{,nb[0-9]*}:../../x11/kdelibs4 +DEPENDS+= kdelibs-experimental4-4.3.2{,nb[0-9]*}:../../x11/kdelibs-experimental4 +DEPENDS+= kdepimlibs4-4.3.2{,nb[0-9]*}:../../misc/kdepimlibs4 +DEPENDS+= kdebase-runtime4-4.3.2{,nb[0-9]*}:../../x11/kdebase-runtime4 +DEPENDS+= kdebase4-4.3.2{,nb[0-9]*}:../../x11/kdebase4 +DEPENDS+= kdebase-workspace4-4.3.2{,nb[0-9]*}:../../x11/kdebase-workspace4 +DEPENDS+= kdeaccessibility4-4.3.2{,nb[0-9]*}:../../misc/kdeaccessibility4 +DEPENDS+= kdeadmin4-4.3.2{,nb[0-9]*}:../../misc/kdeadmin4 +DEPENDS+= kdeartwork4-4.3.2{,nb[0-9]*}:../../misc/kdeartwork4 +DEPENDS+= kdeedu4-4.3.2{,nb[0-9]*}:../../misc/kdeedu4 +DEPENDS+= kdegames4-4.3.2{,nb[0-9]*}:../../games/kdegames4 +DEPENDS+= kdegraphics4-4.3.2{,nb[0-9]*}:../../graphics/kdegraphics4 +DEPENDS+= kdemultimedia4-4.3.2{,nb[0-9]*}:../../multimedia/kdemultimedia4 +DEPENDS+= kdenetwork4-4.3.2{,nb[0-9]*}:../../net/kdenetwork4 +DEPENDS+= kdepim4-4.3.2{,nb[0-9]*}:../../misc/kdepim4 +DEPENDS+= kdepim-runtime4-4.3.2{,nb[0-9]*}:../../misc/kdepim-runtime4 +DEPENDS+= kdeplasma-addons4-4.3.2{,nb[0-9]*}:../../misc/kdeplasma-addons4 +DEPENDS+= kdesdk4-4.3.2{,nb[0-9]*}:../../devel/kdesdk4 +DEPENDS+= kdetoys4-4.3.2{,nb[0-9]*}:../../games/kdetoys4 +DEPENDS+= kdeutils4-4.3.2{,nb[0-9]*}:../../misc/kdeutils4 +DEPENDS+= kdewebdev4-4.3.2{,nb[0-9]*}:../../www/kdewebdev4 META_PACKAGE= yes diff --git a/meta-pkgs/kde4/Makefile.kde4 b/meta-pkgs/kde4/Makefile.kde4 index 7b4b568a8aa..98f0978c633 100644 --- a/meta-pkgs/kde4/Makefile.kde4 +++ b/meta-pkgs/kde4/Makefile.kde4 @@ -1,18 +1,19 @@ -# $NetBSD: Makefile.kde4,v 1.1.1.1 2009/10/02 21:43:12 markd Exp $ +# $NetBSD: Makefile.kde4,v 1.2 2009/10/11 08:13:38 markd Exp $ # # This Makefile fragment is included at the top of package Makefiles for # KDE4-distributed packages (they all share common configure and build # settings). CATEGORIES+= kde -_KDE_VERSION= 4.3.1 -MASTER_SITE_KDE_I18N= ${MASTER_SITE_KDE:=4.3.1/src/kde-l10n/} -MASTER_SITES?= ${MASTER_SITE_KDE:=4.3.1/src/} +_KDE_VERSION= 4.3.2 +MASTER_SITE_KDE_I18N= ${MASTER_SITE_KDE:=4.3.2/src/kde-l10n/} +MASTER_SITES?= ${MASTER_SITE_KDE:=4.3.2/src/} EXTRACT_SUFX?= .tar.bz2 PKGNAME?= ${DISTNAME:S/-4/4-4/} MAINTAINER?= markd@NetBSD.org HOMEPAGE?= http://www.kde.org/ +LICENSE?= gnu-gpl-v2 AND gnu-lgpl-v2 BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 TOOLS_DEPENDS.cmake= cmake>=2.6.3:../../devel/cmake @@ -23,6 +24,8 @@ USE_CMAKE= yes CMAKE_ARG_PATH= .. CONFIGURE_DIRS= _KDE_build +PKG_DESTDIR_SUPPORT= user-destdir + pre-configure: ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ ${MKDIR} ${WRKSRC}/_KDE_build diff --git a/meta-pkgs/kde4/l10n.mk b/meta-pkgs/kde4/l10n.mk index f68aa567785..ca7b4444267 100644 --- a/meta-pkgs/kde4/l10n.mk +++ b/meta-pkgs/kde4/l10n.mk @@ -1,4 +1,4 @@ -# $NetBSD: l10n.mk,v 1.1.1.1 2009/10/02 21:43:12 markd Exp $ +# $NetBSD: l10n.mk,v 1.2 2009/10/11 08:13:38 markd Exp $ # This file provides useful defaults for the l10n packages of koffice. # @@ -21,8 +21,6 @@ COMMENT= ${KOFFICE_LANGUAGE} language pack for KDE4 .include "../../meta-pkgs/kde4/Makefile.kde4" -PKG_DESTDIR_SUPPORT= user-destdir - USE_TOOLS+= msgfmt BUILDLINK_DEPMETHOD.qt4-libs= build diff --git a/misc/kdeaccessibility4/Makefile b/misc/kdeaccessibility4/Makefile index 7e70a44a354..6670e78f710 100644 --- a/misc/kdeaccessibility4/Makefile +++ b/misc/kdeaccessibility4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:41:53 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $ DISTNAME= kdeaccessibility-${_KDE_VERSION} CATEGORIES= misc @@ -8,8 +8,6 @@ COMMENT= Accessibility support for the KDE integrated X11 desktop # BUILD_MAKE_FLAGS+= VERBOSE=1 -PKG_DESTDIR_SUPPORT= user-destdir - CMAKE_ARGS+= -DKDE4_KTTSD_ALSA:BOOL=OFF .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/misc/kdeaccessibility4/distinfo b/misc/kdeaccessibility4/distinfo index e0c93cadca2..d7b070ff6d2 100644 --- a/misc/kdeaccessibility4/distinfo +++ b/misc/kdeaccessibility4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:41:53 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:38 markd Exp $ -SHA1 (kdeaccessibility-4.3.1.tar.bz2) = bc9c56beb161ddf6c1474d356360ec75db0733bc -RMD160 (kdeaccessibility-4.3.1.tar.bz2) = db7f9d2c175dbe1f04e7b1b02596849cb10d9544 -Size (kdeaccessibility-4.3.1.tar.bz2) = 6590404 bytes +SHA1 (kdeaccessibility-4.3.2.tar.bz2) = f6aa2d3cfa74cb2808e02bd67aec8d58cd61ef30 +RMD160 (kdeaccessibility-4.3.2.tar.bz2) = 7983703eaf5d2bf602a94e5ba72e8659007d1767 +Size (kdeaccessibility-4.3.2.tar.bz2) = 6586792 bytes diff --git a/misc/kdeadmin4/Makefile b/misc/kdeadmin4/Makefile index 3e11beee99e..9e4bc22d415 100644 --- a/misc/kdeadmin4/Makefile +++ b/misc/kdeadmin4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:44:34 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $ DISTNAME= kdeadmin-${_KDE_VERSION} CATEGORIES= misc @@ -8,8 +8,6 @@ COMMENT= System administration tools for the KDE integrated X11 desktop # BUILD_MAKE_FLAGS+= VERBOSE=1 -PKG_DESTDIR_SUPPORT= user-destdir - .include "../../meta-pkgs/kde4/kde4.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/misc/kdeadmin4/distinfo b/misc/kdeadmin4/distinfo index dc25f765041..67b14569f22 100644 --- a/misc/kdeadmin4/distinfo +++ b/misc/kdeadmin4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:44:34 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:38 markd Exp $ -SHA1 (kdeadmin-4.3.1.tar.bz2) = 032933e521004046a46a7a3c01b5a03b2d6e75d4 -RMD160 (kdeadmin-4.3.1.tar.bz2) = e6cd337079df64b4a182e15232486d329d0b0064 -Size (kdeadmin-4.3.1.tar.bz2) = 1876808 bytes +SHA1 (kdeadmin-4.3.2.tar.bz2) = fc8978e921f1849b45b269d688b6baf2978555ab +RMD160 (kdeadmin-4.3.2.tar.bz2) = adb13372ad3799a7a1e49406fb016be799a5fce2 +Size (kdeadmin-4.3.2.tar.bz2) = 1877384 bytes diff --git a/misc/kdeartwork4/Makefile b/misc/kdeartwork4/Makefile index 1d9e835e3b5..0a8e3acc8d2 100644 --- a/misc/kdeartwork4/Makefile +++ b/misc/kdeartwork4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:47:41 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $ DISTNAME= kdeartwork-${_KDE_VERSION} CATEGORIES= misc @@ -11,8 +11,6 @@ CMAKE_ARGS+= -DXSCREENSAVER_DIR:PATH=${BUILDLINK_PREFIX.xscreensaver}/libexec/xs #BUILD_MAKE_FLAGS+= VERBOSE=1 -PKG_DESTDIR_SUPPORT= user-destdir - BUILDLINK_API_DEPENDS.xscreensaver+= xscreensaver>=5.00 .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/misc/kdeartwork4/distinfo b/misc/kdeartwork4/distinfo index 6de50a415b6..f5dcdd8319c 100644 --- a/misc/kdeartwork4/distinfo +++ b/misc/kdeartwork4/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:47:41 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:38 markd Exp $ -SHA1 (kdeartwork-4.3.1.tar.bz2) = 9db5c69723bdc9f203e4f854d505c0f87a6dda0d -RMD160 (kdeartwork-4.3.1.tar.bz2) = 5b4f3b9c40beb12c4cc7c9830f00ed58f24fbd37 -Size (kdeartwork-4.3.1.tar.bz2) = 65324088 bytes +SHA1 (kdeartwork-4.3.2.tar.bz2) = c199fae3f37b1a86e46ca2ee7a176d34bf034c5d +RMD160 (kdeartwork-4.3.2.tar.bz2) = 6545205f7bcc84d99a19dbf3dcfd13ba9e7e6cb9 +Size (kdeartwork-4.3.2.tar.bz2) = 65394292 bytes SHA1 (patch-aa) = 9007028225dded2490e3181f853c17985bae9509 SHA1 (patch-ab) = 39d0bbd61000a1bb7f4513c41fb7c8f53e688097 diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile index b472a567199..b9c179fb4b0 100644 --- a/misc/kdeedu4/Makefile +++ b/misc/kdeedu4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:51:26 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $ DISTNAME= kdeedu-${_KDE_VERSION} CATEGORIES= misc @@ -8,8 +8,6 @@ COMMENT= Edu{tainment,cation} tools for the KDE integrated X11 desktop # BUILD_MAKE_FLAGS+= VERBOSE=1 -PKG_DESTDIR_SUPPORT= user-destdir - CMAKE_ARGS+= -DBUILD_kmplot:BOOL=OFF CMAKE_ARGS+= -DWITH_SBIG:BOOL=OFF # CMAKE_ARGS+= -DWITH_PyKDE4:BOOL=OFF # "sip: MarblePlacemarkModel is undefined" diff --git a/misc/kdeedu4/PLIST b/misc/kdeedu4/PLIST index 54a37601c8e..89fa334e026 100644 --- a/misc/kdeedu4/PLIST +++ b/misc/kdeedu4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 20:51:26 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:38 markd Exp $ bin/blinken bin/calgebra bin/geodatatest @@ -2627,8 +2627,9 @@ share/kde/apps/ktouch/german.number.ktouch.xml share/kde/apps/ktouch/german2.ktouch.xml share/kde/apps/ktouch/german3.ktouch.xml share/kde/apps/ktouch/he.keyboard.xml +share/kde/apps/ktouch/hu.keyboard.xml share/kde/apps/ktouch/hungarian.ktouch.xml -share/kde/apps/ktouch/hungarian_expert.ktouch.xml +share/kde/apps/ktouch/hungarian.expert.ktouch.xml share/kde/apps/ktouch/it.keyboard.xml share/kde/apps/ktouch/italian.ktouch.xml share/kde/apps/ktouch/ktouchui.rc diff --git a/misc/kdeedu4/distinfo b/misc/kdeedu4/distinfo index 17a411ed831..f85529ecbec 100644 --- a/misc/kdeedu4/distinfo +++ b/misc/kdeedu4/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:51:24 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:38 markd Exp $ -SHA1 (kdeedu-4.3.1.tar.bz2) = 6326cff7779dfadc1b18a3a6bbe7b0750fb7ceaf -RMD160 (kdeedu-4.3.1.tar.bz2) = dcb90ec4d3794131ea3387518fdbcb88e67c1118 -Size (kdeedu-4.3.1.tar.bz2) = 57866780 bytes +SHA1 (kdeedu-4.3.2.tar.bz2) = df274f08242b1dedbfecc5a1d2ce452dcfbb5735 +RMD160 (kdeedu-4.3.2.tar.bz2) = 1c835d8510ab9063b340e2f92d4fa756b02d4255 +Size (kdeedu-4.3.2.tar.bz2) = 57944404 bytes SHA1 (patch-aa) = 5e2f12e2c70e438524ace2d238c9119dd36695ed SHA1 (patch-ab) = 2ff0e901376e5a01abc26799049eb738b3eb2fd8 SHA1 (patch-ae) = 412adfe31664db087e66ce73428ee775dff858d3 diff --git a/misc/kdepim-runtime4/Makefile b/misc/kdepim-runtime4/Makefile index 33d5de57786..f474b0b3624 100644 --- a/misc/kdepim-runtime4/Makefile +++ b/misc/kdepim-runtime4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:54:04 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:38 markd Exp $ DISTNAME= kdepim-runtime-${_KDE_VERSION} CATEGORIES= misc @@ -6,8 +6,6 @@ COMMENT= Runtime requirements for the KDE PIM tools .include "../../meta-pkgs/kde4/Makefile.kde4" -PKG_DESTDIR_SUPPORT= user-destdir - # BUILD_MAKE_FLAGS+= VERBOSE=1 .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/misc/kdepim-runtime4/distinfo b/misc/kdepim-runtime4/distinfo index a43e05ea765..0c07108cdd5 100644 --- a/misc/kdepim-runtime4/distinfo +++ b/misc/kdepim-runtime4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:54:04 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:38 markd Exp $ -SHA1 (kdepim-runtime-4.3.1.tar.bz2) = c39b0fc1d3721fb8c6074ba6a174ad8716c6c604 -RMD160 (kdepim-runtime-4.3.1.tar.bz2) = d44d8cf1e5dbcc0b60edb4b4f3fae5e5e7f97c16 -Size (kdepim-runtime-4.3.1.tar.bz2) = 744306 bytes +SHA1 (kdepim-runtime-4.3.2.tar.bz2) = 2061f4b2845728a97aef6b64f679cbb8f3a50d91 +RMD160 (kdepim-runtime-4.3.2.tar.bz2) = 59aa306ba32e5be426e91c3eb21c31e183b3250d +Size (kdepim-runtime-4.3.2.tar.bz2) = 745106 bytes diff --git a/misc/kdepim4/Makefile b/misc/kdepim4/Makefile index 14ac396a78f..0967d1be7e3 100644 --- a/misc/kdepim4/Makefile +++ b/misc/kdepim4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 21:24:27 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:39 markd Exp $ DISTNAME= kdepim-${_KDE_VERSION} CATEGORIES= misc @@ -8,8 +8,6 @@ COMMENT= Personal Information Management tools for the KDE desktop # BUILD_MAKE_FLAGS+= VERBOSE=1 -PKG_DESTDIR_SUPPORT= user-destdir - CMAKE_ARGS+=-DMAL_BASE:STRING=${BUILDLINK_PREFIX.libmal} CHECK_PORTABILITY_SKIP+=ktimetracker/test/booktime-baddate.sh \ diff --git a/misc/kdepim4/PLIST b/misc/kdepim4/PLIST index f78d0c574a5..af583afbe2b 100644 --- a/misc/kdepim4/PLIST +++ b/misc/kdepim4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:39 markd Exp $ bin/akregator bin/akregatorstorageexporter bin/egroupwarewizard @@ -730,59 +730,35 @@ share/icons/oxygen/128x128/apps/kalarm.png share/icons/oxygen/128x128/apps/kleopatra.png share/icons/oxygen/16x16/actions/edit-delete-page.png share/icons/oxygen/16x16/actions/ldap_lookup.png -share/icons/oxygen/16x16/actions/mail-forwarded-replied.png -share/icons/oxygen/16x16/actions/mail-forwarded.png -share/icons/oxygen/16x16/actions/mail-reply-custom.png -share/icons/oxygen/16x16/actions/mail-signed-fully.png -share/icons/oxygen/16x16/actions/mail-signed-part.png -share/icons/oxygen/16x16/actions/mail-signed.png share/icons/oxygen/16x16/actions/smallclock.png share/icons/oxygen/16x16/actions/upindicator.png share/icons/oxygen/16x16/apps/kalarm.png share/icons/oxygen/16x16/apps/kleopatra.png share/icons/oxygen/16x16/apps/kmailcvt.png share/icons/oxygen/16x16/mimetypes/x-mail-distribution-list.png -share/icons/oxygen/16x16/status/mail-sent.png -share/icons/oxygen/16x16/status/mail-tagged.png -share/icons/oxygen/16x16/status/mail-task.png share/icons/oxygen/22x22/actions/button_fewer.png share/icons/oxygen/22x22/actions/button_more.png share/icons/oxygen/22x22/actions/checkmark.png share/icons/oxygen/22x22/actions/edit-delete-page.png -share/icons/oxygen/22x22/actions/mail-reply-custom.png share/icons/oxygen/22x22/apps/kalarm.png share/icons/oxygen/22x22/apps/kleopatra.png share/icons/oxygen/22x22/mimetypes/x-mail-distribution-list.png -share/icons/oxygen/22x22/status/mail-tagged.png -share/icons/oxygen/22x22/status/mail-task.png share/icons/oxygen/32x32/actions/edit-delete-page.png -share/icons/oxygen/32x32/actions/mail-reply-custom.png share/icons/oxygen/32x32/apps/kalarm.png share/icons/oxygen/32x32/apps/kleopatra.png share/icons/oxygen/32x32/apps/kmailcvt.png share/icons/oxygen/32x32/mimetypes/x-mail-distribution-list.png -share/icons/oxygen/32x32/status/mail-tagged.png share/icons/oxygen/48x48/actions/edit-delete-page.png -share/icons/oxygen/48x48/actions/mail-reply-custom.png share/icons/oxygen/48x48/apps/kalarm.png share/icons/oxygen/48x48/apps/kleopatra.png share/icons/oxygen/48x48/apps/kmailcvt.png share/icons/oxygen/48x48/mimetypes/x-mail-distribution-list.png -share/icons/oxygen/48x48/status/mail-tagged.png share/icons/oxygen/64x64/apps/kalarm.png share/icons/oxygen/64x64/apps/kleopatra.png share/icons/oxygen/scalable/actions/edit-delete-page.svgz -share/icons/oxygen/scalable/actions/mail-forwarded-replied.svgz -share/icons/oxygen/scalable/actions/mail-forwarded.svgz -share/icons/oxygen/scalable/actions/mail-reply-custom.svgz -share/icons/oxygen/scalable/actions/mail-signed-fully.svgz -share/icons/oxygen/scalable/actions/mail-signed-part.svgz -share/icons/oxygen/scalable/actions/mail-signed.svgz share/icons/oxygen/scalable/apps/kalarm.svgz share/icons/oxygen/scalable/apps/kleopatra.svgz share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz -share/icons/oxygen/scalable/status/mail-tagged.svgz -share/icons/oxygen/scalable/status/mail-task.svgz share/kde/apps/akregator/about/akregator.css share/kde/apps/akregator/about/main.html share/kde/apps/akregator/about/top-left-akregator.png diff --git a/misc/kdepim4/distinfo b/misc/kdepim4/distinfo index e5430248d04..d8beaa828f0 100644 --- a/misc/kdepim4/distinfo +++ b/misc/kdepim4/distinfo @@ -1,12 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 21:24:27 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:39 markd Exp $ -SHA1 (kdepim-4.3.1.tar.bz2) = 6fd0309dbd911e2667ec1c08d1f10f2626a54534 -RMD160 (kdepim-4.3.1.tar.bz2) = fb1cac7ddb1e656c537f8db8abf2b4340db10171 -Size (kdepim-4.3.1.tar.bz2) = 11323109 bytes +SHA1 (kdepim-4.3.2.tar.bz2) = 0de9c7f1c4544f7520128016a6e06f10e6ed1173 +RMD160 (kdepim-4.3.2.tar.bz2) = b22f2888582f2623c07cf96110e0d340938c109f +Size (kdepim-4.3.2.tar.bz2) = 11250502 bytes SHA1 (patch-ab) = 234c88df2dcb633f8c58039b34694a606dc48494 SHA1 (patch-ac) = fa109df4489b5bad67b19272d1d3fee4fd934c18 SHA1 (patch-ad) = 9c7fbc7223b74cafc30626a024b0177d9e80ad8f -SHA1 (patch-ae) = 473c76678f4d0329fb6e9bcc1bad44eb0c7192ac -SHA1 (patch-af) = 5d6f44cfcadb47fd71f024d0bb2c78d9d4dcb7a7 -SHA1 (patch-ag) = 03a751708b841d4f1bc22d33ccdc6efbcb4d6536 -SHA1 (patch-ah) = 04b0b44700daf3179d38f40227b1f734712ed107 diff --git a/misc/kdepim4/patches/patch-ae b/misc/kdepim4/patches/patch-ae deleted file mode 100644 index 410961e5cba..00000000000 --- a/misc/kdepim4/patches/patch-ae +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $ - -KDE svn 1019115 - ---- libkdepim/addresseelineedit.cpp.orig 2009-08-27 20:18:28.000000000 +1200 -+++ libkdepim/addresseelineedit.cpp -@@ -800,7 +800,7 @@ void AddresseeLineEdit::startLoadingLDAP - - void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs ) - { -- if ( s_LDAPLineEdit != this ) { -+ if ( adrs.isEmpty() || s_LDAPLineEdit != this ) { - return; - } - diff --git a/misc/kdepim4/patches/patch-af b/misc/kdepim4/patches/patch-af deleted file mode 100644 index ced979fadc0..00000000000 --- a/misc/kdepim4/patches/patch-af +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $ - -KDE svn 1022963 - ---- kmail/cachedimapjob.cpp.orig 2009-05-28 07:54:17.000000000 +1200 -+++ kmail/cachedimapjob.cpp -@@ -510,7 +510,7 @@ void CachedImapJob::slotPutMessageResult - bool b = kmkernel->iCalIface().isResourceQuiet(); - kmkernel->iCalIface().setResourceQuiet( true ); - -- mFolder->take( i ); -+ mFolder->takeTemporarily( i ); - mFolder->addMsgKeepUID( mMsg ); - mMsg->setTransferInProgress( false ); - diff --git a/misc/kdepim4/patches/patch-ag b/misc/kdepim4/patches/patch-ag deleted file mode 100644 index ea61a75d000..00000000000 --- a/misc/kdepim4/patches/patch-ag +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $ - -KDE svn 1022963 - ---- kmail/kmfoldercachedimap.h.orig 2009-05-28 07:54:17.000000000 +1200 -+++ kmail/kmfoldercachedimap.h -@@ -228,10 +228,23 @@ class KMFolderCachedImap : public KMFold - /** Reimplemented from KMFolder. Moving is not supported, so aParent must be 0. */ - virtual int rename( const QString &aName, KMFolderDir *aParent = 0 ); - -- /** Reimplemented from KMFolderMaildir */ -- virtual KMMessage *take( int idx ); - bool canDeleteMessages() const; - -+ /** -+ * Reimplemented from KMFolderMaildir -+ * This deletes the message permanently, also from the server. For this, -+ * rememberDeletion() is called, so that the message can be deleted from -+ * the server on the next sync. -+ */ -+ virtual KMMessage* take( int idx ); -+ -+ /** -+ * Like take(), only that the deletion is not remembered, i.e. the -+ * message will not be deleted from the server. Calling this can cause -+ * inconsistencies, so make sure you re-add the message later! -+ */ -+ void takeTemporarily( int idx ); -+ - /** Reimplemented from KMFolderMaildir */ - virtual int addMsg( KMMessage *msg, int *index_return = 0 ); - diff --git a/misc/kdepim4/patches/patch-ah b/misc/kdepim4/patches/patch-ah deleted file mode 100644 index 725df138b4c..00000000000 --- a/misc/kdepim4/patches/patch-ah +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2009/10/02 21:24:29 markd Exp $ - -KDE svn 1022963 and 1022964 - ---- kmail/kmfoldercachedimap.cpp.orig 2009-05-28 07:54:17.000000000 +1200 -+++ kmail/kmfoldercachedimap.cpp -@@ -527,6 +527,11 @@ KMMessage *KMFolderCachedImap::take( int - return KMFolderMaildir::take( idx ); - } - -+void KMFolderCachedImap::takeTemporarily( int idx ) -+{ -+ KMFolderMaildir::take( idx ); -+} -+ - int KMFolderCachedImap::addMsgInternal( KMMessage *msg, bool newMail, int *index_return ) - { - // Possible optimization: Only dirty if not filtered below -@@ -1673,6 +1678,11 @@ bool KMFolderCachedImap::deleteMessages( - job->start(); - return true; - } else { -+ -+ // Nothing to delete on the server, make sure the map is clear again. -+ // Normally this wouldn't be necessary, but there can be stale maps because of -+ // https://issues.kolab.org/issue3833. -+ mDeletedUIDsSinceLastSync.clear(); - return false; - } - } diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile index 94ce1164e13..aa294bc26e8 100644 --- a/misc/kdepimlibs4/Makefile +++ b/misc/kdepimlibs4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 21:27:09 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:39 markd Exp $ DISTNAME= kdepimlibs-${_KDE_VERSION} CATEGORIES= misc @@ -6,8 +6,6 @@ COMMENT= Support libraries for PIM for the KDE integrated X11 desktop .include "../../meta-pkgs/kde4/Makefile.kde4" -PKG_DESTDIR_SUPPORT= user-destdir - CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDEPimLibsDependencies.cmake REPLACE_PERL+= mailtransport/kconf_update/migrate-transports.pl diff --git a/misc/kdepimlibs4/distinfo b/misc/kdepimlibs4/distinfo index 91206731022..2a0a9b71dc4 100644 --- a/misc/kdepimlibs4/distinfo +++ b/misc/kdepimlibs4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 21:27:09 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:39 markd Exp $ -SHA1 (kdepimlibs-4.3.1.tar.bz2) = f4b04b21a6aa3accc530bc6c32cf0d820c611265 -RMD160 (kdepimlibs-4.3.1.tar.bz2) = f515ab60014d6e5621ac4e50b332ac9c8407bf7d -Size (kdepimlibs-4.3.1.tar.bz2) = 1779777 bytes +SHA1 (kdepimlibs-4.3.2.tar.bz2) = 1d48b9619e04da121e6233bfb081377afa7c327a +RMD160 (kdepimlibs-4.3.2.tar.bz2) = 56e1bfd6f5c55091f0915c6aa7d30b88ffdac32f +Size (kdepimlibs-4.3.2.tar.bz2) = 1780884 bytes diff --git a/misc/kdeplasma-addons4/Makefile b/misc/kdeplasma-addons4/Makefile index 4eb79c31ddc..d1b94eb4ea2 100644 --- a/misc/kdeplasma-addons4/Makefile +++ b/misc/kdeplasma-addons4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 21:30:03 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:39 markd Exp $ DISTNAME= kdeplasma-addons-${_KDE_VERSION} CATEGORIES= misc @@ -8,8 +8,6 @@ COMMENT= Plasmoids # BUILD_MAKE_FLAGS+= VERBOSE=1 -PKG_DESTDIR_SUPPORT= user-destdir - .include "../../meta-pkgs/kde4/kde4.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/misc/kdeplasma-addons4/PLIST b/misc/kdeplasma-addons4/PLIST index 883aee2063b..af34e7c10b4 100644 --- a/misc/kdeplasma-addons4/PLIST +++ b/misc/kdeplasma-addons4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 21:30:03 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:39 markd Exp $ bin/lancelot include/conversion/converter.h include/conversion/plasmaconversion_export.h @@ -137,9 +137,9 @@ share/icons/hicolor/64x64/apps/bball.png share/icons/hicolor/64x64/apps/lancelot-part.png share/icons/hicolor/64x64/apps/lancelot.png share/icons/hicolor/64x64/apps/previewer.png +share/icons/hicolor/scalable/apps/accessories-dictionary.svgz share/icons/hicolor/scalable/apps/bball.svgz share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz -share/icons/oxygen/scalable/apps/accessories-dictionary.svgz share/kde/apps/bball/bball.svgz share/kde/apps/bball/bounce.ogg share/kde/apps/bball/football.svgz @@ -212,7 +212,6 @@ share/kde/apps/desktoptheme/default/widgets/eyes.svg share/kde/apps/desktoptheme/default/widgets/luna.svgz share/kde/apps/desktoptheme/default/widgets/microblog.svgz share/kde/apps/desktoptheme/default/widgets/notes.svgz -share/kde/apps/desktoptheme/default/widgets/picture-frame-default.svgz share/kde/apps/desktoptheme/default/widgets/previewer-16.svgz share/kde/apps/desktoptheme/default/widgets/previewer-22.svgz share/kde/apps/desktoptheme/default/widgets/timer.svgz @@ -274,6 +273,7 @@ share/kde/apps/desktoptheme/slim-glow/lancelot/system-buttons-extender.svgz share/kde/apps/desktoptheme/slim-glow/lancelot/system-buttons.svgz share/kde/apps/desktoptheme/slim-glow/lancelot/theme.config share/kde/apps/lancelot/lancelot.notifyrc +share/kde/apps/plasma-applet-frame/picture-frame-default.jpg share/kde/apps/plasma-applet-opendesktop/user.css share/kde/apps/plasma/services/rtmauth.operations share/kde/apps/plasma/services/rtmtask.operations diff --git a/misc/kdeplasma-addons4/distinfo b/misc/kdeplasma-addons4/distinfo index 151d557b419..0a776a5d73f 100644 --- a/misc/kdeplasma-addons4/distinfo +++ b/misc/kdeplasma-addons4/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 21:30:03 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:39 markd Exp $ -SHA1 (kdeplasma-addons-4.3.1.tar.bz2) = 83421181dd3a80c4ac0ff5bab111b7f71f6a1192 -RMD160 (kdeplasma-addons-4.3.1.tar.bz2) = 6197ec2ef392fa2b836b04708dedcbbb49eaee22 -Size (kdeplasma-addons-4.3.1.tar.bz2) = 1448440 bytes +SHA1 (kdeplasma-addons-4.3.2.tar.bz2) = ecbb3ebe64eccf41a567bdf98e741b14a05536f4 +RMD160 (kdeplasma-addons-4.3.2.tar.bz2) = 03492475a4964e28d2dd91970ada31db3045ea1a +Size (kdeplasma-addons-4.3.2.tar.bz2) = 1453471 bytes SHA1 (patch-aa) = ea5181ba97e93c89ee331fec3737a639196733a0 diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile index d50ac221bb5..5f5c07cb802 100644 --- a/misc/kdeutils4/Makefile +++ b/misc/kdeutils4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 21:33:16 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:39 markd Exp $ DISTNAME= kdeutils-${_KDE_VERSION} CATEGORIES= misc @@ -12,8 +12,6 @@ CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN} # BUILD_MAKE_FLAGS+= VERBOSE=1 -PKG_DESTDIR_SUPPORT= user-destdir - BUILDLINK_DEPMETHOD.qt4-tools= full .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/misc/kdeutils4/PLIST b/misc/kdeutils4/PLIST index 07f10950d2c..ae99c8e840d 100644 --- a/misc/kdeutils4/PLIST +++ b/misc/kdeutils4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 21:33:16 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:39 markd Exp $ bin/ark bin/irkick bin/kcalc @@ -26,7 +26,7 @@ lib/kde4/kerfuffle_libgz.so lib/kde4/libarkpart.so lib/kde4/libextracthere.so lib/kde4/libkbytearrayedit.so -lib/kde4/liboktetapart.so +lib/kde4/oktetapart.so lib/kde4/plasma_package_superkaramba.so lib/kde4/plasma_scriptengine_superkaramba.so lib/libkdeinit4_irkick.so diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo index 774f11fd0ea..a9316c11bdc 100644 --- a/misc/kdeutils4/distinfo +++ b/misc/kdeutils4/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 21:33:16 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:39 markd Exp $ -SHA1 (kdeutils-4.3.1.tar.bz2) = 9743636306cfb137241b6c87f5944e6bf91870fe -RMD160 (kdeutils-4.3.1.tar.bz2) = 72dcc9d0a5592b371873398604e1bf59acb9eb4e -Size (kdeutils-4.3.1.tar.bz2) = 2524224 bytes -SHA1 (patch-aa) = 275e579aa5b99b7e2e4e0af719d6fd629f6bfd8b +SHA1 (kdeutils-4.3.2.tar.bz2) = 16a4193d847e67abce215056c6eab2cbb348a1c8 +RMD160 (kdeutils-4.3.2.tar.bz2) = c0ae9f74cad3e9167dcf976c955e514ba6c3888e +Size (kdeutils-4.3.2.tar.bz2) = 2524369 bytes diff --git a/misc/kdeutils4/patches/patch-aa b/misc/kdeutils4/patches/patch-aa deleted file mode 100644 index 22a76ac6120..00000000000 --- a/misc/kdeutils4/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/10/02 21:33:16 markd Exp $ - -removing kscd profile as it is delivered by kscd. -fixed in kde svn. - ---- kdelirc/profiles/CMakeLists.txt.orig 2009-08-27 20:17:24.000000000 +1200 -+++ kdelirc/profiles/CMakeLists.txt -@@ -11,7 +11,6 @@ install( FILES - konqueror.profile.xml - suspend.profile.xml - shutdown.profile.xml -- kscd.profile.xml - DESTINATION ${DATA_INSTALL_DIR}/profiles) - - diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 820000675cd..123aad7ccce 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:39 markd Exp $ DISTNAME= kdemultimedia-${_KDE_VERSION} CATEGORIES= multimedia @@ -8,8 +8,6 @@ COMMENT= Multimedia tools for the KDE integrated X11 desktop # BUILD_MAKE_FLAGS+= VERBOSE=1 -PKG_DESTDIR_SUPPORT= user-destdir - DEPENDS+= xine-xcb>=1.1.9:../../x11/xine-xcb .include "../../mk/bsd.prefs.mk" diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo index 39e356c2d2a..6c9ff8e5fe0 100644 --- a/multimedia/kdemultimedia4/distinfo +++ b/multimedia/kdemultimedia4/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:39 markd Exp $ -SHA1 (kdemultimedia-4.3.1.tar.bz2) = ef50f869f1a6cdf91fe7808f095fccbd9463a7dd -RMD160 (kdemultimedia-4.3.1.tar.bz2) = 893453f71b12969c2b16df2b4b5361edab6a7ef0 -Size (kdemultimedia-4.3.1.tar.bz2) = 1585744 bytes +SHA1 (kdemultimedia-4.3.2.tar.bz2) = 22fe17528685799e03f1caf583c7e7b021f2ddd7 +RMD160 (kdemultimedia-4.3.2.tar.bz2) = 2041e7acbd5603ae002445a0c4932c916c82c2ee +Size (kdemultimedia-4.3.2.tar.bz2) = 1588275 bytes SHA1 (patch-ac) = 729f99548af7a21b98e5aa746cca7699f7880800 SHA1 (patch-ad) = 8901537664189b95f54f06b429362ac15df5afa9 SHA1 (patch-af) = c6ce9d8c45ca25ce5fb9ea8f0e26344cc7c70e15 diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index ee155ff9b4b..1f45fbf9d9a 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:17:15 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:39 markd Exp $ DISTNAME= kdenetwork-${_KDE_VERSION} CATEGORIES= net @@ -10,8 +10,6 @@ CONFLICTS= kopete-[0-9]* # BUILD_MAKE_FLAGS+= VERBOSE=1 -PKG_DESTDIR_SUPPORT= user-destdir - # for kded_dnssdwatcher UNLIMIT_RESOURCES+= datasize memorysize stacksize @@ -27,8 +25,8 @@ REPLACE_PERL+= \ REPLACE_SH+= \ kopete/protocols/skype/call_end \ kopete/protocols/skype/call_start \ - kopete/protocols/winpopup/winpopup-install.sh \ - kopete/protocols/winpopup/winpopup-send.sh + kopete/protocols/winpopup/winpopup-install \ + kopete/protocols/winpopup/winpopup-send .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/net/kdenetwork4/PLIST b/net/kdenetwork4/PLIST index d070e083b30..448130ff1e8 100644 --- a/net/kdenetwork4/PLIST +++ b/net/kdenetwork4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 20:17:16 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:39 markd Exp $ bin/kget bin/kopete bin/kopete_latexconvert.sh @@ -7,8 +7,8 @@ bin/kppplogview bin/krdc bin/krfb bin/skype-action-handler -bin/winpopup-install.sh -bin/winpopup-send.sh +bin/winpopup-install +bin/winpopup-send include/kopete/kabcpersistence.h include/kopete/kopete_export.h include/kopete/kopeteaccount.h diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo index 741a366d34a..732bd068a99 100644 --- a/net/kdenetwork4/distinfo +++ b/net/kdenetwork4/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:17:15 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:39 markd Exp $ -SHA1 (kdenetwork-4.3.1.tar.bz2) = 57194b5f89b37329e562951c491fa18029c0b431 -RMD160 (kdenetwork-4.3.1.tar.bz2) = 82248233d954f45765706cb898911e4612eee1f9 -Size (kdenetwork-4.3.1.tar.bz2) = 7382818 bytes +SHA1 (kdenetwork-4.3.2.tar.bz2) = 7b384e11b551c9d1113cc39d318ca1b9d7712864 +RMD160 (kdenetwork-4.3.2.tar.bz2) = 45dccc0ad35041be39bbea3d014927362cfbe307 +Size (kdenetwork-4.3.2.tar.bz2) = 7378385 bytes SHA1 (patch-aa) = 0359cd86501c57197242c398d63c1fc77c60a4d0 SHA1 (patch-ab) = 0743b3b6c994623c507b8bcd52ee01dad31cf56f diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile index d88f11eb5a7..c5083762ea6 100644 --- a/www/kdewebdev4/Makefile +++ b/www/kdewebdev4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:00:13 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:39 markd Exp $ DISTNAME= kdewebdev-${_KDE_VERSION} CATEGORIES= www @@ -8,8 +8,6 @@ COMMENT= HTML editor and tools suitable for experienced web developers # BUILD_MAKE_FLAGS+= VERBOSE=1 -PKG_DESTDIR_SUPPORT= user-destdir - .include "../../meta-pkgs/kde4/kde4.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/www/kdewebdev4/distinfo b/www/kdewebdev4/distinfo index dd0cdbd18ec..9d4408200b1 100644 --- a/www/kdewebdev4/distinfo +++ b/www/kdewebdev4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:00:13 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:39 markd Exp $ -SHA1 (kdewebdev-4.3.1.tar.bz2) = 28580c6f283fa7a6405f6a4415ebe9a4167f0992 -RMD160 (kdewebdev-4.3.1.tar.bz2) = 44086e7da6213797a8297cebce5daacf4b5e3066 -Size (kdewebdev-4.3.1.tar.bz2) = 2525676 bytes +SHA1 (kdewebdev-4.3.2.tar.bz2) = e44a2e311bad8adc18ac4cc7dfd9942839a2dab3 +RMD160 (kdewebdev-4.3.2.tar.bz2) = 3aa6c359cdbed2c6c2ae922652ce0c6410985592 +Size (kdewebdev-4.3.2.tar.bz2) = 2528280 bytes diff --git a/x11/kde4-l10n-de/PLIST b/x11/kde4-l10n-de/PLIST index 8cc967610bf..e97c8e7fe78 100644 --- a/x11/kde4-l10n-de/PLIST +++ b/x11/kde4-l10n-de/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 22:07:58 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $ man/de/man1/adddebug.1 man/de/man1/ark.1 man/de/man1/cheatmake.1 @@ -1884,7 +1884,6 @@ share/locale/de/LC_MESSAGES/kdat.mo share/locale/de/LC_MESSAGES/kde-menu.mo share/locale/de/LC_MESSAGES/kdeasciiquarium.mo share/locale/de/LC_MESSAGES/kdebugdialog.mo -share/locale/de/LC_MESSAGES/kded_phononserver.mo share/locale/de/LC_MESSAGES/kdelibs4.mo share/locale/de/LC_MESSAGES/kdelibs_colors4.mo share/locale/de/LC_MESSAGES/kdelirc.mo @@ -2185,6 +2184,7 @@ share/locale/de/LC_MESSAGES/parley.mo share/locale/de/LC_MESSAGES/phonon-xine.mo share/locale/de/LC_MESSAGES/phonon_gstreamer.mo share/locale/de/LC_MESSAGES/phonon_kde.mo +share/locale/de/LC_MESSAGES/phononserver.mo share/locale/de/LC_MESSAGES/plasma-desktop.mo share/locale/de/LC_MESSAGES/plasma-overlay.mo share/locale/de/LC_MESSAGES/plasma-shells-common.mo @@ -2248,9 +2248,9 @@ share/locale/de/LC_MESSAGES/plasma_applet_webbrowser.mo share/locale/de/LC_MESSAGES/plasma_appletscriptengine_dashboard.mo share/locale/de/LC_MESSAGES/plasma_appletscriptengine_googlegadget.mo share/locale/de/LC_MESSAGES/plasma_appletscriptengine_qedjescripts.mo -share/locale/de/LC_MESSAGES/plasma_engine_applicationjobs.mo share/locale/de/LC_MESSAGES/plasma_engine_kalzium.mo share/locale/de/LC_MESSAGES/plasma_engine_keystate.mo +share/locale/de/LC_MESSAGES/plasma_engine_kuiserver.mo share/locale/de/LC_MESSAGES/plasma_engine_metadata.mo share/locale/de/LC_MESSAGES/plasma_engine_network.mo share/locale/de/LC_MESSAGES/plasma_engine_notifications.mo diff --git a/x11/kde4-l10n-de/distinfo b/x11/kde4-l10n-de/distinfo index 414b3a529da..4db9be17073 100644 --- a/x11/kde4-l10n-de/distinfo +++ b/x11/kde4-l10n-de/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 22:07:58 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $ -SHA1 (kde-l10n-de-4.3.1.tar.bz2) = 862ce30f6c28be3891659c7e44c406430483bdc5 -RMD160 (kde-l10n-de-4.3.1.tar.bz2) = 314a0dc12c49867e8679a2ef2c7d6bd42ae45d1b -Size (kde-l10n-de-4.3.1.tar.bz2) = 20259404 bytes +SHA1 (kde-l10n-de-4.3.2.tar.bz2) = aa393d26e92670efb4167644720ba2aae6ca41cc +RMD160 (kde-l10n-de-4.3.2.tar.bz2) = 932e33b6dc91899f648a00581283d77fa6fcc2a1 +Size (kde-l10n-de-4.3.2.tar.bz2) = 20260134 bytes diff --git a/x11/kde4-l10n-en_GB/PLIST b/x11/kde4-l10n-en_GB/PLIST index e4090fa91b2..fffdd0de006 100644 --- a/x11/kde4-l10n-en_GB/PLIST +++ b/x11/kde4-l10n-en_GB/PLIST @@ -1,7 +1,11 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 22:14:22 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $ share/doc/kde/HTML/en_GB/cervisia/common share/doc/kde/HTML/en_GB/cervisia/index.cache.bz2 share/doc/kde/HTML/en_GB/cervisia/index.docbook +share/doc/kde/HTML/en_GB/common/fdl-translated.html +share/doc/kde/HTML/en_GB/common/gpl-translated.html +share/doc/kde/HTML/en_GB/common/kde-localised.css +share/doc/kde/HTML/en_GB/common/lgpl-translated.html share/doc/kde/HTML/en_GB/kaddressbook/common share/doc/kde/HTML/en_GB/kaddressbook/index.cache.bz2 share/doc/kde/HTML/en_GB/kaddressbook/index.docbook @@ -700,7 +704,6 @@ share/locale/en_GB/LC_MESSAGES/kdat.mo share/locale/en_GB/LC_MESSAGES/kde-menu.mo share/locale/en_GB/LC_MESSAGES/kdeasciiquarium.mo share/locale/en_GB/LC_MESSAGES/kdebugdialog.mo -share/locale/en_GB/LC_MESSAGES/kded_phononserver.mo share/locale/en_GB/LC_MESSAGES/kdelibs4.mo share/locale/en_GB/LC_MESSAGES/kdelibs_colors4.mo share/locale/en_GB/LC_MESSAGES/kdelirc.mo @@ -1000,6 +1003,7 @@ share/locale/en_GB/LC_MESSAGES/parley.mo share/locale/en_GB/LC_MESSAGES/phonon-xine.mo share/locale/en_GB/LC_MESSAGES/phonon_gstreamer.mo share/locale/en_GB/LC_MESSAGES/phonon_kde.mo +share/locale/en_GB/LC_MESSAGES/phononserver.mo share/locale/en_GB/LC_MESSAGES/plasma-desktop.mo share/locale/en_GB/LC_MESSAGES/plasma-overlay.mo share/locale/en_GB/LC_MESSAGES/plasma-shells-common.mo @@ -1063,8 +1067,8 @@ share/locale/en_GB/LC_MESSAGES/plasma_applet_webbrowser.mo share/locale/en_GB/LC_MESSAGES/plasma_appletscriptengine_dashboard.mo share/locale/en_GB/LC_MESSAGES/plasma_appletscriptengine_googlegadget.mo share/locale/en_GB/LC_MESSAGES/plasma_appletscriptengine_qedjescripts.mo -share/locale/en_GB/LC_MESSAGES/plasma_engine_applicationjobs.mo share/locale/en_GB/LC_MESSAGES/plasma_engine_kalzium.mo +share/locale/en_GB/LC_MESSAGES/plasma_engine_kuiserver.mo share/locale/en_GB/LC_MESSAGES/plasma_engine_metadata.mo share/locale/en_GB/LC_MESSAGES/plasma_engine_network.mo share/locale/en_GB/LC_MESSAGES/plasma_engine_notifications.mo diff --git a/x11/kde4-l10n-en_GB/distinfo b/x11/kde4-l10n-en_GB/distinfo index e2601bd160b..01e273cad09 100644 --- a/x11/kde4-l10n-en_GB/distinfo +++ b/x11/kde4-l10n-en_GB/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 22:14:22 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $ -SHA1 (kde-l10n-en_GB-4.3.1.tar.bz2) = e8373c53b310215b73417417c0403a1662a5dbd1 -RMD160 (kde-l10n-en_GB-4.3.1.tar.bz2) = 53c78fef13e7b17d45c04aa371232b112ad12053 -Size (kde-l10n-en_GB-4.3.1.tar.bz2) = 3856885 bytes +SHA1 (kde-l10n-en_GB-4.3.2.tar.bz2) = 45fc26b7a30ac618571acf72501bd1a99f212cbf +RMD160 (kde-l10n-en_GB-4.3.2.tar.bz2) = c9b18b0f63dfa46c926b9d93a942a744b42b04f7 +Size (kde-l10n-en_GB-4.3.2.tar.bz2) = 3876532 bytes diff --git a/x11/kde4-l10n-nl/PLIST b/x11/kde4-l10n-nl/PLIST index fef85a48902..a64a0f0cecc 100644 --- a/x11/kde4-l10n-nl/PLIST +++ b/x11/kde4-l10n-nl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 22:26:20 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $ man/nl/man1/fixincludes.1 man/nl/man1/kalzium.1 man/nl/man1/kappfinder.1 @@ -14,6 +14,10 @@ man/nl/man1/qtdoc.1 man/nl/man1/split2po.1 man/nl/man1/swappo.1 man/nl/man6/kpat.6 +share/doc/kde/HTML/nl/common/fdl-translated.html +share/doc/kde/HTML/nl/common/gpl-translated.html +share/doc/kde/HTML/nl/common/kde-localised.css +share/doc/kde/HTML/nl/common/lgpl-translated.html share/doc/kde/HTML/nl/irkick/common share/doc/kde/HTML/nl/irkick/index.cache.bz2 share/doc/kde/HTML/nl/irkick/index.docbook @@ -1101,7 +1105,6 @@ share/locale/nl/LC_MESSAGES/kdat.mo share/locale/nl/LC_MESSAGES/kde-menu.mo share/locale/nl/LC_MESSAGES/kdeasciiquarium.mo share/locale/nl/LC_MESSAGES/kdebugdialog.mo -share/locale/nl/LC_MESSAGES/kded_phononserver.mo share/locale/nl/LC_MESSAGES/kdelibs4.mo share/locale/nl/LC_MESSAGES/kdelibs_colors4.mo share/locale/nl/LC_MESSAGES/kdelirc.mo @@ -1402,6 +1405,7 @@ share/locale/nl/LC_MESSAGES/parley.mo share/locale/nl/LC_MESSAGES/phonon-xine.mo share/locale/nl/LC_MESSAGES/phonon_gstreamer.mo share/locale/nl/LC_MESSAGES/phonon_kde.mo +share/locale/nl/LC_MESSAGES/phononserver.mo share/locale/nl/LC_MESSAGES/plasma-desktop.mo share/locale/nl/LC_MESSAGES/plasma-overlay.mo share/locale/nl/LC_MESSAGES/plasma-shells-common.mo @@ -1465,9 +1469,9 @@ share/locale/nl/LC_MESSAGES/plasma_applet_webbrowser.mo share/locale/nl/LC_MESSAGES/plasma_appletscriptengine_dashboard.mo share/locale/nl/LC_MESSAGES/plasma_appletscriptengine_googlegadget.mo share/locale/nl/LC_MESSAGES/plasma_appletscriptengine_qedjescripts.mo -share/locale/nl/LC_MESSAGES/plasma_engine_applicationjobs.mo share/locale/nl/LC_MESSAGES/plasma_engine_kalzium.mo share/locale/nl/LC_MESSAGES/plasma_engine_keystate.mo +share/locale/nl/LC_MESSAGES/plasma_engine_kuiserver.mo share/locale/nl/LC_MESSAGES/plasma_engine_metadata.mo share/locale/nl/LC_MESSAGES/plasma_engine_network.mo share/locale/nl/LC_MESSAGES/plasma_engine_notifications.mo diff --git a/x11/kde4-l10n-nl/distinfo b/x11/kde4-l10n-nl/distinfo index be42c9b8e6d..66444ca7be9 100644 --- a/x11/kde4-l10n-nl/distinfo +++ b/x11/kde4-l10n-nl/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 22:26:20 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $ -SHA1 (kde-l10n-nl-4.3.1.tar.bz2) = b3d1a714dc4ed767c0a3cc9fbce0512757a3656e -RMD160 (kde-l10n-nl-4.3.1.tar.bz2) = 93a478f0f75d56570a663465462b5dff1a9d9761 -Size (kde-l10n-nl-4.3.1.tar.bz2) = 12966042 bytes +SHA1 (kde-l10n-nl-4.3.2.tar.bz2) = 4d0eb15547ecaafc717337f9ac91472fb277bb27 +RMD160 (kde-l10n-nl-4.3.2.tar.bz2) = fca6b9a97dc2348bc95110c9d04dbbb8a7bdc2e9 +Size (kde-l10n-nl-4.3.2.tar.bz2) = 12994611 bytes diff --git a/x11/kdebase-runtime4/Makefile b/x11/kdebase-runtime4/Makefile index 1c3bb4994ef..95f46d909fa 100644 --- a/x11/kdebase-runtime4/Makefile +++ b/x11/kdebase-runtime4/Makefile @@ -1,14 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2009/10/06 14:06:27 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2009/10/11 08:13:40 markd Exp $ DISTNAME= kdebase-runtime-${_KDE_VERSION} -PKGREVISION= 1 CATEGORIES= x11 COMMENT= Runtime requirements for the KDE integrated X11 desktop .include "../../meta-pkgs/kde4/Makefile.kde4" -PKG_DESTDIR_SUPPORT= user-destdir - # BUILD_MAKE_FLAGS+= VERBOSE=1 CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=off diff --git a/x11/kdebase-runtime4/distinfo b/x11/kdebase-runtime4/distinfo index 29ce9178c46..4597fabe15d 100644 --- a/x11/kdebase-runtime4/distinfo +++ b/x11/kdebase-runtime4/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 19:30:13 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $ -SHA1 (kdebase-runtime-4.3.1.tar.bz2) = 4cb7a4ed093bacf01d5ecff1cbc60a8934dea59c -RMD160 (kdebase-runtime-4.3.1.tar.bz2) = febfcff745a5021d9ad793fac4d3067c2bbeb846 -Size (kdebase-runtime-4.3.1.tar.bz2) = 7260641 bytes +SHA1 (kdebase-runtime-4.3.2.tar.bz2) = 33bb1da691d1ab75d1fbe5bcac38f105cddab709 +RMD160 (kdebase-runtime-4.3.2.tar.bz2) = e3694468e6056ffea03a922a3b7fb01db3c6fc4f +Size (kdebase-runtime-4.3.2.tar.bz2) = 7331247 bytes SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c SHA1 (patch-ac) = 6bb21775f48d7a7155712524162a2de736391f40 SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4 diff --git a/x11/kdebase-workspace4/Makefile b/x11/kdebase-workspace4/Makefile index 3345a578f6d..61c1bf26498 100644 --- a/x11/kdebase-workspace4/Makefile +++ b/x11/kdebase-workspace4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:40 markd Exp $ DISTNAME= kdebase-workspace-${_KDE_VERSION} CATEGORIES= x11 @@ -14,8 +14,6 @@ SITES.NetBSD-flag-1.0.png= ${MASTER_SITE_LOCAL} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -PKG_DESTDIR_SUPPORT= user-destdir - # BUILD_MAKE_FLAGS+= VERBOSE=1 USE_TOOLS+= mkfontdir bdftopcf diff --git a/x11/kdebase-workspace4/PLIST b/x11/kdebase-workspace4/PLIST index ad658f8e534..c8ab5d40a82 100644 --- a/x11/kdebase-workspace4/PLIST +++ b/x11/kdebase-workspace4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 19:37:22 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $ bin/genkdmconf bin/kaccess bin/kapplymousetheme @@ -417,8 +417,10 @@ share/doc/kde/HTML/en/kcontrol/colors/common share/doc/kde/HTML/en/kcontrol/colors/index.cache.bz2 share/doc/kde/HTML/en/kcontrol/colors/index.docbook share/doc/kde/HTML/en/kcontrol/desktopthemedetails/common +share/doc/kde/HTML/en/kcontrol/desktopthemedetails/desktop-settings.png share/doc/kde/HTML/en/kcontrol/desktopthemedetails/index.cache.bz2 share/doc/kde/HTML/en/kcontrol/desktopthemedetails/index.docbook +share/doc/kde/HTML/en/kcontrol/desktopthemedetails/message.png share/doc/kde/HTML/en/kcontrol/energy/common share/doc/kde/HTML/en/kcontrol/energy/index.cache.bz2 share/doc/kde/HTML/en/kcontrol/energy/index.docbook diff --git a/x11/kdebase-workspace4/distinfo b/x11/kdebase-workspace4/distinfo index 2a8db7318fa..088ad02f8cf 100644 --- a/x11/kdebase-workspace4/distinfo +++ b/x11/kdebase-workspace4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 19:37:19 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $ SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 @@ -9,9 +9,9 @@ Size (Daemon.png) = 15725 bytes SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0 Size (NetBSD-flag-1.0.png) = 4532 bytes -SHA1 (kdebase-workspace-4.3.1.tar.bz2) = c21a6e8028aa993878cccccb26b2611b3337eac9 -RMD160 (kdebase-workspace-4.3.1.tar.bz2) = 1db4e5428a497efff6910b5e1442eaffd2d0bad0 -Size (kdebase-workspace-4.3.1.tar.bz2) = 62286316 bytes +SHA1 (kdebase-workspace-4.3.2.tar.bz2) = 3a07f3e64abd324e0b8a3aeab1ae2c13e75ea026 +RMD160 (kdebase-workspace-4.3.2.tar.bz2) = e3dc7959e8a51091cf5e32c367549d7666453efb +Size (kdebase-workspace-4.3.2.tar.bz2) = 62494257 bytes SHA1 (patch-ab) = a1dc303cdb27bb4cb3067d347baedabefbca8353 SHA1 (patch-ac) = 5420c39a055e6208097cf48db5513f7c9db09bef SHA1 (patch-ad) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84 diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 6135d39a89d..1b37ae769a5 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 19:43:39 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:40 markd Exp $ DISTNAME= kdebase-${_KDE_VERSION} CATEGORIES= x11 @@ -13,8 +13,6 @@ COMMENT= Base modules for the KDE 4 integrated X11 desktop # .../kdebase-4.2.2/apps/konsole/src/ColorSchemeEditor.cpp:36:34: error: ui_ColorSchemeEditor.h: No such file or directory MAKE_JOBS_SAFE= no -PKG_DESTDIR_SUPPORT= user-destdir - .include "../../meta-pkgs/kde4/kde4.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo index 2af78438605..862e1aac25e 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 19:43:39 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $ -SHA1 (kdebase-4.3.1.tar.bz2) = 005681277615a0a3ec737bdd07989763fa1ae781 -RMD160 (kdebase-4.3.1.tar.bz2) = 442706f75ba6da90cb38677c49046b313ce6b7d1 -Size (kdebase-4.3.1.tar.bz2) = 4263214 bytes +SHA1 (kdebase-4.3.2.tar.bz2) = c9c65dc596c8c48974fbe4099f340371de147fa8 +RMD160 (kdebase-4.3.2.tar.bz2) = 9d34189746ee7b99840388d1a45d6ffaef795f19 +Size (kdebase-4.3.2.tar.bz2) = 4273532 bytes +SHA1 (patch-aa) = a25428863150185b0a389ed260e186a6b30cb6fb diff --git a/x11/kdebase4/patches/patch-aa b/x11/kdebase4/patches/patch-aa new file mode 100644 index 00000000000..fb0b6f5265a --- /dev/null +++ b/x11/kdebase4/patches/patch-aa @@ -0,0 +1,30 @@ +$NetBSD: patch-aa,v 1.1 2009/10/11 08:13:40 markd Exp $ + +KDE svn 1032180 + +--- apps/dolphin/src/panels/terminal/terminalpanel.cpp.orig 2009-08-27 20:17:51.000000000 +1200 ++++ apps/dolphin/src/panels/terminal/terminalpanel.cpp +@@ -23,7 +23,6 @@ + #include <kde_terminal_interface_v2.h> + #include <kparts/part.h> + #include <kshell.h> +-#include <kio/netaccess.h> + + #include <QBoxLayout> + #include <QShowEvent> +@@ -58,13 +57,12 @@ void TerminalPanel::setUrl(const KUrl& u + } + + Panel::setUrl(url); +- KUrl mostLocalUrl = KIO::NetAccess::mostLocalUrl(url, 0); + const bool sendInput = (m_terminal != 0) + && (m_terminal->foregroundProcessId() == -1) + && isVisible() +- && mostLocalUrl.isLocalFile(); ++ && url.isLocalFile(); + if (sendInput) { +- m_terminal->sendInput("cd " + KShell::quoteArg(mostLocalUrl.toLocalFile()) + '\n'); ++ m_terminal->sendInput("cd " + KShell::quoteArg(url.toLocalFile()) + '\n'); + } + + } diff --git a/x11/kdebindings4-python/Makefile b/x11/kdebindings4-python/Makefile index 1509fca917d..4acae8a2e09 100644 --- a/x11/kdebindings4-python/Makefile +++ b/x11/kdebindings4-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 19:47:47 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:40 markd Exp $ PKGNAME= kdebindings4-python-${_KDE_VERSION} DISTNAME= kdebindings-${_KDE_VERSION} @@ -7,8 +7,6 @@ COMMENT= Python bindings for the KDE integrated X11 desktop .include "../../meta-pkgs/kde4/Makefile.kde4" -PKG_DESTDIR_SUPPORT= user-destdir - # BUILD_MAKE_FLAGS+= VERBOSE=1 CMAKE_ARGS+= -DENABLE_SMOKE=off diff --git a/x11/kdebindings4-python/distinfo b/x11/kdebindings4-python/distinfo index 783952b259d..91728601e6e 100644 --- a/x11/kdebindings4-python/distinfo +++ b/x11/kdebindings4-python/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 19:47:47 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $ -SHA1 (kdebindings-4.3.1.tar.bz2) = bb414b1ab28b51d9bbbfaa2d9c8474b27c325c32 -RMD160 (kdebindings-4.3.1.tar.bz2) = bddbc6845c294fb10acd189b2c9e7575f97bd8b5 -Size (kdebindings-4.3.1.tar.bz2) = 4881053 bytes +SHA1 (kdebindings-4.3.2.tar.bz2) = 72416301dce5362535bd3c09ffd6d2f884409fc4 +RMD160 (kdebindings-4.3.2.tar.bz2) = 038aaddf18e2dee9f48ea48f767f77bec1799ec5 +Size (kdebindings-4.3.2.tar.bz2) = 4878928 bytes SHA1 (patch-aa) = f01b1d350a8e79e639f46c797baf035684275158 SHA1 (patch-ab) = cae51d216ad914009b4e9c80a17a172ec5a5eaec diff --git a/x11/kdelibs-experimental4/Makefile b/x11/kdelibs-experimental4/Makefile index 2a2d884856f..3ffc717e267 100644 --- a/x11/kdelibs-experimental4/Makefile +++ b/x11/kdelibs-experimental4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 19:23:22 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:40 markd Exp $ DISTNAME= kdelibs-experimental-${_KDE_VERSION} CATEGORIES= x11 @@ -6,8 +6,6 @@ COMMENT= Experimental libraries for the KDE integrated X11 desktop .include "../../meta-pkgs/kde4/Makefile.kde4" -PKG_DESTDIR_SUPPORT= user-destdir - # BUILD_MAKE_FLAGS+= VERBOSE=1 .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/x11/kdelibs-experimental4/PLIST b/x11/kdelibs-experimental4/PLIST index 74173f2b6c2..0bfe488d3d4 100644 --- a/x11/kdelibs-experimental4/PLIST +++ b/x11/kdelibs-experimental4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 19:23:22 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $ include/knotificationitem-1/knotificationitem.h include/knotificationitem-1/knotificationitem_export.h lib/libknotificationitem-1.so @@ -6,4 +6,3 @@ lib/libknotificationitem-1.so.1 lib/libknotificationitem-1.so.1.0.0 share/dbus-1/interfaces/org.kde.NotificationItem.xml share/dbus-1/interfaces/org.kde.NotificationItemWatcher.xml - diff --git a/x11/kdelibs-experimental4/distinfo b/x11/kdelibs-experimental4/distinfo index f88f74d18eb..f9f7c4b4ba9 100644 --- a/x11/kdelibs-experimental4/distinfo +++ b/x11/kdelibs-experimental4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 19:23:22 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $ -SHA1 (kdelibs-experimental-4.3.1.tar.bz2) = 7d560817a186c4b7099d321ee4a58705962a59d3 -RMD160 (kdelibs-experimental-4.3.1.tar.bz2) = a9c5c9882ed42d9d40c401b299588a5ecc8c59b3 -Size (kdelibs-experimental-4.3.1.tar.bz2) = 26920 bytes +SHA1 (kdelibs-experimental-4.3.2.tar.bz2) = 79e34cff9fdcca8fc0e06a0bf524b08abf815705 +RMD160 (kdelibs-experimental-4.3.2.tar.bz2) = 49c9005ffd4124f940c0c3088857e0add44afcfb +Size (kdelibs-experimental-4.3.2.tar.bz2) = 26904 bytes diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 435aa93a2e2..25f2c3703c3 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 19:18:59 markd Exp $ +# $NetBSD: Makefile,v 1.2 2009/10/11 08:13:40 markd Exp $ DISTNAME= kdelibs-${_KDE_VERSION} CATEGORIES= x11 @@ -11,7 +11,6 @@ COMMENT= Support libraries for the KDE integrated X11 desktop .include "../../meta-pkgs/kde4/Makefile.kde4" CONFLICTS= kdelibs-[0-9]* -PKG_DESTDIR_SUPPORT= user-destdir # BUILD_MAKE_FLAGS+= VERBOSE=1 diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST index 8c44a0a3268..dd4ad03b6cd 100644 --- a/x11/kdelibs4/PLIST +++ b/x11/kdelibs4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 19:18:59 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $ bin/checkXML bin/kbuildsycoca4 bin/kconfig_compiler @@ -2501,6 +2501,7 @@ share/kde/apps/ksgmltools2/customization/es/entities/underArtisticLicense.docboo share/kde/apps/ksgmltools2/customization/es/entities/underBSDLicense.docbook share/kde/apps/ksgmltools2/customization/es/entities/underFDL.docbook share/kde/apps/ksgmltools2/customization/es/entities/underGPL.docbook +share/kde/apps/ksgmltools2/customization/es/entities/underLGPL.docbook share/kde/apps/ksgmltools2/customization/es/entities/underX11License.docbook share/kde/apps/ksgmltools2/customization/es/entities/update-doc.docbook share/kde/apps/ksgmltools2/customization/es/lang.entities diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 22709ac1974..51b934b530a 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/10/02 19:18:56 markd Exp $ +$NetBSD: distinfo,v 1.2 2009/10/11 08:13:40 markd Exp $ -SHA1 (kdelibs-4.3.1.tar.bz2) = 511532852caca9302c643fded4013ef1f57d5433 -RMD160 (kdelibs-4.3.1.tar.bz2) = 25c8d6225813a677d4f1e1006f18b0d5c14f9003 -Size (kdelibs-4.3.1.tar.bz2) = 10510833 bytes +SHA1 (kdelibs-4.3.2.tar.bz2) = 37f8dd8275bffbcb0e01f9f133a20856329dfa0c +RMD160 (kdelibs-4.3.2.tar.bz2) = 93a5c29a470023585006c26c956146e21d1bcdfb +Size (kdelibs-4.3.2.tar.bz2) = 10515372 bytes SHA1 (patch-aa) = 7146107f78bbc618cf80479195581f29fc6b5977 SHA1 (patch-ab) = aec1140bef01199f067b079c30d95fea1814839d SHA1 (patch-ac) = 223a97a63907477314b69040e1bca3e2ff8cc7b7 @@ -11,4 +11,7 @@ SHA1 (patch-ag) = af1e58512984726a4efaf315bb958a9a529638b8 SHA1 (patch-ah) = b583dbe1b712984bbe002cc9143352729fba94ed SHA1 (patch-ai) = 75b18b8ac0da0eda398d717b9ee3a2af68bcebe4 SHA1 (patch-aj) = 8520c322d4579e9485253c8e8b130669b0f8b618 -SHA1 (patch-ak) = ef85a1a01e902f98db5fda5b7b27c6a3739dbfd8 +SHA1 (patch-ba) = 9e980afeb09d5b4561638efb339f981b6273d18e +SHA1 (patch-bb) = df8e42a167d1fa46dfe2cef5b92e6c9aae5b565d +SHA1 (patch-bc) = 97ba6045f4ff28423d2a565487305a1f6420ce57 +SHA1 (patch-bd) = dd08b9f7c4c158db5b9e5cdd7777bff6979cb26c diff --git a/x11/kdelibs4/patches/patch-ak b/x11/kdelibs4/patches/patch-ak deleted file mode 100644 index 8707889397c..00000000000 --- a/x11/kdelibs4/patches/patch-ak +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2009/10/02 19:19:00 markd Exp $ - -SVN commit 1028997. - ---- kdecore/network/k3socketdevice.cpp.orig 2009-09-24 09:21:38.000000000 -0600 -+++ kdecore/network/k3socketdevice.cpp 2009-09-24 09:23:15.000000000 -0600 -@@ -352,9 +352,13 @@ bool KSocketDevice::connect(const KResol - if (kde_connect(m_sockfd, address.address(), address.length()) == -1) - { - if (errno == EISCONN) -- return true; // we're already connected -+ { -+ KActiveSocketBase::open(Unbuffered | mode); -+ return true; // we're already connected -+ } - else if (errno == EALREADY || errno == EINPROGRESS) - { -+ KActiveSocketBase::open(Unbuffered | mode); - setError(InProgress); - return true; - } diff --git a/x11/kdelibs4/patches/patch-ba b/x11/kdelibs4/patches/patch-ba new file mode 100644 index 00000000000..cd9a462d77a --- /dev/null +++ b/x11/kdelibs4/patches/patch-ba @@ -0,0 +1,16 @@ +$NetBSD: patch-ba,v 1.1 2009/10/11 08:13:40 markd Exp $ + +KDE svn 1032787 + +--- khtml/khtml_part.cpp.orig 2009-10-02 21:18:12.000000000 +1300 ++++ khtml/khtml_part.cpp +@@ -609,8 +609,7 @@ KHTMLPart::~KHTMLPart() + + if ( d->m_view ) + { +- d->m_view->hide(); +- d->m_view->viewport()->hide(); ++ widget()->hide(); + d->m_view->m_part = 0; + } + diff --git a/x11/kdelibs4/patches/patch-bb b/x11/kdelibs4/patches/patch-bb new file mode 100644 index 00000000000..ddad55f73bc --- /dev/null +++ b/x11/kdelibs4/patches/patch-bb @@ -0,0 +1,138 @@ +$NetBSD: patch-bb,v 1.1 2009/10/11 08:13:40 markd Exp $ + +KDE svn 1032185 + +--- kdecore/localization/klocale.cpp.orig 2009-10-02 21:18:08.000000000 +1300 ++++ kdecore/localization/klocale.cpp +@@ -22,6 +22,7 @@ + */ + + #include "klocale.h" ++#include "klocale_p.h" + + #include <config.h> + +@@ -242,7 +243,6 @@ public: + // Handling of translation catalogs + QStringList languageList; + +- QMutex* mutex; + QList<KCatalogName> catalogNames; // list of all catalogs (regardless of language) + QList<KCatalog> catalogs; // list of all found catalogs, one instance per catalog name and language + int numberOfSysCatalogs; // number of catalogs that each app draws from +@@ -276,7 +276,6 @@ public: + KLocalePrivate::KLocalePrivate(const QString& catalog, KConfig *config, const QString &language_, const QString &country_) + : language(language_), + country(country_), +- mutex(new QMutex(QMutex::Recursive)), + useTranscript(false), + codecForEncoding(0), + languages(0), calendar(0), +@@ -311,7 +310,7 @@ KLocale::KLocale(const QString& catalog, + void KLocalePrivate::initMainCatalogs() + { + KLocaleStaticData *s = staticData; +- QMutexLocker lock(mutex); ++ QMutexLocker lock(kLocaleMutex()); + + if (!s->maincatalog.isEmpty()) { + // If setMainCatalog was called, then we use that (e.g. korgac calls setMainCatalog("korganizer") to use korganizer.po) +@@ -541,7 +540,7 @@ bool KLocale::setLanguage(const QString + + bool KLocalePrivate::setLanguage(const QString & _language, KConfig *config) + { +- QMutexLocker lock(mutex); ++ QMutexLocker lock(kLocaleMutex()); + languageList.removeAll( _language ); + languageList.prepend( _language ); // let us consider this language to be the most important one + +@@ -563,7 +562,7 @@ bool KLocale::setLanguage(const QStringL + + bool KLocalePrivate::setLanguage(const QStringList & languages) + { +- QMutexLocker lock(mutex); ++ QMutexLocker lock(kLocaleMutex()); + // This list might contain + // 1) some empty strings that we have to eliminate + // 2) duplicate entries like in de:fr:de, where we have to keep the first occurrence of a language in order +@@ -685,7 +684,7 @@ QString KLocale::country() const + + void KLocale::insertCatalog( const QString & catalog ) + { +- QMutexLocker lock(d->mutex); ++ QMutexLocker lock(kLocaleMutex()); + int pos = d->catalogNames.indexOf(KCatalogName(catalog)); + if (pos != -1) { + ++d->catalogNames[pos].loadCount; +@@ -736,7 +735,7 @@ void KLocalePrivate::updateCatalogs( ) + + void KLocale::removeCatalog(const QString &catalog) + { +- QMutexLocker lock(d->mutex); ++ QMutexLocker lock(kLocaleMutex()); + int pos = d->catalogNames.indexOf(KCatalogName(catalog)); + if (pos == -1) + return; +@@ -749,7 +748,7 @@ void KLocale::removeCatalog(const QStrin + + void KLocale::setActiveCatalog(const QString &catalog) + { +- QMutexLocker lock(d->mutex); ++ QMutexLocker lock(kLocaleMutex()); + int pos = d->catalogNames.indexOf(KCatalogName(catalog)); + if (pos == -1) + return; +@@ -759,7 +758,6 @@ void KLocale::setActiveCatalog(const QSt + + KLocale::~KLocale() + { +- delete d->mutex; + delete d->calendar; + delete d->languages; + delete d; +@@ -788,7 +786,7 @@ void KLocalePrivate::translate_priv(cons + << "Fix the program" << endl; + } + +- QMutexLocker locker(mutex); ++ QMutexLocker locker(kLocaleMutex()); + // determine the fallback string + QString fallback; + if ( msgid_plural == NULL ) +@@ -1370,7 +1368,7 @@ QString KLocale::formatByteSize( double + //Kibi-byte KiB 2^10 1,024 bytes + + if (d->byteSizeFmt.size() == 0) { +- QMutexLocker lock(d->mutex); ++ QMutexLocker lock(kLocaleMutex()); + // Pretranslated format strings for byte sizes. + #define CACHEBYTEFMT(x) { \ + QString s; \ +@@ -2568,7 +2566,6 @@ KLocale::KLocale(const KLocale & rhs) : + { + d->languages = 0; // Don't copy languages + d->calendar = 0; // Don't copy the calendar +- d->mutex = 0; // Don't copy the mutex + } + + KLocale & KLocale::operator=(const KLocale & rhs) +@@ -2583,8 +2580,7 @@ KLocale & KLocale::operator=(const KLoca + + void KLocale::copyCatalogsTo(KLocale *locale) + { +- QMutexLocker lock(d->mutex); +- QMutexLocker lockOther(locale->d->mutex); ++ QMutexLocker lock(kLocaleMutex()); + locale->d->catalogNames = d->catalogNames; + locale->d->updateCatalogs(); + } +@@ -2656,3 +2652,9 @@ KLocale::DigitSet KLocale::dateTimeDigit + { + return d->dateTimeDigitSet; + } ++ ++Q_GLOBAL_STATIC_WITH_ARGS(QMutex, s_kLocaleMutex, (QMutex::Recursive)) ++QMutex* kLocaleMutex() ++{ ++ return s_kLocaleMutex(); ++} diff --git a/x11/kdelibs4/patches/patch-bc b/x11/kdelibs4/patches/patch-bc new file mode 100644 index 00000000000..b12abf376da --- /dev/null +++ b/x11/kdelibs4/patches/patch-bc @@ -0,0 +1,107 @@ +$NetBSD: patch-bc,v 1.1 2009/10/11 08:13:40 markd Exp $ + +KDE svn 1032185 + +--- kdecore/localization/klocalizedstring.cpp.orig 2009-07-22 03:16:08.000000000 +1200 ++++ kdecore/localization/klocalizedstring.cpp +@@ -24,6 +24,7 @@ + #include <kglobal.h> + #include <kdebug.h> + #include <klocale.h> ++#include <klocale_p.h> + #include <kcomponentdata.h> + #include <klibrary.h> + #include <kstandarddirs.h> +@@ -126,8 +127,6 @@ class KLocalizedStringPrivateStatics + + QHash<QString, KuitSemantics*> formatters; + +- QMutex mutex; +- + KLocalizedStringPrivateStatics () : + theFence("|/|"), + startInterp("$["), +@@ -144,9 +143,7 @@ class KLocalizedStringPrivateStatics + + translits(), + +- formatters(), +- +- mutex(QMutex::Recursive) ++ formatters() + {} + + ~KLocalizedStringPrivateStatics () +@@ -216,7 +213,7 @@ QString KLocalizedString::toString (cons + QString KLocalizedStringPrivate::toString (const KLocale *locale) const + { + KLocalizedStringPrivateStatics *s = staticsKLSP; +- QMutexLocker lock(&s->mutex); ++ QMutexLocker lock(kLocaleMutex()); + + // Assure the message has been supplied. + if (msg.isEmpty()) +@@ -474,7 +471,7 @@ QString KLocalizedStringPrivate::postFor + const QString &ctxt) const + { + KLocalizedStringPrivateStatics *s = staticsKLSP; +- QMutexLocker lock(&s->mutex); ++ QMutexLocker lock(kLocaleMutex()); + + QString final = text; + +@@ -499,7 +496,7 @@ QString KLocalizedStringPrivate::substit + bool &fallback) const + { + KLocalizedStringPrivateStatics *s = staticsKLSP; +- QMutexLocker lock(&s->mutex); ++ QMutexLocker lock(kLocaleMutex()); + + if (s->ktrs == NULL) + // Scripting engine not available. +@@ -564,7 +561,7 @@ int KLocalizedStringPrivate::resolveInte + // fallback is set to true if Transcript evaluation requested so. + + KLocalizedStringPrivateStatics *s = staticsKLSP; +- QMutexLocker lock(&s->mutex); ++ QMutexLocker lock(kLocaleMutex()); + + result.clear(); + fallback = false; +@@ -716,7 +713,7 @@ int KLocalizedStringPrivate::resolveInte + QVariant KLocalizedStringPrivate::segmentToValue (const QString &seg) const + { + KLocalizedStringPrivateStatics *s = staticsKLSP; +- QMutexLocker lock(&s->mutex); ++ QMutexLocker lock(kLocaleMutex()); + + // Return invalid variant if segment is either not a proper + // value reference, or the reference is out of bounds. +@@ -751,7 +748,7 @@ QString KLocalizedStringPrivate::postTra + const QString &final) const + { + KLocalizedStringPrivateStatics *s = staticsKLSP; +- QMutexLocker lock(&s->mutex); ++ QMutexLocker lock(kLocaleMutex()); + + if (s->ktrs == NULL) + // Scripting engine not available. +@@ -945,7 +942,7 @@ extern "C" + void KLocalizedStringPrivate::loadTranscript () + { + KLocalizedStringPrivateStatics *s = staticsKLSP; +- QMutexLocker lock(&s->mutex); ++ QMutexLocker lock(kLocaleMutex()); + + s->loadTranscriptCalled = true; + s->ktrs = NULL; // null indicates that Transcript is not available +@@ -979,7 +976,8 @@ void KLocalizedStringPrivate::notifyCata + return; + } + KLocalizedStringPrivateStatics *s = staticsKLSP; +- QMutexLocker lock(&s->mutex); ++ // Very important: do not the mutex here. ++ //QMutexLocker lock(kLocaleMutex()); + + // Find script modules for all included language/catalogs that have them, + // and remember their paths. diff --git a/x11/kdelibs4/patches/patch-bd b/x11/kdelibs4/patches/patch-bd new file mode 100644 index 00000000000..d2315f0a01d --- /dev/null +++ b/x11/kdelibs4/patches/patch-bd @@ -0,0 +1,17 @@ +$NetBSD: patch-bd,v 1.1 2009/10/11 08:13:40 markd Exp $ + +KDE svn 1032185 + +--- /dev/null 2009-10-11 17:43:10.000000000 +1300 ++++ kdecore/localization/klocale_p.h +@@ -0,0 +1,10 @@ ++#ifndef KLOCALE_P_H ++#define KLOCALE_P_H ++ ++class QMutex; ++ ++// Used by both KLocale and KLocalizedString, since they call each other. ++QMutex* kLocaleMutex(); ++ ++#endif /* KLOCALE_P_H */ ++ |