From nobody Mon Nov 08 07:42:59 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EECB61843DC3; Mon, 8 Nov 2021 07:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hnjl76Nvgz3pvx; Mon, 8 Nov 2021 07:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BBB625BC7; Mon, 8 Nov 2021 07:42:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1A87gxCF052053; Mon, 8 Nov 2021 07:42:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A87gxaV052052; Mon, 8 Nov 2021 07:42:59 GMT (envelope-from git) Date: Mon, 8 Nov 2021 07:42:59 GMT Message-Id: <202111080742.1A87gxaV052052@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 5304a1914e4d - main - games/stonesoup: Fix build on armv6/armv7. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5304a1914e4dfa3da4cb6d54932ff2f0d5e32f89 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=5304a1914e4dfa3da4cb6d54932ff2f0d5e32f89 commit 5304a1914e4dfa3da4cb6d54932ff2f0d5e32f89 Author: Robert Clausecker AuthorDate: 2021-10-28 10:39:35 +0000 Commit: Mikael Urankar CommitDate: 2021-11-08 07:41:55 +0000 games/stonesoup: Fix build on armv6/armv7. Fix build on armv6/armv7 by removing a misguided OS-detection case. Fix build with WRKDIR inside a git-maintained ports tree. Turn the custom README into a pkg-message for better visibility. Take over maintainership of this unmaintained port. PR: 259499 --- games/stonesoup/Makefile | 15 ++++----------- games/stonesoup/files/README.FreeBSD.in | 7 ------- games/stonesoup/files/patch-platform.h | 16 ++++++++++++++++ games/stonesoup/files/patch-util_gen__ver.pl | 12 ++++++++++++ games/stonesoup/files/pkg-message.in | 18 ++++++++++++++++++ games/stonesoup/pkg-plist | 1 - 6 files changed, 50 insertions(+), 19 deletions(-) diff --git a/games/stonesoup/Makefile b/games/stonesoup/Makefile index 25fed763d150..9a9dfbd74967 100644 --- a/games/stonesoup/Makefile +++ b/games/stonesoup/Makefile @@ -2,18 +2,15 @@ PORTNAME= stonesoup PORTVERSION= 0.23.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fuz@fuz.su COMMENT= Dungeon Crawl Stone Soup - a fun, free rogue-like game LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/../../LICENSE -NOT_FOR_ARCHS= armv6 -NOT_FOR_ARCHS_REASON= missing platform \#define or unsupported compiler - BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} USES= bison compiler:c++11-lib gmake lua:51 perl5 pkgconfig \ @@ -32,7 +29,7 @@ SHEBANG_FILES= util/gen-mi-enum \ SAVEDIR= \~/.stonesoup WRKSRC_SUBDIR= crawl-ref/source -SUB_FILES= README.FreeBSD +SUB_FILES= pkg-message PLIST_SUB= SAVEDIR="${SAVEDIR}" MAKE_ARGS= prefix=${PREFIX} \ @@ -52,7 +49,7 @@ MAKE_ARGS= prefix=${PREFIX} \ SQLITE_LIB=-lsqlite3 \ V=yes -OPTIONS_DEFINE= SDL SOUND NOWIZARD LUA DOCS EXAMPLES +OPTIONS_DEFINE= SDL SOUND NOWIZARD LUA EXAMPLES OPTIONS_DEFAULT=LUA OPTIONS_SUB= yes @@ -92,10 +89,6 @@ pre-build: pre-install: @${FIND} ${WRKSRC}/dat -type f -name '*.orig' -delete -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR} - post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${STAGEDIR}${DATADIR}/settings/init.txt ${STAGEDIR}${EXAMPLESDIR}/sample.crawlrc diff --git a/games/stonesoup/files/README.FreeBSD.in b/games/stonesoup/files/README.FreeBSD.in deleted file mode 100644 index f6637795a0ba..000000000000 --- a/games/stonesoup/files/README.FreeBSD.in +++ /dev/null @@ -1,7 +0,0 @@ -The end-user documentation for ``Dungeon Crawl Stone Soup`` can be found -in-game and in `%%DATADIR%%/docs`. - -If the game fails to start after an upgrade try to delete the old save games -using `rm -rf ~/.stonesoup/saves`. - -Happy crawling! diff --git a/games/stonesoup/files/patch-platform.h b/games/stonesoup/files/patch-platform.h new file mode 100644 index 000000000000..b9c501af2fe1 --- /dev/null +++ b/games/stonesoup/files/patch-platform.h @@ -0,0 +1,16 @@ +--- platform.h.orig 2021-10-28 09:13:02 UTC ++++ platform.h +@@ -212,13 +212,6 @@ + #endif + + #if !defined (OS_DETECTED) +-#if defined (TARGET_CPU_ARM) +-#define OS_DETECTED +-#define TARGET_OS_NDSFIRMWARE +-#endif +-#endif +- +-#if !defined (OS_DETECTED) + #if defined (MSDOS) || defined (__DOS__) || defined (__DJGPP__) + #define OS_DETECTED + #define TARGET_OS_DOS diff --git a/games/stonesoup/files/patch-util_gen__ver.pl b/games/stonesoup/files/patch-util_gen__ver.pl new file mode 100644 index 000000000000..862c1d12e961 --- /dev/null +++ b/games/stonesoup/files/patch-util_gen__ver.pl @@ -0,0 +1,12 @@ +--- util/gen_ver.pl.orig 2021-10-28 09:37:07 UTC ++++ util/gen_ver.pl +@@ -13,8 +13,7 @@ $mergebase or $mergebase = ""; + + mkdir dirname($outfile); + +-$_ = `git describe --tags $mergebase 2> /dev/null` +- || (open(IN, "<", "$scriptpath/release_ver") ? ++$_ = (open(IN, "<", "$scriptpath/release_ver") ? + : die "No Git, and $scriptpath/release_ver doesn't exist.\n") + or die "couldn't get the version information\n"; + diff --git a/games/stonesoup/files/pkg-message.in b/games/stonesoup/files/pkg-message.in new file mode 100644 index 000000000000..d13b28906533 --- /dev/null +++ b/games/stonesoup/files/pkg-message.in @@ -0,0 +1,18 @@ +[ +{ type: install + message: <