5 files changed, 28 insertions, 62 deletions

diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index 23d012a6582f..e18ed5d0a5cd 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -7,60 +7,58 @@
 #
 
 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 <bsd.port.pre.mk>
 
 .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
 
diff --git a/games/freecell-solver/distinfo b/games/freecell-solver/distinfo
index bab1301d9dea..a3c3a9b42dad 100644
--- a/games/freecell-solver/distinfo
+++ b/games/freecell-solver/distinfo
@@ -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
diff --git a/games/freecell-solver/files/patch-CMakeLists.txt b/games/freecell-solver/files/patch-CMakeLists.txt
index ec55149d988a..2d5b93a4ba71 100644
--- a/games/freecell-solver/files/patch-CMakeLists.txt
+++ b/games/freecell-solver/files/patch-CMakeLists.txt
@@ -1,36 +1,5 @@
 --- 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)
diff --git a/games/freecell-solver/pkg-descr b/games/freecell-solver/pkg-descr
index de609c50cc52..2c646a5a2d6c 100644
--- a/games/freecell-solver/pkg-descr
+++ b/games/freecell-solver/pkg-descr
@@ -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/
diff --git a/games/freecell-solver/pkg-plist b/games/freecell-solver/pkg-plist
index 29e695b550e0..14bb1b88b4d7 100644
--- a/games/freecell-solver/pkg-plist
+++ b/games/freecell-solver/pkg-plist
@@ -34,8 +34,8 @@ libdata/pkgconfig/libfreecell-solver.pc
 %%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