Update to KDE SC 4.8.0

5 files changed, 136 insertions, 61 deletions

diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index ece637a6c0b..ce368e20e8e 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2012/03/10 19:56:30 markd Exp $
+# $NetBSD: Makefile,v 1.27 2012/03/19 21:40:40 markd Exp $
 
 DISTNAME=	kdegames-${_KDE_VERSION}
-PKGREVISION=	7
+PKGNAME=	${DISTNAME:S/-4/4-4/}
 CATEGORIES=	games
 COMMENT=	Games for the KDE integrated X11 desktop
 
@@ -10,17 +10,21 @@ COMMENT=	Games for the KDE integrated X11 desktop
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
 REPLACE_PERL+=	katomic/katomic-levelset-upd.pl
+REPLACE_PERL+=	klickety/klickety-2.0-inherit-ksame-highscore.pl
 
 DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 
-REPLACE_PYTHON+= \
-	kajongg/setup.py \
-	kajongg/src/kajongg.py \
-	kajongg/src/kajonggserver.py \
-	kajongg/src/scoringtest.py
+REPLACE_PYTHON+=	kajongg/setup.py
+REPLACE_PYTHON+=	kajongg/src/deferredutil.py
+REPLACE_PYTHON+=	kajongg/src/kajongg.py
+REPLACE_PYTHON+=	kajongg/src/kajonggserver.py
+REPLACE_PYTHON+=	kajongg/src/scoringtest.py
+REPLACE_PYTHON+=	kajongg/src/server.py
 
 .include "../../meta-pkgs/kde4/kde4.mk"
 
+.include "../../audio/openal/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/python/application.mk"
 # don't add python include dir to include path
@@ -31,7 +35,7 @@ BUILDLINK_INCDIRS.${PYPACKAGE}=
 .include "../../security/qca2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../x11/kdebase-runtime4/buildlink3.mk"
-.include "../../x11/kdebindings4-python/buildlink3.mk"
+.include "../../x11/kde-runtime4/buildlink3.mk"
+.include "../../x11/py-kde4/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/kdegames4/PLIST b/games/kdegames4/PLIST
index 964fbe02cec..8d2cbf87230 100644
--- a/games/kdegames4/PLIST
+++ b/games/kdegames4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/12/06 11:43:38 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/03/19 21:40:41 markd Exp $
 bin/bomber
 bin/bovo
 bin/granatier
@@ -20,6 +20,7 @@ bin/kigo
 bin/killbots
 bin/kiriki
 bin/kjumpingcube
+bin/klickety
 bin/klines
 bin/kmahjongg
 bin/kmines
@@ -29,7 +30,6 @@ bin/kollision
 bin/konquest
 bin/kpat
 bin/kreversi
-bin/ksame
 bin/kshisen
 bin/ksirk
 bin/ksirkskineditor
@@ -39,7 +39,6 @@ bin/ksudoku
 bin/ktron
 bin/ktuberling
 bin/kubrick
-bin/libpala-puzzlebuilder
 bin/lskat
 bin/palapeli
 include/KDE/KCardDialog
@@ -75,6 +74,10 @@ include/KDE/KGameLCD
 include/KDE/KGameMisc
 include/KDE/KGamePopupItem
 include/KDE/KGameProgress
+include/KDE/KGameRenderedItem
+include/KDE/KGameRenderedObjectItem
+include/KDE/KGameRenderer
+include/KDE/KGameRendererClient
 include/KDE/KGameSvgDigits
 include/KDE/KGameSvgDocument
 include/KDE/KGameTheme
@@ -85,6 +88,7 @@ include/KDE/KScoreDialog
 include/KDE/KStandardGameAction
 include/Pala/Slicer
 include/Pala/SlicerJob
+include/Pala/SlicerMode
 include/Pala/SlicerProperty
 include/Pala/SlicerPropertySet
 include/cardcache.h
@@ -128,6 +132,10 @@ include/kgamelcd.h
 include/kgamemisc.h
 include/kgamepopupitem.h
 include/kgameprogress.h
+include/kgamerendereditem.h
+include/kgamerenderedobjectitem.h
+include/kgamerenderer.h
+include/kgamerendererclient.h
 include/kgamesvgdocument.h
 include/kgametheme.h
 include/kgamethemeselector.h
@@ -153,8 +161,10 @@ include/libkmahjongg_export.h
 include/libpala/libpalamacros.h
 include/libpala/slicer.h
 include/libpala/slicerjob.h
