4 files changed, 48 insertions, 48 deletions

diff --git a/games/crafty/Makefile b/games/crafty/Makefile
index b0dd60be46fd..263a6b8e29f0 100644
--- a/games/crafty/Makefile
+++ b/games/crafty/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	crafty
-PORTVERSION=	23.4
+PORTVERSION=	23.8
 CATEGORIES=	games
 MASTER_SITES=	http://www.craftychess.com/:src \
 		http://www.cis.uab.edu/hyatt/crafty/pgn/:data \
@@ -15,7 +15,7 @@ DISTFILES=	crafty-${PORTVERSION}.zip:src \
 DIST_SUBDIR=	crafty
 EXTRACT_ONLY=	crafty-${PORTVERSION}.zip
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Chess program for playing and analyzing games
 
 USES=		gmake zip
@@ -37,7 +37,18 @@ OPT=		-DCPUS=4 -DHASHSTATS -DTRACE -DBOOKDIR=\\\"${WITH_BOOKDIR}\\\" \
 		-DTBDIR=\\\"${WITH_TBDIR}\\\" \
 		-DPERSDIR=\\\"${WITH_PERSDIR}\\\" -DSKILL
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS BOOK
+OPTIONS_DEFAULT=DOCS
+OPTIONS_SUB=	yes
+BOOK_DESC=	Include (default) opening book
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+OPT+=		-DINLINE32
+.elif ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
+BROKEN=		Does not compile on ia64, powerpc, or sparc64
+.endif
 
 .include <bsd.port.options.mk>
 
@@ -48,50 +59,36 @@ UTILS=		bitmaps.tgz sound.zip
 DISTFILES+=	${UTILS:S/$/:utils/}
 .endif
 
-.if ${ARCH} == "i386"
-OPT+=		-DINLINE32
-.elif ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile on ia64, powerpc, or sparc64
-.endif
-
-.if defined(WITH_BOOK)
+.if ${PORT_OPTIONS:MBOOK}
 BOOKS+=		book.bin
 DISTFILES+=	${BOOKS:S/$/:books/}
 PKGNAMESUFFIX=	-open-default
 CONFLICTS+=	crafty-open-enormous-* crafty-open-large-* crafty-open-medium-*
-PLIST_SUB+=	BOOK=""
-.else
-PLIST_SUB+=	BOOK="@comment "
 .endif
 
 MAKE_ENV+=	opt="${OPT}" target=${OPSYS} CXFLAGS="${CXXFLAGS}"
 
 post-extract:
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/start.pgn ${WRKSRC}/start.pgn
-.if defined(WITH_BOOK)
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/book.bin ${WRKSRC}/book.bin
+	cd ${DISTDIR}/${DIST_SUBDIR} && ${CP} start.pgn books.bin ${WRKSRC}
+.if ${PORT_OPTIONS:MBOOK}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/book.bin ${WRKSRC}
 .endif
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/books.bin ${WRKSRC}/books.bin
 
 post-build:
 	(cd ${WRKSRC}; ./crafty bookpath=. <${FILESDIR}/books-building)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/crafty ${STAGEDIR}${PREFIX}/bin/crafty
-	${CHOWN} root:nogroup ${STAGEDIR}${PREFIX}/bin/crafty
-	${CHMOD} 2555 ${STAGEDIR}${PREFIX}/bin/crafty
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/crafty/cpf
-	${CHOWN} -R root:nogroup ${STAGEDIR}${PREFIX}/lib/crafty
-	${CHMOD} 775 ${STAGEDIR}${PREFIX}/lib/crafty ${STAGEDIR}${PREFIX}/lib/crafty/cpf
-.if defined(WITH_BOOK)
-	${INSTALL_DATA} ${WRKSRC}/book.bin ${STAGEDIR}${PREFIX}/lib/crafty/book.bin
+.if ${PORT_OPTIONS:MBOOK}
+	${INSTALL_DATA} ${WRKSRC}/book.bin ${STAGEDIR}${PREFIX}/lib/crafty
 .endif
