5 files changed, 148 insertions, 50 deletions

diff --git a/games/ksudoku/Makefile b/games/ksudoku/Makefile
index b0b508b81748..0c52ace5b0e5 100644
--- a/games/ksudoku/Makefile
+++ b/games/ksudoku/Makefile
@@ -1,25 +1,24 @@
-# Ports collection makefile for:	ksudoku
-# Date created:				30 September 2005
-# Whom:					Bartosz Fabianowski <freebsd@chillt.de>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	ksudoku
-PORTVERSION=	0.4
-PORTREVISION=	6
+PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	games kde
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE/${PORTVERSION}
 
-MAINTAINER=	freebsd@chillt.de
-COMMENT=	A Sudoku generator and solver for KDE
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	${${PORTNAME}_DESC}
 
-DEPRECATED=	Depends on QT3; unmaintained
-EXPIRATION_DATE=	2013-07-01
+CONFLICTS_INSTALL=	kdegames-4.[0-9].*
 
-USE_KDELIBS_VER=3
-USE_GMAKE=	yes
-USE_GL=		yes
-USES=		cmake
+USE_GL=		glu
+USE_KDE4=	kdehier kdelibs kdeprefix libkdegames automoc4
+USES=		cmake:outsource
+USE_QT4=	corelib gui corelib gui opengl \
+		moc_build qmake_build rcc_build uic_build
+USE_XZ=		yes
+MAKE_JOBS_SAFE=	yes
 
+.include <${.CURDIR}/../kdegames4/Makefile.common>
 .include <bsd.port.mk>
diff --git a/games/ksudoku/distinfo b/games/ksudoku/distinfo
index 077370bac83a..b3b6a122a061 100644
--- a/games/ksudoku/distinfo
+++ b/games/ksudoku/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ksudoku-0.4.tar.gz) = 6dc1b247fba46ccd08a79f7f9b711143f4cce837484bf5230221a2225ab9922b
-SIZE (ksudoku-0.4.tar.gz) = 316486
+SHA256 (KDE/4.10.1/ksudoku-4.10.1.tar.xz) = 4dbbc493f6a7d2e929907b922661107bbc6e65a4d73d4f9fa6d8096e36fb177f
+SIZE (KDE/4.10.1/ksudoku-4.10.1.tar.xz) = 1441084
diff --git a/games/ksudoku/files/patch-src_CMakeLists.txt b/games/ksudoku/files/patch-src_CMakeLists.txt
deleted file mode 100644
index ecd008fca56c..000000000000
--- a/games/ksudoku/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/CMakeLists.txt.orig	Sun Jun 24 02:43:59 2007
-+++ src/CMakeLists.txt	Sun Jun 24 02:51:21 2007
-@@ -50,12 +50,9 @@
- 
- ########### install files ###############
- 
--FIND_PROGRAM(KDE3_KDECONFIG_EXECUTABLE NAMES kde-config )
--
--EXEC_PROGRAM(${KDE3_KDECONFIG_EXECUTABLE} ARGS --expandvars --install 
--xdgdata-apps OUTPUT_VARIABLE KDE3_XDG_APPS_DIR )
--EXEC_PROGRAM(${KDE3_KDECONFIG_EXECUTABLE} ARGS --expandvars --install data OUTPUT_VARIABLE KDE3_DATA_INSTALL_DIR )
--EXEC_PROGRAM(${KDE3_KDECONFIG_EXECUTABLE} ARGS --expandvars --install config OUTPUT_VARIABLE KDE3_CONFIG_INSTALL_DIR )
-+set(KDE3_XDG_APPS_DIR ${CMAKE_INSTALL_PREFIX}/share/applications/kde)
-+set(KDE3_DATA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/apps)
-+set(KDE3_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/config)
- 
- install( FILES gui/ksudoku.desktop  DESTINATION  ${KDE3_XDG_APPS_DIR})
- install( FILES gui/ksudokuui.rc  DESTINATION  ${KDE3_DATA_INSTALL_DIR}/ksudoku )
diff --git a/games/ksudoku/pkg-descr b/games/ksudoku/pkg-descr
index 0a9c8c3b3de7..6a40506a17ef 100644
--- a/games/ksudoku/pkg-descr
+++ b/games/ksudoku/pkg-descr
@@ -1,14 +1,5 @@
-KSudoku is a 2D and 3D Sudoku puzzle generator and solver for KDE.
+KSudoku is a logic-based symbol placement puzzle.  The player has
+to fill a grid so that each column, row as well as each square block
+on the game field contains only one instance of each symbol.
 