+include/libpala/slicermode.h
 include/libpala/slicerproperty.h
 include/libpala/slicerpropertyset.h
+lib/kde4/palapeli_goldbergslicer.so
 lib/kde4/palapeli_jigsawslicer.so
 lib/kde4/palapeli_rectslicer.so
 lib/kde4/palathumbcreator.so
@@ -164,25 +174,25 @@ lib/libiris_ksirk.so.2.0.0
 lib/libkcardgame.so
 lib/libkdegames.so
 lib/libkdegames.so.5
-lib/libkdegames.so.5.0.0
+lib/libkdegames.so.5.1.0
 lib/libkggzgames.so
 lib/libkggzgames.so.4
-lib/libkggzgames.so.4.5.0
+lib/libkggzgames.so.4.8.0
 lib/libkggzmod.so
 lib/libkggzmod.so.4
-lib/libkggzmod.so.4.5.0
+lib/libkggzmod.so.4.8.0
 lib/libkggznet.so
 lib/libkggznet.so.4
-lib/libkggznet.so.4.5.0
+lib/libkggznet.so.4.8.0
 lib/libkmahjongglib.so
 lib/libkmahjongglib.so.4
-lib/libkmahjongglib.so.4.5.0
+lib/libkmahjongglib.so.4.8.0
 lib/libkolfprivate.so
 lib/libkolfprivate.so.4
-lib/libkolfprivate.so.4.5.0
+lib/libkolfprivate.so.4.8.0
 lib/libpala.so
 lib/libpala.so.0
-lib/libpala.so.0.1.0
+lib/libpala.so.0.2.0
 lib/libpala/libpala-config.cmake
 lib/libpala/pala-targets-relwithdebinfo.cmake
 lib/libpala/pala-targets.cmake
@@ -205,6 +215,7 @@ share/applications/kde4/kigo.desktop
 share/applications/kde4/killbots.desktop
 share/applications/kde4/kiriki.desktop
 share/applications/kde4/kjumpingcube.desktop
+share/applications/kde4/klickety.desktop
 share/applications/kde4/klines.desktop
 share/applications/kde4/kmahjongg.desktop
 share/applications/kde4/kmines.desktop
@@ -341,6 +352,18 @@ share/doc/kde/HTML/en/kiriki/index.docbook
 share/doc/kde/HTML/en/kjumpingcube/common
 share/doc/kde/HTML/en/kjumpingcube/index.cache.bz2
 share/doc/kde/HTML/en/kjumpingcube/index.docbook
+share/doc/kde/HTML/en/klickety/common
+share/doc/kde/HTML/en/klickety/config-background.png
+share/doc/kde/HTML/en/klickety/config-customgame.png
+share/doc/kde/HTML/en/klickety/config-general.png
+share/doc/kde/HTML/en/klickety/config-theme.png
+share/doc/kde/HTML/en/klickety/gamescreen.png
+share/doc/kde/HTML/en/klickety/highscore.png
+share/doc/kde/HTML/en/klickety/index.cache.bz2
+share/doc/kde/HTML/en/klickety/index.docbook
+share/doc/kde/HTML/en/klickety/ksamemode.png
+share/doc/kde/HTML/en/klickety/numbered.png
+share/doc/kde/HTML/en/klickety/shortcuts.png
 share/doc/kde/HTML/en/klines/common
 share/doc/kde/HTML/en/klines/gamescreen.png
 share/doc/kde/HTML/en/klines/index.cache.bz2
@@ -384,9 +407,6 @@ share/doc/kde/HTML/en/kreversi/common
 share/doc/kde/HTML/en/kreversi/index.cache.bz2
 share/doc/kde/HTML/en/kreversi/index.docbook
 share/doc/kde/HTML/en/kreversi/kreversi1.png
-share/doc/kde/HTML/en/ksame/common
-share/doc/kde/HTML/en/ksame/index.cache.bz2
-share/doc/kde/HTML/en/ksame/index.docbook
 share/doc/kde/HTML/en/kshisen/common
 share/doc/kde/HTML/en/kshisen/index.cache.bz2
 share/doc/kde/HTML/en/kshisen/index.docbook
@@ -494,6 +514,7 @@ share/doc/kde/HTML/en/palapeli/puzzletable1.png
 share/icons/hicolor/128x128/apps/bomber.png
 share/icons/hicolor/128x128/apps/bovo.png
 share/icons/hicolor/128x128/apps/granatier.png
