The KDE/FreeBSD team is pleased to announce KDE Software Compilation

4.7.2. The official release notes can be found at:
http://kde.org/announcements/announce-4.7.2.php
This release ships with many improvements. Read more about them here:
http://FreeBSD.kde.org/news.php#itemKDESC472availableinports

We'd like to say thanks to all testers and contributors, especially to
lwhsu@ for his effort on hosting our test packages.

PR:		156293 [1]
		159219 [2]
		160164 [3]
Submitted by:	Oleg Sidorkin <osidorkin@gmail.com> [1]
		Alvaro Castillo <gobledb@gmail.com> [2]
		dkeav04@gmail.com [3]
Tested by:	exp-run via pav

6 files changed, 31 insertions, 162 deletions

diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index 9bb86aada721..6cc871425d70 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -6,14 +6,13 @@
 
 PORTNAME=	kdegames
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Games for the KDE integrated X11 desktop
+COMMENT=	Games for KDE 4
 
 LIB_DEPENDS=	ggzcore.9:${PORTSDIR}/games/ggz-client-libs \
 		qca.2:${PORTSDIR}/devel/qca \
@@ -22,19 +21,18 @@ LIB_DEPENDS=	ggzcore.9:${PORTSDIR}/games/ggz-client-libs \
 
 LATEST_LINK=	${PORTNAME}4
 
-USE_BZIP2=	yes
-USE_OPENAL=	al
-USE_PYTHON=	yes
-USE_TWISTED_RUN=	yes
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4 pykde4 sharedmime
+USE_KDE4=	kdehier kdelibs kdeprefix sharedmime automoc4
 KDE4_BUILDENV=	yes
+USE_OPENAL=	al
 USE_QT_VER=	4
-QT_COMPONENTS=	opengl gui svg iconengines multimedia pixeltool \
-		qmake_build moc_build rcc_build uic_build
+QT_COMPONENTS=	dbus gui network opengl qt3support script svg xml \
+		moc_build qmake_build rcc_build uic_build
+USE_BZIP2=	yes
+CMAKE_ARGS+=	-DBUILD_kajongg:BOOL=FALSE
 MAKE_JOBS_SAFE=	yes
-CMAKE_ARGS+=	-DINSTALL_KAJONGG=TRUE
 
-OPTIONS=	FREEBSD "Install FreeBSD card deck" off
+OPTIONS=	FREEBSD "Install FreeBSD card deck" off \
+		KAJONGG "Install the classical Mah Jongg for four players" off
 
 .include <bsd.port.options.mk>
 
@@ -42,4 +40,16 @@ OPTIONS=	FREEBSD "Install FreeBSD card deck" off
 RUN_DEPENDS+=	kde4-freebsd-carddeck>=1.0:${PORTSDIR}/games/freebsd-carddeck-kde4
 .endif
 
+.if defined(WITH_KAJONGG)
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/kajongg:${PORTSDIR}/games/kajongg
+.endif
+
+post-patch:
+	# Prevent updating MIME during build.
+	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \
+		${WRKSRC}/palapeli/mime/CMakeLists.txt
+
+post-install:
+	@-update-mime-database ${KDE4_PREFIX}/share/mime
+
 .include <bsd.port.mk>
diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo
index 9475ddab8560..a76485908c1f 100644
--- a/games/kdegames4/distinfo
+++ b/games/kdegames4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdegames-4.6.5.tar.bz2) = 173a4a7d1fedee57f6dce8ea2381d5d1942361cc6b4e778d6a480558ec259f8a
-SIZE (KDE/kdegames-4.6.5.tar.bz2) = 59294365
+SHA256 (KDE/kdegames-4.7.2.tar.bz2) = 6150fe15dc42d9586827ba0170827eaf527da561163af7d4265baae38199d310
+SIZE (KDE/kdegames-4.7.2.tar.bz2) = 62950912
diff --git a/games/kdegames4/files/patch-kajongg__CMakeLists.txt b/games/kdegames4/files/patch-kajongg__CMakeLists.txt
deleted file mode 100644
index fc050f1167dd..000000000000
--- a/games/kdegames4/files/patch-kajongg__CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./kajongg/CMakeLists.txt.orig	2010-12-25 02:32:25.713807130 +1000
-+++ ./kajongg/CMakeLists.txt	2010-12-25 02:32:44.954802284 +1000
-@@ -35,6 +35,7 @@
- src/genericdelegates.py
- src/guiutil.py
- src/humanclient.py
-+src/modeltest.py
- src/move.py
- src/playerlist.py
- src/playfield.py
diff --git a/games/kdegames4/files/patch-libkdegames__kgamerenderer.h b/games/kdegames4/files/patch-libkdegames__kgamerenderer.h
deleted file mode 100644
index 10632829000f..000000000000
--- a/games/kdegames4/files/patch-libkdegames__kgamerenderer.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./libkdegames/kgamerenderer.h.orig	2010-12-13 00:33:42.457494012 +0100
-+++ ./libkdegames/kgamerenderer.h	2010-12-13 00:41:21.837310103 +0100
-@@ -208,7 +208,8 @@
- 		///@note  For non-animated frames, set @a frame to -1 or omit it.
- 		///@note  Custom colors increase the rendering time considerably, so use
- 		///       this feature only if you really need its flexibility.
--		QPixmap spritePixmap(const QString& key, const QSize& size, int frame = -1, const QHash<QColor, QColor>& customColors = QHash<QColor, QColor>()) const;
-+		typedef QHash<QColor, QColor> qhash_qcolor_qcolor_t;
-+		QPixmap spritePixmap(const QString& key, const QSize& size, int frame = -1, const qhash_qcolor_qcolor_t& customColors = qhash_qcolor_qcolor_t()) const;
- 	public Q_SLOTS:
- 		///Load the given theme and update the pixmaps of all associated
- 		///KGameRendererClient instances.
diff --git a/games/kdegames4/files/patch-libkdegames__kgamerenderer_p.h b/games/kdegames4/files/patch-libkdegames__kgamerenderer_p.h
deleted file mode 100644
index 15b72c008ae3..000000000000
--- a/games/kdegames4/files/patch-libkdegames__kgamerenderer_p.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./libkdegames/kgamerenderer_p.h.orig	2010-12-13 00:59:19.977474457 +0100
-+++ ./libkdegames/kgamerenderer_p.h	2010-12-13 01:02:15.857318373 +0100
-@@ -31,9 +31,10 @@
- namespace KGRInternal
- {
- 	//Describes the state of a KGameRendererClient.
-+	typedef QHash<QColor, QColor> qhash_qcolor_qcolor_t;
- 	struct ClientSpec
- 	{
--		inline ClientSpec(const QString& spriteKey = QString(), int frame = -1, const QSize& size = QSize(), const QHash<QColor, QColor>& customColors = QHash<QColor, QColor>());
-+		inline ClientSpec(const QString& spriteKey = QString(), int frame = -1, const QSize& size = QSize(), const qhash_qcolor_qcolor_t& customColors = qhash_qcolor_qcolor_t());
- 		QString spriteKey;
- 		int frame;
- 		QSize size;
diff --git a/games/kdegames4/pkg-plist b/games/kdegames4/pkg-plist
index 59d849c5b589..8acaa8798f33 100644
--- a/games/kdegames4/pkg-plist
+++ b/games/kdegames4/pkg-plist
@@ -1,8 +1,6 @@
 bin/bomber
 bin/bovo
 bin/granatier
-bin/kajongg
-bin/kajonggserver
 bin/kapman
 bin/katomic
 bin/kbattleship
@@ -38,7 +36,6 @@ bin/ksudoku
 bin/ktron
 bin/ktuberling
 bin/kubrick
-bin/libpala-puzzlebuilder
 bin/lskat
 bin/palapeli
 include/KDE/KCardDialog
@@ -200,7 +197,6 @@ share/applications/kde4/KGoldrunner.desktop
 share/applications/kde4/bomber.desktop
 share/applications/kde4/bovo.desktop
 share/applications/kde4/granatier.desktop
-share/applications/kde4/kajongg.desktop
 share/applications/kde4/kapman.desktop
 share/applications/kde4/katomic.desktop
 share/applications/kde4/kbattleship.desktop
@@ -476,87 +472,6 @@ share/apps/granatier/themes/granatier_preview.png
 share/apps/granatier/themes/waterbomb.desktop
 share/apps/granatier/themes/waterbomb.svgz
 share/apps/granatier/themes/waterbomb_preview.png
-share/apps/kajongg/about.py
-share/apps/kajongg/about.pyc
-share/apps/kajongg/animation.py
-share/apps/kajongg/animation.pyc
-share/apps/kajongg/background.py
-share/apps/kajongg/background.pyc
-share/apps/kajongg/backgroundselector.py
-share/apps/kajongg/backgroundselector.pyc
-share/apps/kajongg/backgroundselector.ui
-share/apps/kajongg/board.py
-share/apps/kajongg/board.pyc
-share/apps/kajongg/client.py
-share/apps/kajongg/client.pyc
-share/apps/kajongg/common.py
-share/apps/kajongg/common.pyc
-share/apps/kajongg/config.py
-share/apps/kajongg/config.pyc
-share/apps/kajongg/deferredutil.py
-share/apps/kajongg/deferredutil.pyc
-share/apps/kajongg/differ.py
-share/apps/kajongg/differ.pyc
-share/apps/kajongg/game.py
-share/apps/kajongg/game.pyc
-share/apps/kajongg/games.py
-share/apps/kajongg/games.pyc
-share/apps/kajongg/genericdelegates.py
-share/apps/kajongg/genericdelegates.pyc
-share/apps/kajongg/guiutil.py
-share/apps/kajongg/guiutil.pyc
-share/apps/kajongg/handboard.py
-share/apps/kajongg/handboard.pyc
-share/apps/kajongg/humanclient.py
-share/apps/kajongg/humanclient.pyc
-share/apps/kajongg/kajongg.py
-share/apps/kajongg/kajonggserver.py
-share/apps/kajongg/kajonggui.rc
-share/apps/kajongg/meld.py
-share/apps/kajongg/meld.pyc
-share/apps/kajongg/message.py
-share/apps/kajongg/message.pyc
-share/apps/kajongg/modeltest.py
-share/apps/kajongg/modeltest.pyc
-share/apps/kajongg/move.py
-share/apps/kajongg/move.pyc
-share/apps/kajongg/playerlist.py
-share/apps/kajongg/playerlist.pyc
-share/apps/kajongg/playfield.py
-share/apps/kajongg/playfield.pyc
-share/apps/kajongg/predefined.py
-share/apps/kajongg/predefined.pyc
-share/apps/kajongg/qt4reactor.py
-share/apps/kajongg/qt4reactor.pyc
-share/apps/kajongg/query.py
-share/apps/kajongg/query.pyc
-share/apps/kajongg/rulesetselector.py
-share/apps/kajongg/rulesetselector.pyc
-share/apps/kajongg/scoring.py
-share/apps/kajongg/scoring.pyc
-share/apps/kajongg/scoringengine.py
-share/apps/kajongg/scoringengine.pyc
-share/apps/kajongg/server.py
-share/apps/kajongg/server.pyc
-share/apps/kajongg/sound.py
-share/apps/kajongg/sound.pyc
-share/apps/kajongg/statesaver.py
-share/apps/kajongg/statesaver.pyc
-share/apps/kajongg/tables.py
-share/apps/kajongg/tables.pyc
-share/apps/kajongg/tile.py
-share/apps/kajongg/tile.pyc
-share/apps/kajongg/tileset.py
-share/apps/kajongg/tileset.pyc
-share/apps/kajongg/tilesetselector.py
-share/apps/kajongg/tilesetselector.pyc
-share/apps/kajongg/tilesetselector.ui
-share/apps/kajongg/uiwall.py
-share/apps/kajongg/uiwall.pyc
-share/apps/kajongg/util.py
-share/apps/kajongg/util.pyc
-share/apps/kajongg/wall.py
-share/apps/kajongg/wall.pyc
 share/apps/kapman/defaultmaze.xml
 share/apps/kapman/kapmanui.rc
 share/apps/kapman/themes/invisible.desktop
@@ -692,16 +607,16 @@ share/apps/kgoldrunner/themes/black-on-white.desktop
 share/apps/kgoldrunner/themes/default.desktop
 share/apps/kgoldrunner/themes/default/actors.svg
 share/apps/kgoldrunner/themes/default/climb.wav
-share/apps/kgoldrunner/themes/default/completed.ogg
-share/apps/kgoldrunner/themes/default/death.ogg
-share/apps/kgoldrunner/themes/default/dig.ogg
-share/apps/kgoldrunner/themes/default/falling.ogg
-share/apps/kgoldrunner/themes/default/gameover.ogg
-share/apps/kgoldrunner/themes/default/gold.ogg
-share/apps/kgoldrunner/themes/default/ladder.ogg
+share/apps/kgoldrunner/themes/default/completed.wav
+share/apps/kgoldrunner/themes/default/death.wav
+share/apps/kgoldrunner/themes/default/dig.wav
+share/apps/kgoldrunner/themes/default/falling.wav
+share/apps/kgoldrunner/themes/default/gameover.wav
+share/apps/kgoldrunner/themes/default/gold.wav
+share/apps/kgoldrunner/themes/default/ladder.wav
 share/apps/kgoldrunner/themes/default/set.svg
 share/apps/kgoldrunner/themes/default/step.wav
-share/apps/kgoldrunner/themes/default/victory.ogg
+share/apps/kgoldrunner/themes/default/victory.wav
 share/apps/kgoldrunner/themes/egypt.desktop
 share/apps/kgoldrunner/themes/egypt/actors.svgz
 share/apps/kgoldrunner/themes/egypt/egypt_kgr.svgz
@@ -1366,8 +1281,6 @@ share/apps/palapeli/collection/european-honey-bee.desktop
 share/apps/palapeli/collection/european-honey-bee.jpg
 share/apps/palapeli/collection/panther-chameleon-female.desktop
 share/apps/palapeli/collection/panther-chameleon-female.jpg
-share/apps/palapeli/palapeli-collectionui.rc
-share/apps/palapeli/palapeli-puzzletableui.rc
 share/apps/palapeli/palapeli.kcfg
 share/apps/palapeli/palapeli.notifyrc
 share/apps/palapeli/palapeliui.rc
@@ -1433,19 +1346,6 @@ share/doc/HTML/en/granatier/config_theme.png
 share/doc/HTML/en/granatier/granatier.png
 share/doc/HTML/en/granatier/index.cache.bz2
 share/doc/HTML/en/granatier/index.docbook
-share/doc/HTML/en/kajongg/common
-share/doc/HTML/en/kajongg/config_background.png
-share/doc/HTML/en/kajongg/config_play.png
-share/doc/HTML/en/kajongg/config_tiles.png
-share/doc/HTML/en/kajongg/differ.png
-share/doc/HTML/en/kajongg/enterhand.png
-share/doc/HTML/en/kajongg/explain.png
-share/doc/HTML/en/kajongg/gamescreen.png
-share/doc/HTML/en/kajongg/index.cache.bz2
-share/doc/HTML/en/kajongg/index.docbook
-share/doc/HTML/en/kajongg/penalty.png
-share/doc/HTML/en/kajongg/ruleseteditor.png
-share/doc/HTML/en/kajongg/scoretable.png
 share/doc/HTML/en/kapman/common
 share/doc/HTML/en/kapman/config.png
 share/doc/HTML/en/kapman/index.cache.bz2
@@ -1918,11 +1818,9 @@ share/icons/hicolor/64x64/apps/lskat.png
 share/icons/hicolor/64x64/apps/palapeli.png
 share/icons/hicolor/64x64/mimetypes/application-x-palapeli.png
 share/icons/hicolor/64x64/mimetypes/application-x-tuberling.png
-share/icons/hicolor/scalable/actions/games-kajongg-law.svgz
 share/icons/hicolor/scalable/apps/bomber.svgz
 share/icons/hicolor/scalable/apps/bovo.svgz
 share/icons/hicolor/scalable/apps/granatier.svgz
-share/icons/hicolor/scalable/apps/kajongg.svgz
 share/icons/hicolor/scalable/apps/kapman.svgz
 share/icons/hicolor/scalable/apps/kdiamond.svgz
 share/icons/hicolor/scalable/apps/killbots.svgz
@@ -2012,7 +1910,6 @@ share/sounds/kshisen/tile-touch.ogg
 @dirrm share/doc/HTML/en/kbattleship
 @dirrm share/doc/HTML/en/katomic
 @dirrm share/doc/HTML/en/kapman
-@dirrm share/doc/HTML/en/kajongg
 @dirrm share/doc/HTML/en/granatier
 @dirrm share/doc/HTML/en/bovo
 @dirrm share/doc/HTML/en/bomber
@@ -2137,8 +2034,6 @@ share/sounds/kshisen/tile-touch.ogg
 @dirrm share/apps/katomic
 @dirrm share/apps/kapman/themes
 @dirrm share/apps/kapman
-@dirrm share/apps/kajongg
-@dirrm share/apps/kajong
 @dirrm share/apps/granatier/themes
 @dirrm share/apps/granatier/sounds
 @dirrm share/apps/granatier/players