From nobody Wed Apr 13 18:46:27 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 372101B47072; Wed, 13 Apr 2022 18:46:29 +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 4Kds4h4GhJz3Hb1; Wed, 13 Apr 2022 18:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649875589; 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=wbk7ylDJy+dhzWBv3Jq8lTS/G00Dbm/lhTIZD68NynU=; b=DEfUKSkAY2HcEnl+VIfdga4JhnmXGAy/OngK+7mErRe4BvAE86Un/Vj0icwiaOcHIx4W+E u80S9+jkXIEySWBVziA5VVeHT8lG1kew93yekqkSIucck9i3HX4ouPPX0Uusift1RC7pIt VQOBYhSxdINIJC4cXGIgRxTG4xpUjGMKFVwMgAoaJN0zHCq6PHJTZkuC7sDmIIy3nUZMOn FjE47G8BNB/2SoNjF5X7/Gz0E0SUtWVAIrqUahLJDie0gRwij/ukCNPjycWA1/94SG2mxo weCMhHHXFzM7yiHlNaLHQcOHhs3hnizEpDm4mgIb6yzOWmTPaMfqaldGO3D7qw== 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 C89AB11914; Wed, 13 Apr 2022 18:46:27 +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 23DIkREh022397; Wed, 13 Apr 2022 18:46:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DIkRxB022396; Wed, 13 Apr 2022 18:46:27 GMT (envelope-from git) Date: Wed, 13 Apr 2022 18:46:27 GMT Message-Id: <202204131846.23DIkRxB022396@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 715d818696d6 - main - games/xtron: unbreak on 13+, minor modernization 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 715d818696d6f48ef4125fe99181439e1ff248e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649875589; 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=wbk7ylDJy+dhzWBv3Jq8lTS/G00Dbm/lhTIZD68NynU=; b=YQXTrlWHfkxncSBF/SCXV2WTo4gfporbDU360wWlJTNWI2Ohqhns+YV85y5UU0P9ZnF/Ud 7utqQU/FCSeB8vVOXGxrTL9NPdfnZCFH9CI6aqRzre/VBv/yKkL0K989g6FIsyxPquLDei Cuijd2uzTC3kM4EFff4CAZ+OQ5x6XuPmHk2fpXN6Mr0wF8x5Ejbu8q29uyXr2NEvutjfVu vJJFZP6m0BshUptEpixf9ToIQ9PUZOGy4kc6GseXO95AhTJXwqEK5IbaBNiI3cytX2t1Ki Bb+KlBsSzgyifOpJxPQ5BkKCTezS4TyuPMzII249AdIoQkKAHvVqw9Cd4yVzeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649875589; a=rsa-sha256; cv=none; b=B91WNf1FmcUb94h9l+1gr5AcPbAmhfO5SDlsWs3ucXFGyjkdu5GszCV/AjFnGbFAB0BNQm cY/ho6/ISapai+viWXJBzpX+CYeqmZTSAGfN+81/sYUeSkqZ4MAkcrQvD5I4ni8cw8WFDJ Dw4neTTahZt7riJ7e8OJVjpsp1j4jUVecmLII+q8uahl5LUy/zpTmuvHn8fBVNa+8E0ifV WV3h3IzsYq62qYiWTZq2IbvIwsPYC9fJvubhqlPRFDgccsjhBdh0MYncRNsKEMweOMmwfC sSPzugSUb8LpZOapz53PZqhLIZ/OiRK8TiwDY6RoqUkclLAg3+DNFgsZvQIKOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=715d818696d6f48ef4125fe99181439e1ff248e5 commit 715d818696d6f48ef4125fe99181439e1ff248e5 Author: Dmitry Marakasov AuthorDate: 2022-04-13 17:35:31 +0000 Commit: Dmitry Marakasov CommitDate: 2022-04-13 18:41:55 +0000 games/xtron: unbreak on 13+, minor modernization --- games/xtron/Makefile | 13 +++++++------ games/xtron/files/patch-xtron.c | 12 ++++++++++++ games/xtron/files/patch-xtron.h | 16 ++++++++++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/games/xtron/Makefile b/games/xtron/Makefile index 60dfc7887e33..7e4cebfe6568 100644 --- a/games/xtron/Makefile +++ b/games/xtron/Makefile @@ -5,15 +5,14 @@ PORTVERSION= 1.1a PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SUNSITE/games/arcade -EXTRACT_SUFX= .tgz MAINTAINER= amdmi3@FreeBSD.org COMMENT= Avoid running into walls, your own tail, and that of your opponent -BROKEN_FreeBSD_13= duplicate symbol: b -BROKEN_FreeBSD_14= duplicate symbol: b +LICENSE= GPLv1+ +LICENSE_FILE= ${WRKSRC}/COPYING -USES= xorg +USES= xorg tar:tgz USE_XORG= x11 xpm PLIST_FILES= bin/${PORTNAME} lib/X11/app-defaults/Tron @@ -34,10 +33,12 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/pixmaps/* ${STAGEDIR}${DATADIR}/ ${INSTALL_DATA} ${WRKSRC}/xtronrc ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Tron - ${MKDIR} ${STAGEDIR}${DOCSDIR} + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} diff --git a/games/xtron/files/patch-xtron.c b/games/xtron/files/patch-xtron.c new file mode 100644 index 000000000000..14592683ed5c --- /dev/null +++ b/games/xtron/files/patch-xtron.c @@ -0,0 +1,12 @@ +--- xtron.c.orig 1995-04-16 12:48:44 UTC ++++ xtron.c +@@ -21,6 +21,9 @@ + + #include "xtron.h" + ++struct Player p[2]; ++struct Board b; ++ + void plr_setup(void) + { + int i; diff --git a/games/xtron/files/patch-xtron.h b/games/xtron/files/patch-xtron.h new file mode 100644 index 000000000000..4a32829718c4 --- /dev/null +++ b/games/xtron/files/patch-xtron.h @@ -0,0 +1,16 @@ +--- xtron.h.orig 1995-04-16 12:48:20 UTC ++++ xtron.h +@@ -40,11 +40,11 @@ struct Player { + int alive; + enum directions plr_dir; + enum play_types plr_type; +-} p[2]; ++}; + + struct Board { + short int contents[200][200]; +-} b; ++}; + + void plr_setup(void); + int plr_checkmove(int p_num, int new_val, int axis_type, enum directions dir);