4 files changed, 41 insertions, 44 deletions

diff --git a/games/crafty/Makefile b/games/crafty/Makefile
index 142577bd5906..16605dfab9fa 100644
--- a/games/crafty/Makefile
+++ b/games/crafty/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	crafty
-PORTVERSION=	23.8
+PORTVERSION=	25.2
 CATEGORIES=	games
-MASTER_SITES=	http://www.craftychess.com/:src \
+MASTER_SITES=	http://www.craftychess.com/downloads/source/:src \
 		http://www.cis.uab.edu/hyatt/crafty/pgn/:data \
 		http://www.cis.uab.edu/hyatt/crafty/documentation/:doc \
 		http://www.cis.uab.edu/hyatt/crafty/source/:src \
@@ -18,14 +18,14 @@ EXTRACT_ONLY=	crafty-${PORTVERSION}.zip
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Chess program for playing and analyzing games
 
-USES=		gmake zip
+WRKSRC=		${WRKDIR}
 
-BROKEN=		file not found
+USES=		gmake zip
 
 BOOKS=		books.bin
 DISTFILES+=	${BOOKS:S/$/:books/}
 
-ALL_TARGET=	freebsd
+ALL_TARGET=	unix-gcc
 
 WITH_BOOKDIR?=	${PREFIX}/lib/crafty
 WITH_LOGDIR?=	/tmp
@@ -59,7 +59,7 @@ OPT+=		-DCPUS=1 # disables x86 assembler
 .if ${PORT_OPTIONS:MBOOK}
 BOOKS+=		book.bin
 PKGNAMESUFFIX=	-open-default
-CONFLICTS+=	crafty-open-enormous-* crafty-open-large-* crafty-open-medium-*
+CONFLICTS+=	crafty-open-enormous-[0-9]* crafty-open-large-[0-9]* crafty-open-medium-[0-9]*
 .endif
 
 MAKE_ENV+=	opt="${OPT}" target=${OPSYS} CXFLAGS="${CXXFLAGS}"
