- Update to 2.22.0

PR:		133315
Submitted by:	Ports Fury

3 files changed, 38 insertions, 15 deletions

diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index ed93f4261286..0b7c28948d14 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -7,23 +7,20 @@
 #
 
 PORTNAME=	freecell-solver
-PORTVERSION=	2.14.0
-PORTREVISION=	2
+PORTVERSION=	2.22.0
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR=	fc-solve
+MASTER_SITES=	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
+
 USE_PERL5_BUILD=	yes
 USE_CMAKE=	yes
 USE_LDCONFIG=	yes
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	AUTHORS README TODO USAGE README.win32.txt INSTALL
-.endif
-
 MAN6=	fc-solve-board_gen.6 \
 	fc-solve.6 \
 	freecell-solver-range-parallel-solve.6 \
@@ -32,11 +29,29 @@ MAN6=	fc-solve-board_gen.6 \
 	make_pysol_freecell_board.py.6 \
 	pi-make-microsoft-freecell-board.6
 
-.if !defined(NOPORTDOCS)
+CFLAGS+=	-I${LOCALBASE}/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="FCS_STACK_STORAGE_JUDY" \
+		-DFCS_STATE_STORAGE="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"
+.endif
+
 post-install:
-	${MKDIR} ${DOCSDIR}
-.for DOCFILE in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${DOCFILE} ${DOCSDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in AUTHORS INSTALL README README.win32.txt TODO USAGE 
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/games/freecell-solver/distinfo b/games/freecell-solver/distinfo
index cfe7407d86ef..4fab1e614547 100644
--- a/games/freecell-solver/distinfo
+++ b/games/freecell-solver/distinfo
@@ -1,3 +1,3 @@
-MD5 (freecell-solver-2.14.0.tar.gz) = 49ad9d558a2124f8cf66ee26f61691fa
-SHA256 (freecell-solver-2.14.0.tar.gz) = 287d3126e66d652a5b5e4aaf1a2e7261b6e245231ea89bfa40d23ede56c7261a
-SIZE (freecell-solver-2.14.0.tar.gz) = 223029
+MD5 (freecell-solver-2.22.0.tar.gz) = 274738898b7bd2afd0b28b72d165f792
+SHA256 (freecell-solver-2.22.0.tar.gz) = 6f89f1c7b460e0c7ea145c97316d6e3f519f534cbedd23dbe60afa982ac96260
+SIZE (freecell-solver-2.22.0.tar.gz) = 298146
diff --git a/games/freecell-solver/pkg-plist b/games/freecell-solver/pkg-plist
index b1cb7da9f08e..f5655551d207 100644
--- a/games/freecell-solver/pkg-plist
+++ b/games/freecell-solver/pkg-plist
@@ -10,9 +10,16 @@ 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
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.win32.txt
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/USAGE
 %%DATADIR%%/presetrc
 %%DATADIR%%/presets/abra-kadabra.sh
 %%DATADIR%%/presets/cool-jives.sh
@@ -24,4 +31,5 @@ lib/libfreecell-solver.so.0.5.0
 %%DATADIR%%/presets/yellow-brick-road.sh
 @dirrm %%DATADIR%%/presets
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/freecell-solver