+share/icons/hicolor/128x128/apps/kajongg.png
 share/icons/hicolor/128x128/apps/kapman.png
 share/icons/hicolor/128x128/apps/katomic.png
 share/icons/hicolor/128x128/apps/kbattleship.png
@@ -509,6 +530,7 @@ share/icons/hicolor/128x128/apps/kigo.png
 share/icons/hicolor/128x128/apps/killbots.png
 share/icons/hicolor/128x128/apps/kiriki.png
 share/icons/hicolor/128x128/apps/kjumpingcube.png
+share/icons/hicolor/128x128/apps/klickety.png
 share/icons/hicolor/128x128/apps/klines.png
 share/icons/hicolor/128x128/apps/kmahjongg.png
 share/icons/hicolor/128x128/apps/kmines.png
@@ -533,6 +555,7 @@ share/icons/hicolor/128x128/mimetypes/application-x-palapeli.png
 share/icons/hicolor/128x128/mimetypes/application-x-tuberling.png
 share/icons/hicolor/16x16/apps/bovo.png
 share/icons/hicolor/16x16/apps/granatier.png
+share/icons/hicolor/16x16/apps/kajongg.png
 share/icons/hicolor/16x16/apps/kapman.png
 share/icons/hicolor/16x16/apps/katomic.png
 share/icons/hicolor/16x16/apps/kbattleship.png
@@ -548,6 +571,7 @@ share/icons/hicolor/16x16/apps/kigo.png
 share/icons/hicolor/16x16/apps/killbots.png
 share/icons/hicolor/16x16/apps/kiriki.png
 share/icons/hicolor/16x16/apps/kjumpingcube.png
+share/icons/hicolor/16x16/apps/klickety.png
 share/icons/hicolor/16x16/apps/klines.png
 share/icons/hicolor/16x16/apps/kmahjongg.png
 share/icons/hicolor/16x16/apps/kmines.png
@@ -572,6 +596,7 @@ share/icons/hicolor/16x16/mimetypes/application-x-palapeli.png
 share/icons/hicolor/16x16/mimetypes/application-x-tuberling.png
 share/icons/hicolor/22x22/apps/bovo.png
 share/icons/hicolor/22x22/apps/granatier.png
+share/icons/hicolor/22x22/apps/kajongg.png
 share/icons/hicolor/22x22/apps/kapman.png
 share/icons/hicolor/22x22/apps/katomic.png
 share/icons/hicolor/22x22/apps/kbattleship.png
@@ -587,6 +612,7 @@ share/icons/hicolor/22x22/apps/kigo.png
 share/icons/hicolor/22x22/apps/killbots.png
 share/icons/hicolor/22x22/apps/kiriki.png
 share/icons/hicolor/22x22/apps/kjumpingcube.png
+share/icons/hicolor/22x22/apps/klickety.png
 share/icons/hicolor/22x22/apps/klines.png
 share/icons/hicolor/22x22/apps/kmahjongg.png
 share/icons/hicolor/22x22/apps/kmines.png
@@ -614,6 +640,7 @@ share/icons/hicolor/256x256/apps/kpat.png
 share/icons/hicolor/32x32/apps/bomber.png
 share/icons/hicolor/32x32/apps/bovo.png
 share/icons/hicolor/32x32/apps/granatier.png
+share/icons/hicolor/32x32/apps/kajongg.png
 share/icons/hicolor/32x32/apps/kapman.png
 share/icons/hicolor/32x32/apps/katomic.png
 share/icons/hicolor/32x32/apps/kbattleship.png
@@ -629,6 +656,7 @@ share/icons/hicolor/32x32/apps/kigo.png
 share/icons/hicolor/32x32/apps/killbots.png
 share/icons/hicolor/32x32/apps/kiriki.png
 share/icons/hicolor/32x32/apps/kjumpingcube.png
+share/icons/hicolor/32x32/apps/klickety.png
 share/icons/hicolor/32x32/apps/klines.png
 share/icons/hicolor/32x32/apps/kmahjongg.png
 share/icons/hicolor/32x32/apps/kmines.png
@@ -654,6 +682,7 @@ share/icons/hicolor/32x32/mimetypes/application-x-tuberling.png
 share/icons/hicolor/48x48/apps/bomber.png
 share/icons/hicolor/48x48/apps/bovo.png
 share/icons/hicolor/48x48/apps/granatier.png
