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 @@ -1,73 +1,79 @@ # ex:ts=8 # New ports collection makefile for: freecell-solver # Date created: Fab 9, 2001 # Whom: Ying-Chieh Liao # # $FreeBSD$ # PORTNAME= freecell-solver -PORTVERSION= 2.32.1 +PORTVERSION= 2.34.0 CATEGORIES= games MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \ BERLIOS/fc-solve MAINTAINER= ports@FreeBSD.org 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 \ TCMALLOC "Use Google's TCMalloc" off USE_BZIP2= yes USE_PERL5_BUILD= yes USE_CMAKE= yes CMAKE_USE_PTHREAD= yes USE_LDCONFIG= yes MAN6= fc-solve-board_gen.6 \ fc-solve.6 \ freecell-solver-range-parallel-solve.6 \ make-aisleriot-freecell-board.6 \ make-gnome-freecell-board.6 \ make_pysol_freecell_board.py.6 \ pi-make-microsoft-freecell-board.6 CFLAGS+= -I${LOCALBASE}/include .include .if defined(WITH_JUDY) && defined(WITH_REDBLACK) IGNORE= you cannot enable both JUDY and REDBLACK .endif .if defined(WITH_JUDY) LIB_DEPENDS+= Judy.1:${PORTSDIR}/devel/judy CMAKE_ARGS+= -DFCS_STACK_STORAGE:STRING="FCS_STACK_STORAGE_JUDY" \ -DFCS_STATE_STORAGE:STRING="FCS_STATE_STORAGE_JUDY" .endif .if defined(WITH_REDBLACK) LIB_DEPENDS+= redblack.2:${PORTSDIR}/devel/libredblack CMAKE_ARGS+= -DFCS_STACK_STORAGE:STRING="FCS_STACK_STORAGE_LIBREDBLACK_TREE" \ -DFCS_STATE_STORAGE:STRING="FCS_STATE_STORAGE_LIBREDBLACK_TREE" .endif .if defined(WITH_TCMALLOC) LIB_DEPENDS+= tcmalloc.0:${PORTSDIR}/devel/google-perftools 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 INSTALL README README.win32.txt TODO USAGE ${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 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,60 +1,69 @@ ---- 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)") +SET (FCS_USE_TCMALLOC "" CACHE BOOL "Use tcmalloc") + 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 - "-Wall" "-Werror=implicit-function-declaration" "-fvisibility=hidden" + "-Wall" ) 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. -FIND_LIBRARY(LIBTCMALLOC_LIB tcmalloc) +IF (FCS_USE_TCMALLOC) + + FIND_LIBRARY(LIBTCMALLOC_LIB tcmalloc) + +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) - TARGET_LINK_LIBRARIES(freecell-solver-multi-thread-solve "pthread") ENDIF (CMAKE_USE_PTHREADS_INIT) IF (MY_LINK_FLAGS) -@@ -473,18 +478,6 @@ +@@ -490,18 +495,6 @@ INSTALL( FILES - "AUTHORS" - "INSTALL" - "README" - "README.win32.txt" - "TODO" - "USAGE" - DESTINATION - "share/doc/freecell-solver/" -) - -INSTALL( - FILES "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 @@ -1,39 +1,43 @@ 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 bin/make-microsoft-freecell-board bin/make_pysol_freecell_board.py bin/pi-make-microsoft-freecell-board include/freecell-solver/fcs_cl.h include/freecell-solver/fcs_enums.h include/freecell-solver/fcs_move.h include/freecell-solver/fcs_user.h 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 %%DATADIR%%/presets/crooked-nose.sh %%DATADIR%%/presets/fools-gold.sh %%DATADIR%%/presets/gooey-unknown-thing.sh %%DATADIR%%/presets/hello-world.sh %%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