diff --git a/japanese/ebnetd/Makefile b/japanese/ebnetd/Makefile
index 636bff9957e8..58801079b246 100644
--- a/japanese/ebnetd/Makefile
+++ b/japanese/ebnetd/Makefile
@@ -16,27 +16,27 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libeb.so:japanese/eb
 
 USES=		iconv:patch
+USE_RC_SUBR=	ebhttpd ebnetd ndtpd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${RUNDIR} --with-logdir=${LOGDIR}
 CONFIGURE_ENV=	PERL=${PREFIX}/bin/perl
 
+SUB_FILES=	pkg-message
+
 USERS=		${EBNETD_USER}
 GROUPS=		${EBNETD_GROUP}
 
-# Local variables
-LOGDIR=		/var/log
-RUNDIR=		/var/run
-EBNETD_USER=	ebnetd
-EBNETD_GROUP=	ebnetd
-
-USE_RC_SUBR=	ebhttpd ebnetd ndtpd
-SUB_FILES=	pkg-message
+INFO=		ebnetd ebnetd-ja
 PLIST_SUB=	EBNETD_RUNDIR=${RUNDIR}/${PORTNAME} \
 		EBNETD_USER=${EBNETD_USER} \
 		EBNETD_GROUP=${EBNETD_GROUP}
 
-INFO=		ebnetd ebnetd-ja
+# Local variables
+EBNETD_GROUP=	ebnetd
+EBNETD_USER=	ebnetd
+LOGDIR=		/var/log
+RUNDIR=		/var/run
 
 post-patch:
 	${MV} ${WRKSRC}/doc-ja/ebnetd-ja.texi ${WRKSRC}/doc-ja/ebnetd-ja.texi.orig
diff --git a/japanese/ebnetd/files/patch-ebnetd_defs.h.in b/japanese/ebnetd/files/patch-ebnetd_defs.h.in
new file mode 100644
index 000000000000..8988534647f9
--- /dev/null
+++ b/japanese/ebnetd/files/patch-ebnetd_defs.h.in
@@ -0,0 +1,13 @@
+--- ebnetd/defs.h.in.orig	2003-06-15 11:39:27 UTC
++++ ebnetd/defs.h.in
+@@ -313,8 +313,8 @@ extern char work_path[];
+ extern char configuration_file_name[];
+ extern in_port_t listening_port;
+ extern in_port_t old_listening_port;
+-fd_set listening_files;
+-int max_listening_file;
++extern fd_set listening_files;
++extern int max_listening_file;
+ extern int accepted_in_file;
+ extern int accepted_out_file;
+ extern uid_t user_id;