+share/icons/hicolor/48x48/apps/kajongg.png
 share/icons/hicolor/48x48/apps/kapman.png
 share/icons/hicolor/48x48/apps/katomic.png
 share/icons/hicolor/48x48/apps/kbattleship.png
@@ -669,6 +698,7 @@ share/icons/hicolor/48x48/apps/kigo.png
 share/icons/hicolor/48x48/apps/killbots.png
 share/icons/hicolor/48x48/apps/kiriki.png
 share/icons/hicolor/48x48/apps/kjumpingcube.png
+share/icons/hicolor/48x48/apps/klickety.png
 share/icons/hicolor/48x48/apps/klines.png
 share/icons/hicolor/48x48/apps/kmahjongg.png
 share/icons/hicolor/48x48/apps/kmines.png
@@ -693,6 +723,7 @@ share/icons/hicolor/48x48/mimetypes/application-x-tuberling.png
 share/icons/hicolor/64x64/apps/bomber.png
 share/icons/hicolor/64x64/apps/bovo.png
 share/icons/hicolor/64x64/apps/granatier.png
+share/icons/hicolor/64x64/apps/kajongg.png
 share/icons/hicolor/64x64/apps/kapman.png
 share/icons/hicolor/64x64/apps/katomic.png
 share/icons/hicolor/64x64/apps/kbattleship.png
@@ -708,6 +739,7 @@ share/icons/hicolor/64x64/apps/kigo.png
 share/icons/hicolor/64x64/apps/killbots.png
 share/icons/hicolor/64x64/apps/kiriki.png
 share/icons/hicolor/64x64/apps/kjumpingcube.png
+share/icons/hicolor/64x64/apps/klickety.png
 share/icons/hicolor/64x64/apps/klines.png
 share/icons/hicolor/64x64/apps/kmahjongg.png
 share/icons/hicolor/64x64/apps/kmines.png
@@ -951,6 +983,8 @@ share/kde/apps/granatier/arenas/clanbomber_Tiny_Standard.desktop
 share/kde/apps/granatier/arenas/clanbomber_Tiny_Standard.xml
 share/kde/apps/granatier/arenas/clanbomber_Whole_Mess.desktop
 share/kde/apps/granatier/arenas/clanbomber_Whole_Mess.xml
+share/kde/apps/granatier/arenas/clover.desktop
+share/kde/apps/granatier/arenas/clover.xml
 share/kde/apps/granatier/arenas/crazy.desktop
 share/kde/apps/granatier/arenas/crazy.xml
 share/kde/apps/granatier/arenas/granatier.desktop
@@ -975,17 +1009,17 @@ share/kde/apps/granatier/players/player4_preview.svgz
 share/kde/apps/granatier/players/player5.desktop
 share/kde/apps/granatier/players/player5.svgz
 share/kde/apps/granatier/players/player5_preview.svgz
-share/kde/apps/granatier/sounds/break.ogg
-share/kde/apps/granatier/sounds/clear.ogg
-share/kde/apps/granatier/sounds/corpse_explode.ogg
-share/kde/apps/granatier/sounds/crunch.ogg
-share/kde/apps/granatier/sounds/deepfall.ogg
-share/kde/apps/granatier/sounds/die.ogg
-share/kde/apps/granatier/sounds/explode.ogg
-share/kde/apps/granatier/sounds/joint.ogg
-share/kde/apps/granatier/sounds/putbomb.ogg
-share/kde/apps/granatier/sounds/winlevel.ogg
-share/kde/apps/granatier/sounds/wow.ogg
+share/kde/apps/granatier/sounds/break.wav
+share/kde/apps/granatier/sounds/clear.wav
+share/kde/apps/granatier/sounds/corpse_explode.wav
+share/kde/apps/granatier/sounds/crunch.wav
+share/kde/apps/granatier/sounds/deepfall.wav
+share/kde/apps/granatier/sounds/die.wav
+share/kde/apps/granatier/sounds/explode.wav
+share/kde/apps/granatier/sounds/joint.wav
+share/kde/apps/granatier/sounds/putbomb.wav
+share/kde/apps/granatier/sounds/winlevel.wav
+share/kde/apps/granatier/sounds/wow.wav
 share/kde/apps/granatier/themes/clanbomber.desktop
 share/kde/apps/granatier/themes/clanbomber.svgz
 share/kde/apps/granatier/themes/clanbomber_preview.png
