From nobody Sat Dec 30 14:44:18 2023 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 4T2Q4L5XCNz55MHG; Sat, 30 Dec 2023 14:44:18 +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 4T2Q4L50Yjz3Vpn; Sat, 30 Dec 2023 14:44:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703947458; 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=zp1xFXdMpoLyCtUDBI8tXHQefJi1ONMaUeqIaSH4QJE=; b=EGMJcr3GU5TIl/YbqFBtTaHPuh4cB/FvMC+YRGEE5jADK5ffAVyEcqfpEXONPh5DD9J465 PaUUex5es2OOoVFUm9oybeRqvgoIQzue0jrh8rhU2T9MljAtffHkCbJbpcx2QDJwpg8QVB 0jBx1c04oVtbH7qs2vXXRbPHMCHRyVS5c+eq1up4k0sTpLhX8NDKYuuvK81llHvhtx7D/o kp1wBMvlFrlpDt7OWw5ukkzQ8E68Oa6wbYazmDZn8OXXIUlzS5IBJ0dsOC8eEruOENy/Zk ET4drWGGmu87z4p/VPk/ZbmhQF7caBszQiXtCvh62n5Y8mz4GYg2NPXCDQdm6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703947458; a=rsa-sha256; cv=none; b=aIe2nYdovNw8pfLIC8cPZn1W0Exhm29aZMegdNJTrHp60EGcOccwmGVjwLM1wiQMHcdPJJ pkWsDOFwtUhXIBP+42JDGH+zlX277SUNxz8MhRWjLSHj+uI0tWvP5Jq34+jHRYTXcTgc/F c98GYjClIG1sa2azape0dEPN2QdY+f0fTFkg7GzV7AYiUpECxWAvZTRIe+Av+r7nD9wXjx 6L/7UxDehVV+OEUU0l5fpkYfBkVkdrGRYGSPtEtrUMrQbAogVakJwosLvnJKuMF8ZAE5nC AISyYJIudhSz4Gt6M9th4Lx72TueNmD4MEysdsxm70Bx3JRs2JdkrpCBhBL8XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703947458; 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=zp1xFXdMpoLyCtUDBI8tXHQefJi1ONMaUeqIaSH4QJE=; b=i2T6qm/+l6rdyYK4vxv2Qr66+R3SMSGv1J1dVpZdgGXYzvQUC3jVanTtEFrV5uC/0hOFhq wfMbv4M83TjdXR1+GlUnrAEWEmOfk8kTh8765GqH2GxlH3FrXfVOAMtVmTw11OtDYO+VEr nS4LIdjxtzymdEgwrBKodoHXNDo8WGd1Wswp442I+GPeE1zQn+fVnqMxpyMrghZQxgsZ8F WRcvHrKXYvwbb44mHs9GsljVUqUl3i28Dd5/WhnAnwLQLepTMpOdmkGRt7yEiwP3BVWi+Q R3mb4io4TcFt8M24yC3DVW8KB4JyLriK5U9WPLYjR2ezOKrsJIh6a2f/BuLIAg== 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 4T2Q4L4337zv3q; Sat, 30 Dec 2023 14:44:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BUEiIdN051543; Sat, 30 Dec 2023 14:44:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BUEiIx5051540; Sat, 30 Dec 2023 14:44:18 GMT (envelope-from git) Date: Sat, 30 Dec 2023 14:44:18 GMT Message-Id: <202312301444.3BUEiIx5051540@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 3eadab0ea3ae - main - games/tomenet: unbreak the port, undeprecate, respect CFLAGS better. 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3eadab0ea3ae60cde9ffaa21c0caa71f48563827 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=3eadab0ea3ae60cde9ffaa21c0caa71f48563827 commit 3eadab0ea3ae60cde9ffaa21c0caa71f48563827 Author: Alexey Dokuchaev AuthorDate: 2023-12-30 14:42:20 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-12-30 14:42:20 +0000 games/tomenet: unbreak the port, undeprecate, respect CFLAGS better. --- games/tomenet/Makefile | 5 ----- games/tomenet/files/patch-makefile | 2 +- games/tomenet/files/patch-server_externs.h | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/games/tomenet/Makefile b/games/tomenet/Makefile index 75078ae6b9ba..7e4eb1868340 100644 --- a/games/tomenet/Makefile +++ b/games/tomenet/Makefile @@ -7,11 +7,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Online multiplayer rogue-like role-playing game WWW= https://tomenet.eu/ -DEPRECATED= BROKEN for more than 2 years on all supported versions after the EOL of 12 -EXPIRATION_DATE= 2023-12-31 -BROKEN_FreeBSD_13= ld: error: duplicate symbol: lite_later -BROKEN_FreeBSD_14= ld: error: duplicate symbol: lite_later - USES= gmake ncurses tar:bzip2 MAKEFILE= makefile diff --git a/games/tomenet/files/patch-makefile b/games/tomenet/files/patch-makefile index 620e59d85f5d..702b02c8a236 100644 --- a/games/tomenet/files/patch-makefile +++ b/games/tomenet/files/patch-makefile @@ -26,7 +26,7 @@ ## Without SDL -#CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -#LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm -+CFLAGS += -g -pipe -Wall -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 ++CFLAGS += -Wall -Wno-implicit-int -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 +LIBS += -lncurses -lcrypt -lm -lexecinfo diff --git a/games/tomenet/files/patch-server_externs.h b/games/tomenet/files/patch-server_externs.h new file mode 100644 index 000000000000..36e4f0373a68 --- /dev/null +++ b/games/tomenet/files/patch-server_externs.h @@ -0,0 +1,15 @@ +--- server/externs.h.orig 2015-05-03 12:56:01 UTC ++++ server/externs.h +@@ -455,9 +455,9 @@ extern auction_type *auctions; + extern u32b auction_alloc; + + /* Array used by everyone_lite_later_spot */ +-struct worldspot *lite_later; +-int lite_later_alloc; +-int lite_later_num; ++extern struct worldspot *lite_later; ++extern int lite_later_alloc; ++extern int lite_later_num; + + /* + * The spell list of schools