4 files changed, 32 insertions, 13 deletions

diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index 345d5115033c..a52d2fc07047 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	freecell-solver
-PORTVERSION=	2.32.1
+PORTVERSION=	2.34.0
 CATEGORIES=	games
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		BERLIOS/fc-solve
@@ -69,5 +69,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+.for file in ctypes-test.py
+	${INSTALL_DATA} ${WRKSRC}/examples/${file} ${EXAMPLESDIR}
+.endfor
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/games/freecell-solver/distinfo b/games/freecell-solver/distinfo
index c5954c1dd8fc..786ce191b983 100644
--- a/games/freecell-solver/distinfo
+++ b/games/freecell-solver/distinfo
@@ -1,3 +1,3 @@
-MD5 (freecell-solver-2.32.1.tar.bz2) = 135c77cbee93e0d2f384eba972449155
-SHA256 (freecell-solver-2.32.1.tar.bz2) = c2e42d9d7cd916f18901c886aac7daf9f4ad2026935f53f615ba5b52d71b4a26
-SIZE (freecell-solver-2.32.1.tar.bz2) = 229057
+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
diff --git a/games/freecell-solver/files/patch-CMakeLists.txt b/games/freecell-solver/files/patch-CMakeLists.txt
index 3f039948b02a..b29e47ef2000 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-06-24 22:03:08.000000000 +0900
-+++ CMakeLists.txt	2009-06-26 00:20:23.000000000 +0900
-@@ -136,6 +136,8 @@
+--- 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 @@
  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)$"))
-@@ -289,7 +291,7 @@
+@@ -290,7 +292,7 @@
  CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
  
  SET(COMPILER_FLAGS_TO_CHECK 
@@ -18,7 +18,7 @@
  )
  
  IF (CPU_ARCH)
-@@ -348,7 +350,11 @@
+@@ -352,7 +354,11 @@
  # Optionally link against Google's TCMalloc if it's available:
  # http://goog-perftools.sourceforge.net/
  # This gives better performance for the threaded programs.
@@ -29,9 +29,9 @@
 +
 +ENDIF (FCS_USE_TCMALLOC)
  
- TARGET_LINK_LIBRARIES (freecell-solver 
-     ${MATH_LIB} ${LIBTCMALLOC_LIB} ${LIBREDBLACK_LIB} ${LIBJUDY_LIB}
-@@ -369,7 +375,6 @@
+ SET(LIBTCMALLOC_LIB_LIST)
+ IF(LIBTCMALLOC_LIB STREQUAL "LIBTCMALLOC_LIB-NOTFOUND")
+@@ -380,7 +386,6 @@
  
  IF (CMAKE_USE_PTHREADS_INIT)
      FCS_ADD_EXEC(freecell-solver-multi-thread-solve threaded_range_solver.c)
@@ -39,7 +39,7 @@
  ENDIF (CMAKE_USE_PTHREADS_INIT)
  
  IF (MY_LINK_FLAGS)
-@@ -473,18 +478,6 @@
+@@ -490,18 +495,6 @@
  
  INSTALL(
      FILES
@@ -58,3 +58,12 @@
          "fcs_cl.h"
          "fcs_enums.h"
          "fcs_move.h"
+@@ -515,7 +508,7 @@
+     FILES
+         "${CMAKE_CURRENT_BINARY_DIR}/lib${CPACK_PACKAGE_NAME}.pc"
+     DESTINATION 
+-        "lib/pkgconfig"
++        "libdata/pkgconfig"
+ )
+ 
+ # Rebuild config.h if ver.txt has changed.
diff --git a/games/freecell-solver/pkg-plist b/games/freecell-solver/pkg-plist
index 699f7c99d3e0..ea454eba5995 100644
--- a/games/freecell-solver/pkg-plist
+++ b/games/freecell-solver/pkg-plist
@@ -16,12 +16,14 @@ lib/libfreecell-solver.a
 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%%/README.win32.txt
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/USAGE
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctypes-test.py
 %%DATADIR%%/presetrc
 %%DATADIR%%/presets/abra-kadabra.sh
 %%DATADIR%%/presets/cool-jives.sh
@@ -32,8 +34,10 @@ lib/libfreecell-solver.so.0.5.0
 %%DATADIR%%/presets/john_galt_line-500.sh
 %%DATADIR%%/presets/rin-tin-tin.sh
 %%DATADIR%%/presets/sand-stone.sh
+%%DATADIR%%/presets/toons-for-twenty-somethings.sh
 %%DATADIR%%/presets/yellow-brick-road.sh
 @dirrm %%DATADIR%%/presets
 @dirrm %%DATADIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/freecell-solver