- Update to 1.18.1

PR:		179223
Submitted by:	Ports Fury

5 files changed, 13 insertions, 57 deletions

diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index 3bf50ddcd8ef..70e294dc254f 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	freecell-solver
-PORTVERSION=	3.16.0
+PORTVERSION=	3.18.1
 CATEGORIES=	games
 MASTER_SITES=	http://fc-solve.shlomifish.org/downloads/fc-solve/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A program that automatically solves games of Freecell
+COMMENT=	Open source framework for solving Freecell
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
@@ -16,8 +16,9 @@ OPTIONS_DEFINE=	TCMALLOC DOCS EXAMPLES
 TCMALLOC_DESC=	Use Google's TCMalloc
 
 USE_BZIP2=	yes
+USES=		cmake:outsource
 USE_PERL5_BUILD=yes
-USES=		cmake
+CMAKE_ARGS=	-DFCS_WITH_TEST_SUITE:BOOL=OFF
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
@@ -39,7 +40,10 @@ CMAKE_ARGS+=	-DFCS_AVOID_TCMALLOC:BOOL=ON
 
 post-patch:
 .for f in CMakeLists.txt
-	@${REINPLACE_CMD} -e 's|"pthread"|"${PTHREAD_LIBS}"|' ${WRKSRC}/${f}
+	@${REINPLACE_CMD} -e 's|"pthread"|"-pthread"|' ${WRKSRC}/${f}
+.endfor
+.for f in Shlomif_Common.cmake
+	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/cmake/${f}
 .endfor
 .for f in children-playing-ball.sh sentient-pearls.sh
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/Presets/presets/${f}
diff --git a/games/freecell-solver/distinfo b/games/freecell-solver/distinfo
index a7e308f37ed0..6f7d078c4c96 100644
--- a/games/freecell-solver/distinfo
+++ b/games/freecell-solver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freecell-solver-3.16.0.tar.bz2) = c294fab18d895c116d6c17972ea1a11147c26995d4087f1711937d3fa295058e
-SIZE (freecell-solver-3.16.0.tar.bz2) = 658981
+SHA256 (freecell-solver-3.18.1.tar.bz2) = d883fe9aeed4f0ad25e6b4b167dd18b68d98baba43029f12e508ecb46be9f473
+SIZE (freecell-solver-3.18.1.tar.bz2) = 552744
diff --git a/games/freecell-solver/files/patch-Common.cmake b/games/freecell-solver/files/patch-Common.cmake
index f93fc11c5261..e69de29bb2d1 100644
--- a/games/freecell-solver/files/patch-Common.cmake
+++ b/games/freecell-solver/files/patch-Common.cmake
@@ -1,11 +0,0 @@
---- Common.cmake.orig	2009-01-26 21:46:25.000000000 +0800
-+++ Common.cmake	2009-01-26 21:46:40.000000000 +0800
-@@ -84,7 +84,7 @@
-         FILES
-             ${SOURCE}
-         DESTINATION
--            "share/man/man${SECTION}"
-+            "man/man${SECTION}"
-    )
- ENDMACRO(INSTALL_MAN)
- 
diff --git a/games/freecell-solver/files/patch-board_gen__CMaleLists.txt b/games/freecell-solver/files/patch-board_gen__CMaleLists.txt
index 6712b5e6f9d5..e69de29bb2d1 100644
--- a/games/freecell-solver/files/patch-board_gen__CMaleLists.txt
+++ b/games/freecell-solver/files/patch-board_gen__CMaleLists.txt
@@ -1,37 +0,0 @@
---- board_gen/CMakeLists.txt.orig	2012-06-08 07:31:57.000000000 +0900
-+++ board_gen/CMakeLists.txt	2012-06-14 19:58:34.000000000 +0900
-@@ -20,25 +20,6 @@
-     pi_make_microsoft_freecell_board.c
- )
- 
--SET (make_pysol "make_pysol_freecell_board.py")
--SET (_dest "${CMAKE_CURRENT_BINARY_DIR}/${make_pysol}")
--SET (_src  "${CMAKE_CURRENT_SOURCE_DIR}/${make_pysol}")
--
--# Adapted from:
--# http://stackoverflow.com/questions/697560/how-to-copy-directory-from-source-tree-to-binary-tree
--ADD_CUSTOM_COMMAND(
--    OUTPUT "${_dest}"
--    DEPENDS "${_src}"
--    COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${_src}" "${_dest}"
--)
--
--ADD_CUSTOM_TARGET(
--    "make_pysol_board"
--    ALL DEPENDS "${_dest}"
--)
--
--SET (_make_py_dest "${_dest}")
--
- RUN_POD2MAN(
-     "${CMAKE_CURRENT_SOURCE_DIR}/fc-solve-board_gen.pod"
-     "fc-solve-board_gen.6"
-@@ -67,7 +48,7 @@
- 
- INSTALL(
-     PROGRAMS
--        "${_make_py_dest}"
-+        "make_pysol_freecell_board.py"
-     DESTINATION
-         "bin"
- )
diff --git a/games/freecell-solver/pkg-descr b/games/freecell-solver/pkg-descr
index 7ff6b897a8ee..f17a622c3334 100644
--- a/games/freecell-solver/pkg-descr
+++ b/games/freecell-solver/pkg-descr
@@ -1,5 +1,5 @@
-This is Freecell Solver - a program that automatically solves games of
-Freecell and similar Solitaire variants such as Eight Off, Forecell and
-Seahaven Towers. 
+This is Freecell Solver - a program that automatically solves layouts of
+Freecell and similar variants of Card Solitaire such as Eight Off,
+Forecell, and Seahaven Towers, as well as Simple Simon boards. 
 
 WWW: http://fc-solve.shlomifish.org/