svn commit: r443789 - in head/games/freecell-solver: . files

[Danilo Egea Gondolfo]

Author: danilo
Date: Sat Jun 17 22:30:42 2017
New Revision: 443789
URL: https://svnweb.freebsd.org/changeset/ports/443789

Log:
  - Update to 4.12.1

Modified:
  head/games/freecell-solver/Makefile
  head/games/freecell-solver/distinfo
  head/games/freecell-solver/files/patch-CMakeLists.txt

Modified: head/games/freecell-solver/Makefile
==============================================================================
--- head/games/freecell-solver/Makefile	Sat Jun 17 22:14:22 2017	(r443788)
+++ head/games/freecell-solver/Makefile	Sat Jun 17 22:30:42 2017	(r443789)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freecell-solver
-PORTVERSION=	4.8.0
-PORTREVISION=	1
+PORTVERSION=	4.12.1
 CATEGORIES=	games
 MASTER_SITES=	http://fc-solve.shlomifish.org/downloads/fc-solve/
 
@@ -14,9 +13,10 @@ LICENSE=	MIT
 
 BUILD_DEPENDS=	p5-Path-Tiny>=0.076:devel/p5-Path-Tiny \
 		p5-Template-Toolkit>=2.26:www/p5-Template-Toolkit \
-		gperf:devel/gperf
+		gperf:devel/gperf \
+		asciidoc:textproc/asciidoc
 
-OPTIONS_DEFINE=	TCMALLOC DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES TCMALLOC
 TCMALLOC_DESC=	Use Google's TCMalloc
 
 USES=		cmake:outsource compiler:c11 perl5 shebangfix tar:xz
@@ -31,9 +31,6 @@ TCMALLOC_LIB_DEPENDS=	libtcmalloc.so:devel/google-perf
 TCMALLOC_CMAKE_OFF=	-DFCS_AVOID_TCMALLOC:BOOL=ON
 
 post-patch:
-.for f in CMakeLists.txt
-	@${REINPLACE_CMD} -e 's|"pthread"|"-pthread"|' ${WRKSRC}/${f}
-.endfor
 .for f in Shlomif_Common.cmake
 	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/cmake/${f}
 .endfor

Modified: head/games/freecell-solver/distinfo
==============================================================================
--- head/games/freecell-solver/distinfo	Sat Jun 17 22:14:22 2017	(r443788)
+++ head/games/freecell-solver/distinfo	Sat Jun 17 22:30:42 2017	(r443789)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485122391
-SHA256 (freecell-solver-4.8.0.tar.xz) = c3aa7add44f095b6565eb742c149458c3980de74187261a21042df706ea0e408
-SIZE (freecell-solver-4.8.0.tar.xz) = 433396
+TIMESTAMP = 1497723139
+SHA256 (freecell-solver-4.12.1.tar.xz) = 607d6e3980fc9883bbf71c6df8e84eff6a16baece5fb7e9a898e74a38c738193
+SIZE (freecell-solver-4.12.1.tar.xz) = 391304

Modified: head/games/freecell-solver/files/patch-CMakeLists.txt
==============================================================================
--- head/games/freecell-solver/files/patch-CMakeLists.txt	Sat Jun 17 22:14:22 2017	(r443788)
+++ head/games/freecell-solver/files/patch-CMakeLists.txt	Sat Jun 17 22:30:42 2017	(r443789)
@@ -1,6 +1,24 @@
---- CMakeLists.txt.orig	2016-04-05 02:30:11 UTC
+--- CMakeLists.txt.orig	2017-06-09 15:03:09 UTC
 +++ CMakeLists.txt
-@@ -893,7 +893,7 @@ INSTALL(
+@@ -636,7 +636,7 @@ IF ("${FCS_ENABLE_DBM_SOLVER}")
+         SET (DEBONDT_DELTA_STATES 1)
+     ENDIF ()
+ 
+-    SET (DBM_LIBS "pthread")
++    SET (DBM_LIBS "-pthread")
+     # LINK_DIRECTORIES("/home/shlomif/progs/C/pthreads/rwlock/fcfs-rwlock/pthreads")
+     # INCLUDE_DIRECTORIES("/home/shlomif/progs/C/pthreads/rwlock/fcfs-rwlock/pthreads")
+ 
+@@ -703,7 +703,7 @@ ENDIF ()
+ 
+ IF (CMAKE_USE_PTHREADS_INIT)
+     FCS_ADD_EXEC(freecell-solver-multi-thread-solve threaded_range_solver.c)
+-    TARGET_LINK_LIBRARIES(freecell-solver-multi-thread-solve "pthread")
++    TARGET_LINK_LIBRARIES(freecell-solver-multi-thread-solve "-pthread")
+ ENDIF ()
+ 
+ IF (UNIX)
+@@ -872,7 +872,7 @@ INSTALL(
      FILES
          "${CMAKE_CURRENT_BINARY_DIR}/lib${CPACK_PACKAGE_NAME}.pc"
      DESTINATION
@@ -9,3 +27,12 @@
  )
  
  # Rebuild config.h if ver.txt has changed.
+@@ -1061,7 +1061,7 @@ IF(ASCIIDOC_FOUND)
+     ADD_CUSTOM_COMMAND(
+         OUTPUT "${_manpage}"
+         COMMAND "xsltproc" "--output" "${_manpage}"
+-            "--nonet" "/etc/asciidoc/docbook-xsl/manpage.xsl"
++            "--nonet" "/usr/local/etc/asciidoc/docbook-xsl/manpage.xsl"
+              "${_out}"
+         DEPENDS "${_out}"
+         COMMENT "Build man page ${_out}"