diff options
| author | markd <markd@pkgsrc.org> | 2009-12-04 22:04:04 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2009-12-04 22:04:04 +0000 |
| commit | 6aca8210544334e2e3fb651452e66c5c382f9a7d (patch) | |
| tree | fa1509da5a09c7835238003db0e0530660a25518 | |
| parent | 8bc175d6f46021f852cd7d02626749c4ea850ed7 (diff) | |
| download | pkgsrc-6aca8210544334e2e3fb651452e66c5c382f9a7d.tar.gz | |
update to kde 4.3.4
KDE SC 4.3.4 has a number of improvements:
* A bugfix in Plasma's pixmap cache makes the workspace more responsive
* Okular, the document viewer improved stability in certain situations
* Marble, the desktop globe has seen some polish
* Passphrases with non-ASCII characters have been fixed in the KGpg
encryption tool
40 files changed, 199 insertions, 259 deletions
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo index 55e2074800f..6d7c4578f3c 100644 --- a/devel/kdesdk4/distinfo +++ b/devel/kdesdk4/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:50 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:04 markd Exp $ -SHA1 (kdesdk-4.3.3.tar.bz2) = 3b582863935d924854989d541c148387c7f52eba -RMD160 (kdesdk-4.3.3.tar.bz2) = 991c8cd55e3794347dc0dce5e0530afcc7e903da -Size (kdesdk-4.3.3.tar.bz2) = 5618409 bytes +SHA1 (kdesdk-4.3.4.tar.bz2) = 42b6209908f8baadc0add46153649ebdfa9a977a +RMD160 (kdesdk-4.3.4.tar.bz2) = 63ee89b62d71b88499c0d038a3fd6ac5beeebd16 +Size (kdesdk-4.3.4.tar.bz2) = 5620046 bytes SHA1 (patch-aa) = ab73e4306efb33344012f95c059ea0ed0adfafd1 SHA1 (patch-ab) = af132807eaca326ad0c5fe87ffced9e8b813f3f9 diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo index d393187fa0d..ecb3d645590 100644 --- a/games/kdegames4/distinfo +++ b/games/kdegames4/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:51 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:04 markd Exp $ -SHA1 (kdegames-4.3.3.tar.bz2) = 7f8f84f934e7f8f5321297bbb87a0e656e5e7c17 -RMD160 (kdegames-4.3.3.tar.bz2) = 9d9510e80ebcad8c08658d227329e5d5f38cb399 -Size (kdegames-4.3.3.tar.bz2) = 50565670 bytes +SHA1 (kdegames-4.3.4.tar.bz2) = 33ea8ec476b1557a55c90c071bd462e5ceb7c52b +RMD160 (kdegames-4.3.4.tar.bz2) = 6741c053a0a99757cc48c201d005c2cd733b1b16 +Size (kdegames-4.3.4.tar.bz2) = 50569497 bytes SHA1 (patch-aa) = 248ac75a6e76dae6f5648a10e7f73dfa5eb0944b SHA1 (patch-ab) = 8f36bf07bf41905dda2da518c8930ffb2fc328bf diff --git a/games/kdetoys4/distinfo b/games/kdetoys4/distinfo index fc809ef50cf..e0dc4cad3ca 100644 --- a/games/kdetoys4/distinfo +++ b/games/kdetoys4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:51 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:04 markd Exp $ -SHA1 (kdetoys-4.3.3.tar.bz2) = 69dc19179b1dfb805d5843c612f5f763dca33696 -RMD160 (kdetoys-4.3.3.tar.bz2) = 22030fd2ec23e0e9cb01d8eeecbc8c721f43059b -Size (kdetoys-4.3.3.tar.bz2) = 1305711 bytes +SHA1 (kdetoys-4.3.4.tar.bz2) = 96f6121990590acd3fb5b8cae25ef98b5572733c +RMD160 (kdetoys-4.3.4.tar.bz2) = 187e32458abad8cb692a7c126930da2b823f4712 +Size (kdetoys-4.3.4.tar.bz2) = 1305732 bytes diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo index 90b3c734e98..54762df879a 100644 --- a/graphics/kdegraphics4/distinfo +++ b/graphics/kdegraphics4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:51 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:05 markd Exp $ -SHA1 (kdegraphics-4.3.3.tar.bz2) = f3d3155a6edf4fbf39e4dc07d9a6a52965f3f344 -RMD160 (kdegraphics-4.3.3.tar.bz2) = 2b9a02cbefb07bb2191eaf94b8f078f43ef2e393 -Size (kdegraphics-4.3.3.tar.bz2) = 3621439 bytes +SHA1 (kdegraphics-4.3.4.tar.bz2) = bb32171b0d562d5698d4f0526be2b069e99f7448 +RMD160 (kdegraphics-4.3.4.tar.bz2) = ccadc26a9c1133267082b8f390f9a769ae579c66 +Size (kdegraphics-4.3.4.tar.bz2) = 3621926 bytes diff --git a/graphics/oxygen-icons/Makefile b/graphics/oxygen-icons/Makefile index e73e2223c51..1c752a0ad12 100644 --- a/graphics/oxygen-icons/Makefile +++ b/graphics/oxygen-icons/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2009/11/04 11:05:53 markd Exp $ +# $NetBSD: Makefile,v 1.4 2009/12/04 22:04:07 markd Exp $ -DISTNAME= oxygen-icons-4.3.3 +DISTNAME= oxygen-icons-4.3.4 CATEGORIES= graphics kde -MASTER_SITES= ${MASTER_SITE_KDE:=4.3.3/src/} +MASTER_SITES= ${MASTER_SITE_KDE:=4.3.4/src/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= markd@NetBSD.org diff --git a/graphics/oxygen-icons/PLIST b/graphics/oxygen-icons/PLIST index 04a772bc90d..e4d0fc21903 100644 --- a/graphics/oxygen-icons/PLIST +++ b/graphics/oxygen-icons/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2009/11/04 11:05:53 markd Exp $ +@comment $NetBSD: PLIST,v 1.4 2009/12/04 22:04:07 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 @@ -90,6 +90,7 @@ share/icons/oxygen/128x128/apps/akonadi.png share/icons/oxygen/128x128/apps/akregator.png share/icons/oxygen/128x128/apps/basket.png share/icons/oxygen/128x128/apps/bovo.png +share/icons/oxygen/128x128/apps/charm.png share/icons/oxygen/128x128/apps/device-notifier.png share/icons/oxygen/128x128/apps/digikam.png share/icons/oxygen/128x128/apps/esd.png @@ -1027,9 +1028,11 @@ 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-agenda.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-journal.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 @@ -1040,6 +1043,7 @@ 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-whatsnext.png share/icons/oxygen/16x16/actions/view-calendar-workweek.png share/icons/oxygen/16x16/actions/view-calendar.png share/icons/oxygen/16x16/actions/view-choose.png @@ -1067,6 +1071,7 @@ share/icons/oxygen/16x16/actions/view-pim-mail.png share/icons/oxygen/16x16/actions/view-pim-news.png share/icons/oxygen/16x16/actions/view-pim-notes.png share/icons/oxygen/16x16/actions/view-pim-summary.png +share/icons/oxygen/16x16/actions/view-pim-tasks-pending.png share/icons/oxygen/16x16/actions/view-pim-tasks.png share/icons/oxygen/16x16/actions/view-presentation.png share/icons/oxygen/16x16/actions/view-preview.png @@ -2110,9 +2115,11 @@ 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-agenda.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-journal.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 @@ -2123,6 +2130,7 @@ 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-whatsnext.png share/icons/oxygen/22x22/actions/view-calendar-workweek.png share/icons/oxygen/22x22/actions/view-calendar.png share/icons/oxygen/22x22/actions/view-choose.png @@ -2150,6 +2158,7 @@ share/icons/oxygen/22x22/actions/view-pim-mail.png share/icons/oxygen/22x22/actions/view-pim-news.png share/icons/oxygen/22x22/actions/view-pim-notes.png share/icons/oxygen/22x22/actions/view-pim-summary.png +share/icons/oxygen/22x22/actions/view-pim-tasks-pending.png share/icons/oxygen/22x22/actions/view-pim-tasks.png share/icons/oxygen/22x22/actions/view-presentation.png share/icons/oxygen/22x22/actions/view-preview.png @@ -2387,6 +2396,12 @@ share/icons/oxygen/22x22/devices/multimedia-player-apple-ipod.png share/icons/oxygen/22x22/devices/multimedia-player.png share/icons/oxygen/22x22/devices/network-wired.png share/icons/oxygen/22x22/devices/network-wireless.png +share/icons/oxygen/22x22/devices/network-wireless-connected-00.png +share/icons/oxygen/22x22/devices/network-wireless-connected-100.png +share/icons/oxygen/22x22/devices/network-wireless-connected-25.png +share/icons/oxygen/22x22/devices/network-wireless-connected-50.png +share/icons/oxygen/22x22/devices/network-wireless-connected-75.png +share/icons/oxygen/22x22/devices/network-wireless-disconnected.png share/icons/oxygen/22x22/devices/pda.png share/icons/oxygen/22x22/devices/phone-openmoko-freerunner.png share/icons/oxygen/22x22/devices/phone.png @@ -2794,7 +2809,10 @@ share/icons/oxygen/22x22/status/weather-snow.png share/icons/oxygen/22x22/status/weather-storm.png share/icons/oxygen/22x22/status/window-suppressed.png share/icons/oxygen/256x256/apps/MameExecutor.png +share/icons/oxygen/256x256/apps/accessories-calculator.png +share/icons/oxygen/256x256/apps/accessories-dictionary.png share/icons/oxygen/256x256/apps/akonadi.png +share/icons/oxygen/256x256/apps/charm.png share/icons/oxygen/256x256/apps/k3b.png share/icons/oxygen/256x256/apps/karbon.png share/icons/oxygen/256x256/apps/kbruch.png @@ -2814,6 +2832,7 @@ share/icons/oxygen/256x256/apps/krita.png share/icons/oxygen/256x256/apps/kspread.png share/icons/oxygen/256x256/apps/kword.png share/icons/oxygen/256x256/apps/lokalize.png +share/icons/oxygen/256x256/apps/multimedia-volume-control.png share/icons/oxygen/256x256/apps/oxygen.png share/icons/oxygen/256x256/apps/partitionmanager.png share/icons/oxygen/256x256/apps/preferences-desktop-locale.png @@ -2821,6 +2840,7 @@ share/icons/oxygen/256x256/apps/preferences-desktop-screensaver.png share/icons/oxygen/256x256/apps/qelectrotech.png share/icons/oxygen/256x256/apps/quassel.png share/icons/oxygen/256x256/apps/strigi.png +share/icons/oxygen/256x256/apps/system-diagnosis.png share/icons/oxygen/256x256/apps/yakuake.png share/icons/oxygen/256x256/categories/applications-engineering.png share/icons/oxygen/256x256/categories/applications-graphics.png @@ -2829,7 +2849,9 @@ share/icons/oxygen/256x256/categories/applications-multimedia.png share/icons/oxygen/256x256/categories/applications-office.png share/icons/oxygen/256x256/categories/applications-other.png share/icons/oxygen/256x256/categories/applications-science.png +share/icons/oxygen/256x256/categories/applications-system.png share/icons/oxygen/256x256/categories/preferences-desktop.png +share/icons/oxygen/256x256/categories/preferences-other.png share/icons/oxygen/256x256/categories/preferences-system-network.png share/icons/oxygen/256x256/categories/preferences-system.png share/icons/oxygen/256x256/devices/audio-card.png @@ -2843,11 +2865,14 @@ share/icons/oxygen/256x256/devices/media-flash.png share/icons/oxygen/256x256/devices/media-floppy.png share/icons/oxygen/256x256/devices/media-optical-audio.png share/icons/oxygen/256x256/devices/media-optical-blu-ray.png +share/icons/oxygen/256x256/devices/media-optical-data.png +share/icons/oxygen/256x256/devices/media-optical-dvd-data.png share/icons/oxygen/256x256/devices/media-optical-dvd-video.png share/icons/oxygen/256x256/devices/media-optical-dvd.png share/icons/oxygen/256x256/devices/media-optical-recordable.png share/icons/oxygen/256x256/devices/media-optical-video.png share/icons/oxygen/256x256/devices/media-optical.png +share/icons/oxygen/256x256/devices/network-wired.png share/icons/oxygen/256x256/devices/network-wireless-connected-00.png share/icons/oxygen/256x256/devices/network-wireless-connected-100.png share/icons/oxygen/256x256/devices/network-wireless-connected-25.png @@ -3347,8 +3372,10 @@ 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-agenda.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-journal.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 @@ -3360,6 +3387,7 @@ 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-whatsnext.png share/icons/oxygen/32x32/actions/view-calendar-workweek.png share/icons/oxygen/32x32/actions/view-calendar.png share/icons/oxygen/32x32/actions/view-choose.png @@ -3387,6 +3415,7 @@ share/icons/oxygen/32x32/actions/view-pim-mail.png share/icons/oxygen/32x32/actions/view-pim-news.png share/icons/oxygen/32x32/actions/view-pim-notes.png share/icons/oxygen/32x32/actions/view-pim-summary.png +share/icons/oxygen/32x32/actions/view-pim-tasks-pending.png share/icons/oxygen/32x32/actions/view-pim-tasks.png share/icons/oxygen/32x32/actions/view-presentation.png share/icons/oxygen/32x32/actions/view-preview.png @@ -3628,6 +3657,12 @@ share/icons/oxygen/32x32/devices/multimedia-player-apple-ipod.png share/icons/oxygen/32x32/devices/multimedia-player.png share/icons/oxygen/32x32/devices/network-wired.png share/icons/oxygen/32x32/devices/network-wireless.png +share/icons/oxygen/32x32/devices/network-wireless-connected-00.png +share/icons/oxygen/32x32/devices/network-wireless-connected-100.png +share/icons/oxygen/32x32/devices/network-wireless-connected-25.png +share/icons/oxygen/32x32/devices/network-wireless-connected-50.png +share/icons/oxygen/32x32/devices/network-wireless-connected-75.png +share/icons/oxygen/32x32/devices/network-wireless-disconnected.png share/icons/oxygen/32x32/devices/pda.png share/icons/oxygen/32x32/devices/phone-openmoko-freerunner.png share/icons/oxygen/32x32/devices/phone.png @@ -4376,9 +4411,11 @@ 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-agenda.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-journal.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 @@ -4389,6 +4426,7 @@ 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-whatsnext.png share/icons/oxygen/48x48/actions/view-calendar-workweek.png share/icons/oxygen/48x48/actions/view-calendar.png share/icons/oxygen/48x48/actions/view-choose.png @@ -4413,6 +4451,7 @@ share/icons/oxygen/48x48/actions/view-pim-mail.png share/icons/oxygen/48x48/actions/view-pim-news.png share/icons/oxygen/48x48/actions/view-pim-notes.png share/icons/oxygen/48x48/actions/view-pim-summary.png +share/icons/oxygen/48x48/actions/view-pim-tasks-pending.png share/icons/oxygen/48x48/actions/view-pim-tasks.png share/icons/oxygen/48x48/actions/view-presentation.png share/icons/oxygen/48x48/actions/view-preview.png @@ -5617,6 +5656,12 @@ share/icons/oxygen/8x8/emblems/emblem-important.png share/icons/oxygen/8x8/emblems/emblem-link.png share/icons/oxygen/8x8/emblems/emblem-mounted.png share/icons/oxygen/8x8/emblems/emblem-unmounted.png +share/icons/oxygen/8x8/emblems/vcs-added.png +share/icons/oxygen/8x8/emblems/vcs-conflicting.png +share/icons/oxygen/8x8/emblems/vcs-locally-modified.png +share/icons/oxygen/8x8/emblems/vcs-normal.png +share/icons/oxygen/8x8/emblems/vcs-removed.png +share/icons/oxygen/8x8/emblems/vcs-update-required.png share/icons/oxygen/index.theme @pkgdir share/icons/oxygen/64x64/intl @pkgdir share/icons/oxygen/64x64/filesystems diff --git a/graphics/oxygen-icons/distinfo b/graphics/oxygen-icons/distinfo index 2ca3db63c82..4aa8a0faa7f 100644 --- a/graphics/oxygen-icons/distinfo +++ b/graphics/oxygen-icons/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:53 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:07 markd Exp $ -SHA1 (oxygen-icons-4.3.3.tar.bz2) = a897e02c2b37fa4c6c7146ea7773f56060d4465a -RMD160 (oxygen-icons-4.3.3.tar.bz2) = 15a3c4ebf939ee6223d11778fdcb5da480c16f92 -Size (oxygen-icons-4.3.3.tar.bz2) = 124058934 bytes +SHA1 (oxygen-icons-4.3.4.tar.bz2) = 9905f6b5a47db85c05f7387a75b6ae0e0fdd756e +RMD160 (oxygen-icons-4.3.4.tar.bz2) = b3138b064e131f51ce40b4884f5ab4b407c2b379 +Size (oxygen-icons-4.3.4.tar.bz2) = 125784224 bytes diff --git a/meta-pkgs/kde4/Makefile b/meta-pkgs/kde4/Makefile index f307c1dc716..3a6a1eac41a 100644 --- a/meta-pkgs/kde4/Makefile +++ b/meta-pkgs/kde4/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2009/11/04 14:14:35 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2009/12/04 22:04:05 markd Exp $ -DISTNAME= kde4-4.3.3 +DISTNAME= kde4-4.3.4 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.3{,nb[0-9]*}:../../graphics/oxygen-icons -DEPENDS+= kdelibs4-4.3.3{,nb[0-9]*}:../../x11/kdelibs4 -DEPENDS+= kdelibs-experimental4-4.3.3{,nb[0-9]*}:../../x11/kdelibs-experimental4 -DEPENDS+= kdepimlibs4-4.3.3{,nb[0-9]*}:../../misc/kdepimlibs4 -DEPENDS+= kdebase-runtime4-4.3.3{,nb[0-9]*}:../../x11/kdebase-runtime4 -DEPENDS+= kdebase4-4.3.3{,nb[0-9]*}:../../x11/kdebase4 -DEPENDS+= kdebase-workspace4-4.3.3{,nb[0-9]*}:../../x11/kdebase-workspace4 -DEPENDS+= kdeaccessibility4-4.3.3{,nb[0-9]*}:../../misc/kdeaccessibility4 -DEPENDS+= kdeadmin4-4.3.3{,nb[0-9]*}:../../misc/kdeadmin4 -DEPENDS+= kdeartwork4-4.3.3{,nb[0-9]*}:../../misc/kdeartwork4 -DEPENDS+= kdeedu4-4.3.3{,nb[0-9]*}:../../misc/kdeedu4 -DEPENDS+= kdegames4-4.3.3{,nb[0-9]*}:../../games/kdegames4 -DEPENDS+= kdegraphics4-4.3.3{,nb[0-9]*}:../../graphics/kdegraphics4 -DEPENDS+= kdemultimedia4-4.3.3{,nb[0-9]*}:../../multimedia/kdemultimedia4 -DEPENDS+= kdenetwork4-4.3.3{,nb[0-9]*}:../../net/kdenetwork4 -DEPENDS+= kdepim4-4.3.3{,nb[0-9]*}:../../misc/kdepim4 -DEPENDS+= kdepim-runtime4-4.3.3{,nb[0-9]*}:../../misc/kdepim-runtime4 -DEPENDS+= kdeplasma-addons4-4.3.3{,nb[0-9]*}:../../misc/kdeplasma-addons4 -DEPENDS+= kdesdk4-4.3.3{,nb[0-9]*}:../../devel/kdesdk4 -DEPENDS+= kdetoys4-4.3.3{,nb[0-9]*}:../../games/kdetoys4 -DEPENDS+= kdeutils4-4.3.3{,nb[0-9]*}:../../misc/kdeutils4 -DEPENDS+= kdewebdev4-4.3.3{,nb[0-9]*}:../../www/kdewebdev4 +DEPENDS+= oxygen-icons-4.3.4{,nb[0-9]*}:../../graphics/oxygen-icons +DEPENDS+= kdelibs4-4.3.4{,nb[0-9]*}:../../x11/kdelibs4 +DEPENDS+= kdelibs-experimental4-4.3.4{,nb[0-9]*}:../../x11/kdelibs-experimental4 +DEPENDS+= kdepimlibs4-4.3.4{,nb[0-9]*}:../../misc/kdepimlibs4 +DEPENDS+= kdebase-runtime4-4.3.4{,nb[0-9]*}:../../x11/kdebase-runtime4 +DEPENDS+= kdebase4-4.3.4{,nb[0-9]*}:../../x11/kdebase4 +DEPENDS+= kdebase-workspace4-4.3.4{,nb[0-9]*}:../../x11/kdebase-workspace4 +DEPENDS+= kdeaccessibility4-4.3.4{,nb[0-9]*}:../../misc/kdeaccessibility4 +DEPENDS+= kdeadmin4-4.3.4{,nb[0-9]*}:../../misc/kdeadmin4 +DEPENDS+= kdeartwork4-4.3.4{,nb[0-9]*}:../../misc/kdeartwork4 +DEPENDS+= kdeedu4-4.3.4{,nb[0-9]*}:../../misc/kdeedu4 +DEPENDS+= kdegames4-4.3.4{,nb[0-9]*}:../../games/kdegames4 +DEPENDS+= kdegraphics4-4.3.4{,nb[0-9]*}:../../graphics/kdegraphics4 +DEPENDS+= kdemultimedia4-4.3.4{,nb[0-9]*}:../../multimedia/kdemultimedia4 +DEPENDS+= kdenetwork4-4.3.4{,nb[0-9]*}:../../net/kdenetwork4 +DEPENDS+= kdepim4-4.3.4{,nb[0-9]*}:../../misc/kdepim4 +DEPENDS+= kdepim-runtime4-4.3.4{,nb[0-9]*}:../../misc/kdepim-runtime4 +DEPENDS+= kdeplasma-addons4-4.3.4{,nb[0-9]*}:../../misc/kdeplasma-addons4 +DEPENDS+= kdesdk4-4.3.4{,nb[0-9]*}:../../devel/kdesdk4 +DEPENDS+= kdetoys4-4.3.4{,nb[0-9]*}:../../games/kdetoys4 +DEPENDS+= kdeutils4-4.3.4{,nb[0-9]*}:../../misc/kdeutils4 +DEPENDS+= kdewebdev4-4.3.4{,nb[0-9]*}:../../www/kdewebdev4 META_PACKAGE= yes diff --git a/meta-pkgs/kde4/Makefile.kde4 b/meta-pkgs/kde4/Makefile.kde4 index dbb899ed033..165e51d0e3a 100644 --- a/meta-pkgs/kde4/Makefile.kde4 +++ b/meta-pkgs/kde4/Makefile.kde4 @@ -1,13 +1,13 @@ -# $NetBSD: Makefile.kde4,v 1.3 2009/11/04 14:15:35 wiz Exp $ +# $NetBSD: Makefile.kde4,v 1.4 2009/12/04 22:04:05 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.3 -MASTER_SITE_KDE_I18N= ${MASTER_SITE_KDE:=4.3.3/src/kde-l10n/} -MASTER_SITES?= ${MASTER_SITE_KDE:=4.3.3/src/} +_KDE_VERSION= 4.3.4 +MASTER_SITE_KDE_I18N= ${MASTER_SITE_KDE:=4.3.4/src/kde-l10n/} +MASTER_SITES?= ${MASTER_SITE_KDE:=4.3.4/src/} EXTRACT_SUFX?= .tar.bz2 PKGNAME?= ${DISTNAME:S/-4/4-4/} diff --git a/misc/kdeaccessibility4/distinfo b/misc/kdeaccessibility4/distinfo index ba819d1d459..55cbd1cab85 100644 --- a/misc/kdeaccessibility4/distinfo +++ b/misc/kdeaccessibility4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:51 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:05 markd Exp $ -SHA1 (kdeaccessibility-4.3.3.tar.bz2) = 1c1632f6bbfe47fbe4f57b4416475b4520ebc279 -RMD160 (kdeaccessibility-4.3.3.tar.bz2) = f4ffed8d9ef0a75137a9734790939b8804d7440c -Size (kdeaccessibility-4.3.3.tar.bz2) = 6586467 bytes +SHA1 (kdeaccessibility-4.3.4.tar.bz2) = 96aa150b8a5c368b6bb36476ed5fb3e3b3c30547 +RMD160 (kdeaccessibility-4.3.4.tar.bz2) = b295ccfca0ada4f68938446555cacc0385fdc646 +Size (kdeaccessibility-4.3.4.tar.bz2) = 6586216 bytes diff --git a/misc/kdeadmin4/distinfo b/misc/kdeadmin4/distinfo index 798e2c68026..f0392db9ba5 100644 --- a/misc/kdeadmin4/distinfo +++ b/misc/kdeadmin4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:51 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:05 markd Exp $ -SHA1 (kdeadmin-4.3.3.tar.bz2) = 90c630bb47a6001c07dfa225fb90d9f23ea0afea -RMD160 (kdeadmin-4.3.3.tar.bz2) = 7c73e2041667c5537c05d8a50420e9b9cf9e2bf3 -Size (kdeadmin-4.3.3.tar.bz2) = 1878326 bytes +SHA1 (kdeadmin-4.3.4.tar.bz2) = 8f61aeb2ff9d51712d72cd77dad837c8902b6a5d +RMD160 (kdeadmin-4.3.4.tar.bz2) = df9686ed860c3c2d17cea6770cffca676995c730 +Size (kdeadmin-4.3.4.tar.bz2) = 1878227 bytes diff --git a/misc/kdeartwork4/distinfo b/misc/kdeartwork4/distinfo index 033a9a2fc67..fda8349087e 100644 --- a/misc/kdeartwork4/distinfo +++ b/misc/kdeartwork4/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:51 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:05 markd Exp $ -SHA1 (kdeartwork-4.3.3.tar.bz2) = 7265d60a339ea692ccb57483959579a71d7fdfc8 -RMD160 (kdeartwork-4.3.3.tar.bz2) = 7c95169185ea88eba49972eb123ab6da80aacbb9 -Size (kdeartwork-4.3.3.tar.bz2) = 65394411 bytes +SHA1 (kdeartwork-4.3.4.tar.bz2) = 7a095932bad297f22b23765ce6ee17bfd2438bf2 +RMD160 (kdeartwork-4.3.4.tar.bz2) = 33a47839485d660a55cba943bb2b7bbbf2828c2a +Size (kdeartwork-4.3.4.tar.bz2) = 65394306 bytes SHA1 (patch-aa) = 9007028225dded2490e3181f853c17985bae9509 SHA1 (patch-ab) = 39d0bbd61000a1bb7f4513c41fb7c8f53e688097 diff --git a/misc/kdeedu4/PLIST b/misc/kdeedu4/PLIST index 89fa334e026..6436c9c7a0e 100644 --- a/misc/kdeedu4/PLIST +++ b/misc/kdeedu4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:38 markd Exp $ +@comment $NetBSD: PLIST,v 1.3 2009/12/04 22:04:05 markd Exp $ bin/blinken bin/calgebra bin/geodatatest @@ -2632,6 +2632,7 @@ share/kde/apps/ktouch/hungarian.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/kn.keyboard.xml share/kde/apps/ktouch/ktouchui.rc share/kde/apps/ktouch/lat.keyboard.xml share/kde/apps/ktouch/latin.ktouch.xml diff --git a/misc/kdeedu4/distinfo b/misc/kdeedu4/distinfo index 59cff0477c3..90e4a661522 100644 --- a/misc/kdeedu4/distinfo +++ b/misc/kdeedu4/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:51 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:05 markd Exp $ -SHA1 (kdeedu-4.3.3.tar.bz2) = fde1b8a7e548077f6327c940ec530db8565b5968 -RMD160 (kdeedu-4.3.3.tar.bz2) = 97ebfc7d2eb4fd5cf21df32eae95efa26f835b86 -Size (kdeedu-4.3.3.tar.bz2) = 57944052 bytes +SHA1 (kdeedu-4.3.4.tar.bz2) = ee646d57db11b761d8da33fc03c596c8f531eb9d +RMD160 (kdeedu-4.3.4.tar.bz2) = 1f5ab9a52dae38d245720796d4b69838006f6414 +Size (kdeedu-4.3.4.tar.bz2) = 57962298 bytes SHA1 (patch-aa) = 5e2f12e2c70e438524ace2d238c9119dd36695ed SHA1 (patch-ab) = 2ff0e901376e5a01abc26799049eb738b3eb2fd8 SHA1 (patch-ae) = 412adfe31664db087e66ce73428ee775dff858d3 diff --git a/misc/kdepim-runtime4/PLIST b/misc/kdepim-runtime4/PLIST index 276995b38ce..c657d958a79 100644 --- a/misc/kdepim-runtime4/PLIST +++ b/misc/kdepim-runtime4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 20:54:04 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/12/04 22:04:05 markd Exp $ bin/akonadi2xml bin/akonadi_birthdays_resource bin/akonadi_distlist_resource @@ -11,8 +11,6 @@ bin/akonadi_kolabproxy_resource bin/akonadi_localbookmarks_resource bin/akonadi_maildir_resource bin/akonadi_microblog_resource -bin/akonadi_nepomuk_contact_feeder -bin/akonadi_nepomuk_email_feeder bin/akonadi_nepomuktag_resource bin/akonadi_nntp_resource bin/akonadi_strigi_feeder @@ -67,8 +65,6 @@ share/akonadi/agents/kolabproxyresource.desktop share/akonadi/agents/localbookmarksresource.desktop share/akonadi/agents/maildirresource.desktop share/akonadi/agents/microblog.desktop -share/akonadi/agents/nepomukcontactfeeder.desktop -share/akonadi/agents/nepomukemailfeeder.desktop share/akonadi/agents/nepomuktagresource.desktop share/akonadi/agents/nntpresource.desktop share/akonadi/agents/notesresource.desktop diff --git a/misc/kdepim-runtime4/distinfo b/misc/kdepim-runtime4/distinfo index 669c6bf193c..6be41a5af9e 100644 --- a/misc/kdepim-runtime4/distinfo +++ b/misc/kdepim-runtime4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:51 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:05 markd Exp $ -SHA1 (kdepim-runtime-4.3.3.tar.bz2) = 2c13726ffc64a6975b774af4262914bcc7ad1e66 -RMD160 (kdepim-runtime-4.3.3.tar.bz2) = d5ed82e2c66f91ef290e4ae9c0f46044c9fa8e92 -Size (kdepim-runtime-4.3.3.tar.bz2) = 745417 bytes +SHA1 (kdepim-runtime-4.3.4.tar.bz2) = bef70088aec4355f5bb8c0375082388eaa3d4b26 +RMD160 (kdepim-runtime-4.3.4.tar.bz2) = eb14075e34711fef0cd204f6307476f36abe75af +Size (kdepim-runtime-4.3.4.tar.bz2) = 745494 bytes diff --git a/misc/kdepim4/distinfo b/misc/kdepim4/distinfo index ab7d3e2e63a..f58e503b2a3 100644 --- a/misc/kdepim4/distinfo +++ b/misc/kdepim4/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:51 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:05 markd Exp $ -SHA1 (kdepim-4.3.3.tar.bz2) = 8d467f7c652631c9955538e57ef846cdb5e8905c -RMD160 (kdepim-4.3.3.tar.bz2) = a8809be1ff6d6ae3f22d0f29124566793ed97aaa -Size (kdepim-4.3.3.tar.bz2) = 11250414 bytes +SHA1 (kdepim-4.3.4.tar.bz2) = 3ddc34c2b0c96c0273431631ccf47a8b9b4289b3 +RMD160 (kdepim-4.3.4.tar.bz2) = 8c33c627357e70a44cf4d97a186002793e49c062 +Size (kdepim-4.3.4.tar.bz2) = 11252861 bytes SHA1 (patch-ab) = 234c88df2dcb633f8c58039b34694a606dc48494 SHA1 (patch-ac) = fa109df4489b5bad67b19272d1d3fee4fd934c18 SHA1 (patch-ad) = 9c7fbc7223b74cafc30626a024b0177d9e80ad8f diff --git a/misc/kdepimlibs4/PLIST b/misc/kdepimlibs4/PLIST index 0d67d4b1ea9..9002888fc09 100644 --- a/misc/kdepimlibs4/PLIST +++ b/misc/kdepimlibs4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 21:27:09 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/12/04 22:04:05 markd Exp $ include/KDE/Akonadi/AgentBase include/KDE/Akonadi/AgentFilterProxyModel include/KDE/Akonadi/AgentInstance @@ -763,6 +763,8 @@ share/kde/apps/libkholidays/holiday_it share/kde/apps/libkholidays/holiday_jm share/kde/apps/libkholidays/holiday_jp share/kde/apps/libkholidays/holiday_lt +share/kde/apps/libkholidays/holiday_luFrench +share/kde/apps/libkholidays/holiday_luLuxembourgish share/kde/apps/libkholidays/holiday_mx share/kde/apps/libkholidays/holiday_nl share/kde/apps/libkholidays/holiday_no diff --git a/misc/kdepimlibs4/distinfo b/misc/kdepimlibs4/distinfo index a7d07f3f735..a6fbf75d844 100644 --- a/misc/kdepimlibs4/distinfo +++ b/misc/kdepimlibs4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:51 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:05 markd Exp $ -SHA1 (kdepimlibs-4.3.3.tar.bz2) = a380ec7707433c814d3a196b9bebebd2363ed2e2 -RMD160 (kdepimlibs-4.3.3.tar.bz2) = cb3cf30367af204637e937da42e4c4bc033d0e8d -Size (kdepimlibs-4.3.3.tar.bz2) = 1780850 bytes +SHA1 (kdepimlibs-4.3.4.tar.bz2) = 4f7cd55999e82f504e3766b6f360ae58b984d5cb +RMD160 (kdepimlibs-4.3.4.tar.bz2) = 4c1d1ed223acb849645f43dc2545d5c451d98f1b +Size (kdepimlibs-4.3.4.tar.bz2) = 1781468 bytes diff --git a/misc/kdeplasma-addons4/distinfo b/misc/kdeplasma-addons4/distinfo index 9a75e9f8bd0..35d7bf00ac2 100644 --- a/misc/kdeplasma-addons4/distinfo +++ b/misc/kdeplasma-addons4/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:52 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:05 markd Exp $ -SHA1 (kdeplasma-addons-4.3.3.tar.bz2) = c474a193c951fbcb2566d0da1167214b88412ff2 -RMD160 (kdeplasma-addons-4.3.3.tar.bz2) = 04c6524d5f97c371d384a5162a57a64404f0a277 -Size (kdeplasma-addons-4.3.3.tar.bz2) = 1451797 bytes +SHA1 (kdeplasma-addons-4.3.4.tar.bz2) = 0b7af5db24fd194dd5fbbe1690d4ea62f597b891 +RMD160 (kdeplasma-addons-4.3.4.tar.bz2) = d4040e835769ec4edd7d7a976b13b2d9013cbcad +Size (kdeplasma-addons-4.3.4.tar.bz2) = 1451039 bytes SHA1 (patch-aa) = ea5181ba97e93c89ee331fec3737a639196733a0 diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo index 44286ec9d95..b54086b2870 100644 --- a/misc/kdeutils4/distinfo +++ b/misc/kdeutils4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:52 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:05 markd Exp $ -SHA1 (kdeutils-4.3.3.tar.bz2) = af3bd5c91020ae4fcd27b799eecf06aa161b48b4 -RMD160 (kdeutils-4.3.3.tar.bz2) = d1e8a1a8ee2a7bf1e5104dfb97af9b354aaac2bd -Size (kdeutils-4.3.3.tar.bz2) = 2525876 bytes +SHA1 (kdeutils-4.3.4.tar.bz2) = 2d5e26055e364af2df7459cdbc3aebdc3a8abdea +RMD160 (kdeutils-4.3.4.tar.bz2) = 8a6444010e026341d492c9a43681e2ed32c29863 +Size (kdeutils-4.3.4.tar.bz2) = 2526973 bytes diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo index 54c42965b45..ce988b54ff1 100644 --- a/multimedia/kdemultimedia4/distinfo +++ b/multimedia/kdemultimedia4/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:52 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:06 markd Exp $ -SHA1 (kdemultimedia-4.3.3.tar.bz2) = d4215ebfa119faafd8d91abdfaea7575eceb9a79 -RMD160 (kdemultimedia-4.3.3.tar.bz2) = d60bdcbfa57445b45b520faaf833c1e1727c05de -Size (kdemultimedia-4.3.3.tar.bz2) = 1588641 bytes +SHA1 (kdemultimedia-4.3.4.tar.bz2) = cf8f2696267ec682ee48fbb0f6171d9e9f7aa4b3 +RMD160 (kdemultimedia-4.3.4.tar.bz2) = ca6d4b75d40a73895c8fbc44ccbc2905dbe12a0c +Size (kdemultimedia-4.3.4.tar.bz2) = 1589180 bytes SHA1 (patch-ac) = 729f99548af7a21b98e5aa746cca7699f7880800 SHA1 (patch-ad) = 8901537664189b95f54f06b429362ac15df5afa9 SHA1 (patch-af) = c6ce9d8c45ca25ce5fb9ea8f0e26344cc7c70e15 diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo index f6965d2a2ba..1a645f4d8b6 100644 --- a/net/kdenetwork4/distinfo +++ b/net/kdenetwork4/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2009/11/04 11:05:52 markd Exp $ +$NetBSD: distinfo,v 1.5 2009/12/04 22:04:06 markd Exp $ -SHA1 (kdenetwork-4.3.3.tar.bz2) = b842f0cfe629a597e74b367037d53d95215efc0c -RMD160 (kdenetwork-4.3.3.tar.bz2) = 191dfbd73112b8194bcebf63c6e26abe9f6df299 -Size (kdenetwork-4.3.3.tar.bz2) = 7379886 bytes +SHA1 (kdenetwork-4.3.4.tar.bz2) = e066c3642d254e1e8213ef511546e960c5658596 +RMD160 (kdenetwork-4.3.4.tar.bz2) = 9b9a83b309420ad1c6b913569dc91a1d23e932e6 +Size (kdenetwork-4.3.4.tar.bz2) = 7379505 bytes SHA1 (patch-aa) = 0359cd86501c57197242c398d63c1fc77c60a4d0 SHA1 (patch-ab) = 0743b3b6c994623c507b8bcd52ee01dad31cf56f SHA1 (patch-ae) = 765d48550d2d8b7a59a1593a669b0909fef3bd96 diff --git a/www/kdewebdev4/distinfo b/www/kdewebdev4/distinfo index 9cafbe3aebc..650f5bf0bf3 100644 --- a/www/kdewebdev4/distinfo +++ b/www/kdewebdev4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:52 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:06 markd Exp $ -SHA1 (kdewebdev-4.3.3.tar.bz2) = f84f412a9eabb690c4005e2527f73002e2bbd5fb -RMD160 (kdewebdev-4.3.3.tar.bz2) = ce0616bca4427993bec37ae3bfa77067b364541b -Size (kdewebdev-4.3.3.tar.bz2) = 2527118 bytes +SHA1 (kdewebdev-4.3.4.tar.bz2) = 697f0557c616497a6f80bbcac472ad6ddd687ae8 +RMD160 (kdewebdev-4.3.4.tar.bz2) = 969b50973d5d0d30d2389e2c02c7737fab02b61a +Size (kdewebdev-4.3.4.tar.bz2) = 2526774 bytes diff --git a/x11/kde4-l10n-de/distinfo b/x11/kde4-l10n-de/distinfo index ccef507832c..a3eecda17b1 100644 --- a/x11/kde4-l10n-de/distinfo +++ b/x11/kde4-l10n-de/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:53 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:06 markd Exp $ -SHA1 (kde-l10n-de-4.3.3.tar.bz2) = 70cc4aa8857f67ca7dd675c4c39f0ceac98f8122 -RMD160 (kde-l10n-de-4.3.3.tar.bz2) = 18389eb81e4da8c1a21f0579801606ae1d1d5962 -Size (kde-l10n-de-4.3.3.tar.bz2) = 20265869 bytes +SHA1 (kde-l10n-de-4.3.4.tar.bz2) = c37c7eea733cfa0927d028fe3dd9a7ecf088a6e8 +RMD160 (kde-l10n-de-4.3.4.tar.bz2) = af1a6dfc9d8fd1cf72249d451cc6916122cd72f7 +Size (kde-l10n-de-4.3.4.tar.bz2) = 20265916 bytes diff --git a/x11/kde4-l10n-en_GB/PLIST b/x11/kde4-l10n-en_GB/PLIST index fffdd0de006..2a1e2002702 100644 --- a/x11/kde4-l10n-en_GB/PLIST +++ b/x11/kde4-l10n-en_GB/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $ +@comment $NetBSD: PLIST,v 1.3 2009/12/04 22:04:06 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 @@ -627,6 +627,7 @@ share/locale/en_GB/LC_MESSAGES/kbruch.mo share/locale/en_GB/LC_MESSAGES/kbugbuster.mo share/locale/en_GB/LC_MESSAGES/kcachegrind.mo share/locale/en_GB/LC_MESSAGES/kcachegrind_qt.mo +share/locale/en_GB/LC_MESSAGES/kcal_akonadi.mo share/locale/en_GB/LC_MESSAGES/kcalc.mo share/locale/en_GB/LC_MESSAGES/kcertpart.mo share/locale/en_GB/LC_MESSAGES/kcharselect.mo @@ -870,6 +871,7 @@ share/locale/en_GB/LC_MESSAGES/kres_remote.mo share/locale/en_GB/LC_MESSAGES/kres_scalix.mo share/locale/en_GB/LC_MESSAGES/kres_tvanytime.mo share/locale/en_GB/LC_MESSAGES/kres_xmlrpc.mo +share/locale/en_GB/LC_MESSAGES/kresources_shared_akonadi.mo share/locale/en_GB/LC_MESSAGES/kreversi.mo share/locale/en_GB/LC_MESSAGES/krfb.mo share/locale/en_GB/LC_MESSAGES/kruler.mo @@ -971,6 +973,7 @@ share/locale/en_GB/LC_MESSAGES/libphonon.mo share/locale/en_GB/LC_MESSAGES/libplasma.mo share/locale/en_GB/LC_MESSAGES/libplasmaclock.mo share/locale/en_GB/LC_MESSAGES/libplasmaweather.mo +share/locale/en_GB/LC_MESSAGES/librtm.mo share/locale/en_GB/LC_MESSAGES/libtaskmanager.mo share/locale/en_GB/LC_MESSAGES/lokalize.mo share/locale/en_GB/LC_MESSAGES/lskat.mo @@ -1068,6 +1071,7 @@ 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_kalzium.mo +share/locale/en_GB/LC_MESSAGES/plasma_engine_keystate.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 diff --git a/x11/kde4-l10n-en_GB/distinfo b/x11/kde4-l10n-en_GB/distinfo index df429979134..8f4cc45682a 100644 --- a/x11/kde4-l10n-en_GB/distinfo +++ b/x11/kde4-l10n-en_GB/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:53 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:06 markd Exp $ -SHA1 (kde-l10n-en_GB-4.3.3.tar.bz2) = 43031f21070d563ba02579ce68979fe839e50232 -RMD160 (kde-l10n-en_GB-4.3.3.tar.bz2) = 6efcc9e3c1def8e522ff7adfdac0698972d5d77a -Size (kde-l10n-en_GB-4.3.3.tar.bz2) = 3867266 bytes +SHA1 (kde-l10n-en_GB-4.3.4.tar.bz2) = cfe4505d83e7bcba706efd2efb5275ed42a9fa7a +RMD160 (kde-l10n-en_GB-4.3.4.tar.bz2) = 8bed4d8ceaf978a1336c008ef79ccca82d522ca6 +Size (kde-l10n-en_GB-4.3.4.tar.bz2) = 3872010 bytes diff --git a/x11/kde4-l10n-nl/distinfo b/x11/kde4-l10n-nl/distinfo index b59e6609f20..fc522949ca5 100644 --- a/x11/kde4-l10n-nl/distinfo +++ b/x11/kde4-l10n-nl/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:53 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:06 markd Exp $ -SHA1 (kde-l10n-nl-4.3.3.tar.bz2) = 9b7524f6e985b04d3197716cbd81e916ed448fb3 -RMD160 (kde-l10n-nl-4.3.3.tar.bz2) = 27f1d490da9d1d90db54c88b9ddbbad335bb8e6c -Size (kde-l10n-nl-4.3.3.tar.bz2) = 12994787 bytes +SHA1 (kde-l10n-nl-4.3.4.tar.bz2) = d532ae5b8b9d0edada461f5d25afa33450701799 +RMD160 (kde-l10n-nl-4.3.4.tar.bz2) = b7fd600ed634ab5d653982da6c9f48fe52d9f828 +Size (kde-l10n-nl-4.3.4.tar.bz2) = 12998981 bytes diff --git a/x11/kdebase-runtime4/distinfo b/x11/kdebase-runtime4/distinfo index cc4801443e3..00973f0b48e 100644 --- a/x11/kdebase-runtime4/distinfo +++ b/x11/kdebase-runtime4/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:52 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:06 markd Exp $ -SHA1 (kdebase-runtime-4.3.3.tar.bz2) = 43f0b96cbb3c61523fbd283d11c2a5eedde0c9a2 -RMD160 (kdebase-runtime-4.3.3.tar.bz2) = 03dadfbdf036a5a6118b36a943bd1e517cef8534 -Size (kdebase-runtime-4.3.3.tar.bz2) = 7329976 bytes +SHA1 (kdebase-runtime-4.3.4.tar.bz2) = 871d23457c4a2676704722e2e3b7194d447904ee +RMD160 (kdebase-runtime-4.3.4.tar.bz2) = 5563dd94d3bd70ec90a44cc295d958ec296eb195 +Size (kdebase-runtime-4.3.4.tar.bz2) = 7333696 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 e70dcafcb9c..cbe3cef5282 100644 --- a/x11/kdebase-workspace4/Makefile +++ b/x11/kdebase-workspace4/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2009/11/21 20:15:49 markd Exp $ +# $NetBSD: Makefile,v 1.4 2009/12/04 22:04:06 markd Exp $ DISTNAME= kdebase-workspace-${_KDE_VERSION} -PKGREVISION= 1 CATEGORIES= x11 COMMENT= base workspace for the KDE 4 integrated X11 desktop diff --git a/x11/kdebase-workspace4/distinfo b/x11/kdebase-workspace4/distinfo index 49838a4eb55..276c78e863e 100644 --- a/x11/kdebase-workspace4/distinfo +++ b/x11/kdebase-workspace4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:52 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:06 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.3.tar.bz2) = 2839e913cecef8ead0685bd50e9515ccd8bc0a9d -RMD160 (kdebase-workspace-4.3.3.tar.bz2) = 48ab90a519c7811e9fe4aa4e77f06134d2dc4afa -Size (kdebase-workspace-4.3.3.tar.bz2) = 62496238 bytes +SHA1 (kdebase-workspace-4.3.4.tar.bz2) = 5b43447139d22247d5bc2deee8e3a944447f0bbf +RMD160 (kdebase-workspace-4.3.4.tar.bz2) = 665b49b9dd03408ef9ec50e7bd5eb50b993d6138 +Size (kdebase-workspace-4.3.4.tar.bz2) = 62517195 bytes SHA1 (patch-ab) = a1dc303cdb27bb4cb3067d347baedabefbca8353 SHA1 (patch-ac) = 5420c39a055e6208097cf48db5513f7c9db09bef SHA1 (patch-ad) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84 diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 2a0c03dcb4b..52aa6f1afbf 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2009/11/16 08:55:06 markd Exp $ +# $NetBSD: Makefile,v 1.4 2009/12/04 22:04:06 markd Exp $ DISTNAME= kdebase-${_KDE_VERSION} -PKGREVISION= 1 CATEGORIES= x11 COMMENT= Base modules for the KDE 4 integrated X11 desktop diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo index 6be3f92b700..7989b49034e 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2009/11/16 08:55:06 markd Exp $ +$NetBSD: distinfo,v 1.5 2009/12/04 22:04:06 markd Exp $ -SHA1 (kdebase-4.3.3.tar.bz2) = 7459ea75312961b4802626edd22dc291370be329 -RMD160 (kdebase-4.3.3.tar.bz2) = 7fdc0f5cb3574b6707ae8f005eb887126ca2339e -Size (kdebase-4.3.3.tar.bz2) = 4275500 bytes +SHA1 (kdebase-4.3.4.tar.bz2) = 7f8637367177c93916dfc2e6a2f6323a5e91c6ce +RMD160 (kdebase-4.3.4.tar.bz2) = b300e0c11a20e4e9bd68c80dde94cea4c2fa6f15 +Size (kdebase-4.3.4.tar.bz2) = 4150757 bytes SHA1 (patch-aa) = 8ab0c0a6f79e871cf869d9aae2331f9ed3f8d366 diff --git a/x11/kdebindings4-python/Makefile b/x11/kdebindings4-python/Makefile index 07059f4f25d..cc5e3d466b5 100644 --- a/x11/kdebindings4-python/Makefile +++ b/x11/kdebindings4-python/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2009/11/26 20:00:20 markd Exp $ +# $NetBSD: Makefile,v 1.5 2009/12/04 22:04:06 markd Exp $ PKGNAME= kdebindings4-python-${_KDE_VERSION} -PKGREVISION= 2 DISTNAME= kdebindings-${_KDE_VERSION} CATEGORIES= misc COMMENT= Python bindings for the KDE integrated X11 desktop diff --git a/x11/kdebindings4-python/distinfo b/x11/kdebindings4-python/distinfo index b062556e3ad..6b39cdf11ee 100644 --- a/x11/kdebindings4-python/distinfo +++ b/x11/kdebindings4-python/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:53 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:06 markd Exp $ -SHA1 (kdebindings-4.3.3.tar.bz2) = 34ddcfd5d338962b8623b9dd9c2b850a621e4040 -RMD160 (kdebindings-4.3.3.tar.bz2) = 587fd37cc2369a39fb1cf97e164afc40294f97b2 -Size (kdebindings-4.3.3.tar.bz2) = 4881799 bytes +SHA1 (kdebindings-4.3.4.tar.bz2) = 0c7bf45bd3d81bf6aa1d2b085c17b4ce925c656b +RMD160 (kdebindings-4.3.4.tar.bz2) = 71bf95f667a5e3d7b165987e582ef9deafad0145 +Size (kdebindings-4.3.4.tar.bz2) = 4880929 bytes SHA1 (patch-aa) = f01b1d350a8e79e639f46c797baf035684275158 SHA1 (patch-ab) = cae51d216ad914009b4e9c80a17a172ec5a5eaec diff --git a/x11/kdelibs-experimental4/distinfo b/x11/kdelibs-experimental4/distinfo index 8bdbccda151..09532236554 100644 --- a/x11/kdelibs-experimental4/distinfo +++ b/x11/kdelibs-experimental4/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:52 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:07 markd Exp $ -SHA1 (kdelibs-experimental-4.3.3.tar.bz2) = 68a98febc551a7d98a78798864ff85f556fda12b -RMD160 (kdelibs-experimental-4.3.3.tar.bz2) = 69e868445f706bcf1a90714feafac5a0728f2595 -Size (kdelibs-experimental-4.3.3.tar.bz2) = 26910 bytes +SHA1 (kdelibs-experimental-4.3.4.tar.bz2) = 43e19c44c3cdc1049c9ee9aca2e2f83a48ffe8bd +RMD160 (kdelibs-experimental-4.3.4.tar.bz2) = fb8f77e9c728fa2016b9a3710ad91805b11ed924 +Size (kdelibs-experimental-4.3.4.tar.bz2) = 26904 bytes diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST index dd4ad03b6cd..41515fc2c5e 100644 --- a/x11/kdelibs4/PLIST +++ b/x11/kdelibs4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $ +@comment $NetBSD: PLIST,v 1.3 2009/12/04 22:04:07 markd Exp $ bin/checkXML bin/kbuildsycoca4 bin/kconfig_compiler @@ -2817,6 +2817,7 @@ share/kde/apps/ksgmltools2/customization/pl/entities/underArtisticLicense.docboo share/kde/apps/ksgmltools2/customization/pl/entities/underBSDLicense.docbook share/kde/apps/ksgmltools2/customization/pl/entities/underFDL.docbook share/kde/apps/ksgmltools2/customization/pl/entities/underGPL.docbook +share/kde/apps/ksgmltools2/customization/pl/entities/underLGPL.docbook share/kde/apps/ksgmltools2/customization/pl/entities/underX11License.docbook share/kde/apps/ksgmltools2/customization/pl/entities/update-doc.docbook share/kde/apps/ksgmltools2/customization/pl/lang.entities diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 3c679720ff9..88471d12b06 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.3 2009/11/04 11:05:52 markd Exp $ +$NetBSD: distinfo,v 1.4 2009/12/04 22:04:07 markd Exp $ -SHA1 (kdelibs-4.3.3.tar.bz2) = 89b55982e007c44835a9da0f540dd57fa096df45 -RMD160 (kdelibs-4.3.3.tar.bz2) = 3d6a2c971cef12fb2cb9ba64a10200b2cf098043 -Size (kdelibs-4.3.3.tar.bz2) = 10516364 bytes +SHA1 (kdelibs-4.3.4.tar.bz2) = 1af2d185c88898b71f36b57f033e3a6d9839ab3d +RMD160 (kdelibs-4.3.4.tar.bz2) = 0719043ddcf251a3fce4c2d4bfb1583e80c4b54d +Size (kdelibs-4.3.4.tar.bz2) = 10518171 bytes SHA1 (patch-aa) = 7146107f78bbc618cf80479195581f29fc6b5977 SHA1 (patch-ab) = aec1140bef01199f067b079c30d95fea1814839d -SHA1 (patch-ac) = 223a97a63907477314b69040e1bca3e2ff8cc7b7 +SHA1 (patch-ac) = f90a566c3eb500f01b463e491748bc50ce963682 SHA1 (patch-ad) = 2a0dfd3dda071654c89b8dda3db8885e2a55ba2b SHA1 (patch-ag) = af1e58512984726a4efaf315bb958a9a529638b8 SHA1 (patch-ah) = b583dbe1b712984bbe002cc9143352729fba94ed -SHA1 (patch-ai) = 75b18b8ac0da0eda398d717b9ee3a2af68bcebe4 SHA1 (patch-aj) = 8520c322d4579e9485253c8e8b130669b0f8b618 diff --git a/x11/kdelibs4/patches/patch-ac b/x11/kdelibs4/patches/patch-ac index a15a1a169f3..5a5353881c1 100644 --- a/x11/kdelibs4/patches/patch-ac +++ b/x11/kdelibs4/patches/patch-ac @@ -1,6 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2009/10/02 19:19:00 markd Exp $ - -Includes patch from https://bugs.kde.org/show_bug.cgi?id=193215 +$NetBSD: patch-ac,v 1.2 2009/12/04 22:04:07 markd Exp $ --- kio/kssl/kopenssl.cpp.ORIG 2008-10-23 12:05:00.000000000 +1300 +++ kio/kssl/kopenssl.cpp @@ -200,12 +198,3 @@ Includes patch from https://bugs.kde.org/show_bug.cgi?id=193215 if (d->sslLib) { #ifdef KSSL_HAVE_SSL -@@ -622,7 +613,7 @@ KOpenSSLProxy::KOpenSSLProxy() - K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) d->sslLib->resolveFunction("SSL_set_session"); - K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) d->sslLib->resolveFunction("d2i_SSL_SESSION"); - K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) d->sslLib->resolveFunction("i2d_SSL_SESSION"); -- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers"); -+ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers"); - #endif - - diff --git a/x11/kdelibs4/patches/patch-ai b/x11/kdelibs4/patches/patch-ai deleted file mode 100644 index 709287333fb..00000000000 --- a/x11/kdelibs4/patches/patch-ai +++ /dev/null @@ -1,94 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2009/10/02 19:18:59 markd Exp $ - -From https://bugs.kde.org/show_bug.cgi?id=193215 - ---- kio/kssl/kopenssl.h.orig 2009-05-20 00:06:53.000000000 +1200 -+++ kio/kssl/kopenssl.h -@@ -43,6 +43,9 @@ class KOpenSSLProxyPrivate; - #include <openssl/evp.h> - #include <openssl/stack.h> - #include <openssl/bn.h> -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L -+typedef _STACK STACK; -+#endif - #undef crypt - #endif - -@@ -499,24 +502,50 @@ public: - */ - char *sk_pop(STACK *s); - -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L -+ /* -+ * Pop off the stack with OpenSSL 1.x -+ */ -+ char *sk_pop(void *s) { return sk_pop(reinterpret_cast<STACK*>(s)); } -+#endif -+ - - /* - * Free the stack - */ - void sk_free(STACK *s); - -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L -+ /* -+ * Free the stack with OpenSSL 1.x -+ */ -+ void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); } -+#endif -+ - - /* - * Number of elements in the stack - */ - int sk_num(STACK *s); - -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L -+ /* -+ * Number of elements in the stack with OpenSSL 1.x -+ */ -+ int sk_num(void *s) { return sk_num(reinterpret_cast<STACK*>(s)); } -+#endif - - /* - * Value of element n in the stack - */ - char *sk_value(STACK *s, int n); - -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L -+ /* -+ * Value of element n in the stack with OpenSSL 1.x -+ */ -+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); } -+#endif - - /* - * Create a new stack -@@ -529,12 +558,26 @@ public: - */ - int sk_push(STACK *s, char *d); - -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L -+ /* -+ * Add an element to the stack with OpenSSL 1.x -+ */ -+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); } -+#endif -+ - - /* - * Duplicate the stack - */ - STACK *sk_dup(STACK *s); - -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L -+ /* -+ * Duplicate the stack with OpenSSL 1.x -+ */ -+ STACK *sk_dup(void *s) { return sk_dup(reinterpret_cast<STACK*>(s)); } -+#endif -+ - - /* - * Convert an ASN1_INTEGER to its text form |