@@ -997,6 +1031,8 @@ share/kde/apps/granatier/themes/waterbomb.svgz
 share/kde/apps/granatier/themes/waterbomb_preview.png
 share/kde/apps/kajongg/about.py
 share/kde/apps/kajongg/about.pyc
+share/kde/apps/kajongg/animation.py
+share/kde/apps/kajongg/animation.pyc
 share/kde/apps/kajongg/background.py
 share/kde/apps/kajongg/background.pyc
 share/kde/apps/kajongg/backgroundselector.py
@@ -1010,6 +1046,8 @@ share/kde/apps/kajongg/common.py
 share/kde/apps/kajongg/common.pyc
 share/kde/apps/kajongg/config.py
 share/kde/apps/kajongg/config.pyc
+share/kde/apps/kajongg/deferredutil.py
+share/kde/apps/kajongg/deferredutil.pyc
 share/kde/apps/kajongg/differ.py
 share/kde/apps/kajongg/differ.pyc
 share/kde/apps/kajongg/game.py
@@ -1020,19 +1058,25 @@ share/kde/apps/kajongg/genericdelegates.py
 share/kde/apps/kajongg/genericdelegates.pyc
 share/kde/apps/kajongg/guiutil.py
 share/kde/apps/kajongg/guiutil.pyc
+share/kde/apps/kajongg/handboard.py
+share/kde/apps/kajongg/handboard.pyc
 share/kde/apps/kajongg/humanclient.py
 share/kde/apps/kajongg/humanclient.pyc
 share/kde/apps/kajongg/kajongg.py
-share/kde/apps/kajongg/kajongg.pyc
 share/kde/apps/kajongg/kajonggserver.py
-share/kde/apps/kajongg/kajonggserver.pyc
 share/kde/apps/kajongg/kajonggui.rc
+share/kde/apps/kajongg/kde.py
+share/kde/apps/kajongg/kde.pyc
 share/kde/apps/kajongg/meld.py
 share/kde/apps/kajongg/meld.pyc
 share/kde/apps/kajongg/message.py
 share/kde/apps/kajongg/message.pyc
+share/kde/apps/kajongg/modeltest.py
+share/kde/apps/kajongg/modeltest.pyc
 share/kde/apps/kajongg/move.py
 share/kde/apps/kajongg/move.pyc
+share/kde/apps/kajongg/player.py
+share/kde/apps/kajongg/player.pyc
 share/kde/apps/kajongg/playerlist.py
 share/kde/apps/kajongg/playerlist.pyc
 share/kde/apps/kajongg/playfield.py
@@ -1049,6 +1093,8 @@ share/kde/apps/kajongg/scoring.py
 share/kde/apps/kajongg/scoring.pyc
 share/kde/apps/kajongg/scoringengine.py
 share/kde/apps/kajongg/scoringengine.pyc
+share/kde/apps/kajongg/server.py
+share/kde/apps/kajongg/server.pyc
 share/kde/apps/kajongg/sound.py
 share/kde/apps/kajongg/sound.pyc
 share/kde/apps/kajongg/statesaver.py
@@ -1062,6 +1108,8 @@ share/kde/apps/kajongg/tileset.pyc
 share/kde/apps/kajongg/tilesetselector.py
 share/kde/apps/kajongg/tilesetselector.pyc
 share/kde/apps/kajongg/tilesetselector.ui
+share/kde/apps/kajongg/tree.py
+share/kde/apps/kajongg/tree.pyc
 share/kde/apps/kajongg/uiwall.py
 share/kde/apps/kajongg/uiwall.pyc
 share/kde/apps/kajongg/util.py
@@ -1088,6 +1136,7 @@ share/kde/apps/kapman/themes/retro.svgz
 share/kde/apps/kapman/themes/retro_preview.png
 share/kde/apps/katomic/katomicui.rc
 share/kde/apps/katomic/levels/default_levels.dat
+share/kde/apps/katomic/pics/default_theme.desktop
 share/kde/apps/katomic/pics/default_theme.svgz
 share/kde/apps/kbattleship/kbattleshipui.rc
 share/kde/apps/kbattleship/pictures/default_theme.svgz
