4 files changed, 32 insertions, 29 deletions

diff --git a/games/crafty/Makefile b/games/crafty/Makefile
index adf88daec390..128cbed277c3 100644
--- a/games/crafty/Makefile
+++ b/games/crafty/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	crafty
-PORTVERSION=	22.1
+PORTVERSION=	22.10
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cis.uab.edu/pub/hyatt/pgn/:data \
 		ftp://ftp.cis.uab.edu/pub/hyatt/documentation/:doc \
@@ -17,7 +17,7 @@ DISTFILES=	crafty-${PORTVERSION}.zip:src \
 DIST_SUBDIR=	crafty
 EXTRACT_ONLY=	crafty-${PORTVERSION}.zip
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	flo@kasimir.com
 COMMENT=	A chess programm for playing and analyzing games
 
 USE_ZIP=	yes
@@ -26,27 +26,18 @@ USE_GMAKE=	yes
 .if !defined(NOPORTDOCS)
 DOCFILES=	crafty.doc.ascii crafty.doc.ps
 DISTFILES+=	${DOCFILES:S/$/:doc/}
-UTILS=		bitmaps.tgz sound.zip
+UTILS=		bitmaps.tgz sound.zip book.bin books.bin
 DISTFILES+=	${UTILS:S/$/:utils/}
 .endif
 
 ALL_TARGET=	freebsd
 
-.if !defined(WITH_BOOKDIR)
-WITH_BOOKDIR=	${PREFIX}/lib/crafty
-.endif
-.if !defined(WITH_LOGDIR)
-WITH_LOGDIR=	/tmp
-.endif
-.if !defined(WITH_RCDIR)
-WITH_RCDIR=	~/
-.endif
-.if !defined(WITH_TBDIR)
-WITH_TBDIR=	${PREFIX}/lib/crafty/TB
-.endif
-.if !defined(WITH_PERSDIR)
-WITH_PERSDIR=	${PREFIX}/lib/crafty/cpf
-.endif
+WITH_BOOKDIR?=	${PREFIX}/lib/crafty
+WITH_LOGDIR?=	/tmp
+WITH_RCDIR?=	~/
+WITH_TBDIR?=	${PREFIX}/lib/crafty/TB
+WITH_PERSDIR?=	${PREFIX}/lib/crafty/cpf
+
 OPT=		-DCPUS=4 -DHASHSTATS -DTRACE -DBOOKDIR=\\\"${WITH_BOOKDIR}\\\" \
 		-DLOGDIR=\\\"${WITH_LOGDIR}\\\" \
 		-DRCDIR=\\\"${WITH_RCDIR}\\\" \
@@ -67,6 +58,8 @@ MAKE_ENV+=	opt="${OPT}" target=${OPSYS} CXFLAGS="${CXXFLAGS}"
 
 post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/start.pgn ${WRKSRC}/start.pgn
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/book.bin ${WRKSRC}/book.bin
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/books.bin ${WRKSRC}/books.bin
 
 post-build:
 	(cd ${WRKSRC}; ./crafty bookpath=. <${FILESDIR}/books-building)
diff --git a/games/crafty/distinfo b/games/crafty/distinfo
index 97f3fa0d293e..12f9ea6b2a48 100644
--- a/games/crafty/distinfo
+++ b/games/crafty/distinfo
@@ -1,6 +1,6 @@
-MD5 (crafty/crafty-22.1.zip) = 44c983e96cd16bb0314484c5d7af91de
-SHA256 (crafty/crafty-22.1.zip) = ec25063af97d079402f1daee99493cc7d7c9a9df6001f856f9d0584dd23894be
-SIZE (crafty/crafty-22.1.zip) = 405169
+MD5 (crafty/crafty-22.10.zip) = 8abea59fa48e0b3012a1908683447cfa
+SHA256 (crafty/crafty-22.10.zip) = 0a5300315bacf6a532cb0e68c5699edde3b172d190911a68e58b8c7341a4a4fa
+SIZE (crafty/crafty-22.10.zip) = 417834
 MD5 (crafty/start.pgn) = 98176af8ec13945a4ec60ad9b5959412
 SHA256 (crafty/start.pgn) = 750397385a67307bd3e565f7a86d69745476db5fed4735650af971cc94318021
 SIZE (crafty/start.pgn) = 1349
@@ -16,3 +16,9 @@ SIZE (crafty/bitmaps.tgz) = 27317
 MD5 (crafty/sound.zip) = ccf72dfe83be9d11c230c9825f763af8
 SHA256 (crafty/sound.zip) = a9cd8f9c4ebfb41a8a57056da2256c8c88d5fa21c3865f2aeea5bbe8cd2b4e24
 SIZE (crafty/sound.zip) = 737470
+MD5 (crafty/book.bin) = 085e207bd19bd974d511e77fbef36507
+SHA256 (crafty/book.bin) = 57f49bff337946ea36f9409e1ec1e5fa4aebcf267062f4130f1283f7272f430a
+SIZE (crafty/book.bin) = 1697492
+MD5 (crafty/books.bin) = 6d7abc20944720986086ff6569fe35ec
+SHA256 (crafty/books.bin) = 34391763077243951c54523a5ce906204bcc0bac1850ddfde52e7b0461595444
+SIZE (crafty/books.bin) = 132252
diff --git a/games/crafty/files/patch-Makefile b/games/crafty/files/patch-Makefile
index b85ac7796b36..46bacfd5af70 100644
--- a/games/crafty/files/patch-Makefile
+++ b/games/crafty/files/patch-Makefile
@@ -1,16 +1,18 @@
---- Makefile.orig	Tue Jun 20 07:57:17 2006
-+++ Makefile	Sun Sep  9 10:48:25 2007
-@@ -146,10 +146,10 @@
+--- Makefile.orig	2009-01-27 04:15:14.000000000 +0300
++++ Makefile	2009-02-28 03:36:17.000000000 +0300
+@@ -119,11 +119,11 @@
+ 	
  freebsd:
  	$(MAKE) target=FreeBSD \
- 		CC=gcc CXX='$(CC)' \
+-		CC=gcc CXX='$(CC)' \
 -		CFLAGS='$(CFLAGS) -fomit-frame-pointer -m486 -O3 -Wall' \
 -		CXFLAGS=$(CFLAGS) \
--		LDFLAGS=$(LDFLAGS) \
+-		LDFLAGS='$(LDFLAGS) -lpthread' \
 -		opt='$(opt) -DINLINE32' \
-+		CFLAGS+='-fomit-frame-pointer -Wall' \
-+		CXFLAGS+='$(CXXFLAGS)' \
-+		LDFLAGS='$(LDFLAGS) -lstdc++' \
++		CC='$(CC)' CXX='$(CC)' \
++		CFLAGS='$(CFLAGS) -fomit-frame-pointer -Wall' \
++		CXFLAGS='$(CXXFLAGS)' \
++		LDFLAGS='$(LDFLAGS) -pthread -lstdc++' \
 +		opt='$(opt)' \
  		crafty-make
  
diff --git a/games/crafty/pkg-plist b/games/crafty/pkg-plist
index f8aafec47dff..3969e10ee118 100644
--- a/games/crafty/pkg-plist
+++ b/games/crafty/pkg-plist
@@ -4,6 +4,8 @@ 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/book.bin
+%%PORTDOCS%%share/doc/crafty/books.bin
 %%PORTDOCS%%share/doc/crafty/sound.zip
 %%PORTDOCS%%@dirrm share/doc/crafty
 @dirrm lib/crafty/cpf