-Among its features are:
-
-* 2D boards of various sizes: 9x9, 16x16, 25x25
-* 3D boards of various sizes: 3x3x3, 4x4x4, 5x5x5
-* Cutom 2D boards, including: 4x4, Jigsaw, Samurai, XSudoku
-* GUI for playing, saving, printing, solving and dubbing puzzles
-* Automatic solver that can provide hints should you get stuck
-
-For more information on Sudoku puzzles in general, see:
-http://en.wikipedia.org/wiki/Sudoku
-
-WWW: http://ksudoku.sourceforge.net/
+WWW: http://www.kde.org/applications/games/ksudoku/
diff --git a/games/ksudoku/pkg-plist b/games/ksudoku/pkg-plist
index 6c7312f9aa8b..f9b1df8bda11 100644
--- a/games/ksudoku/pkg-plist
+++ b/games/ksudoku/pkg-plist
@@ -1,12 +1,138 @@
 bin/ksudoku
-share/applications/kde/ksudoku.desktop
+share/applications/kde4/ksudoku.desktop
+share/apps/ksudoku/4x4.desktop
 share/apps/ksudoku/4x4.xml
+share/apps/ksudoku/6x6.desktop
+share/apps/ksudoku/6x6.xml
+share/apps/ksudoku/Aztec.desktop
+share/apps/ksudoku/Aztec.xml
+share/apps/ksudoku/DoubleRoxdoku.desktop
+share/apps/ksudoku/DoubleRoxdoku.xml
+share/apps/ksudoku/Jigsaw.desktop
 share/apps/ksudoku/Jigsaw.xml
+share/apps/ksudoku/Nonomino.desktop
+share/apps/ksudoku/Nonomino.xml
+share/apps/ksudoku/Pentomino.desktop
+share/apps/ksudoku/Pentomino.xml
+share/apps/ksudoku/RoxdokuTwin.desktop
+share/apps/ksudoku/RoxdokuTwin.xml
+share/apps/ksudoku/Samurai.desktop
 share/apps/ksudoku/Samurai.xml
+share/apps/ksudoku/SamuraiRoxdoku.desktop
+share/apps/ksudoku/SamuraiRoxdoku.xml
+share/apps/ksudoku/Sohei.desktop
+share/apps/ksudoku/Sohei.xml
+share/apps/ksudoku/Tetromino.desktop
+share/apps/ksudoku/Tetromino.xml
+share/apps/ksudoku/TinySamurai.desktop
+share/apps/ksudoku/TinySamurai.xml
+share/apps/ksudoku/Windmill.desktop
+share/apps/ksudoku/Windmill.xml
+share/apps/ksudoku/XSudoku.desktop
 share/apps/ksudoku/XSudoku.xml