@@ -1150,7 +1199,8 @@ share/kde/apps/kbreakout/themes/web20.svgz
 share/kde/apps/kbreakout/themes/web20_preview.png
 share/kde/apps/kconf_update/katomic-levelset-upd.pl
 share/kde/apps/kconf_update/katomic-levelset.upd
-share/kde/apps/kconf_update/kpat_update_cardwidth.upd
+share/kde/apps/kconf_update/klickety-2.0-inherit-ksame-highscore.pl
+share/kde/apps/kconf_update/klickety.upd
 share/kde/apps/kdegames/pics/star.png
 share/kde/apps/kdiamond/kdiamond.kcfg
 share/kde/apps/kdiamond/kdiamond.notifyrc
@@ -1178,6 +1228,8 @@ share/kde/apps/kfourinline/grafix/yellow_reflection.rc
 share/kde/apps/kfourinline/kfourinlineui.rc
 share/kde/apps/kgoldrunner/kgoldrunnerui.rc
 share/kde/apps/kgoldrunner/system/game_CM.txt
+share/kde/apps/kgoldrunner/system/game_GMEP.txt
+share/kde/apps/kgoldrunner/system/game_GMGR.txt
 share/kde/apps/kgoldrunner/system/game_MAZ.txt
 share/kde/apps/kgoldrunner/system/game_cnt.txt
 share/kde/apps/kgoldrunner/system/game_ende.txt
@@ -1201,16 +1253,16 @@ share/kde/apps/kgoldrunner/themes/black-on-white.desktop
 share/kde/apps/kgoldrunner/themes/default.desktop
 share/kde/apps/kgoldrunner/themes/default/actors.svg
 share/kde/apps/kgoldrunner/themes/default/climb.wav
-share/kde/apps/kgoldrunner/themes/default/completed.ogg
-share/kde/apps/kgoldrunner/themes/default/death.ogg
-share/kde/apps/kgoldrunner/themes/default/dig.ogg
-share/kde/apps/kgoldrunner/themes/default/falling.ogg
-share/kde/apps/kgoldrunner/themes/default/gameover.ogg
-share/kde/apps/kgoldrunner/themes/default/gold.ogg
-share/kde/apps/kgoldrunner/themes/default/ladder.ogg
+share/kde/apps/kgoldrunner/themes/default/completed.wav
+share/kde/apps/kgoldrunner/themes/default/death.wav
+share/kde/apps/kgoldrunner/themes/default/dig.wav
+share/kde/apps/kgoldrunner/themes/default/falling.wav
+share/kde/apps/kgoldrunner/themes/default/gameover.wav
+share/kde/apps/kgoldrunner/themes/default/gold.wav
+share/kde/apps/kgoldrunner/themes/default/ladder.wav
 share/kde/apps/kgoldrunner/themes/default/set.svg
 share/kde/apps/kgoldrunner/themes/default/step.wav
-share/kde/apps/kgoldrunner/themes/default/victory.ogg
+share/kde/apps/kgoldrunner/themes/default/victory.wav
 share/kde/apps/kgoldrunner/themes/egypt.desktop
 share/kde/apps/kgoldrunner/themes/egypt/actors.svgz
 share/kde/apps/kgoldrunner/themes/egypt/egypt_kgr.svgz
@@ -1230,6 +1282,9 @@ share/kde/apps/kigo/kigoui.rc
 share/kde/apps/kigo/themes/default.desktop
 share/kde/apps/kigo/themes/kigo_default.png
 share/kde/apps/kigo/themes/kigo_default.svgz
+share/kde/apps/kigo/themes/kigo_plain.png
+share/kde/apps/kigo/themes/kigo_plain.svgz
+share/kde/apps/kigo/themes/plain.desktop
 share/kde/apps/killbots/killbotsui.rc
 share/kde/apps/killbots/rulesets/classic.desktop
 share/kde/apps/killbots/rulesets/daleks.desktop
@@ -1259,6 +1314,18 @@ share/kde/apps/kiriki/kirikiui.rc
 share/kde/apps/kjumpingcube/kjumpingcubeui.rc
 share/kde/apps/kjumpingcube/pics/default.desktop
 share/kde/apps/kjumpingcube/pics/default.svg
