svn commit: r315163 - in head/japanese/ebnetd: . files
TAKATSU Tomonari
tota at FreeBSD.org
Sun Mar 24 21:08:08 UTC 2013
Author: tota
Date: Sun Mar 24 21:08:06 2013
New Revision: 315163
URL: http://svnweb.freebsd.org/changeset/ports/315163
Log:
- Divide ebnetd.sh into 3 scripts
- Set a list of these scripts to USE_RC_SUBR
- Use SUB_FILES for pkg-message
- Use PLIST_SUB to substitute EBNETD_RUNDIR macro in pkg-plist
- Remove obsolete WWW url from pkg-descr
- Rename some patch files to pet portlint
PR: ports/176866
Submitted by: Yasuhiro KIMURA (maintainer)
Added:
head/japanese/ebnetd/files/ebhttpd.in
- copied, changed from r314949, head/japanese/ebnetd/files/ebnetd.sh
head/japanese/ebnetd/files/ebnetd.in
- copied, changed from r314949, head/japanese/ebnetd/files/ebnetd.sh
head/japanese/ebnetd/files/ndtpd.in
- copied, changed from r314949, head/japanese/ebnetd/files/ebnetd.sh
head/japanese/ebnetd/files/patch-doc-ja_ebnetd-ja.texi
- copied unchanged from r314949, head/japanese/ebnetd/files/patch-doc-ja::ebnetd-ja.texi
head/japanese/ebnetd/files/patch-doc_ebnetd.texi
- copied unchanged from r314949, head/japanese/ebnetd/files/patch-doc::ebnetd.texi
head/japanese/ebnetd/files/pkg-message.in
- copied, changed from r314949, head/japanese/ebnetd/pkg-message
Deleted:
head/japanese/ebnetd/files/ebnetd.sh
head/japanese/ebnetd/files/patch-doc-ja::ebnetd-ja.texi
head/japanese/ebnetd/files/patch-doc::ebnetd.texi
head/japanese/ebnetd/pkg-message
Modified:
head/japanese/ebnetd/Makefile
head/japanese/ebnetd/pkg-descr
head/japanese/ebnetd/pkg-plist
Modified: head/japanese/ebnetd/Makefile
==============================================================================
--- head/japanese/ebnetd/Makefile Sun Mar 24 20:58:29 2013 (r315162)
+++ head/japanese/ebnetd/Makefile Sun Mar 24 21:08:06 2013 (r315163)
@@ -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
# 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}
Copied and modified: head/japanese/ebnetd/files/ebhttpd.in (from r314949, head/japanese/ebnetd/files/ebnetd.sh)
==============================================================================
--- head/japanese/ebnetd/files/ebnetd.sh Fri Mar 22 17:58:26 2013 (r314949, copy source)
+++ head/japanese/ebnetd/files/ebhttpd.in Sun Mar 24 21:08:06 2013 (r315163)
@@ -3,21 +3,12 @@
# $FreeBSD$
#
-# PROVIDE: ebnetd ndtpd ebhttpd
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
+# PROVIDE: ebhttpd
+# REQUIRE: LOGIN
# 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.
+# 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.
@@ -25,41 +16,6 @@
. /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}"
Copied and modified: head/japanese/ebnetd/files/ebnetd.in (from r314949, head/japanese/ebnetd/files/ebnetd.sh)
==============================================================================
--- head/japanese/ebnetd/files/ebnetd.sh Fri Mar 22 17:58:26 2013 (r314949, copy source)
+++ head/japanese/ebnetd/files/ebnetd.in Sun Mar 24 21:08:06 2013 (r315163)
@@ -3,25 +3,16 @@
# $FreeBSD$
#
-# PROVIDE: ebnetd ndtpd ebhttpd
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
+# PROVIDE: ebnetd
+# REQUIRE: LOGIN
# KEYWORD: shutdown
#
-# Add the following lines to /etc/rc.conf to enable EBNETD servers:
+# 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.
-# 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
@@ -41,37 +32,3 @@ 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"
Copied and modified: head/japanese/ebnetd/files/ndtpd.in (from r314949, head/japanese/ebnetd/files/ebnetd.sh)
==============================================================================
--- head/japanese/ebnetd/files/ebnetd.sh Fri Mar 22 17:58:26 2013 (r314949, copy source)
+++ head/japanese/ebnetd/files/ndtpd.in Sun Mar 24 21:08:06 2013 (r315163)
@@ -3,45 +3,19 @@
# $FreeBSD$
#
-# PROVIDE: ebnetd ndtpd ebhttpd
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
+# PROVIDE: ndtpd
+# REQUIRE: LOGIN
# 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.
+# 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.
-# 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
@@ -58,20 +32,3 @@ 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"
Copied: head/japanese/ebnetd/files/patch-doc-ja_ebnetd-ja.texi (from r314949, head/japanese/ebnetd/files/patch-doc-ja::ebnetd-ja.texi)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/ebnetd/files/patch-doc-ja_ebnetd-ja.texi Sun Mar 24 21:08:06 2013 (r315163, copy of r314949, head/japanese/ebnetd/files/patch-doc-ja::ebnetd-ja.texi)
@@ -0,0 +1,13 @@
+--- ../ebnetd-1.0-dist/doc-ja/ebnetd-ja.texi Wed Sep 3 20:26:39 2003
++++ doc-ja/ebnetd-ja.texi Sat Oct 2 23:50:34 2004
+@@ -8,9 +8,7 @@
+
+ @dircategory CD-ROM Book Utilities
+ @direntry
+-* EBNETD: (ebnetd). Network EB Library server.
+-* NDTPD: (ndtpd). Server for accessing CD-ROM books with NDTP.
+-* ebHTTPD: (ebhttpd). Server for accessing CD-ROM books with HTTP.
++* EBNETD-ja: (ebnetd-ja). Servers for accessing CD-ROM books via TCP/IP
+ @end direntry
+
+ @ifinfo
Copied: head/japanese/ebnetd/files/patch-doc_ebnetd.texi (from r314949, head/japanese/ebnetd/files/patch-doc::ebnetd.texi)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/japanese/ebnetd/files/patch-doc_ebnetd.texi Sun Mar 24 21:08:06 2013 (r315163, copy of r314949, head/japanese/ebnetd/files/patch-doc::ebnetd.texi)
@@ -0,0 +1,13 @@
+--- ../ebnetd-1.0-dist/doc/ebnetd.texi Wed Sep 3 20:26:39 2003
++++ doc/ebnetd.texi Sat Oct 2 23:46:15 2004
+@@ -8,9 +8,7 @@
+
+ @dircategory CD-ROM Book Utilities
+ @direntry
+-* EBNETD: (ebnetd). Network EB Library server.
+-* NDTPD: (ndtpd). Server for accessing CD-ROM books with NDTP.
+-* ebHTTPD: (ebhttpd). Server for accessing CD-ROM books with HTTP.
++* EBNETD: (ebnetd). Servers for accessing CD-ROM books via TCP/IP
+ @end direntry
+
+ @ifinfo
Copied and modified: head/japanese/ebnetd/files/pkg-message.in (from r314949, head/japanese/ebnetd/pkg-message)
==============================================================================
--- head/japanese/ebnetd/pkg-message Fri Mar 22 17:58:26 2013 (r314949, copy source)
+++ head/japanese/ebnetd/files/pkg-message.in Sun Mar 24 21:08:06 2013 (r315163)
@@ -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:
Modified: head/japanese/ebnetd/pkg-descr
==============================================================================
--- head/japanese/ebnetd/pkg-descr Sun Mar 24 20:58:29 2013 (r315162)
+++ head/japanese/ebnetd/pkg-descr Sun Mar 24 21:08:06 2013 (r315163)
@@ -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
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/
Modified: head/japanese/ebnetd/pkg-plist
==============================================================================
--- head/japanese/ebnetd/pkg-plist Sun Mar 24 20:58:29 2013 (r315162)
+++ head/japanese/ebnetd/pkg-plist Sun Mar 24 21:08:06 2013 (r315163)
@@ -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
- at exec /bin/mkdir -m 0755 -p /var/run/ebnetd
- at dirrmtry /var/run/ebnetd
+ at exec mkdir -m 0755 -p %%EBNETD_RUNDIR%%
+ at unexec rmdir %%EBNETD_RUNDIR%%
More information about the svn-ports-head
mailing list