Date: Fri, 26 Jun 2009 03:00:19 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/136046: Update port: games/freecell-solver to 2.32.0 Message-ID: <20090626030019.b4d493b7.tkato432@yahoo.com> Resent-Message-ID: <200906251810.n5PIA23K086410@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 136046 >Category: ports >Synopsis: Update port: games/freecell-solver to 2.32.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jun 25 18:10:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.2-RELEASE-p1 i386 >Organization: >Environment: >Description: - Update to version 2.32.0 >How-To-Repeat: >Fix: diff -urN /usr/ports/games/freecell-solver/Makefile games/freecell-solver/Makefile --- /usr/ports/games/freecell-solver/Makefile 2009-06-18 23:12:20.000000000 +0900 +++ games/freecell-solver/Makefile 2009-06-26 00:21:11.000000000 +0900 @@ -7,7 +7,7 @@ # PORTNAME= freecell-solver -PORTVERSION= 2.30.0 +PORTVERSION= 2.32.0 CATEGORIES= games MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \ BERLIOS/fc-solve @@ -16,7 +16,8 @@ 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 + REDBLACK "Use libredblack for states and stacks storage" off \ + TCMALLOC "Use Google's TCMalloc" off USE_BZIP2= yes USE_PERL5_BUILD= yes @@ -34,20 +35,27 @@ CFLAGS+= -I${LOCALBASE}/include +.include <bsd.port.pre.mk> + .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="FCS_STACK_STORAGE_JUDY" \ - -DFCS_STATE_STORAGE="FCS_STATE_STORAGE_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="FCS_STACK_STORAGE_LIBREDBLACK_TREE" \ - -DFCS_STATE_STORAGE="FCS_STATE_STORAGE_LIBREDBLACK_TREE" +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: @@ -62,4 +70,4 @@ .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -urN /usr/ports/games/freecell-solver/distinfo games/freecell-solver/distinfo --- /usr/ports/games/freecell-solver/distinfo 2009-06-18 23:12:20.000000000 +0900 +++ games/freecell-solver/distinfo 2009-06-25 18:27:02.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (freecell-solver-2.30.0.tar.bz2) = da52741498899cc7ad4667dbb18b20d7 -SHA256 (freecell-solver-2.30.0.tar.bz2) = 4c0b632eaa506d4510f33b9c92a6c740d89abd245b2e51c0199ab6f82b27ed88 -SIZE (freecell-solver-2.30.0.tar.bz2) = 223860 +MD5 (freecell-solver-2.32.0.tar.bz2) = 95948bbeff4e8bb7e7eb8b83ee02404e +SHA256 (freecell-solver-2.32.0.tar.bz2) = e138449eccb0be45df59254df594ff0d9599f4a6df77ac09a0e969efde571bc7 +SIZE (freecell-solver-2.32.0.tar.bz2) = 229460 diff -urN /usr/ports/games/freecell-solver/files/patch-CMakeLists.txt games/freecell-solver/files/patch-CMakeLists.txt --- /usr/ports/games/freecell-solver/files/patch-CMakeLists.txt 2009-05-31 09:46:14.000000000 +0900 +++ games/freecell-solver/files/patch-CMakeLists.txt 2009-06-26 00:20:54.000000000 +0900 @@ -1,15 +1,37 @@ ---- CMakeLists.txt.orig 2009-05-18 18:49:56.000000000 +0900 -+++ CMakeLists.txt 2009-05-29 06:35:00.000000000 +0900 -@@ -191,7 +191,7 @@ - +--- 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 @@ + 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 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) --SET(COMPILER_FLAGS_TO_CHECK "-Wall" "-Werror=implicit-function-declaration") -+SET(COMPILER_FLAGS_TO_CHECK "-Wall") + SET(COMPILER_FLAGS_TO_CHECK +- "-Wall" "-Werror=implicit-function-declaration" "-fvisibility=hidden" ++ "-Wall" + ) IF (CPU_ARCH) - LIST(APPEND COMPILER_FLAGS_TO_CHECK "-march=${CPU_ARCH}") -@@ -257,7 +257,6 @@ +@@ -348,7 +350,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 @@ IF (CMAKE_USE_PTHREADS_INIT) FCS_ADD_EXEC(freecell-solver-multi-thread-solve threaded_range_solver.c) @@ -17,7 +39,7 @@ ENDIF (CMAKE_USE_PTHREADS_INIT) IF (MY_LINK_FLAGS) -@@ -329,18 +328,6 @@ +@@ -473,18 +478,6 @@ INSTALL( FILES >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090626030019.b4d493b7.tkato432>