3 files changed, 138 insertions, 74 deletions

diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile
index 4b1adffd75a1..1a2f36c3d191 100644
--- a/games/knights-kde4/Makefile
+++ b/games/knights-kde4/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	knights
-PORTVERSION=	2.3.1
-PORTREVISION=	2
+PORTVERSION=	2.5.0
 CATEGORIES=	games kde
 MASTER_SITES=	http://dl.dropbox.com/u/2888238/Knights/
 
@@ -13,12 +12,31 @@ COMMENT=	KDE4 chess interface
 LIB_DEPENDS=	kdegames:${PORTSDIR}/games/kdegames4
 RUN_DEPENDS=	${LOCALBASE}/bin/gnuchess:${PORTSDIR}/games/gnuchess
 
-BROKEN=		does not build with kdegames4>=4.9.0
-
 LATEST_LINK=	${PORTNAME}-kde4
+MAKE_JOBS_SAFE=	yes
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4 workspace
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 
+.include <bsd.port.options.mk>
+
+.if empty(PORT_OPTIONS:MDOCS}
+CMAKE_ARGS+=	-DBUILD_doc=FALSE
+.endif
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+CMAKE_ARGS+=	-DBUILD_po=FALSE
+.endif
+
+post-patch:
+.if empty(PORT_OPTIONS:MDOCS)
+	${REINPLACE_CMD} "s/^add_subdirectory( doc )//g" \
+		${WRKSRC}/CMakeLists.txt
+.endif
+
 .include <bsd.port.mk>
diff --git a/games/knights-kde4/distinfo b/games/knights-kde4/distinfo
index 4585588477b6..889563e8aa23 100644
--- a/games/knights-kde4/distinfo
+++ b/games/knights-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (knights-2.3.1.tar.bz2) = dd1d74d20b5a52c4b073a72f06e4950debc4c65b7b9b371e52fd8d5e6482b5ab
-SIZE (knights-2.3.1.tar.bz2) = 2615577
+SHA256 (knights-2.5.0.tar.bz2) = 6567c4203c55ebe0ae6b5a25c852d7beef8b88d4154592437bc357797da5bd28
+SIZE (knights-2.5.0.tar.bz2) = 3426822
diff --git a/games/knights-kde4/pkg-plist b/games/knights-kde4/pkg-plist
index 76734971115a..247388be0af7 100644
--- a/games/knights-kde4/pkg-plist
+++ b/games/knights-kde4/pkg-plist
@@ -5,7 +5,6 @@ share/apps/knights/themes/default.desktop
 share/apps/knights/themes/east_west.desktop
 share/apps/knights/themes/east_west.png
 share/apps/knights/themes/east_west.svgz
-share/apps/knights/themes/gray.desktop
 share/apps/knights/themes/gray.png
 share/apps/knights/themes/gray.svgz
 share/apps/knights/themes/knights.desktop
@@ -19,76 +18,123 @@ share/apps/knights/themes/xboard2.png
 share/apps/knights/themes/xboard2.svgz
 share/config.kcfg/knights.kcfg
 share/config/knights.knsrc
