From nobody Sat Sep 03 14:27:02 2022 X-Original-To: dev-commits-ports-all@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 4MKcYL2M7vz4bXQm; Sat, 3 Sep 2022 14:27:02 +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 4MKcYL1jJZz3TnV; Sat, 3 Sep 2022 14:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662215222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hgusHsyP4+itubuyOqvFBYDpchCjFlwLfodNBKU3AhY=; b=DERG+G21I3EPPdZQYZL5vrw4prpwM5nUjRrMtVvTwah55ed/c8BkXfwEpSyq1Z46uwwq7Y 47+7LZZMq1hkSvfLP628wY+sbHixwR+09yaPGkD7gVyZXTeo0E2gLZmvo2fM4m2aNs3svh almE2+fSDJ6etoaA6Rj7XWiw6a5pnC9eGdRvkdACoLkHNQpOhEgi+irvb2MKr2Wcw0zNDX XXXmJrXJxk6Ryeg1T/c4KhF0R0c02ysR7cfHK0WCblkZaXzYyUYH7KjjYBSxDFRZ89HIjU IuU2pK6W8XLK7xuSZ43MuhK2IPVe9I8qBcqgLpjrGrXhum1sQWobJstOxmkYCA== 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 4MKcYL0pbSz19X5; Sat, 3 Sep 2022 14:27:02 +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 283ER2Mc073595; Sat, 3 Sep 2022 14:27:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 283ER28b073594; Sat, 3 Sep 2022 14:27:02 GMT (envelope-from git) Date: Sat, 3 Sep 2022 14:27:02 GMT Message-Id: <202209031427.283ER28b073594@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 9d4bc59908d5 - main - games/exult: Fix version platform List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d4bc59908d56de5fe4c5165f483c2d794ca9779 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662215222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hgusHsyP4+itubuyOqvFBYDpchCjFlwLfodNBKU3AhY=; b=LiPZxfUdEF2lD0ltoW1gE5yqp/s+r6YQg1ZYtoO1V49lAlOGp17bb3faaEYbP2JeUNE+sH w+riiuBOgMKhiurOe2N4k/EoZE73pNMUjV0Oi9X3dq8+GVnwHiAFDR/rGyhbq1Zgeoqug5 569QSOgmgnmQZxt8V2egruV5OX5E7Es+/JSbBnji+QQUU6k9zGePRgyZzmCi7HxmXxF863 FZMi2Yvp1tNJmVcFv8gJ83jW7LooDHWIx4izEGloTCglBNBmaF8jnXLJY48lsQ+mgHyp0Z 6VF2My3tWfiG7XO7O1pes2HjY9GsK2LynhfuuzIEvemkFyYtPE8WulXwlI04Ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662215222; a=rsa-sha256; cv=none; b=Llvq+wPMyD084l04OZfmCNVAw204H9fXwFYOWgRVXfy/U8+V4NMf+7yO7pmd5E8GP1Uakl q9dFBY7ZJ4sworiw9DIgwD8mMuGo62lLDgfhXtJTNYoCOTqSHBCNxL3AnOYbUy0OjxOOCE CWCVQqrlSsCr5fZFgVYRrZaFRyCmlfUmpQ9Jzmd91cD98cywhwJQpLhNEgvIPDXb78mrMF m/OAebo/jH61s/hEzsrxfZomdWhEQZZbk9rBdGqcwX9Ad0G2mZwqx5c/ws78+BCpBelSIN D+1t44drx+PFn82L7Chaqy0ixcH9HEU6obj2ebWzh5ukTyu//fGO7EXpkKcKUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d4bc59908d56de5fe4c5165f483c2d794ca9779 commit 9d4bc59908d56de5fe4c5165f483c2d794ca9779 Author: Nuno Teixeira AuthorDate: 2022-09-03 12:17:07 +0000 Commit: Nuno Teixeira CommitDate: 2022-09-03 14:26:45 +0000 games/exult: Fix version platform --- games/exult/Makefile | 5 +++-- games/exult/files/patch-configure.ac | 11 +++++++++++ games/exult/files/patch-mapedit_Makefile.am | 4 ++-- games/exult/files/patch-tools_Makefile.am | 4 ++-- games/exult/files/patch-version.cc | 11 +++++++++++ 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/games/exult/Makefile b/games/exult/Makefile index 14be42bdd8f6..7b581bdc9a17 100644 --- a/games/exult/Makefile +++ b/games/exult/Makefile @@ -1,5 +1,6 @@ PORTNAME= exult DISTVERSION?= 1.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= games @@ -28,8 +29,8 @@ CONFIGURE_ARGS= --disable-static \ --with-icondir=${PREFIX}/share/pixmaps CONFLICTS_INSTALL= exult-devel -SUB_FILES= pkg-message -PLIST?= ${.CURDIR}/pkg-plist +SUB_FILES= pkg-message +PLIST?= ${.CURDIR}/pkg-plist .if !defined(MASTERDIR) MASTER_SITES= http://prdownloads.sourceforge.net/exult/ diff --git a/games/exult/files/patch-configure.ac b/games/exult/files/patch-configure.ac new file mode 100644 index 000000000000..bda440166ff1 --- /dev/null +++ b/games/exult/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2022-09-03 11:46:03 UTC ++++ configure.ac +@@ -79,7 +79,7 @@ case "$host_os" in + ;; + freebsd* ) + WINDOWING_SYSTEM="-DXWIN" +- AC_DEFINE(NETBSD, 1, [Using NetBSD]) ++ AC_DEFINE(FREEBSD, 1, [Using FreeBSD]) + AC_MSG_RESULT([X11 (FreeBSD)]) + CXXFLAGS="$CXXFLAGS -I/usr/local/include" + ;; diff --git a/games/exult/files/patch-mapedit_Makefile.am b/games/exult/files/patch-mapedit_Makefile.am index 41d91341084f..119c02a9df74 100644 --- a/games/exult/files/patch-mapedit_Makefile.am +++ b/games/exult/files/patch-mapedit_Makefile.am @@ -1,6 +1,6 @@ ---- mapedit/Makefile.am.orig 2016-05-14 01:04:00 UTC +--- mapedit/Makefile.am.orig 2022-04-12 16:34:45 UTC +++ mapedit/Makefile.am -@@ -92,8 +92,8 @@ EXTRA_DIST= \ +@@ -101,8 +101,8 @@ install-exec-local: if GIMP_PLUGIN install-exec-local: diff --git a/games/exult/files/patch-tools_Makefile.am b/games/exult/files/patch-tools_Makefile.am index 3ee110dcfe29..2416cc2caa8b 100644 --- a/games/exult/files/patch-tools_Makefile.am +++ b/games/exult/files/patch-tools_Makefile.am @@ -1,4 +1,4 @@ ---- tools/Makefile.am.orig 2016-05-14 01:04:00 UTC +--- tools/Makefile.am.orig 2022-04-12 16:34:45 UTC +++ tools/Makefile.am @@ -56,11 +56,11 @@ if BUILD_GTHUMB ## Does not work: @@ -14,7 +14,7 @@ # Rule to make the service file with bindir expanded $(thumbnailer_DATA): $(thumbnailer_in_files) -@@ -99,10 +99,10 @@ cmanip_LDADD = \ +@@ -105,10 +105,10 @@ install-data-hook: if BUILD_GTHUMB install-data-hook: diff --git a/games/exult/files/patch-version.cc b/games/exult/files/patch-version.cc new file mode 100644 index 000000000000..c48ff501c171 --- /dev/null +++ b/games/exult/files/patch-version.cc @@ -0,0 +1,11 @@ +--- version.cc.orig 2022-09-03 11:51:13 UTC ++++ version.cc +@@ -210,6 +210,8 @@ void getVersionInfo(std::ostream &out) { + + out << " Version " << info.dwMajorVersion << "." << info.dwMinorVersion << " Build " << LOWORD(info.dwBuildNumber & 0xFFFF); + } ++#elif (defined(FREEBSD)) ++ out << "FreeBSD"; + #elif (defined(MACOSX)) + out << "Mac OS X"; + #elif (defined(__IPHONEOS__))