From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 12 00:10:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id C66F69E1 for ; Tue, 12 Mar 2013 00:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 9C87EB25 for ; Tue, 12 Mar 2013 00:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r2C0A1XP046715 for ; Tue, 12 Mar 2013 00:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2C0A1YS046714; Tue, 12 Mar 2013 00:10:01 GMT (envelope-from gnats) Resent-Date: Tue, 12 Mar 2013 00:10:01 GMT Resent-Message-Id: <201303120010.r2C0A1YS046714@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yasuhiro KIMURA Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D5B04994 for ; Tue, 12 Mar 2013 00:04:58 +0000 (UTC) (envelope-from yasu@home.utahime.org) Received: from gate.utahime.jp (gate.utahime.jp [183.180.29.210]) by mx1.freebsd.org (Postfix) with ESMTP id 839A7B02 for ; Tue, 12 Mar 2013 00:04:58 +0000 (UTC) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) by gate.utahime.jp (Postfix) with ESMTP id A62C661F9D; Tue, 12 Mar 2013 09:04:50 +0900 (JST) Received: from eastasia.home.utahime.org (localhost [127.0.0.1]) by localhost-backdoor.home.utahime.org (Postfix) with ESMTP id 774B54E630; Tue, 12 Mar 2013 09:04:50 +0900 (JST) Received: by eastasia.home.utahime.org (Postfix, from userid 1000) id 4AC054E62D; Tue, 12 Mar 2013 09:04:50 +0900 (JST) Message-Id: <20130312000450.4AC054E62D@eastasia.home.utahime.org> Date: Tue, 12 Mar 2013 09:04:50 +0900 (JST) From: Yasuhiro KIMURA To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/176866: [MAINTAINER] japanese/ebnetd: divide rc.d script and etc X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2013 00:10:01 -0000 >Number: 176866 >Category: ports >Synopsis: [MAINTAINER] japanese/ebnetd: divide rc.d script and etc >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Mar 12 00:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Yasuhiro KIMURA >Release: FreeBSD 9.1-RELEASE-p1 amd64 >Organization: >Environment: System: FreeBSD xxxx 9.1-RELEASE-p1 FreeBSD 9.1-RELEASE-p1 #0 r246991: Wed Feb 20 04:01:53 JST 2013 xxxx amd64 >Description: - Divide rc.d script into 3 ones and change into current USE_RC_SUBR usage. - Use pkg-plist and pkg-message substitution. - Remove obsolete WWW url from pkg-descr. - Rename some patch files to pet portlint. >How-To-Repeat: >Fix: Sinse some files are copied and/or moved, please apply attached patch with following commands: % cd /usr/ports/japanese/ebnetd % svn copy files/ebnetd.sh files/ebhttpd.in % svn copy files/ebnetd.sh files/ndtpd.in % svn move files/ebnetd.sh files/ebnetd.in % svn move files/patch-doc-ja::ebnetd-ja.texi files/patch-doc-ja_ebnetd-ja.texi % svn move files/patch-doc::ebnetd.texi files/patch-doc_ebnetd.texi % svn move pkg-message files/pkg-message.in % svn patch /somewhere/saved/directory/patch-ja-ebnetd --- patch-ja-ebnetd begins here --- Index: Makefile =================================================================== --- Makefile (revision 313906) +++ Makefile (working copy) @@ -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 @@ # 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} Index: files/ebhttpd.in =================================================================== --- files/ebhttpd.in (working copy) +++ files/ebhttpd.in (working copy) @@ -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}" Index: files/ebnetd.in =================================================================== --- files/ebnetd.in (working copy) +++ files/ebnetd.in (working copy) @@ -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 @@ 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" Index: files/ndtpd.in =================================================================== --- files/ndtpd.in (working copy) +++ files/ndtpd.in (working copy) @@ -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 @@ 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" Index: files/pkg-message.in =================================================================== --- files/pkg-message.in (working copy) +++ files/pkg-message.in (working copy) @@ -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: Index: pkg-descr =================================================================== --- pkg-descr (revision 313906) +++ pkg-descr (working copy) @@ -20,5 +20,3 @@ 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/ Index: pkg-plist =================================================================== --- pkg-plist (revision 313906) +++ pkg-plist (working copy) @@ -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/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%% --- patch-ja-ebnetd ends here --- >Release-Note: >Audit-Trail: >Unformatted: