From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Feb 14 19:30:07 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CADE11065696 for ; Mon, 14 Feb 2011 19:30:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 871FB8FC13 for ; Mon, 14 Feb 2011 19:30:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p1EJU7I0012858 for ; Mon, 14 Feb 2011 19:30:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p1EJU7lC012853; Mon, 14 Feb 2011 19:30:07 GMT (envelope-from gnats) Resent-Date: Mon, 14 Feb 2011 19:30:07 GMT Resent-Message-Id: <201102141930.p1EJU7lC012853@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Pawel Pekala" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79F54106564A for ; Mon, 14 Feb 2011 19:24:19 +0000 (UTC) (envelope-from c0rn@o2.pl) Received: from moh2-ve2.go2.pl (moh2-ve2.go2.pl [193.17.41.200]) by mx1.freebsd.org (Postfix) with ESMTP id DD5298FC13 for ; Mon, 14 Feb 2011 19:24:18 +0000 (UTC) Received: from moh2-ve2.go2.pl (unknown [10.0.0.200]) by moh2-ve2.go2.pl (Postfix) with ESMTP id 4A818B00111 for ; Mon, 14 Feb 2011 20:24:17 +0100 (CET) Received: from unknown (unknown [10.0.0.142]) by moh2-ve2.go2.pl (Postfix) with SMTP for ; Mon, 14 Feb 2011 20:24:17 +0100 (CET) Received: from bsb186.neoplus.adsl.tpnet.pl [83.29.121.186] by poczta.o2.pl with ESMTP id lXYtUz; Mon, 14 Feb 2011 20:24:16 +0100 Message-Id: <1297711521.16692@caprica.slowicza.org> Date: Mon, 14 Feb 2011 20:25:21 +0100 From: "Pawel Pekala" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/154781: [PATCH] games/freecell-solver update X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Feb 2011 19:30:08 -0000 >Number: 154781 >Category: ports >Synopsis: [PATCH] games/freecell-solver update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Feb 14 19:30:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Pawel Pekala >Release: FreeBSD 8.1-RELEASE i386 >Organization: >Environment: System: FreeBSD 8.1-RELEASE #2: Sat Aug 21 18:46:54 CEST 2010 corn@caprica.slowicza.org:/usr/obj/usr/src/sys/GENERIC >Description: - update to version 3.6.0 - add LICENSE - remove WITH_JUDY and WITH_REDBLACK, they lead to broken builds anyway >How-To-Repeat: >Fix: --- freecell-solver-3.6.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/games/freecell-solver/Makefile /home/corn/devel/freecell-solver/Makefile --- /usr/ports/games/freecell-solver/Makefile 2010-07-15 07:13:34.000000000 +0200 +++ /home/corn/devel/freecell-solver/Makefile 2011-02-14 19:56:03.000000000 +0100 @@ -7,7 +7,7 @@ # PORTNAME= freecell-solver -PORTVERSION= 3.2.0 +PORTVERSION= 3.6.0 CATEGORIES= games MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \ BERLIOS/fc-solve @@ -15,15 +15,16 @@ 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 +LICENSE= MIT + +OPTIONS= TCMALLOC "Use Google's TCMalloc" off USE_BZIP2= yes USE_PERL5_BUILD= yes USE_CMAKE= yes CMAKE_USE_PTHREAD= yes USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes MAN6= fc-solve-board_gen.6 \ fc-solve.6 \ @@ -37,27 +38,16 @@ .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-patch: + @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \ + ${WRKSRC}/Presets/presets/children-playing-ball.sh \ + ${WRKSRC}/Presets/presets/sentient-pearls.sh + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} diff -ruN --exclude=CVS /usr/ports/games/freecell-solver/distinfo /home/corn/devel/freecell-solver/distinfo --- /usr/ports/games/freecell-solver/distinfo 2010-07-15 07:13:34.000000000 +0200 +++ /home/corn/devel/freecell-solver/distinfo 2011-02-08 20:48:02.000000000 +0100 @@ -1,3 +1,2 @@ -MD5 (freecell-solver-3.2.0.tar.bz2) = 5122582b48fe532c7eeb2aac3a1d3308 -SHA256 (freecell-solver-3.2.0.tar.bz2) = 4b75a859044a8162d8ab60d01e37561225a132580d4c6eea60d4c5fe872a9270 -SIZE (freecell-solver-3.2.0.tar.bz2) = 349558 +SHA256 (freecell-solver-3.6.0.tar.bz2) = 958162318419e3a914bccd149f29b79e74f82f9edb79083745f3572c2576ca50 +SIZE (freecell-solver-3.6.0.tar.bz2) = 397996 diff -ruN --exclude=CVS /usr/ports/games/freecell-solver/files/patch-CMakeLists.txt /home/corn/devel/freecell-solver/files/patch-CMakeLists.txt --- /usr/ports/games/freecell-solver/files/patch-CMakeLists.txt 2010-05-09 13:21:56.000000000 +0200 +++ /home/corn/devel/freecell-solver/files/patch-CMakeLists.txt 2011-02-08 20:56:41.000000000 +0100 @@ -1,37 +1,37 @@ ---- CMakeLists.txt.orig 2010-03-28 00:13:11.000000000 +0900 -+++ CMakeLists.txt 2010-03-31 04:13:01.000000000 +0900 -@@ -154,6 +154,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)") +--- 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)$")) -@@ -308,7 +310,7 @@ +@@ -362,7 +364,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) - SET(COMPILER_FLAGS_TO_CHECK + SET(COMPILER_FLAGS_TO_CHECK - "-Wall" "-Werror=implicit-function-declaration" "-fvisibility=hidden" + "-Wall" ) IF (CPU_ARCH) -@@ -383,7 +385,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. -@@ -426,7 +432,6 @@ +@@ -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) @@ -39,7 +39,7 @@ ENDIF (CMAKE_USE_PTHREADS_INIT) IF (UNIX) -@@ -537,14 +542,6 @@ +@@ -632,14 +637,6 @@ INSTALL( FILES @@ -54,11 +54,11 @@ "fcs_cl.h" "fcs_enums.h" "fcs_move.h" -@@ -558,7 +555,7 @@ +@@ -654,7 +651,7 @@ FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${CPACK_PACKAGE_NAME}.pc" - DESTINATION -- "lib/pkgconfig" + DESTINATION +- "lib${LIB_SUFFIX}/pkgconfig" + "libdata/pkgconfig" ) diff -ruN --exclude=CVS /usr/ports/games/freecell-solver/pkg-plist /home/corn/devel/freecell-solver/pkg-plist --- /usr/ports/games/freecell-solver/pkg-plist 2010-07-15 07:13:34.000000000 +0200 +++ /home/corn/devel/freecell-solver/pkg-plist 2011-02-08 21:03:40.000000000 +0100 @@ -9,6 +9,7 @@ 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 @@ -32,11 +33,13 @@ %%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/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 --- freecell-solver-3.6.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: