diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile
index b2d7f2f87a20..dce3c5b8251a 100644
--- a/japanese/edict/Makefile
+++ b/japanese/edict/Makefile
@@ -1,102 +1,100 @@
 PORTNAME=	edict
 PORTVERSION=	19990714
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese
-MASTER_SITES=	\
-		http://japanology.arts.kuleuven.ac.be/mirrors/monash/ \
-		http://ftp.edrdg.org/pub/Nihongo/
+MASTER_SITES=	http://ftp.edrdg.org/pub/Nihongo/
 DISTFILES=	${DICTFILES} ${SRCFILES} ${DOCFILES}
 DIST_SUBDIR=	edict
 EXTRACT_ONLY=	${SRCFILES}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Japanese-English dictionaries with access and maintenance utilities
 WWW=		http://ftp.monash.edu.au/pub/nihongo/00INDEX.html
 
 # Fix build with clang11
 CFLAGS+=	-fcommon
 
 DICTFILES=	edict.gz edicth enamdict.gz compdic.gz \
 		j_places.gz ediclsd3.zip \
 		kanjidic.gz kanjd212.gz lawgledt.zip \
 		lingdic.zip geodic.gz pandpdic.zip \
 		aviation.zip findic.zip mktdic.zip \
 		4jword3_edict.zip concrete.zip
 
 SRCFILES=	xjdic23.tgz
 
 DOCFILES=	edict_doc.html edicth.doc \
 		enamdict_doc.txt enamdict_doc.html \
 		j_places.inf kanjidic.doc kanjd212.doc ediclsd3.rme \
 		lawgldoc.new lingdic.txt geodic.doc aviation.txt \
 		findic.doc mktdic.doc 4jword3_inf.txt \
 		concrete.doc
 
 BINFILES=	exjdxgen xjdic_cl xjdic_sa xjdserver xjdxgen
 
 # Where to install the data files
 DATADIR=	${PREFIX}/share/dict/edict
 DOCSDIR=	${PREFIX}/share/doc/xjdic
 
 NO_WRKSUBDIR=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 post-patch:
 	@${GREP} -l '^main' ${WRKSRC}/*.c | ${XARGS} ${REINPLACE_CMD} \
 		-e '/argv/s/unsigned//'
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${BINFILES} ${STAGEDIR}${PREFIX}/bin)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${CP} ${_DISTDIR}/edicth ${STAGEDIR}${DATADIR}
 .for f in edict enamdict compdic j_places kanjidic kanjd212 geodic
 	${GZIP_CMD} -cd ${_DISTDIR}/${f}.gz > ${STAGEDIR}${DATADIR}/${f}
 .endfor
 .for f in ediclsd3 lawgledt lingdic pandpdic aviation findic mktdic \
 	4jword3_edict concrete
 	cd ${STAGEDIR}${DATADIR} && \
 		${TAR} -xf ${_DISTDIR}/${f}.zip ${f:S|edict|edict.euc|}
 .endfor
 .for dict in ${DICTFILES:S|_edict|_edict.euc|}
 	(cd ${STAGEDIR}${DATADIR} && ${STAGEDIR}${PREFIX}/bin/xjdxgen ${dict:R})
 	(cd ${STAGEDIR}${DATADIR} && ${CHMOD} ${SHAREMODE} \
 		${dict:R} ${dict:R}.xjdx)
 .endfor
 	${RM} ${STAGEDIR}${PREFIX}/bin/xjdic
 	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s xjdic_sa xjdic)
 	(cd ${WRKSRC} && ${INSTALL_DATA} radicals.tm radkfile kanjstroke \
 		romkana.cnv vconj ${STAGEDIR}${DATADIR})
 	#
 	# Only 9 dictionaries can be enabled
 	#
 	@${ECHO_CMD} dicdir ${DATADIR} > ${STAGEDIR}${DATADIR}/.xjdicrc
 	@${ECHO_CMD} dicfile edict >> ${STAGEDIR}${DATADIR}/.xjdicrc
 	@${ECHO_CMD} dicfile enamdict >> ${STAGEDIR}${DATADIR}/.xjdicrc
 	@${ECHO_CMD} dicfile compdic >> ${STAGEDIR}${DATADIR}/.xjdicrc
 	@${ECHO_CMD} dicfile ediclsd3 >> ${STAGEDIR}${DATADIR}/.xjdicrc
 	@${ECHO_CMD} dicfile j_places >> ${STAGEDIR}${DATADIR}/.xjdicrc
 	# @${ECHO_CMD} dicfile lawgledt >> ${DATADIR}/.xjdicrc
 	@${ECHO_CMD} dicfile geodic >> ${STAGEDIR}${DATADIR}/.xjdicrc
 	# @${ECHO_CMD} dicfile pandpdic >> ${DATADIR}/.xjdicrc
 	@${ECHO_CMD} dicfile aviation >> ${STAGEDIR}${DATADIR}/.xjdicrc
 	# @${ECHO_CMD} dicfile findic >> ${DATADIR}/.xjdicrc
 	# @${ECHO_CMD} dicfile mktdic >> ${DATADIR}/.xjdicrc
 	@${ECHO_CMD} dicfile 4jword3_edict.euc >> ${STAGEDIR}${DATADIR}/.xjdicrc
 	# @${ECHO_CMD} dicfile concrete.doc >> ${DATADIR}/.xjdicrc
 	# @${ECHO_CMD} dicfile lingdic >> ${DATADIR}/.xjdicrc
 	@${CHMOD} ${SHAREMODE} ${STAGEDIR}${DATADIR}/.xjdicrc
 	${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/xjdic23.inf ${STAGEDIR}${DOCSDIR}
 	(cd ${_DISTDIR} && ${INSTALL_DATA} ${DOCFILES} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/japanese/edict/files/patch-xjdclient.c b/japanese/edict/files/patch-xjdclient.c
new file mode 100644
index 000000000000..58c749a9ffd0
--- /dev/null
+++ b/japanese/edict/files/patch-xjdclient.c
@@ -0,0 +1,18 @@
+--- xjdclient.c.orig	2024-09-30 19:41:16.980011000 +0100
++++ xjdclient.c	2024-09-30 19:42:00.456457000 +0100
+@@ -26,6 +26,7 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#include <errno.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -40,7 +41,6 @@
+ 
+ #define CVERBOSE 0
+ int chk_cnt=0;
+-extern int errno;
+ unsigned char host[51] = {"localhost"};
+ unsigned char yn[2];
+ unsigned int portno = XJ_PORTNO;
diff --git a/japanese/edict/files/patch-xjdserver.c b/japanese/edict/files/patch-xjdserver.c
new file mode 100644
index 000000000000..3e1727c7ae28
--- /dev/null
+++ b/japanese/edict/files/patch-xjdserver.c
@@ -0,0 +1,19 @@
+--- xjdserver.c.orig	2024-09-30 19:42:21.985134000 +0100
++++ xjdserver.c	2024-09-30 19:42:39.088405000 +0100
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
++#include <errno.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -55,8 +56,6 @@
+ int jiver = 14; 
+ int thisdic = 0;
+ int DicNum;
+-
+-extern int errno;
+ 
+ extern unsigned char Dnamet[10][100],XJDXnamet[10][100];
+ extern unsigned char *dicbufft[10];