Index: head/games/freecell-solver/Makefile =================================================================== --- head/games/freecell-solver/Makefile (revision 458283) +++ head/games/freecell-solver/Makefile (revision 458284) @@ -1,53 +1,53 @@ # Created by: Ying-Chieh Liao # $FreeBSD$ PORTNAME= freecell-solver -PORTVERSION= 4.12.1 -PORTREVISION= 1 +PORTVERSION= 4.14.1 CATEGORIES= games MASTER_SITES= http://fc-solve.shlomifish.org/downloads/fc-solve/ MAINTAINER= danilo@FreeBSD.org COMMENT= Open source framework for solving Freecell 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 \ asciidoc:textproc/asciidoc OPTIONS_DEFINE= DOCS EXAMPLES TCMALLOC TCMALLOC_DESC= Use Google's TCMalloc -USES= cmake:outsource compiler:c11 perl5 shebangfix tar:xz +USES= cmake:outsource compiler:c11 perl5 python:3.4+ shebangfix tar:xz USE_PERL5= build -SHEBANG_FILES= board_gen/make_pysol_freecell_board.py +SHEBANG_FILES= board_gen/make_pysol_freecell_board.py \ + board_gen/transpose-freecell-board.py CMAKE_ARGS= -DFCS_WITH_TEST_SUITE:BOOL=OFF USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools TCMALLOC_CMAKE_OFF= -DFCS_AVOID_TCMALLOC:BOOL=ON post-patch: .for f in Shlomif_Common.cmake @${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/cmake/${f} .endfor .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: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in AUTHORS.txt HACKING.txt INSTALL.txt NEWS.txt README.txt \ README.win32.txt TODO.txt USAGE.txt ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ctypes-test.py ${INSTALL_DATA} ${WRKSRC}/examples/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor .include Index: head/games/freecell-solver/distinfo =================================================================== --- head/games/freecell-solver/distinfo (revision 458283) +++ head/games/freecell-solver/distinfo (revision 458284) @@ -1,3 +1,3 @@ -TIMESTAMP = 1497723139 -SHA256 (freecell-solver-4.12.1.tar.xz) = 607d6e3980fc9883bbf71c6df8e84eff6a16baece5fb7e9a898e74a38c738193 -SIZE (freecell-solver-4.12.1.tar.xz) = 391304 +TIMESTAMP = 1510100388 +SHA256 (freecell-solver-4.14.1.tar.xz) = b805e1261ebf0e5ae2c1e7877f9553eb06274e84c140badc8f453fb97d235076 +SIZE (freecell-solver-4.14.1.tar.xz) = 391912 Index: head/games/freecell-solver/files/patch-CMakeLists.txt =================================================================== --- head/games/freecell-solver/files/patch-CMakeLists.txt (revision 458283) +++ head/games/freecell-solver/files/patch-CMakeLists.txt (revision 458284) @@ -1,38 +1,51 @@ ---- CMakeLists.txt.orig 2017-06-09 15:03:09 UTC +--- CMakeLists.txt.orig 2017-10-06 15:32:19 UTC +++ CMakeLists.txt -@@ -636,7 +636,7 @@ IF ("${FCS_ENABLE_DBM_SOLVER}") +@@ -598,7 +598,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 () +@@ -665,7 +665,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( +@@ -823,7 +823,7 @@ INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/lib${CPACK_PACKAGE_NAME}.pc" DESTINATION - "lib${LIB_SUFFIX}/pkgconfig" + "libdata/pkgconfig" ) # Rebuild config.h if ver.txt has changed. -@@ -1061,7 +1061,7 @@ IF(ASCIIDOC_FOUND) +@@ -947,10 +947,10 @@ ENDMACRO() + IF(ASCIIDOC_FOUND) + + SET (_pdf_targets) +- ADD_COPY_TARGET( "asciidoc__css" "/etc/asciidoc/stylesheets/asciidoc.css" ++ ADD_COPY_TARGET( "asciidoc__css" "/usr/local/etc/asciidoc/stylesheets/asciidoc.css" + "${CMAKE_CURRENT_SOURCE_DIR}/asciidoc.css") + TRAIL_SPACE_COPY_TARGET( "asciidoc__js" +- "/etc/asciidoc/javascripts/asciidoc.js" ++ "/usr/local/etc/asciidoc/javascripts/asciidoc.js" + "${CMAKE_CURRENT_SOURCE_DIR}/asciidoc.js") + FOREACH(_file ${_docfiles}) + GET_FILENAME_COMPONENT(_file_we ${_file} NAME_WE) +@@ -1036,7 +1036,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}" Index: head/games/freecell-solver/pkg-plist =================================================================== --- head/games/freecell-solver/pkg-plist (revision 458283) +++ head/games/freecell-solver/pkg-plist (revision 458284) @@ -1,65 +1,66 @@ bin/fc-solve bin/freecell-solver-config bin/freecell-solver-fc-pro-range-solve bin/freecell-solver-multi-thread-solve bin/freecell-solver-range-parallel-solve bin/make_pysol_freecell_board.py bin/pi-make-microsoft-freecell-board bin/transpose-freecell-board.py include/freecell-solver/fcs_back_compat.h include/freecell-solver/fcs_cl.h include/freecell-solver/fcs_dllexport.h include/freecell-solver/fcs_enums.h include/freecell-solver/fcs_limit.h include/freecell-solver/fcs_move.h include/freecell-solver/fcs_pats_xy_param.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 libdata/pkgconfig/libfreecell-solver.pc man/man1/freecell-solver-config.1.gz man/man6/fc-solve-board_gen.6.gz man/man6/fc-solve.6.gz man/man6/freecell-solver-range-parallel-solve.6.gz man/man6/make_pysol_freecell_board.py.6.gz man/man6/pi-make-microsoft-freecell-board.6.gz man/man6/transpose-freecell-board.py.6.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt %%PORTDOCS%%%%DOCSDIR%%/HACKING.txt %%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt %%PORTDOCS%%%%DOCSDIR%%/NEWS.txt %%PORTDOCS%%%%DOCSDIR%%/README.txt %%PORTDOCS%%%%DOCSDIR%%/README.win32.txt %%PORTDOCS%%%%DOCSDIR%%/TODO.txt %%PORTDOCS%%%%DOCSDIR%%/USAGE.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctypes-test.py %%DATADIR%%/presetrc %%DATADIR%%/presets/abra-kadabra.sh %%DATADIR%%/presets/amateur-star.sh %%DATADIR%%/presets/blue-yonder.sh %%DATADIR%%/presets/children-playing-ball.sh %%DATADIR%%/presets/conspiracy-theory.sh +%%DATADIR%%/presets/cookie-monster.sh %%DATADIR%%/presets/cool-jives.sh %%DATADIR%%/presets/crooked-nose.sh %%DATADIR%%/presets/enlightened-ostrich.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 %%DATADIR%%/presets/maliciously-obscure.sh %%DATADIR%%/presets/micro-finance-improved.sh %%DATADIR%%/presets/micro-finance.sh %%DATADIR%%/presets/one-big-family.sh %%DATADIR%%/presets/qualified-seed.sh %%DATADIR%%/presets/rin-tin-tin.sh %%DATADIR%%/presets/sand-stone.sh %%DATADIR%%/presets/sentient-pearls.sh %%DATADIR%%/presets/tea-for-two.sh %%DATADIR%%/presets/the-iglu-cabal.sh %%DATADIR%%/presets/three-eighty.sh %%DATADIR%%/presets/toons-for-twenty-somethings.sh %%DATADIR%%/presets/video-editing.sh %%DATADIR%%/presets/yellow-brick-road.sh