10 files changed, 111 insertions, 94 deletions
diff --git a/japanese/ebnetd/Makefile b/japanese/ebnetd/Makefile
index 1477383f9561..bef5eaf0e914 100644
--- a/japanese/ebnetd/Makefile
+++ b/japanese/ebnetd/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ebnetd
 PORTVERSION=	1.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	japanese ipv6
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/
 
@@ -20,19 +20,14 @@ CONFIGURE_ARGS=	--localstatedir=${RUNDIR} --with-logdir=${LOGDIR}
 # Local variables
 LOGDIR=		/var/log
 RUNDIR=		/var/run
-STARTUP_SCRIPT=	${PORTNAME}.sh
 
-USE_RC_SUBR=	yes
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX}
+USE_RC_SUBR=	ebhttpd ebnetd ndtpd
+SUB_FILES=	pkg-message
+PLIST_SUB=	EBNETD_RUNDIR=${RUNDIR}/${PORTNAME}
 
 INFO=		ebnetd ebnetd-ja
 
-post-build:
-	${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/${STARTUP_SCRIPT} > ${WRKDIR}/${STARTUP_SCRIPT}
-
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${STARTUP_SCRIPT} ${PREFIX}/etc/rc.d
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${ECHO}
 	@${CAT} ${PKGMESSAGE}
diff --git a/japanese/ebnetd/files/ebhttpd.in b/japanese/ebnetd/files/ebhttpd.in
new file mode 100644
index 000000000000..cc608a92dbd6
--- /dev/null
+++ b/japanese/ebnetd/files/ebhttpd.in
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: ebhttpd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable ebhttpd:
+# ebhttpd_enable (bool): Set to "NO" by default.
+#                        Set it to "YES" to enable ebhttpd.
+# ebhttpd_flags (str):   Set to "" by default.
+#                        Extra flags passed to start ebhttpd.
+
+. /etc/rc.subr
+
+name=ebhttpd
+rcvar=ebhttpd_enable
+command="%%PREFIX%%/sbin/${name}"
+pidfile="/var/run/ebnetd/${name}.pid"
+required_dirs="/var/run/ebnetd"
+required_files=%%PREFIX%%/etc/ebnetd.conf
+
+ebhttpd_enable=${ebhttpd_enable:-"NO"}
+ebhttpd_flags=${ebhttpd_flags:-""}
+
+sig_reload=SIGHUP
+extra_commands="reload"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/japanese/ebnetd/files/ebnetd.in b/japanese/ebnetd/files/ebnetd.in
new file mode 100644
index 000000000000..443f1fd58f3c
--- /dev/null
+++ b/japanese/ebnetd/files/ebnetd.in
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: ebnetd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable ebnetd:
+# ebnetd_enable (bool):  Set to "NO" by default.
+#                        Set it to "YES" to enable ebnetd.
+# ebnetd_flags (str):    Set to "" by default.
+#                        Extra flags passed to start ebnetd.
+
+. /etc/rc.subr
+
+# ebnetd
+name=ebnetd
+rcvar=ebnetd_enable
+command="%%PREFIX%%/sbin/${name}"
+pidfile="/var/run/ebnetd/ebnd.pid"
+required_dirs="/var/run/ebnetd"
+required_files=%%PREFIX%%/etc/ebnetd.conf
+
+ebnetd_enable=${ebnetd_enable:-"NO"}
+ebnetd_flags=${ebnetd_flags:-""}
+
+sig_reload=SIGHUP
+extra_commands="reload"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/japanese/ebnetd/files/ebnetd.sh b/japanese/ebnetd/files/ebnetd.sh
deleted file mode 100644
index ae55580e3f26..000000000000
--- a/japanese/ebnetd/files/ebnetd.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: ebnetd ndtpd ebhttpd
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable EBNETD servers:
-# ebnetd_enable (bool):  Set to "NO" by default.
-#                        Set it to "YES" to enable ebnetd.
-# ebnetd_flags (str):    Set to "" by default.
-#                        Extra flags passed to start ebnetd.
-# ndtpd_enable (bool):   Set to "NO" by default.
-#                        Set it to "YES" to enable ndtpd.
-# ndtpd_flags (str):     Set to "" by default.
-#                        Extra flags passed to start ndtpd.
-# ebhttpd_enable (bool): Set to "NO" by default.
-#                        Set it to "YES" to enable ebhttpd.
-# ebhttpd_flags (str):   Set to "" by default.
-#                        Extra flags passed to start ebhttpd.
-
-. /etc/rc.subr
-
-# ebnetd
-name=ebnetd
-rcvar=ebnetd_enable
-command="%%PREFIX%%/sbin/${name}"
-pidfile="/var/run/ebnetd/ebnd.pid"
-required_dirs="/var/run/ebnetd"
-required_files=%%PREFIX%%/etc/ebnetd.conf
-
-ebnetd_enable=${ebnetd_enable:-"NO"}
-ebnetd_flags=${ebnetd_flags:-""}
-
-sig_reload=SIGHUP
-extra_commands="reload"
-
-load_rc_config $name
-run_rc_command "$1"
-
-# ndtpd
-name=ndtpd
-rcvar=ndtpd_enable
-command="%%PREFIX%%/sbin/${name}"
-pidfile="/var/run/ebnetd/${name}.pid"
-required_dirs="/var/run/ebnetd"
-required_files=%%PREFIX%%/etc/ebnetd.conf
-
-ndtpd_enable=${ndtpd_enable:-"NO"}
-ndtpd_flags=${ndtpd_flags:-""}
-
-sig_reload=SIGHUP
-extra_commands="reload"
-
-load_rc_config $name
-run_rc_command "$1"
-
-# ebhttpd
-name=ebhttpd
-rcvar=ebhttpd_enable
-command="%%PREFIX%%/sbin/${name}"
-pidfile="/var/run/ebnetd/${name}.pid"
-required_dirs="/var/run/ebnetd"
-required_files=%%PREFIX%%/etc/ebnetd.conf
-
-ebhttpd_enable=${ebhttpd_enable:-"NO"}
-ebhttpd_flags=${ebhttpd_flags:-""}
-
-sig_reload=SIGHUP
-extra_commands="reload"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/japanese/ebnetd/files/ndtpd.in b/japanese/ebnetd/files/ndtpd.in
new file mode 100644
index 000000000000..3659e22aec61
--- /dev/null
+++ b/japanese/ebnetd/files/ndtpd.in
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: ndtpd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable ndtpd:
+# ndtpd_enable (bool):   Set to "NO" by default.
+#                        Set it to "YES" to enable ndtpd.
+# ndtpd_flags (str):     Set to "" by default.
+#                        Extra flags passed to start ndtpd.
+
+. /etc/rc.subr
+
+# ndtpd
+name=ndtpd
+rcvar=ndtpd_enable
+command="%%PREFIX%%/sbin/${name}"
+pidfile="/var/run/ebnetd/${name}.pid"
+required_dirs="/var/run/ebnetd"
+required_files=%%PREFIX%%/etc/ebnetd.conf
+
+ndtpd_enable=${ndtpd_enable:-"NO"}
+ndtpd_flags=${ndtpd_flags:-""}
+
+sig_reload=SIGHUP
+extra_commands="reload"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/japanese/ebnetd/files/patch-doc-ja::ebnetd-ja.texi b/japanese/ebnetd/files/patch-doc-ja_ebnetd-ja.texi
index 1c6445021712..1c6445021712 100644
--- a/japanese/ebnetd/files/patch-doc-ja::ebnetd-ja.texi
+++ b/japanese/ebnetd/files/patch-doc-ja_ebnetd-ja.texi
diff --git a/japanese/ebnetd/files/patch-doc::ebnetd.texi b/japanese/ebnetd/files/patch-doc_ebnetd.texi
index db2059c5ba28..db2059c5ba28 100644
--- a/japanese/ebnetd/files/patch-doc::ebnetd.texi
+++ b/japanese/ebnetd/files/patch-doc_ebnetd.texi
diff --git a/japanese/ebnetd/pkg-message b/japanese/ebnetd/files/pkg-message.in
index 0822d34efec8..b3457bdced32 100644
--- a/japanese/ebnetd/pkg-message
+++ b/japanese/ebnetd/files/pkg-message.in
@@ -1,12 +1,13 @@
 **********************************************************************
-You'll need manual configurations to actually activate EBNETD servers.
+You'll need manual configurations to actually activate EBNETD servers 
+(ebhttpd/ebnetd/ndtpd).
 
 Step 0(optional):
 If you want to setup private syslog, edit /etc/syslog.conf.
 
 Step 1:
 Copy a sample configuration file `ebnetd.conf.sample' to `ebnetd.conf'
-in `${PREFIX}/etc' directory, and edit it. Consult the "Configuration
+in `%%PREFIX%%/etc' directory, and edit it. Consult the "Configuration
 File" section of info file.
 
 Step 2a:
diff --git a/japanese/ebnetd/pkg-descr b/japanese/ebnetd/pkg-descr
index 0e77179c7c92..0487b4e84286 100644
--- a/japanese/ebnetd/pkg-descr
+++ b/japanese/ebnetd/pkg-descr
@@ -4,7 +4,7 @@ via TCP/IP.
 
 ebnetd:  ebnetd is a server of EBNET protocol which is designed to
 	 communicate with EB Library. For more details about EB
-	 Library, see http://www.sra.co.jp/m-kasahr/eb/.
+	 Library.
 
 ndtpd:   ndtpd is an NDTP (Network Dictionary Transfer Protocol)
 	 server. The first implementation of the NDTP esrver is
@@ -20,5 +20,3 @@ default, but can also run as children of `inetd'.
 In addition, you must follow the licenses of your CD-ROM books. Though
 EBNETD is free software, your books may not be free. Don't open your
 books to unlicensed hosts nor users.
-
-WWW: http://www.sra.co.jp/people/m-kasahr/ebnetd/
diff --git a/japanese/ebnetd/pkg-plist b/japanese/ebnetd/pkg-plist
index 89ce8cbad25b..1021959cb631 100644
--- a/japanese/ebnetd/pkg-plist
+++ b/japanese/ebnetd/pkg-plist
@@ -1,6 +1,5 @@
 @comment $FreeBSD$
 etc/ebnetd.conf.sample
-etc/rc.d/ebnetd.sh
 libexec/ebhtstat
 libexec/ebnstat
 libexec/ndtpstat
@@ -15,5 +14,5 @@ sbin/ebnupgrade
 sbin/ndtpcheck
 sbin/ndtpcontrol
 sbin/ndtpd
-@exec /bin/mkdir -m 0755 -p /var/run/ebnetd
-@dirrmtry /var/run/ebnetd
+@exec mkdir -m 0755 -p %%EBNETD_RUNDIR%%
+@unexec rmdir %%EBNETD_RUNDIR%%