+share/apps/ksudoku/icons/hicolor/128x128/actions/ksudoku-jigsaw.png
+share/apps/ksudoku/icons/hicolor/128x128/actions/ksudoku-ksudoku_16x16.png
+share/apps/ksudoku/icons/hicolor/128x128/actions/ksudoku-ksudoku_25x25.png
+share/apps/ksudoku/icons/hicolor/128x128/actions/ksudoku-ksudoku_4x4.png
+share/apps/ksudoku/icons/hicolor/128x128/actions/ksudoku-ksudoku_9x9.png
+share/apps/ksudoku/icons/hicolor/128x128/actions/ksudoku-roxdoku_3x3x3.png
+share/apps/ksudoku/icons/hicolor/128x128/actions/ksudoku-roxdoku_4x4x4.png
+share/apps/ksudoku/icons/hicolor/128x128/actions/ksudoku-roxdoku_5x5x5.png
+share/apps/ksudoku/icons/hicolor/128x128/actions/ksudoku-samurai.png
+share/apps/ksudoku/icons/hicolor/128x128/actions/ksudoku-tiny_samurai.png
+share/apps/ksudoku/icons/hicolor/128x128/actions/ksudoku-xsudoku.png
+share/apps/ksudoku/icons/hicolor/128x128/actions/ksudoku.png
+share/apps/ksudoku/icons/hicolor/16x16/actions/ksudoku-jigsaw.png
+share/apps/ksudoku/icons/hicolor/16x16/actions/ksudoku-ksudoku_16x16.png
+share/apps/ksudoku/icons/hicolor/16x16/actions/ksudoku-ksudoku_25x25.png
+share/apps/ksudoku/icons/hicolor/16x16/actions/ksudoku-ksudoku_4x4.png
+share/apps/ksudoku/icons/hicolor/16x16/actions/ksudoku-ksudoku_9x9.png
+share/apps/ksudoku/icons/hicolor/16x16/actions/ksudoku-roxdoku_3x3x3.png
+share/apps/ksudoku/icons/hicolor/16x16/actions/ksudoku-roxdoku_4x4x4.png
+share/apps/ksudoku/icons/hicolor/16x16/actions/ksudoku-roxdoku_5x5x5.png
+share/apps/ksudoku/icons/hicolor/16x16/actions/ksudoku-samurai.png
+share/apps/ksudoku/icons/hicolor/16x16/actions/ksudoku-tiny_samurai.png
+share/apps/ksudoku/icons/hicolor/16x16/actions/ksudoku-xsudoku.png
+share/apps/ksudoku/icons/hicolor/16x16/actions/ksudoku.png
+share/apps/ksudoku/icons/hicolor/22x22/actions/ksudoku-jigsaw.png
+share/apps/ksudoku/icons/hicolor/22x22/actions/ksudoku-ksudoku_16x16.png
+share/apps/ksudoku/icons/hicolor/22x22/actions/ksudoku-ksudoku_25x25.png
+share/apps/ksudoku/icons/hicolor/22x22/actions/ksudoku-ksudoku_4x4.png
+share/apps/ksudoku/icons/hicolor/22x22/actions/ksudoku-ksudoku_9x9.png
+share/apps/ksudoku/icons/hicolor/22x22/actions/ksudoku-roxdoku_3x3x3.png
+share/apps/ksudoku/icons/hicolor/22x22/actions/ksudoku-roxdoku_4x4x4.png
+share/apps/ksudoku/icons/hicolor/22x22/actions/ksudoku-roxdoku_5x5x5.png
+share/apps/ksudoku/icons/hicolor/22x22/actions/ksudoku-samurai.png
+share/apps/ksudoku/icons/hicolor/22x22/actions/ksudoku-tiny_samurai.png
+share/apps/ksudoku/icons/hicolor/22x22/actions/ksudoku-xsudoku.png
+share/apps/ksudoku/icons/hicolor/22x22/actions/ksudoku.png
+share/apps/ksudoku/icons/hicolor/32x32/actions/ksudoku-jigsaw.png
+share/apps/ksudoku/icons/hicolor/32x32/actions/ksudoku-ksudoku_16x16.png
+share/apps/ksudoku/icons/hicolor/32x32/actions/ksudoku-ksudoku_25x25.png
+share/apps/ksudoku/icons/hicolor/32x32/actions/ksudoku-ksudoku_4x4.png
+share/apps/ksudoku/icons/hicolor/32x32/actions/ksudoku-ksudoku_9x9.png
+share/apps/ksudoku/icons/hicolor/32x32/actions/ksudoku-roxdoku_3x3x3.png
+share/apps/ksudoku/icons/hicolor/32x32/actions/ksudoku-roxdoku_4x4x4.png
+share/apps/ksudoku/icons/hicolor/32x32/actions/ksudoku-roxdoku_5x5x5.png
+share/apps/ksudoku/icons/hicolor/32x32/actions/ksudoku-samurai.png
+share/apps/ksudoku/icons/hicolor/32x32/actions/ksudoku-tiny_samurai.png
+share/apps/ksudoku/icons/hicolor/32x32/actions/ksudoku-xsudoku.png
+share/apps/ksudoku/icons/hicolor/32x32/actions/ksudoku.png
+share/apps/ksudoku/icons/hicolor/48x48/actions/ksudoku-jigsaw.png
+share/apps/ksudoku/icons/hicolor/48x48/actions/ksudoku-ksudoku_16x16.png
+share/apps/ksudoku/icons/hicolor/48x48/actions/ksudoku-ksudoku_25x25.png
+share/apps/ksudoku/icons/hicolor/48x48/actions/ksudoku-ksudoku_4x4.png
+share/apps/ksudoku/icons/hicolor/48x48/actions/ksudoku-ksudoku_9x9.png
+share/apps/ksudoku/icons/hicolor/48x48/actions/ksudoku-roxdoku_3x3x3.png
+share/apps/ksudoku/icons/hicolor/48x48/actions/ksudoku-roxdoku_4x4x4.png
+share/apps/ksudoku/icons/hicolor/48x48/actions/ksudoku-roxdoku_5x5x5.png
+share/apps/ksudoku/icons/hicolor/48x48/actions/ksudoku-samurai.png
+share/apps/ksudoku/icons/hicolor/48x48/actions/ksudoku-tiny_samurai.png
+share/apps/ksudoku/icons/hicolor/48x48/actions/ksudoku-xsudoku.png
+share/apps/ksudoku/icons/hicolor/48x48/actions/ksudoku.png
+share/apps/ksudoku/icons/hicolor/64x64/actions/ksudoku-jigsaw.png
+share/apps/ksudoku/icons/hicolor/64x64/actions/ksudoku-ksudoku_16x16.png
+share/apps/ksudoku/icons/hicolor/64x64/actions/ksudoku-ksudoku_25x25.png
+share/apps/ksudoku/icons/hicolor/64x64/actions/ksudoku-ksudoku_4x4.png
+share/apps/ksudoku/icons/hicolor/64x64/actions/ksudoku-ksudoku_9x9.png
+share/apps/ksudoku/icons/hicolor/64x64/actions/ksudoku-roxdoku_3x3x3.png
+share/apps/ksudoku/icons/hicolor/64x64/actions/ksudoku-roxdoku_4x4x4.png
+share/apps/ksudoku/icons/hicolor/64x64/actions/ksudoku-roxdoku_5x5x5.png
+share/apps/ksudoku/icons/hicolor/64x64/actions/ksudoku-samurai.png
+share/apps/ksudoku/icons/hicolor/64x64/actions/ksudoku-tiny_samurai.png
+share/apps/ksudoku/icons/hicolor/64x64/actions/ksudoku-xsudoku.png
+share/apps/ksudoku/icons/hicolor/64x64/actions/ksudoku.png
 share/apps/ksudoku/ksudokuui.rc