-	${INSTALL_DATA} ${WRKSRC}/books.bin ${STAGEDIR}${PREFIX}/lib/crafty/books.bin
-	${INSTALL_DATA} ${WRKSRC}/crafty.hlp ${STAGEDIR}${PREFIX}/lib/crafty/crafty.hlp
-	${CHOWN} root:nogroup ${STAGEDIR}${PREFIX}/lib/crafty/book*
-	${CHMOD} 664 ${STAGEDIR}${PREFIX}/lib/crafty/book*
+	${INSTALL_DATA} ${WRKSRC}/books.bin ${WRKSRC}/crafty.hlp \
+		${STAGEDIR}${PREFIX}/lib/crafty
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${DOCFILES} ${STAGEDIR}${DOCSDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${UTILS} ${STAGEDIR}${DOCSDIR}
+	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${DOCFILES} ${UTILS} \
+		${STAGEDIR}${DOCSDIR}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/crafty/distinfo b/games/crafty/distinfo
index fa256dc7f8b4..905f02e18fd1 100644
--- a/games/crafty/distinfo
+++ b/games/crafty/distinfo
@@ -1,9 +1,11 @@
-SHA256 (crafty/crafty-23.4.zip) = f49e119b9e843bd1f99b895919b4361ba0d6ae4349e2751a864872d6dd250e66
-SIZE (crafty/crafty-23.4.zip) = 426295
+SHA256 (crafty/crafty-23.8.zip) = 01c3c34125e43dcdba9015d8b31f0e2c46a58d792e8eefc0b75ca3ec6b294e14
+SIZE (crafty/crafty-23.8.zip) = 429967
 SHA256 (crafty/start.pgn) = 750397385a67307bd3e565f7a86d69745476db5fed4735650af971cc94318021
 SIZE (crafty/start.pgn) = 1349
 SHA256 (crafty/books.bin) = c81be5033aeb43decfa82604eebf7f16026131e9aedd7d1f0aa1b5e19863a744
 SIZE (crafty/books.bin) = 132252
+SHA256 (crafty/book.bin) = 67a41dda9a477912b570cc5583fe5fac4f93fb2dba9db436f77f5f95217279b2
+SIZE (crafty/book.bin) = 1697508
 SHA256 (crafty/crafty.doc.ascii) = be291c0f4c7e7d64404ec58b9e92c2455c4342d3c96c721ba21a80fce8332e83
 SIZE (crafty/crafty.doc.ascii) = 79678
 SHA256 (crafty/crafty.doc.ps) = 887eb54de05f3371ef95adc38629a0f1f2cad66d1ca1b14fc426b87f5b13a9ab
@@ -12,3 +14,7 @@ SHA256 (crafty/bitmaps.tgz) = fd9279dadb5fa2d8ee77ef4245ef4d5cd51842b3029b1b3698
 SIZE (crafty/bitmaps.tgz) = 27317
 SHA256 (crafty/sound.zip) = a9cd8f9c4ebfb41a8a57056da2256c8c88d5fa21c3865f2aeea5bbe8cd2b4e24
 SIZE (crafty/sound.zip) = 737470
+SHA256 (crafty/books.bin) = c81be5033aeb43decfa82604eebf7f16026131e9aedd7d1f0aa1b5e19863a744
+SIZE (crafty/books.bin) = 132252
+SHA256 (crafty/book.bin) = 67a41dda9a477912b570cc5583fe5fac4f93fb2dba9db436f77f5f95217279b2
+SIZE (crafty/book.bin) = 1697508
diff --git a/games/crafty/files/patch-chess.h b/games/crafty/files/patch-chess.h
deleted file mode 100644
index 5493afceab25..000000000000
--- a/games/crafty/files/patch-chess.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./chess.h.orig	2010-08-11 11:20:40.000000000 +0200
-+++ ./chess.h	2010-08-11 11:20:49.000000000 +0200
-@@ -24,7 +24,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include <stdlib.h>
--#if !defined(IPHONE)
-+#if !defined(IPHONE) && !defined(__FreeBSD__)   
- #  include <malloc.h>
- #endif
- #include <string.h>
diff --git a/games/crafty/pkg-plist b/games/crafty/pkg-plist
index 90289a6e013d..d4bd026c89a8 100644
--- a/games/crafty/pkg-plist
+++ b/games/crafty/pkg-plist
@@ -1,11 +1,19 @@
+@group nogroup
+@mode 2755
 bin/crafty
+@mode 775
+lib/crafty
+lib/crafty/cpf
+@mode 664
 %%BOOK%%lib/crafty/book.bin
+@mode 644
 lib/crafty/books.bin
 lib/crafty/crafty.hlp
-%%PORTDOCS%%share/doc/crafty/crafty.doc.ascii
-%%PORTDOCS%%share/doc/crafty/crafty.doc.ps
-%%PORTDOCS%%share/doc/crafty/bitmaps.tgz
-%%PORTDOCS%%share/doc/crafty/sound.zip
-%%PORTDOCS%%@dirrm share/doc/crafty
+@group
+%%PORTDOCS%%%%DOCSDIR%%/crafty.doc.ascii
+%%PORTDOCS%%%%DOCSDIR%%/crafty.doc.ps
+%%PORTDOCS%%%%DOCSDIR%%/bitmaps.tgz
+%%PORTDOCS%%%%DOCSDIR%%/sound.zip
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/crafty/cpf
 @dirrm lib/crafty