5 files changed, 43 insertions, 17 deletions

diff --git a/games/ksudoku/Makefile b/games/ksudoku/Makefile
index 7024e445f50b..47d4271e8ff2 100644
--- a/games/ksudoku/Makefile
+++ b/games/ksudoku/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ksudoku
-PORTVERSION=	0.3
-PORTREVISION=	2
+PORTVERSION=	0.4
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,12 +14,20 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	freebsd@chillt.de
 COMMENT=	A Sudoku generator and solver for KDE
 
-EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
+BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
+
+CMAKE_ARGS=	-DCMAKE_C_COMPILER:STRING="${CC}" \
+		-DCMAKE_CXX_COMPILER:STRING="${CXX}" \
+		-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} ${PTHREAD_CFLAGS}" \
+		-DCMAKE_EXE_LINKER_FLAGS:STRING="${PTHREAD_LIBS}" \
+		-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX}
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_GMAKE=	yes
+USE_GL=		yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure
+do-configure:
+	@cd ${WRKSRC} && \
+		${LOCALBASE}/bin/cmake ${CMAKE_ARGS}
 
 .include <bsd.port.mk>
diff --git a/games/ksudoku/distinfo b/games/ksudoku/distinfo
index 70fe0d5fe97d..86d90d4150c9 100644
--- a/games/ksudoku/distinfo
+++ b/games/ksudoku/distinfo
@@ -1,3 +1,3 @@
-MD5 (ksudoku-0.3.tar.gz) = d5fe20e9deda671dd15340f43ab4c4a3
-SHA256 (ksudoku-0.3.tar.gz) = 18f95cb383a7d313f907eff6a1f23e0cf66627d901cbbb8488c521851c3f2cca
-SIZE (ksudoku-0.3.tar.gz) = 704694
+MD5 (ksudoku-0.4.tar.gz) = 418f9ecac5756f7bc79863596dee7f34
+SHA256 (ksudoku-0.4.tar.gz) = 6dc1b247fba46ccd08a79f7f9b711143f4cce837484bf5230221a2225ab9922b
+SIZE (ksudoku-0.4.tar.gz) = 316486
diff --git a/games/ksudoku/files/patch-src_CMakeLists.txt b/games/ksudoku/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000000..ecd008fca56c
--- /dev/null
+++ b/games/ksudoku/files/patch-src_CMakeLists.txt
@@ -0,0 +1,18 @@
+--- 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 19efcca4f3f8..0a9c8c3b3de7 100644
--- a/games/ksudoku/pkg-descr
+++ b/games/ksudoku/pkg-descr
@@ -2,8 +2,9 @@ KSudoku is a 2D and 3D Sudoku puzzle generator and solver for KDE.
 
 Among its features are:
 
-* Supported board sizes (2D): 9x9, 16x16, 25x25
-* Supported board sizes (3D): 3x3x3, 4x4x4, 5x5x5
+* 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
 
diff --git a/games/ksudoku/pkg-plist b/games/ksudoku/pkg-plist
index 2e05696f63a8..6c7312f9aa8b 100644
--- a/games/ksudoku/pkg-plist
+++ b/games/ksudoku/pkg-plist
@@ -1,12 +1,12 @@
 bin/ksudoku
-bin/ksudoku_client
-share/applnk/Games/ksudoku.desktop
+share/applications/kde/ksudoku.desktop
+share/apps/ksudoku/4x4.xml
+share/apps/ksudoku/Jigsaw.xml
+share/apps/ksudoku/Samurai.xml
+share/apps/ksudoku/XSudoku.xml
 share/apps/ksudoku/ksudokuui.rc
-share/doc/HTML/en/ksudoku/common
-share/doc/HTML/en/ksudoku/index.cache.bz2
-share/doc/HTML/en/ksudoku/index.docbook
+share/config/ksudokurc
 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