Index: head/games/freecell-solver/files/patch-CMakeLists.txt =================================================================== --- head/games/freecell-solver/files/patch-CMakeLists.txt (revision 544696) +++ head/games/freecell-solver/files/patch-CMakeLists.txt (nonexistent) @@ -1,51 +0,0 @@ ---- CMakeLists.txt.orig 2017-10-06 15:32:19 UTC -+++ CMakeLists.txt -@@ -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") - -@@ -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) -@@ -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. -@@ -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}" Property changes on: head/games/freecell-solver/files/patch-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/freecell-solver/Makefile =================================================================== --- head/games/freecell-solver/Makefile (revision 544696) +++ head/games/freecell-solver/Makefile (revision 544697) @@ -1,62 +1,62 @@ # Created by: Ying-Chieh Liao # $FreeBSD$ PORTNAME= freecell-solver -PORTVERSION= 4.20.0 -PORTREVISION= 3 +PORTVERSION= 6.0.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 \ + p5-Moo>=2.0:devel/p5-Moo \ gperf:devel/gperf \ - asciidoc:textproc/asciidoc \ + asciidoctor:textproc/rubygem-asciidoctor \ + ${LOCALBASE}/include/rinutils/rinutils.h:devel/rinutils \ ${PYTHON_PKGNAMEPREFIX}random2>=1.0.1:math/py-random2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysol-cards>=0.10.0:games/py-pysol-cards@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}random2>=1.0.1:math/py-random2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysol-cards>=0.10.0:games/py-pysol-cards@${PY_FLAVOR} +LIB_DEPENDS= ${LIB_DEPENDS_${ARCH}} +LIB_DEPENDS_i386= libgmp.so:math/gmp -OPTIONS_DEFINE= DOCS EXAMPLES TCMALLOC +OPTIONS_DEFINE= DOCS TCMALLOC TCMALLOC_DESC= Use Google's TCMalloc -USES= cmake compiler:c11 perl5 python:3.4+ shebangfix tar:xz +USES= cmake compiler:c11 localbase perl5 python:3.4+ shebangfix tar:xz USE_PERL5= build SHEBANG_FILES= board_gen/make_pysol_freecell_board.py \ board_gen/transpose-freecell-board.py \ board_gen/find-freecell-deal-index.py \ board_gen/fc_solve_find_index_s2ints.py \ + board_gen/gen-multiple-pysol-layouts \ patsolve/patsolve/param.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 - @${REINPLACE_CMD} -e 's|COMMAND "python3"|COMMAND "${PYTHON_VERSION}"|' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's|"python3"|"${PYTHON_VERSION}"|' ${WRKSRC}/CMakeLists.txt 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 +.for f in AUTHORS.asciidoc HACKING.asciidoc INSTALL.asciidoc NEWS.asciidoc README.asciidoc \ + README.win32.txt TODO.asciidoc USAGE.asciidoc ${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 544696) +++ head/games/freecell-solver/distinfo (revision 544697) @@ -1,3 +1,3 @@ -TIMESTAMP = 1532508911 -SHA256 (freecell-solver-4.20.0.tar.xz) = 869c210e7b63b0e0dcfb1c4a2322c41cfa8fbf8db01e7722254a7425a1ab7f81 -SIZE (freecell-solver-4.20.0.tar.xz) = 400008 +TIMESTAMP = 1597066645 +SHA256 (freecell-solver-6.0.1.tar.xz) = 9f1a4c6d5c8ac54c6619b3b988efb5562d460cd048d33345e52a0c849fd0d9df +SIZE (freecell-solver-6.0.1.tar.xz) = 421700 Index: head/games/freecell-solver/pkg-plist =================================================================== --- head/games/freecell-solver/pkg-plist (revision 544696) +++ head/games/freecell-solver/pkg-plist (revision 544697) @@ -1,67 +1,82 @@ +bin/dbm-fc-solver +bin/depth-dbm-fc-solver bin/fc-solve bin/fc_solve_find_index_s2ints.py bin/find-freecell-deal-index.py bin/freecell-solver-fc-pro-range-solve bin/freecell-solver-multi-thread-solve bin/freecell-solver-range-parallel-solve +bin/gen-multiple-pysol-layouts bin/make_pysol_freecell_board.py bin/pi-make-microsoft-freecell-board bin/transpose-freecell-board.py +include/freecell-solver/config.h include/freecell-solver/fcs_back_compat.h include/freecell-solver/fcs_cl.h +include/freecell-solver/fcs_conf.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 +lib/libfreecell-solver.so.0.7.0 libdata/pkgconfig/libfreecell-solver.pc +man/man6/dbm-fc-solver.6.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/gen-multiple-pysol-layouts.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%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.asciidoc +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/HACKING +%%PORTDOCS%%%%DOCSDIR%%/HACKING.asciidoc +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/INSTALL.asciidoc +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/NEWS.asciidoc +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.asciidoc %%PORTDOCS%%%%DOCSDIR%%/README.win32.txt -%%PORTDOCS%%%%DOCSDIR%%/TODO.txt -%%PORTDOCS%%%%DOCSDIR%%/USAGE.txt -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctypes-test.py +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/TODO.asciidoc +%%PORTDOCS%%%%DOCSDIR%%/USAGE +%%PORTDOCS%%%%DOCSDIR%%/USAGE.asciidoc +%%PORTDOCS%%%%DOCSDIR%%/fc-solve.txt %%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/looking-glass.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 Index: head/games/kpat/Makefile =================================================================== --- head/games/kpat/Makefile (revision 544696) +++ head/games/kpat/Makefile (revision 544697) @@ -1,24 +1,25 @@ # $FreeBSD$ PORTNAME= kpat DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= games kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= ${${PORTNAME:tu}_DESC} LIB_DEPENDS= libfreecell-solver.so:games/freecell-solver USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:5 pkgconfig \ qt:5 shared-mime-info tar:xz USE_KDE= attica auth codecs completion config configwidgets coreaddons \ crash dbusaddons ecm guiaddons i18n iconthemes itemviews \ kdeclarative kio libkdegames newstuff notifyconfig service \ textwidgets widgetsaddons xmlgui USE_QT= concurrent core dbus declarative gui network phonon4 svg widgets xml \ buildtools_build qmake_build OPTIONS_DEFINE= DOCS .include <${.CURDIR}/../kdegames/Makefile.common> .include