5 files changed, 43 insertions, 7 deletions
diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index 917e2ee6e157..31204adfcb63 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	freecell-solver
-PORTVERSION=	2.26.0
+PORTVERSION=	2.28.1
 CATEGORIES=	games
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		BERLIOS/fc-solve
@@ -18,8 +18,10 @@ COMMENT=	A program that automatically solves games of Freecell
 OPTIONS=	JUDY "Use libJudy for states and stacks storage" off \
 		REDBLACK "Use libredblack for states and stacks storage" off
 
+USE_BZIP2=	yes
 USE_PERL5_BUILD=	yes
 USE_CMAKE=	yes
+CMAKE_USE_PTHREAD=	yes
 USE_LDCONFIG=	yes
 
 MAN6=	fc-solve-board_gen.6 \
@@ -49,6 +51,10 @@ CMAKE_ARGS+=	-DFCS_STACK_STORAGE="FCS_STACK_STORAGE_LIBREDBLACK_TREE" \
 .endif
 
 post-install:
+.for file in freecell-solver-fc-pro-range-solve \
+	freecell-solver-multi-thread-solve
+	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
+.endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in AUTHORS INSTALL README README.win32.txt TODO USAGE
diff --git a/games/freecell-solver/distinfo b/games/freecell-solver/distinfo
index 57ec86a71974..362a684aae47 100644
--- a/games/freecell-solver/distinfo
+++ b/games/freecell-solver/distinfo
@@ -1,3 +1,3 @@
-MD5 (freecell-solver-2.26.0.tar.gz) = df5343ac6206d80e29c5ef237af5869c
-SHA256 (freecell-solver-2.26.0.tar.gz) = 86f38682f35163de31ad818d82442a7efa103cafe25ddef40e26e8cd73813526
-SIZE (freecell-solver-2.26.0.tar.gz) = 284372
+MD5 (freecell-solver-2.28.1.tar.bz2) = 2d55cda91ecde5fb9bae4dad9c8d6d65
+SHA256 (freecell-solver-2.28.1.tar.bz2) = 7fabbb22aa657054e18fae2d9cebb366ed3515fdd68104a9a5a7f2bae4c1c067
+SIZE (freecell-solver-2.28.1.tar.bz2) = 219138
diff --git a/games/freecell-solver/files/patch-CMakeLists.txt b/games/freecell-solver/files/patch-CMakeLists.txt
index 73cc0988099b..ff390fd84529 100644
--- a/games/freecell-solver/files/patch-CMakeLists.txt
+++ b/games/freecell-solver/files/patch-CMakeLists.txt
@@ -1,6 +1,23 @@
---- CMakeLists.txt.orig	2009-02-19 11:27:44.292036727 -0500
-+++ CMakeLists.txt	2009-02-19 11:28:03.932046002 -0500
-@@ -156,18 +156,6 @@
+--- CMakeLists.txt.orig	2009-05-18 18:49:56.000000000 +0900
++++ CMakeLists.txt	2009-05-29 06:35:00.000000000 +0900
+@@ -191,7 +191,7 @@
+ 
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+ 
+-SET(COMPILER_FLAGS_TO_CHECK "-Wall" "-Werror=implicit-function-declaration")
++SET(COMPILER_FLAGS_TO_CHECK "-Wall")
+ 
+ IF (CPU_ARCH)
+     LIST(APPEND COMPILER_FLAGS_TO_CHECK "-march=${CPU_ARCH}")
+@@ -257,7 +257,6 @@
+ 
+ IF (CMAKE_USE_PTHREADS_INIT)
+     FCS_ADD_EXEC(freecell-solver-multi-thread-solve threaded_range_solver.c)
+-    TARGET_LINK_LIBRARIES(freecell-solver-multi-thread-solve "pthread")
+ ENDIF (CMAKE_USE_PTHREADS_INIT)
+ 
+ IF (MY_LINK_FLAGS)
+@@ -329,18 +328,6 @@
  
  INSTALL(
      FILES
diff --git a/games/freecell-solver/files/patch-caas.c b/games/freecell-solver/files/patch-caas.c
new file mode 100644
index 000000000000..8940e7ea9cfb
--- /dev/null
+++ b/games/freecell-solver/files/patch-caas.c
@@ -0,0 +1,11 @@
+--- caas.c.orig	2009-05-18 18:49:56.000000000 +0900
++++ caas.c	2009-05-18 23:10:59.000000000 +0900
+@@ -236,7 +236,7 @@
+             PValue,
+             instance->stacks_judy_array,
+             new_state_key->stacks[a],
+-            (fcs_stack_len(*new_state_key, a)+1)
++            col_len
+         );
+         /* TODO : Handle out-of-memory. */
+         if (*PValue == 0)
diff --git a/games/freecell-solver/pkg-plist b/games/freecell-solver/pkg-plist
index f5655551d207..b72e1c45628b 100644
--- a/games/freecell-solver/pkg-plist
+++ b/games/freecell-solver/pkg-plist
@@ -1,5 +1,7 @@
 bin/fc-solve
 bin/freecell-solver-config
+bin/freecell-solver-fc-pro-range-solve
+bin/freecell-solver-multi-thread-solve
 bin/freecell-solver-range-parallel-solve
 bin/make-aisleriot-freecell-board
 bin/make-gnome-freecell-board