-share/doc/HTML/en/knights/Knights-board-setup.png
-share/doc/HTML/en/knights/Knights-board.png
-share/doc/HTML/en/knights/Knights-castle-kingside.png
-share/doc/HTML/en/knights/Knights-castle-queenside.png
-share/doc/HTML/en/knights/Knights-danger.png
-share/doc/HTML/en/knights/Knights-enpassant.png
-share/doc/HTML/en/knights/Knights-lastmove.png
-share/doc/HTML/en/knights/Knights-move-bishop.png
-share/doc/HTML/en/knights/Knights-move-king.png
-share/doc/HTML/en/knights/Knights-move-knight.png
-share/doc/HTML/en/knights/Knights-move-limits.png
-share/doc/HTML/en/knights/Knights-move-pawn.png
-share/doc/HTML/en/knights/Knights-move-queen.png
-share/doc/HTML/en/knights/Knights-move-rook.png
-share/doc/HTML/en/knights/Knights-moving-queen.png
-share/doc/HTML/en/knights/Knights-newgame-dialog.png
-share/doc/HTML/en/knights/Knights-server-account.png
-share/doc/HTML/en/knights/Knights-server-challenges.png
-share/doc/HTML/en/knights/Knights-server-graph.png
-share/doc/HTML/en/knights/Knights-server-list.png
-share/doc/HTML/en/knights/common
-share/doc/HTML/en/knights/index.cache.bz2
-share/doc/HTML/en/knights/index.docbook
-share/doc/HTML/et/knights/common
-share/doc/HTML/et/knights/index.cache.bz2
-share/doc/HTML/et/knights/index.docbook
-share/doc/HTML/pt_BR/knights/common
-share/doc/HTML/pt_BR/knights/index.cache.bz2
-share/doc/HTML/pt_BR/knights/index.docbook
-share/doc/HTML/uk/knights/Knights-newgame-dialog.png
-share/doc/HTML/uk/knights/common
-share/doc/HTML/uk/knights/index.cache.bz2
-share/doc/HTML/uk/knights/index.docbook
+share/dbus-1/interfaces/org.kde.Knights.xml
+%%PORTDOCS%%share/doc/HTML/de/knights/Knights-newgame-dialog.png
+%%PORTDOCS%%share/doc/HTML/de/knights/Knights-server-account.png
+%%PORTDOCS%%share/doc/HTML/de/knights/Knights-server-challenges.png
+%%PORTDOCS%%share/doc/HTML/de/knights/Knights-server-graph.png
+%%PORTDOCS%%share/doc/HTML/de/knights/Knights-server-list.png
+%%PORTDOCS%%share/doc/HTML/de/knights/common
+%%PORTDOCS%%share/doc/HTML/de/knights/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/de/knights/index.docbook
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-board-setup.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-board.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-castle-kingside.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-castle-queenside.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-danger.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-engines.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-enpassant.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-lastmove.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-move-bishop.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-move-king.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-move-knight.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-move-limits.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-move-pawn.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-move-queen.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-move-rook.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-moving-queen.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-newgame-dialog.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-server-account.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-server-challenges.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-server-graph.png
+%%PORTDOCS%%share/doc/HTML/en/knights/Knights-server-list.png
+%%PORTDOCS%%share/doc/HTML/en/knights/common
+%%PORTDOCS%%share/doc/HTML/en/knights/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/en/knights/index.docbook
+%%PORTDOCS%%share/doc/HTML/es/knights/common
+%%PORTDOCS%%share/doc/HTML/es/knights/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/es/knights/index.docbook
+%%PORTDOCS%%share/doc/HTML/et/knights/common
+%%PORTDOCS%%share/doc/HTML/et/knights/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/et/knights/index.docbook
+%%PORTDOCS%%share/doc/HTML/it/knights/common
+%%PORTDOCS%%share/doc/HTML/it/knights/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/it/knights/index.docbook
+%%PORTDOCS%%share/doc/HTML/nl/knights/common
+%%PORTDOCS%%share/doc/HTML/nl/knights/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/nl/knights/index.docbook
+%%PORTDOCS%%share/doc/HTML/pt/knights/common
+%%PORTDOCS%%share/doc/HTML/pt/knights/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/pt/knights/index.docbook
+%%PORTDOCS%%share/doc/HTML/pt_BR/knights/common
+%%PORTDOCS%%share/doc/HTML/pt_BR/knights/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/pt_BR/knights/index.docbook
+%%PORTDOCS%%share/doc/HTML/ru/knights/Knights-newgame-dialog.png
+%%PORTDOCS%%share/doc/HTML/ru/knights/Knights-server-account.png
+%%PORTDOCS%%share/doc/HTML/ru/knights/Knights-server-challenges.png
+%%PORTDOCS%%share/doc/HTML/ru/knights/Knights-server-graph.png
+%%PORTDOCS%%share/doc/HTML/ru/knights/Knights-server-list.png
+%%PORTDOCS%%share/doc/HTML/ru/knights/common
+%%PORTDOCS%%share/doc/HTML/ru/knights/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/ru/knights/index.docbook
+%%PORTDOCS%%share/doc/HTML/sv/knights/common
+%%PORTDOCS%%share/doc/HTML/sv/knights/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/sv/knights/index.docbook
+%%PORTDOCS%%share/doc/HTML/uk/knights/Knights-engines.png
+%%PORTDOCS%%share/doc/HTML/uk/knights/Knights-server-account.png
+%%PORTDOCS%%share/doc/HTML/uk/knights/Knights-server-challenges.png
+%%PORTDOCS%%share/doc/HTML/uk/knights/Knights-server-graph.png
+%%PORTDOCS%%share/doc/HTML/uk/knights/Knights-server-list.png
+%%PORTDOCS%%share/doc/HTML/uk/knights/Knights-newgame-dialog.png
+%%PORTDOCS%%share/doc/HTML/uk/knights/common
+%%PORTDOCS%%share/doc/HTML/uk/knights/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/uk/knights/index.docbook
 share/icons/hicolor/16x16/apps/knights.png
 share/icons/hicolor/32x32/apps/knights.png
 share/icons/hicolor/48x48/apps/knights.png
 share/icons/hicolor/64x64/apps/knights.png
