Date: Tue, 9 Apr 2019 19:38:52 +0000 (UTC) From: Lars Engels <lme@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498512 - in head/games/jaggedalliance2: . files Message-ID: <201904091938.x39JcqK0058198@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lme Date: Tue Apr 9 19:38:51 2019 New Revision: 498512 URL: https://svnweb.freebsd.org/changeset/ports/498512 Log: games/jaggedalliance2: - Update to 0.16.1 - Unbreak and remove expiration date - Fetch from Github - Add LICENSE - Use CMake/Ninja for the main build - Switch to Rust / Cargo to build libstracciatella.so - Pass to new maintainer (tobik). Thanks for taking it! PR: 229711 Submitted by: fluffy, rebased and updated by tobik Added: head/games/jaggedalliance2/pkg-message (contents, props changed) Deleted: head/games/jaggedalliance2/files/ Modified: head/games/jaggedalliance2/Makefile head/games/jaggedalliance2/distinfo head/games/jaggedalliance2/pkg-descr head/games/jaggedalliance2/pkg-plist Modified: head/games/jaggedalliance2/Makefile ============================================================================== --- head/games/jaggedalliance2/Makefile Tue Apr 9 19:37:04 2019 (r498511) +++ head/games/jaggedalliance2/Makefile Tue Apr 9 19:38:51 2019 (r498512) @@ -2,43 +2,91 @@ # $FreeBSD$ PORTNAME= ja2 -PORTVERSION= 0.14.01 +DISTVERSIONPREFIX= v +DISTVERSION= 0.16.1 CATEGORIES= games -MASTER_SITES= https://bitbucket.org/gennady/ja2-stracciatella/get/ -DISTNAME= v${PORTVERSION} -DIST_SUBDIR= ${PORTNAME} -MAINTAINER= lme@FreeBSD.org +MAINTAINER= tobik@FreeBSD.org COMMENT= Port of "Jagged Alliance 2" using SDL -BROKEN= fails to build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2019-05-08 +LICENSE= PD SFI-SCLA +LICENSE_COMB= multi +LICENSE_NAME_SFI-SCLA= Strategy First Inc. Source Code License Agreement +LICENSE_FILE_SFI-SCLA= ${WRKSRC}/SFI\ Source\ Code\ license\ agreement.txt +LICENSE_PERMS_SFI-SCLA= dist-mirror no-dist-sell pkg-mirror no-pkg-sell \ + auto-accept + # Ignore this if you feel adventurous ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 armv7 i386 ONLY_FOR_ARCHS_REASON= Needs a little endian environment -NO_CDROM= License only permits non-commerical use +LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ + libfltk.so:x11-toolkits/fltk -USES= gmake tar:bzip2 -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} -USE_SDL= sdl +USES= cargo cmake:noninja pkgconfig sdl +USE_GITHUB= yes +GH_ACCOUNT= ja2-stracciatella +GH_PROJECT= ja2-stracciatella +USE_LDCONFIG= yes +USE_SDL= sdl2 -MAKE_ENV= Q= +CMAKE_ARGS= -DEXTRA_DATA_DIR:PATH="${DATADIR}" +CMAKE_OFF= WITH_UNITTESTS +LDFLAGS+= -Wl,--as-needed +MAKE_ENV= ${CARGO_ENV} -WRKSRC= ${WRKDIR}/gennady-ja2-stracciatella-5585014471a7 -SUB_FILES= pkg-message +CARGO_CARGOTOML= ${WRKSRC}/rust/Cargo.toml +CARGO_CARGOLOCK= ${WRKSRC}/rust/Cargo.lock +CARGO_TARGET_DIR= ${WRKSRC}/rust +CARGO_BUILD= no +CARGO_INSTALL= no +CARGO_CRATES= aho-corasick-0.5.3 \ + fuchsia-cprng-0.1.1 \ + getopts-0.2.18 \ + itoa-0.4.3 \ + kernel32-sys-0.2.2 \ + libc-0.2.51 \ + memchr-0.1.11 \ + proc-macro2-0.4.27 \ + quote-0.6.11 \ + rand-0.4.6 \ + rand_core-0.3.1 \ + rand_core-0.4.0 \ + rdrand-0.4.0 \ + regex-0.1.80 \ + regex-syntax-0.3.9 \ + remove_dir_all-0.5.1 \ + ryu-0.2.7 \ + serde-1.0.90 \ + serde_derive-1.0.90 \ + serde_json-1.0.39 \ + shell32-sys-0.1.2 \ + syn-0.15.30 \ + tempdir-0.3.7 \ + thread-id-2.0.0 \ + thread_local-0.2.7 \ + unicode-width-0.1.5 \ + unicode-xid-0.1.0 \ + user32-sys-0.2.0 \ + utf8-ranges-0.1.3 \ + winapi-0.2.8 \ + winapi-0.3.7 \ + winapi-build-0.1.1 \ + winapi-i686-pc-windows-gnu-0.4.0 \ + winapi-x86_64-pc-windows-gnu-0.4.0 post-patch: @${REINPLACE_CMD} -e 's|/some/place/where/the/data/is|${DATADIR}|' \ - ${WRKSRC}/sgp/SGP.cc + ${WRKSRC}/rust/src/stracciatella.rs +post-configure: + @${MKDIR} ${CONFIGURE_WRKSRC} + @cd ${CONFIGURE_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} \ + ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} + post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ja2 - ${INSTALL_DATA} ${WRKSRC}/_build/distr-files-linux/ja2-stracciatella.desktop \ - ${STAGEDIR}${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/Build/Res/jagged3.ico \ - ${STAGEDIR}${PREFIX}/share/pixmaps/jagged2.ico + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ja2 \ + ${STAGEDIR}${PREFIX}/bin/ja2-launcher \ + ${STAGEDIR}${PREFIX}/lib/libstracciatella.so .include <bsd.port.mk> Modified: head/games/jaggedalliance2/distinfo ============================================================================== --- head/games/jaggedalliance2/distinfo Tue Apr 9 19:37:04 2019 (r498511) +++ head/games/jaggedalliance2/distinfo Tue Apr 9 19:38:51 2019 (r498512) @@ -1,2 +1,71 @@ -SHA256 (ja2/v0.14.01.tar.bz2) = 53ba2fa928eded7e1c1e574407fb814234a7040ebd3a28e4000f6d834b110350 -SIZE (ja2/v0.14.01.tar.bz2) = 7752070 +TIMESTAMP = 1554627710 +SHA256 (rust/crates/aho-corasick-0.5.3.tar.gz) = ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66 +SIZE (rust/crates/aho-corasick-0.5.3.tar.gz) = 252052 +SHA256 (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba +SIZE (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = 2950 +SHA256 (rust/crates/getopts-0.2.18.tar.gz) = 0a7292d30132fb5424b354f5dc02512a86e4c516fe544bb7a25e7f266951b797 +SIZE (rust/crates/getopts-0.2.18.tar.gz) = 18416 +SHA256 (rust/crates/itoa-0.4.3.tar.gz) = 1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b +SIZE (rust/crates/itoa-0.4.3.tar.gz) = 11061 +SHA256 (rust/crates/kernel32-sys-0.2.2.tar.gz) = 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d +SIZE (rust/crates/kernel32-sys-0.2.2.tar.gz) = 24537 +SHA256 (rust/crates/libc-0.2.51.tar.gz) = bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917 +SIZE (rust/crates/libc-0.2.51.tar.gz) = 397323 +SHA256 (rust/crates/memchr-0.1.11.tar.gz) = d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20 +SIZE (rust/crates/memchr-0.1.11.tar.gz) = 6977 +SHA256 (rust/crates/proc-macro2-0.4.27.tar.gz) = 4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915 +SIZE (rust/crates/proc-macro2-0.4.27.tar.gz) = 34098 +SHA256 (rust/crates/quote-0.6.11.tar.gz) = cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1 +SIZE (rust/crates/quote-0.6.11.tar.gz) = 17283 +SHA256 (rust/crates/rand-0.4.6.tar.gz) = 552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293 +SIZE (rust/crates/rand-0.4.6.tar.gz) = 76401 +SHA256 (rust/crates/rand_core-0.3.1.tar.gz) = 7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b +SIZE (rust/crates/rand_core-0.3.1.tar.gz) = 15483 +SHA256 (rust/crates/rand_core-0.4.0.tar.gz) = d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0 +SIZE (rust/crates/rand_core-0.4.0.tar.gz) = 20326 +SHA256 (rust/crates/rdrand-0.4.0.tar.gz) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2 +SIZE (rust/crates/rdrand-0.4.0.tar.gz) = 6456 +SHA256 (rust/crates/regex-0.1.80.tar.gz) = 4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f +SIZE (rust/crates/regex-0.1.80.tar.gz) = 185806 +SHA256 (rust/crates/regex-syntax-0.3.9.tar.gz) = f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957 +SIZE (rust/crates/regex-syntax-0.3.9.tar.gz) = 117427 +SHA256 (rust/crates/remove_dir_all-0.5.1.tar.gz) = 3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5 +SIZE (rust/crates/remove_dir_all-0.5.1.tar.gz) = 8726 +SHA256 (rust/crates/ryu-0.2.7.tar.gz) = eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7 +SIZE (rust/crates/ryu-0.2.7.tar.gz) = 41382 +SHA256 (rust/crates/serde-1.0.90.tar.gz) = aa5f7c20820475babd2c077c3ab5f8c77a31c15e16ea38687b4c02d3e48680f4 +SIZE (rust/crates/serde-1.0.90.tar.gz) = 71415 +SHA256 (rust/crates/serde_derive-1.0.90.tar.gz) = 58fc82bec244f168b23d1963b45c8bf5726e9a15a9d146a067f9081aeed2de79 +SIZE (rust/crates/serde_derive-1.0.90.tar.gz) = 48815 +SHA256 (rust/crates/serde_json-1.0.39.tar.gz) = 5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d +SIZE (rust/crates/serde_json-1.0.39.tar.gz) = 69621 +SHA256 (rust/crates/shell32-sys-0.1.2.tar.gz) = 9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c +SIZE (rust/crates/shell32-sys-0.1.2.tar.gz) = 6204 +SHA256 (rust/crates/syn-0.15.30.tar.gz) = 66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2 +SIZE (rust/crates/syn-0.15.30.tar.gz) = 146358 +SHA256 (rust/crates/tempdir-0.3.7.tar.gz) = 15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8 +SIZE (rust/crates/tempdir-0.3.7.tar.gz) = 11468 +SHA256 (rust/crates/thread-id-2.0.0.tar.gz) = a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03 +SIZE (rust/crates/thread-id-2.0.0.tar.gz) = 6108 +SHA256 (rust/crates/thread_local-0.2.7.tar.gz) = 8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5 +SIZE (rust/crates/thread_local-0.2.7.tar.gz) = 10954 +SHA256 (rust/crates/unicode-width-0.1.5.tar.gz) = 882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526 +SIZE (rust/crates/unicode-width-0.1.5.tar.gz) = 15761 +SHA256 (rust/crates/unicode-xid-0.1.0.tar.gz) = fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc +SIZE (rust/crates/unicode-xid-0.1.0.tar.gz) = 16000 +SHA256 (rust/crates/user32-sys-0.2.0.tar.gz) = 4ef4711d107b21b410a3a974b1204d9accc8b10dad75d8324b5d755de1617d47 +SIZE (rust/crates/user32-sys-0.2.0.tar.gz) = 10624 +SHA256 (rust/crates/utf8-ranges-0.1.3.tar.gz) = a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f +SIZE (rust/crates/utf8-ranges-0.1.3.tar.gz) = 8422 +SHA256 (rust/crates/winapi-0.2.8.tar.gz) = 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a +SIZE (rust/crates/winapi-0.2.8.tar.gz) = 455145 +SHA256 (rust/crates/winapi-0.3.7.tar.gz) = f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770 +SIZE (rust/crates/winapi-0.3.7.tar.gz) = 1075776 +SHA256 (rust/crates/winapi-build-0.1.1.tar.gz) = 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc +SIZE (rust/crates/winapi-build-0.1.1.tar.gz) = 669 +SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 +SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815 +SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f +SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998 +SHA256 (ja2-stracciatella-ja2-stracciatella-v0.16.1_GH0.tar.gz) = 750c56b7011479dc89ce1f57f3da551d856a75eb87b545bc655dcbb87c42ba43 +SIZE (ja2-stracciatella-ja2-stracciatella-v0.16.1_GH0.tar.gz) = 25971172 Modified: head/games/jaggedalliance2/pkg-descr ============================================================================== --- head/games/jaggedalliance2/pkg-descr Tue Apr 9 19:37:04 2019 (r498511) +++ head/games/jaggedalliance2/pkg-descr Tue Apr 9 19:38:51 2019 (r498512) @@ -3,4 +3,4 @@ mercenaries to liberate the small country of Arulco. You need an original game CD and installation to use this port. -WWW: https://bitbucket.org/gennady/ja2-stracciatella +WWW: https://ja2-stracciatella.github.io/ Added: head/games/jaggedalliance2/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/jaggedalliance2/pkg-message Tue Apr 9 19:38:51 2019 (r498512) @@ -0,0 +1,2 @@ +This Jagged Alliance 2 port requires data files from the original +game CD and installation. Modified: head/games/jaggedalliance2/pkg-plist ============================================================================== --- head/games/jaggedalliance2/pkg-plist Tue Apr 9 19:37:04 2019 (r498511) +++ head/games/jaggedalliance2/pkg-plist Tue Apr 9 19:38:51 2019 (r498512) @@ -1,18 +1,9 @@ bin/ja2 +bin/ja2-launcher +lib/libstracciatella.so man/man6/ja2.6.gz share/applications/ja2-stracciatella.desktop -%%DATADIR%%/_unittests/datatypes/doubles.bin -%%DATADIR%%/_unittests/datatypes/floats.bin -%%DATADIR%%/_unittests/find-files/file-without-extension -%%DATADIR%%/_unittests/find-files/lowercase-ext.txt -%%DATADIR%%/_unittests/find-files/subfolder/file.txt -%%DATADIR%%/_unittests/find-files/uppercase-ext.TXT -%%DATADIR%%/_unittests/saves/strac-linux/SaveGame01.sav -%%DATADIR%%/_unittests/saves/strac-macos/SaveGame09.sav -%%DATADIR%%/_unittests/saves/strac-macos/imp.dat -%%DATADIR%%/_unittests/saves/strac-win/SaveGame09.sav -%%DATADIR%%/_unittests/saves/vanilla-russian/IMP.dat -%%DATADIR%%/_unittests/saves/vanilla-russian/SaveGame06.sav +share/icons/hicolor/scalable/apps/ja2-stracciatella.svg %%DATADIR%%/externalized/ammo_types.json %%DATADIR%%/externalized/army-gun-choice-extended.json %%DATADIR%%/externalized/army-gun-choice-normal.json @@ -41,7 +32,9 @@ share/applications/ja2-stracciatella.desktop %%DATADIR%%/externalized/game.json %%DATADIR%%/externalized/imp.json %%DATADIR%%/externalized/magazines.json +%%DATADIR%%/externalized/music.json %%DATADIR%%/externalized/readme.txt +%%DATADIR%%/externalized/sti/interface/LOADSCREENTAB.STI %%DATADIR%%/externalized/strings/ammo-calibre-bobbyray-dut.json %%DATADIR%%/externalized/strings/ammo-calibre-bobbyray-eng.json %%DATADIR%%/externalized/strings/ammo-calibre-bobbyray-fr.json @@ -67,7 +60,27 @@ share/applications/ja2-stracciatella.desktop %%DATADIR%%/mods/from-russia-with-love/data/maps/A9.dat %%DATADIR%%/mods/from-russia-with-love/license.txt %%DATADIR%%/mods/from-russia-with-love/readme.txt +%%DATADIR%%/mods/generous-rebels/data/Maps/A10_b1.dat +%%DATADIR%%/mods/generous-rebels/Generous Rebels Mod.txt +%%DATADIR%%/mods/generous-rebels/GR mod.jpg +%%DATADIR%%/mods/imp-quiz-honest-answers/data/Binarydata/IMPTEXT.EDT +%%DATADIR%%/mods/imp-quiz-honest-answers/IMP quiz honest answers mod.txt +%%DATADIR%%/mods/o-fortuna/data/music.json +%%DATADIR%%/mods/o-fortuna/data/music/o-fortuna.wav +%%DATADIR%%/mods/o-fortuna/license.txt +%%DATADIR%%/mods/o-fortuna/readme.txt %%DATADIR%%/mods/readme.txt %%DATADIR%%/mods/test-json-dialogs/data/mercedt/009.edt.json %%DATADIR%%/mods/test-json-dialogs/readme.txt -share/pixmaps/jagged2.ico +%%DATADIR%%/unittests/datatypes/doubles.bin +%%DATADIR%%/unittests/datatypes/floats.bin +%%DATADIR%%/unittests/find-files/file-without-extension +%%DATADIR%%/unittests/find-files/lowercase-ext.txt +%%DATADIR%%/unittests/find-files/subfolder/file.txt +%%DATADIR%%/unittests/find-files/uppercase-ext.TXT +%%DATADIR%%/unittests/saves/strac-linux/SaveGame01.sav +%%DATADIR%%/unittests/saves/strac-macos/imp.dat +%%DATADIR%%/unittests/saves/strac-macos/SaveGame09.sav +%%DATADIR%%/unittests/saves/strac-win/SaveGame09.sav +%%DATADIR%%/unittests/saves/vanilla-russian/IMP.dat +%%DATADIR%%/unittests/saves/vanilla-russian/SaveGame06.sav
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904091938.x39JcqK0058198>