Date: Sat, 30 Dec 2023 14:44:18 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3eadab0ea3ae - main - games/tomenet: unbreak the port, undeprecate, respect CFLAGS better. Message-ID: <202312301444.3BUEiIx5051540@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=3eadab0ea3ae60cde9ffaa21c0caa71f48563827 commit 3eadab0ea3ae60cde9ffaa21c0caa71f48563827 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-12-30 14:42:20 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312301444.3BUEiIx5051540>