+share/kde/apps/klickety/klickety.kcfg
+share/kde/apps/klickety/klickety.notifyrc
+share/kde/apps/klickety/klicketyui.rc
+share/kde/apps/klickety/themes/classic.svg
+share/kde/apps/klickety/themes/classic_preview.png
+share/kde/apps/klickety/themes/default.desktop
+share/kde/apps/klickety/themes/ksame.desktop
+share/kde/apps/klickety/themes/ksame.svg
+share/kde/apps/klickety/themes/ksame_old.desktop
+share/kde/apps/klickety/themes/ksame_old.svg
+share/kde/apps/klickety/themes/ksame_old_preview.png
+share/kde/apps/klickety/themes/ksame_preview.png
 share/kde/apps/klines/klinesui.rc
 share/kde/apps/klines/themes/crystal.desktop
 share/kde/apps/klines/themes/crystal.png
@@ -1487,6 +1554,7 @@ share/kde/apps/kolf/courses/ReallyEasy
 share/kde/apps/kolf/courses/USApro
 share/kde/apps/kolf/intro
 share/kde/apps/kolf/kolfui.rc
+share/kde/apps/kolf/pics/default_theme.desktop
 share/kde/apps/kolf/pics/default_theme.svgz
 share/kde/apps/kolf/sounds/blackhole.wav
 share/kde/apps/kolf/sounds/blackholeeject.wav
@@ -1499,6 +1567,7 @@ share/kde/apps/kolf/sounds/wall.wav
 share/kde/apps/kolf/tutorial.kolf
 share/kde/apps/kolf/tutorial.kolfgame
 share/kde/apps/kollision/kollisionui.rc
+share/kde/apps/kollision/pictures/theme.desktop
 share/kde/apps/kollision/pictures/theme.svgz
 share/kde/apps/kollision/sounds/ball_leaving.ogg
 share/kde/apps/kollision/sounds/hit_wall.ogg
@@ -1520,6 +1589,8 @@ share/kde/apps/kpat/previews/5.png
 share/kde/apps/kpat/previews/7.png
 share/kde/apps/kpat/previews/8.png
 share/kde/apps/kpat/previews/9.png
+share/kde/apps/kpat/sounds/card-down.ogg
+share/kde/apps/kpat/sounds/card-pickup.ogg
 share/kde/apps/kpat/themes/ancientegypt.desktop
 share/kde/apps/kpat/themes/ancientegypt.png
 share/kde/apps/kpat/themes/ancientegypt.svgz
@@ -1534,12 +1605,10 @@ share/kde/apps/kpat/themes/oldertheme.png
 share/kde/apps/kpat/themes/oldertheme.svgz
 share/kde/apps/kreversi/kreversi.notifyrc
 share/kde/apps/kreversi/kreversiui.rc
+share/kde/apps/kreversi/pics/default_theme.desktop
 share/kde/apps/kreversi/pics/default_theme.svgz
 share/kde/apps/kreversi/sounds/reversi-click.wav
 share/kde/apps/kreversi/sounds/reversi-won.wav
-share/kde/apps/ksame/ksameui.rc
-share/kde/apps/ksame/pics/default_theme.svgz
-share/kde/apps/ksame/pics/old_theme.svgz
 share/kde/apps/kshisen/kshisenui.rc
 share/kde/apps/ksirk/jabber.png
 share/kde/apps/ksirk/ksirkui.rc
@@ -1692,11 +1761,13 @@ share/kde/apps/ksudoku/icons/oxygen/64x64/actions/ksudoku.png
 share/kde/apps/ksudoku/ksudokuui.rc
 share/kde/apps/ksudoku/themes/abstraction.desktop
 share/kde/apps/ksudoku/themes/abstraction.svg
+share/kde/apps/ksudoku/themes/abstraction_preview.png
 share/kde/apps/ksudoku/themes/default.desktop
 share/kde/apps/ksudoku/themes/egyptian_preview.png
 share/kde/apps/ksudoku/themes/ksudoku_egyptian.svg
 share/kde/apps/ksudoku/themes/ksudoku_scrible.desktop
 share/kde/apps/ksudoku/themes/ksudoku_scrible.svg
+share/kde/apps/ksudoku/themes/scribble_preview.png
 share/kde/apps/ktron/ktronui.rc
 share/kde/apps/ktron/themes/default.desktop
 share/kde/apps/ktron/themes/default.png
@@ -1859,8 +1930,6 @@ share/kde/apps/palapeli/collection/european-honey-bee.desktop
 share/kde/apps/palapeli/collection/european-honey-bee.jpg
 share/kde/apps/palapeli/collection/panther-chameleon-female.desktop
 share/kde/apps/palapeli/collection/panther-chameleon-female.jpg
