4 files changed, 22 insertions, 23 deletions

diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index a52d2fc07047..42416d860262 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	freecell-solver
-PORTVERSION=	2.34.0
+PORTVERSION=	2.36.0
 CATEGORIES=	games
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		BERLIOS/fc-solve
@@ -65,7 +65,8 @@ post-install:
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS INSTALL README README.win32.txt TODO USAGE
+.for file in AUTHORS.txt HACKING.txt INSTALL.txt NEWS.txt README.txt \
+	README.win32.txt TODO.txt USAGE.txt
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
diff --git a/games/freecell-solver/distinfo b/games/freecell-solver/distinfo
index 786ce191b983..dd226d5c982d 100644
--- a/games/freecell-solver/distinfo
+++ b/games/freecell-solver/distinfo
@@ -1,3 +1,3 @@
-MD5 (freecell-solver-2.34.0.tar.bz2) = d7c803311b4ba392b33bfc79d3f4f6d4
-SHA256 (freecell-solver-2.34.0.tar.bz2) = f61445c30aec8bf4691475c0da0578e705fbeb0972c7d2319256b9116cbfe140
-SIZE (freecell-solver-2.34.0.tar.bz2) = 267811
+MD5 (freecell-solver-2.36.0.tar.bz2) = 5fdfbef7f75f76156bcc1e7886bcab3d
+SHA256 (freecell-solver-2.36.0.tar.bz2) = 9e056ac1a757763db35c3d95f1e52351cd7f9ed16a5e32c3af4187cda4919b77
+SIZE (freecell-solver-2.36.0.tar.bz2) = 282379
diff --git a/games/freecell-solver/files/patch-CMakeLists.txt b/games/freecell-solver/files/patch-CMakeLists.txt
index b29e47ef2000..23b27b803892 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-07-11 00:28:26.000000000 +0900
-+++ CMakeLists.txt	2009-07-11 22:27:38.000000000 +0900
-@@ -137,6 +137,8 @@
+--- 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 @@
  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)$"))
-@@ -290,7 +292,7 @@
+@@ -299,7 +301,7 @@
  CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
  
  SET(COMPILER_FLAGS_TO_CHECK 
@@ -18,7 +18,7 @@
  )
  
  IF (CPU_ARCH)
-@@ -352,7 +354,11 @@
+@@ -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.
@@ -31,7 +31,7 @@
  
  SET(LIBTCMALLOC_LIB_LIST)
  IF(LIBTCMALLOC_LIB STREQUAL "LIBTCMALLOC_LIB-NOTFOUND")
-@@ -380,7 +386,6 @@
+@@ -389,7 +395,6 @@
  
  IF (CMAKE_USE_PTHREADS_INIT)
      FCS_ADD_EXEC(freecell-solver-multi-thread-solve threaded_range_solver.c)
@@ -39,16 +39,12 @@
  ENDIF (CMAKE_USE_PTHREADS_INIT)
  
  IF (MY_LINK_FLAGS)
-@@ -490,18 +495,6 @@
+@@ -499,14 +504,6 @@
  
  INSTALL(
      FILES
--        "AUTHORS"
--        "INSTALL"
--        "README"
+-        ${docs_to_install}
 -        "README.win32.txt"
--        "TODO"
--        "USAGE"
 -    DESTINATION
 -        "share/doc/freecell-solver/"
 -)
@@ -58,7 +54,7 @@
          "fcs_cl.h"
          "fcs_enums.h"
          "fcs_move.h"
-@@ -515,7 +508,7 @@
+@@ -520,7 +517,7 @@
      FILES
          "${CMAKE_CURRENT_BINARY_DIR}/lib${CPACK_PACKAGE_NAME}.pc"
      DESTINATION 
diff --git a/games/freecell-solver/pkg-plist b/games/freecell-solver/pkg-plist
index ea454eba5995..c3e49a67ee6a 100644
--- a/games/freecell-solver/pkg-plist
+++ b/games/freecell-solver/pkg-plist
@@ -17,12 +17,14 @@ lib/libfreecell-solver.so
 lib/libfreecell-solver.so.0
 lib/libfreecell-solver.so.0.5.0
 libdata/pkgconfig/libfreecell-solver.pc
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt
+%%PORTDOCS%%%%DOCSDIR%%/HACKING.txt
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
+%%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.win32.txt
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/USAGE
+%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
+%%PORTDOCS%%%%DOCSDIR%%/USAGE.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctypes-test.py
 %%DATADIR%%/presetrc
 %%DATADIR%%/presets/abra-kadabra.sh