+share/apps/ksudoku/themes/abstraction.desktop
+share/apps/ksudoku/themes/abstraction.svg
+share/apps/ksudoku/themes/abstraction_preview.png
+share/apps/ksudoku/themes/default.desktop
+share/apps/ksudoku/themes/egyptian_preview.png
+share/apps/ksudoku/themes/ksudoku_egyptian.svg
+share/apps/ksudoku/themes/ksudoku_scrible.desktop
+share/apps/ksudoku/themes/ksudoku_scrible.svg
+share/apps/ksudoku/themes/scribble_preview.png
 share/config/ksudokurc
+share/doc/HTML/en/ksudoku/common
+share/doc/HTML/en/ksudoku/index.cache.bz2
+share/doc/HTML/en/ksudoku/index.docbook
 share/icons/hicolor/128x128/apps/ksudoku.png
 share/icons/hicolor/16x16/apps/ksudoku.png
 share/icons/hicolor/32x32/apps/ksudoku.png
+@dirrm share/doc/HTML/en/ksudoku
+@dirrm share/apps/ksudoku/themes
+@dirrm share/apps/ksudoku/icons/hicolor/64x64/actions
+@dirrm share/apps/ksudoku/icons/hicolor/64x64
+@dirrm share/apps/ksudoku/icons/hicolor/48x48/actions
+@dirrm share/apps/ksudoku/icons/hicolor/48x48
+@dirrm share/apps/ksudoku/icons/hicolor/32x32/actions
+@dirrm share/apps/ksudoku/icons/hicolor/32x32
+@dirrm share/apps/ksudoku/icons/hicolor/22x22/actions
+@dirrm share/apps/ksudoku/icons/hicolor/22x22
+@dirrm share/apps/ksudoku/icons/hicolor/16x16/actions
+@dirrm share/apps/ksudoku/icons/hicolor/16x16
+@dirrm share/apps/ksudoku/icons/hicolor/128x128/actions
+@dirrm share/apps/ksudoku/icons/hicolor/128x128
+@dirrm share/apps/ksudoku/icons/hicolor
+@dirrm share/apps/ksudoku/icons
 @dirrm share/apps/ksudoku