-share/kde/apps/palapeli/palapeli-collectionui.rc
-share/kde/apps/palapeli/palapeli-puzzletableui.rc
 share/kde/apps/palapeli/palapeli.kcfg
 share/kde/apps/palapeli/palapeli.notifyrc
 share/kde/apps/palapeli/palapeliui.rc
@@ -1895,10 +1964,12 @@ share/kde/config/ktron.knsrc
 share/kde/config/palapeli-collectionrc
 share/kde4/services/ServiceMenus/palapeli_servicemenu.desktop
 share/kde4/services/kbattleship.protocol
+share/kde4/services/palapeli_goldbergslicer.desktop
 share/kde4/services/palapeli_jigsawslicer.desktop
 share/kde4/services/palapeli_rectslicer.desktop
 share/kde4/services/palathumbcreator.desktop
 share/kde4/servicetypes/libpala-slicerplugin.desktop
+share/mime/packages/kpatience.xml
 share/mime/packages/palapeli-mimetypes.xml
 share/sounds/KDiamond-Stone-Drop.ogg
 share/sounds/KDiamond-Stone-Swap.ogg
diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo
index 6aee48f1a05..11eabe6d7d4 100644
--- a/games/kdegames4/distinfo
+++ b/games/kdegames4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2012/03/10 19:56:30 markd Exp $
+$NetBSD: distinfo,v 1.15 2012/03/19 21:40:41 markd Exp $
 
-SHA1 (kdegames-4.5.5.tar.bz2) = 622e817c3296dec58e122a0f18053fd743125c0b
-RMD160 (kdegames-4.5.5.tar.bz2) = bbfe2d6c12007dab7291d76bad8128998ecb3a98
-Size (kdegames-4.5.5.tar.bz2) = 57998684 bytes
+SHA1 (kdegames-4.8.0.tar.bz2) = 714a775811dae11ca85ce1113d673894b0afdcdd
+RMD160 (kdegames-4.8.0.tar.bz2) = 24378367252228d29452686efd14564bfaf24f55
+Size (kdegames-4.8.0.tar.bz2) = 63266258 bytes
 SHA1 (patch-ab) = 8f36bf07bf41905dda2da518c8930ffb2fc328bf
diff --git a/games/kdetoys4/Makefile b/games/kdetoys4/Makefile
index b4b4569b4f2..b4611ff88a3 100644
--- a/games/kdetoys4/Makefile
+++ b/games/kdetoys4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2012/03/03 00:13:07 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2012/03/19 21:40:41 markd Exp $
 
 DISTNAME=	kdetoys-${_KDE_VERSION}
-PKGREVISION=	5
+PKGNAME=	${DISTNAME:S/-4/4-4/}
 CATEGORIES=	games
 COMMENT=	Toys for the KDE integrated X11 desktop
 
@@ -14,7 +14,7 @@ COMMENT=	Toys for the KDE integrated X11 desktop
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../x11/kdebase-runtime4/buildlink3.mk"
-.include "../../x11/kdebase-workspace4/buildlink3.mk"
+.include "../../x11/kde-runtime4/buildlink3.mk"
+.include "../../x11/kde-workspace4/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/kdetoys4/distinfo b/games/kdetoys4/distinfo
index 831f3fabb4b..b47ddbfaeee 100644
--- a/games/kdetoys4/distinfo
+++ b/games/kdetoys4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2011/01/23 07:55:12 markd Exp $
+$NetBSD: distinfo,v 1.14 2012/03/19 21:40:41 markd Exp $
 
-SHA1 (kdetoys-4.5.5.tar.bz2) = 7b133ccc7ca1f506630ea98b97c3e04a04bc614d
-RMD160 (kdetoys-4.5.5.tar.bz2) = 7f24c4f29ac9d354e4eccf919fbec445b8a3797f
-Size (kdetoys-4.5.5.tar.bz2) = 402642 bytes
+SHA1 (kdetoys-4.8.0.tar.bz2) = 4d583cf52d10462a71df8eba907c07453f844cb2
+RMD160 (kdetoys-4.8.0.tar.bz2) = 78afbc96e43a5ebb550e44a206a49dd87e36b65d
+Size (kdetoys-4.8.0.tar.bz2) = 408838 bytes