-share/locale/ca/LC_MESSAGES/knights.mo
-share/locale/ca@valencia/LC_MESSAGES/knights.mo
-share/locale/cs/LC_MESSAGES/knights.mo
-share/locale/da/LC_MESSAGES/knights.mo
-share/locale/de/LC_MESSAGES/knights.mo
-share/locale/en_GB/LC_MESSAGES/knights.mo
-share/locale/eo/LC_MESSAGES/knights.mo
-share/locale/es/LC_MESSAGES/knights.mo
-share/locale/et/LC_MESSAGES/knights.mo
-share/locale/fi/LC_MESSAGES/knights.mo
-share/locale/fr/LC_MESSAGES/knights.mo
-share/locale/hu/LC_MESSAGES/knights.mo
-share/locale/it/LC_MESSAGES/knights.mo
-share/locale/ja/LC_MESSAGES/knights.mo
-share/locale/lt/LC_MESSAGES/knights.mo
-share/locale/ml/LC_MESSAGES/knights.mo
-share/locale/nds/LC_MESSAGES/knights.mo
-share/locale/nl/LC_MESSAGES/knights.mo
-share/locale/pt/LC_MESSAGES/knights.mo
-share/locale/pt_BR/LC_MESSAGES/knights.mo
-share/locale/ro/LC_MESSAGES/knights.mo
-share/locale/ru/LC_MESSAGES/knights.mo
-share/locale/sk/LC_MESSAGES/knights.mo
-share/locale/sr/LC_MESSAGES/knights.mo
-share/locale/sr@ijekavian/LC_MESSAGES/knights.mo
-share/locale/sr@ijekavianlatin/LC_MESSAGES/knights.mo
-share/locale/sr@latin/LC_MESSAGES/knights.mo
-share/locale/sv/LC_MESSAGES/knights.mo
-share/locale/uk/LC_MESSAGES/knights.mo
-share/locale/zh_TW/LC_MESSAGES/knights.mo
-@dirrm share/doc/HTML/uk/knights
-@dirrm share/doc/HTML/pt_BR/knights
-@dirrm share/doc/HTML/et/knights/
-@dirrm share/doc/HTML/en/knights
+%%NLS%%share/locale/bs/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/da/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/de/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/el/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/es/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/et/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/it/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/km/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/nds/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/sr@ijekavian/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/sr@ijekavianlatin/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/knights.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/knights.mo
+%%PORTDOCS%%@dirrm share/doc/HTML/uk/knights
+%%PORTDOCS%%@dirrm share/doc/HTML/sv/knights
+%%PORTDOCS%%@dirrm share/doc/HTML/ru/knights
+%%PORTDOCS%%@dirrm share/doc/HTML/pt_BR/knights
+%%PORTDOCS%%@dirrm share/doc/HTML/pt/knights
+%%PORTDOCS%%@dirrm share/doc/HTML/nl/knights
+%%PORTDOCS%%@dirrm share/doc/HTML/it/knights
+%%PORTDOCS%%@dirrm share/doc/HTML/et/knights
+%%PORTDOCS%%@dirrm share/doc/HTML/es/knights
+%%PORTDOCS%%@dirrm share/doc/HTML/en/knights
+%%PORTDOCS%%@dirrm share/doc/HTML/de/knights
 @dirrm share/apps/knights/themes
 @dirrm share/apps/knights