diff --git a/games/tomenet/Makefile b/games/tomenet/Makefile
index 75078ae6b9ba..7e4eb1868340 100644
--- a/games/tomenet/Makefile
+++ b/games/tomenet/Makefile
@@ -1,41 +1,36 @@
 PORTNAME=	tomenet
 PORTVERSION=	4.6.0
 CATEGORIES=	games
 MASTER_SITES=	http://tomenet.eu/downloads/
 
 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
 MAKE_JOBS_UNSAFE=	yes
 
 CFLAGS+=	-DDEFAULT_PATH="\\\"${DATADIR}/lib/\\\""
 
 SUB_FILES=	pkg-message
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 .for f in tomenet tomenet.server accedit
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKDIR}/${DISTNAME} && ${COPYTREE_SHARE} lib ${STAGEDIR}${DATADIR})
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/.tomenetrc ${STAGEDIR}${ETCDIR}/tomenetrc
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/TomeNET-Guide.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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
@@ -1,42 +1,42 @@
 --- makefile.orig	2015-02-01 10:19:25 UTC
 +++ makefile
 @@ -203,7 +203,7 @@ CLI_LUAOBJS = \
  #
  # This is my compiler of choice, it seems to work most everywhere
  #
 -CC = gcc
 +CC ?= cc
  
  # For allowing #if..#else..#endif constructs in LUA files - C. Blue
  # Note: The flags must contain
 @@ -256,8 +256,8 @@ X11BASE = /usr/X11R6
  # attempt to "guess" at many of these flags based on your system.
  #
  ## With SDL
 -CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32
 -LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
 +#CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32
 +#LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
  ##
  ## Without SDL
  #CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
 @@ -304,8 +304,8 @@ LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -
  #LDFLAGS = -Wl,-rpath,\$$ORIGIN
  ##
  ## 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
  
  
  ## Added by thaler, 6/28/97
 @@ -397,7 +397,7 @@ date:
  #
  
  accedit: account/accedit.o
 -	$(CC) $(CFLAGS) $(LDFLAGS) -o accedit account/accedit.o -lcurses -lcrypt
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o accedit account/accedit.o -lncurses -lcrypt
  
  
  #
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