diff --git a/games/crafty/distinfo b/games/crafty/distinfo
index fb8018cea594..aa46f6578d53 100644
--- a/games/crafty/distinfo
+++ b/games/crafty/distinfo
@@ -1,16 +1,17 @@
-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
-SIZE (crafty/crafty.doc.ps) = 141725
-SHA256 (crafty/bitmaps.tgz) = fd9279dadb5fa2d8ee77ef4245ef4d5cd51842b3029b1b3698c0b8ed724b0be6
-SIZE (crafty/bitmaps.tgz) = 27317
-SHA256 (crafty/sound.zip) = a9cd8f9c4ebfb41a8a57056da2256c8c88d5fa21c3865f2aeea5bbe8cd2b4e24
-SIZE (crafty/sound.zip) = 737470
+TIMESTAMP = 1500155416
+SHA256 (crafty/crafty-25.2.zip) = 337e00bab79c33739fbaa71cd26c65f986886ee0d8ce181f2cb62f2efd317710
+SIZE (crafty/crafty-25.2.zip) = 433320
+SHA256 (crafty/start.pgn) = 4aa2ec5b29609c04e58e6a210307b736d9b83cd2d8c852c71427427d51967065
+SIZE (crafty/start.pgn) = 51307
+SHA256 (crafty/books.bin) = 4aa2ec5b29609c04e58e6a210307b736d9b83cd2d8c852c71427427d51967065
+SIZE (crafty/books.bin) = 51307
+SHA256 (crafty/book.bin) = 4aa2ec5b29609c04e58e6a210307b736d9b83cd2d8c852c71427427d51967065
+SIZE (crafty/book.bin) = 51307
+SHA256 (crafty/crafty.doc.ascii) = 4aa2ec5b29609c04e58e6a210307b736d9b83cd2d8c852c71427427d51967065
+SIZE (crafty/crafty.doc.ascii) = 51307
+SHA256 (crafty/crafty.doc.ps) = 4aa2ec5b29609c04e58e6a210307b736d9b83cd2d8c852c71427427d51967065
+SIZE (crafty/crafty.doc.ps) = 51307
+SHA256 (crafty/bitmaps.tgz) = 4aa2ec5b29609c04e58e6a210307b736d9b83cd2d8c852c71427427d51967065
+SIZE (crafty/bitmaps.tgz) = 51307
+SHA256 (crafty/sound.zip) = 4aa2ec5b29609c04e58e6a210307b736d9b83cd2d8c852c71427427d51967065
+SIZE (crafty/sound.zip) = 51307
diff --git a/games/crafty/files/patch-Makefile b/games/crafty/files/patch-Makefile
index 43ccfaa81b92..489a36e9be21 100644
--- a/games/crafty/files/patch-Makefile
+++ b/games/crafty/files/patch-Makefile
@@ -1,19 +1,15 @@
---- Makefile.orig	2010-03-30 17:06:21.000000000 +0200
-+++ Makefile	2010-03-30 17:06:57.000000000 +0200
-@@ -81,11 +81,11 @@
- 	
- freebsd:
- 	$(MAKE) target=FreeBSD \
--		CC=gcc CXX='$(CC)' \
--		CFLAGS='-fomit-frame-pointer -m486 -O3 -Wall' \
--		CXFLAGS='-fomit-frame-pointer -m486 -O3 -Wall' \
--		LDFLAGS=$(LDFLAGS) \
--		opt='$(opt) -DINLINE32' \
-+		CC='$(CC)' CXX='$(CC)' \
-+		CFLAGS='$(CFLAGS) -fomit-frame-pointer -O3 -Wall' \
-+		CXFLAGS='$(CXXFLAGS) -fomit-frame-pointer -O3 -Wall' \
-+		LDFLAGS='$(LDFLAGS) -pthread -lstdc++' \
-+		opt='$(opt)' \
- 		crafty-make
+--- Makefile.orig	2016-10-03 22:11:34.000000000 +0200
++++ Makefile	2017-07-15 23:47:33.427574000 +0200
+@@ -83,9 +83,9 @@ quick:
  
- freebsd-pgcc:
+ unix-gcc:
+ 	$(MAKE) -j target=UNIX \
+-		CC=gcc \
+-		opt='-DSYZYGY -DTEST -DCPUS=4' \
+-		CFLAGS='-Wall -Wno-array-bounds -pipe -O3 -fprofile-use \
++		CC=$(CC) \
++		opt='$(opt) -DSYZYGY -DTEST -DCPUS=4' \
++		CFLAGS='$(CFLAGS) -Wall -Wno-array-bounds -pipe -O3 -fprofile-use \
+ 		-mpopcnt -fprofile-correction -pthread' \
+ 		LDFLAGS='$(LDFLAGS) -fprofile-use -pthread -lstdc++' \
+ 		crafty-make
diff --git a/games/crafty/files/patch-option.c b/games/crafty/files/patch-option.c
index 3fa9104b480c..ab8c93d27d81 100644
--- a/games/crafty/files/patch-option.c
+++ b/games/crafty/files/patch-option.c
@@ -1,6 +1,6 @@
---- option.c.orig	Tue Jun 20 07:57:17 2006
-+++ option.c	Mon Sep 10 14:53:11 2007
-@@ -1331,9 +1331,11 @@
+--- option.c.orig	2016-10-28 05:11:42.000000000 +0200
++++ option.c	2017-07-15 23:35:58.863941000 +0200
+@@ -978,9 +978,11 @@ int Option(TREE * RESTRICT tree) {
    else if (OptionMatch("help", *args)) {
      FILE *helpfile;
      char *readstat = (char *) -1;
@@ -12,4 +12,4 @@
 +          helpfile = fopen(fname, "r");
      if (!helpfile) {
        printf("ERROR.  Unable to open \"crafty.hlp\" -- help unavailable\n");
-       return (1);
+       return 1;