Index: head/games/freecell-solver/Makefile =================================================================== --- head/games/freecell-solver/Makefile (revision 279311) +++ head/games/freecell-solver/Makefile (revision 279312) @@ -1,67 +1,65 @@ # ex:ts=8 # New ports collection makefile for: freecell-solver # Date created: Fab 9, 2001 # Whom: Ying-Chieh Liao # # $FreeBSD$ # PORTNAME= freecell-solver -PORTVERSION= 3.6.0 -PORTREVISION= 1 +PORTVERSION= 3.8.0 CATEGORIES= games -MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \ - BERLIOS/fc-solve +MASTER_SITES= BERLIOS/fc-solve MAINTAINER= ports@FreeBSD.org COMMENT= A program that automatically solves games of Freecell LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING.txt -OPTIONS= TCMALLOC "Use Google's TCMalloc" off - -USE_BZIP2= yes +USE_BZIP2= yes USE_PERL5_BUILD= yes -USE_CMAKE= yes +USE_CMAKE= yes CMAKE_USE_PTHREAD= yes -USE_LDCONFIG= yes -MAKE_JOBS_SAFE= yes +USE_LDCONFIG= yes +MAKE_JOBS_SAFE= 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 +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 +OPTIONS= TCMALLOC "Use Google's TCMalloc" off + .include .if defined(WITH_TCMALLOC) LIB_DEPENDS+= tcmalloc.1:${PORTSDIR}/devel/google-perftools -CMAKE_ARGS+= -DFCS_USE_TCMALLOC:BOOL=ON +.else +CMAKE_ARGS+= -DFCS_AVOID_TCMALLOC:BOOL=ON .endif post-patch: - @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \ - ${WRKSRC}/Presets/presets/children-playing-ball.sh \ - ${WRKSRC}/Presets/presets/sentient-pearls.sh +.for f in children-playing-ball.sh sentient-pearls.sh + @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/Presets/presets/${f} +.endfor post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for file in AUTHORS.txt HACKING.txt INSTALL.txt NEWS.txt README.txt \ +.for f in AUTHORS.txt HACKING.txt INSTALL.txt NEWS.txt README.txt \ README.win32.txt TODO.txt USAGE.txt - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} .endfor .endif .if !defined(NOPORTEXAMPLES) @${MKDIR} ${EXAMPLESDIR} -.for file in ctypes-test.py - ${INSTALL_DATA} ${WRKSRC}/examples/${file} ${EXAMPLESDIR} +.for f in ctypes-test.py + ${INSTALL_DATA} ${WRKSRC}/examples/${f} ${EXAMPLESDIR} .endfor .endif .include Property changes on: head/games/freecell-solver/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.57 \ No newline at end of property +1.58 \ No newline at end of property Index: head/games/freecell-solver/distinfo =================================================================== --- head/games/freecell-solver/distinfo (revision 279311) +++ head/games/freecell-solver/distinfo (revision 279312) @@ -1,2 +1,2 @@ -SHA256 (freecell-solver-3.6.0.tar.bz2) = 958162318419e3a914bccd149f29b79e74f82f9edb79083745f3572c2576ca50 -SIZE (freecell-solver-3.6.0.tar.bz2) = 397996 +SHA256 (freecell-solver-3.8.0.tar.bz2) = 2c282979eccd82d70a2fb301b8a20285b6b23ce9b49009c9e74aa5c598846066 +SIZE (freecell-solver-3.8.0.tar.bz2) = 629168 Property changes on: head/games/freecell-solver/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.43 \ No newline at end of property +1.44 \ No newline at end of property Index: head/games/freecell-solver/files/patch-CMakeLists.txt =================================================================== --- head/games/freecell-solver/files/patch-CMakeLists.txt (revision 279311) +++ head/games/freecell-solver/files/patch-CMakeLists.txt (revision 279312) @@ -1,65 +1,34 @@ --- CMakeLists.txt.orig 2011-02-01 21:34:27.000000000 +0100 +++ CMakeLists.txt 2011-02-08 20:56:22.000000000 +0100 -@@ -168,6 +168,8 @@ - SET (FCS_TRACE_MEM "" CACHE BOOL "Enable memory tracing in fc-solve.") - SET (FCS_MAX_NUM_SCANS_BUCKETS "" CACHE STRING "The number of scan_visited buckets in fc-solve (safe to ignore).") - -+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)$")) -@@ -362,7 +364,7 @@ - CMAKE_MINIMUM_REQUIRED(VERSION 2.6) - - SET(COMPILER_FLAGS_TO_CHECK -- "-Wall" "-Werror=implicit-function-declaration" "-fvisibility=hidden" -+ "-Wall" - ) - - IF (CPU_ARCH) -@@ -461,7 +463,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) - - IF(LIBTCMALLOC_LIB STREQUAL "LIBTCMALLOC_LIB-NOTFOUND") - # Do nothing. @@ -496,7 +502,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 (UNIX) @@ -632,14 +637,6 @@ INSTALL( FILES - ${docs_to_install} - "README.win32.txt" - DESTINATION - "share/doc/freecell-solver/" -) - -INSTALL( - FILES "fcs_cl.h" "fcs_enums.h" "fcs_move.h" @@ -654,7 +651,7 @@ FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${CPACK_PACKAGE_NAME}.pc" DESTINATION - "lib${LIB_SUFFIX}/pkgconfig" + "libdata/pkgconfig" ) # Rebuild config.h if ver.txt has changed. Property changes on: head/games/freecell-solver/files/patch-CMakeLists.txt ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/games/freecell-solver/pkg-descr =================================================================== --- head/games/freecell-solver/pkg-descr (revision 279311) +++ head/games/freecell-solver/pkg-descr (revision 279312) @@ -1,5 +1,4 @@ -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 games of Freecell +and similar Solitaire variants such as Eight Off, Forecell and Seahaven Towers. WWW: http://fc-solve.berlios.de/ Property changes on: head/games/freecell-solver/pkg-descr ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/games/freecell-solver/pkg-plist =================================================================== --- head/games/freecell-solver/pkg-plist (revision 279311) +++ head/games/freecell-solver/pkg-plist (revision 279312) @@ -1,54 +1,54 @@ 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_dllexport.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.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.txt %%PORTDOCS%%%%DOCSDIR%%/USAGE.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctypes-test.py %%DATADIR%%/presetrc %%DATADIR%%/presets/abra-kadabra.sh %%DATADIR%%/presets/blue-yonder.sh %%DATADIR%%/presets/children-playing-ball.sh %%DATADIR%%/presets/cool-jives.sh %%DATADIR%%/presets/crooked-nose.sh %%DATADIR%%/presets/enlightened-ostrich.sh -%%DATADIR%%/presets/foss-nessy.sh %%DATADIR%%/presets/fools-gold.sh +%%DATADIR%%/presets/foss-nessy.sh %%DATADIR%%/presets/gooey-unknown-thing.sh %%DATADIR%%/presets/hello-world.sh %%DATADIR%%/presets/john_galt_line-500.sh %%DATADIR%%/presets/maliciously-obscure.sh %%DATADIR%%/presets/rin-tin-tin.sh %%DATADIR%%/presets/sand-stone.sh %%DATADIR%%/presets/sentient-pearls.sh %%DATADIR%%/presets/tea-for-two.sh %%DATADIR%%/presets/the-iglu-cabal.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 Property changes on: head/games/freecell-solver/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.19 \ No newline at end of property +1.20 \ No newline at end of property