- Update to 2.42.0

PR:		146304
Submitted by:	Ports Fury

3 files changed, 22 insertions, 26 deletions

diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index fc8252afd50f..80fb6b01b41b 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	freecell-solver
-PORTVERSION=	2.40.0
+PORTVERSION=	2.42.0
 CATEGORIES=	games
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		BERLIOS/fc-solve
@@ -59,10 +59,6 @@ CMAKE_ARGS+=	-DFCS_USE_TCMALLOC:BOOL=ON
 .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.txt HACKING.txt INSTALL.txt NEWS.txt README.txt \
diff --git a/games/freecell-solver/distinfo b/games/freecell-solver/distinfo
index b4d41242d814..a662d2807567 100644
--- a/games/freecell-solver/distinfo
+++ b/games/freecell-solver/distinfo
@@ -1,3 +1,3 @@
-MD5 (freecell-solver-2.40.0.tar.bz2) = 4b56595c0e7b56f897638cf0a660a055
-SHA256 (freecell-solver-2.40.0.tar.bz2) = da87d9caf865061e3f87c6e67546728e5eb220b1878b4e8a0f520def68de9720
-SIZE (freecell-solver-2.40.0.tar.bz2) = 291531
+MD5 (freecell-solver-2.42.0.tar.bz2) = 8aa082a5dc509493eb227e6edfd3011b
+SHA256 (freecell-solver-2.42.0.tar.bz2) = 02914ba3b86e3db49336fb5f44f78e2f7900b3259d0b406cb20a002fea50a99e
+SIZE (freecell-solver-2.42.0.tar.bz2) = 318549
diff --git a/games/freecell-solver/files/patch-CMakeLists.txt b/games/freecell-solver/files/patch-CMakeLists.txt
index 23b27b803892..196099cfc388 100644
--- a/games/freecell-solver/files/patch-CMakeLists.txt
+++ b/games/freecell-solver/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2009-11-27 23:03:34.000000000 +0900
-+++ CMakeLists.txt	2009-11-29 03:31:22.000000000 +0900
-@@ -146,6 +146,8 @@
+--- CMakeLists.txt.orig	2010-03-28 00:13:11.000000000 +0900
++++ CMakeLists.txt	2010-03-31 04:13:01.000000000 +0900
+@@ -154,6 +154,8 @@
  SET (FCS_STACK_STORAGE_LIBAVL2_TREE_TYPE "avl" CACHE STRING "The libavl2 tree type used for the stack storage. Ignored if not set to libavl2")
  SET (LIBAVL2_SOURCE_DIR "/usr/src/avl-2.0.3" CACHE STRING "The location of the libavl2 source tree (from which files are copied)")
  
@@ -9,7 +9,7 @@
  IF (NOT (STATES_TYPE MATCHES "^(INDIRECT_STACK_STATES|COMPACT_STATES|DEBUG_STATES)$"))
      MESSAGE(FATAL_ERROR "STATES_TYPE should be ('INDIRECT_STACK_STATES', 'COMPACT_STATES' or 'DEBUG_STATES')")
  ENDIF(NOT (STATES_TYPE MATCHES "^(INDIRECT_STACK_STATES|COMPACT_STATES|DEBUG_STATES)$"))
-@@ -299,7 +301,7 @@
+@@ -308,7 +310,7 @@
  CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
  
  SET(COMPILER_FLAGS_TO_CHECK 
@@ -18,28 +18,28 @@
  )
  
  IF (CPU_ARCH)
-@@ -361,7 +363,11 @@
- # Optionally link against Google's TCMalloc if it's available:
- # http://goog-perftools.sourceforge.net/
- # This gives better performance for the threaded programs.
--FIND_LIBRARY(LIBTCMALLOC_LIB tcmalloc)
-+IF (FCS_USE_TCMALLOC)
+@@ -383,7 +385,11 @@
+     # Optionally link against Google's TCMalloc if it's available:
+     # http://goog-perftools.sourceforge.net/
+     # This gives better performance for the threaded programs.
+-    FIND_LIBRARY(LIBTCMALLOC_LIB tcmalloc)
++    IF (FCS_USE_TCMALLOC)
 +
-+    FIND_LIBRARY(LIBTCMALLOC_LIB tcmalloc)
++        FIND_LIBRARY(LIBTCMALLOC_LIB tcmalloc)
 +
-+ENDIF (FCS_USE_TCMALLOC)
++    ENDIF (FCS_USE_TCMALLOC)
  
- SET(LIBTCMALLOC_LIB_LIST)
- IF(LIBTCMALLOC_LIB STREQUAL "LIBTCMALLOC_LIB-NOTFOUND")
-@@ -389,7 +395,6 @@
+     IF(LIBTCMALLOC_LIB STREQUAL "LIBTCMALLOC_LIB-NOTFOUND")
+         # Do nothing.
+@@ -426,7 +432,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)
-@@ -499,14 +504,6 @@
+ IF (UNIX)
+@@ -537,14 +542,6 @@
  
  INSTALL(
      FILES
@@ -54,7 +54,7 @@
          "fcs_cl.h"
          "fcs_enums.h"
          "fcs_move.h"
-@@ -520,7 +517,7 @@
+@@ -558,7 +555,7 @@
      FILES
          "${CMAKE_CURRENT_BINARY_DIR}/lib${CPACK_PACKAGE_NAME}.pc"
      DESTINATION