5 files changed, 20 insertions, 36 deletions

diff --git a/games/freecell-solver/Makefile b/games/freecell-solver/Makefile
index a78f895aa111..d47dbc006f97 100644
--- a/games/freecell-solver/Makefile
+++ b/games/freecell-solver/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	freecell-solver
-PORTVERSION=	2.8.7
+PORTVERSION=	2.8.10
 CATEGORIES=	games
 MASTER_SITES=	http://vipe.technion.ac.il/~shlomif/freecell-solver/ \
 		http://fc-solve.berlios.de/
@@ -15,7 +15,9 @@ MASTER_SITES=	http://vipe.technion.ac.il/~shlomif/freecell-solver/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program that automatically solves games of Freecell
 
-USE_INC_LIBTOOL_VER=13
+USE_REINPLACE=	yes
+USE_LIBTOOL_VER=	15
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
 MAN6=	fc-solve-board_gen.6 fc-solve.6 \
@@ -25,4 +27,7 @@ MAN6=	fc-solve-board_gen.6 fc-solve.6 \
 	make_pysol_freecell_board.py.6 \
 	pi-make-microsoft-freecell-board.6
 
+post-patch:
+	@${REINPLACE_CMD} -e '/<malloc\.h>/d' ${WRKSRC}/alloc.c
+
 .include <bsd.port.mk>
diff --git a/games/freecell-solver/distinfo b/games/freecell-solver/distinfo
index a882031046e0..48fd65263e40 100644
--- a/games/freecell-solver/distinfo
+++ b/games/freecell-solver/distinfo
@@ -1,2 +1,2 @@
-MD5 (freecell-solver-2.8.7.tar.gz) = ff85de20675bd4c6823abfcd097949bd
-SIZE (freecell-solver-2.8.7.tar.gz) = 368960
+MD5 (freecell-solver-2.8.10.tar.gz) = d532b44fe39c5edba57b806938ca9a23
+SIZE (freecell-solver-2.8.10.tar.gz) = 544676
diff --git a/games/freecell-solver/files/patch-alloc.c b/games/freecell-solver/files/patch-alloc.c
deleted file mode 100644
index 86c44ef0b407..000000000000
--- a/games/freecell-solver/files/patch-alloc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- alloc.c.orig	Thu Aug 22 22:18:34 2002
-+++ alloc.c	Thu Aug 22 22:18:24 2002
-@@ -8,7 +8,7 @@
-  * This file is in the public domain (it's uncopyrighted).
-  */
- 
--#include <malloc.h>
-+#include <stdlib.h>
- #include <stdio.h>
- 
- #include "config.h"
diff --git a/games/freecell-solver/files/patch-configure b/games/freecell-solver/files/patch-configure
deleted file mode 100644
index 5b8d28211a7a..000000000000
--- a/games/freecell-solver/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sat Sep 28 20:39:17 2002
-+++ configure	Tue Oct 22 00:49:04 2002
-@@ -5310,6 +5310,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/games/freecell-solver/pkg-plist b/games/freecell-solver/pkg-plist
index 946ab8af999b..9d116222081d 100644
--- a/games/freecell-solver/pkg-plist
+++ b/games/freecell-solver/pkg-plist
@@ -13,15 +13,15 @@ include/freecell-solver/fcs_user.h
 lib/libfreecell-solver.a
 lib/libfreecell-solver.so
 lib/libfreecell-solver.so.5
-share/freecell-solver/presetrc
-share/freecell-solver/presets/abra-kadabra.sh
-share/freecell-solver/presets/cool-jives.sh
-share/freecell-solver/presets/crooked-nose.sh
-share/freecell-solver/presets/fools-gold.sh
-share/freecell-solver/presets/hello-world.sh
-share/freecell-solver/presets/john_galt_line-500.sh
-share/freecell-solver/presets/rin-tin-tin.sh
-share/freecell-solver/presets/yellow-brick-road.sh
-@dirrm share/freecell-solver/presets
-@dirrm share/freecell-solver
+%%DATADIR%%/presetrc
+%%DATADIR%%/presets/abra-kadabra.sh
+%%DATADIR%%/presets/cool-jives.sh
+%%DATADIR%%/presets/crooked-nose.sh
+%%DATADIR%%/presets/fools-gold.sh
+%%DATADIR%%/presets/hello-world.sh
+%%DATADIR%%/presets/john_galt_line-500.sh
+%%DATADIR%%/presets/rin-tin-tin.sh
+%%DATADIR%%/presets/yellow-brick-road.sh
+@dirrm %%DATADIR%%/presets
+@dirrm %%DATADIR%%
 @dirrm include/freecell-solver