Date: Mon, 25 Sep 2006 13:02:11 +0400 From: Gleb Smirnoff <glebius@FreeBSD.org> To: Norikatsu Shigemura <nork@FreeBSD.org> Cc: ports@FreeBSD.org Subject: Re: rcNG-fy net/mpd4 Message-ID: <20060925090211.GR27667@cell.sick.ru> In-Reply-To: <20060923211437.6f685109.nork@FreeBSD.org> References: <20060923211437.6f685109.nork@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Sep 23, 2006 at 09:14:37PM +0900, Norikatsu Shigemura wrote:
N> Hi glebius!
N>
N> I make a patch to rcNG-fy the net/mpd4. Please review and commit
N> or may I commit this OK?
N>
N> cvs add:
N> files/mpd4.sh.in
N> cvs remove:
N> files/mpd4.sh
N> cvs commit:
N> Makefile
N> pkg-plist
N> ports/UPDATING
We already have a PR from sat@ about this. The problem is that the
mpd4 port is generated. Whenever we roll new mpd release, we run
a script, that generates the port. Then we send diff to port committers.
That's why I'd like to see a patch not to port, but a patch against
mpd distribution, the part that generates port.
N> Index: Makefile
N> ===================================================================
N> RCS file: /home/ncvs/ports/net/mpd4/Makefile,v
N> retrieving revision 1.5
N> diff -u -r1.5 Makefile
N> --- Makefile 19 Mar 2006 07:49:21 -0000 1.5
N> +++ Makefile 23 Sep 2006 11:54:23 -0000
N> @@ -7,6 +7,7 @@
N>
N> PORTNAME= mpd4
N> PORTVERSION= 4.0b4
N> +PORTREVISION= 1
N> CATEGORIES= net
N> MASTER_SITES= ${MASTER_SITE_LOCAL}
N> MASTER_SITE_SUBDIR= glebius
N> @@ -22,6 +23,7 @@
N> MANCOMPRESSED= maybe
N>
N> USE_OPENSSL= yes
N> +USE_RC_SUBR= mpd4.sh
N>
N> .include <bsd.port.pre.mk>
N>
N> @@ -29,7 +31,4 @@
N> IGNORE= does not compile on FreeBSD 4.x; use net/mpd instead
N> .endif
N>
N> -post-install:
N> - @${INSTALL_SCRIPT} -m 751 ${FILESDIR}/mpd4.sh ${PREFIX}/etc/rc.d/mpd4.sh.sample
N> -
N> .include <bsd.port.post.mk>
N> Index: pkg-plist
N> ===================================================================
N> RCS file: /home/ncvs/ports/net/mpd4/pkg-plist,v
N> retrieving revision 1.2
N> diff -u -r1.2 pkg-plist
N> --- pkg-plist 24 Jan 2006 09:28:21 -0000 1.2
N> +++ pkg-plist 23 Sep 2006 12:02:17 -0000
N> @@ -2,7 +2,6 @@
N> etc/mpd4/mpd.links.sample
N> etc/mpd4/mpd.secret.sample
N> etc/mpd4/mpd.script.sample
N> -etc/rc.d/mpd4.sh.sample
N> sbin/mpd4
N> share/doc/mpd4/README
N> share/doc/mpd4/mpd.ps
N> Index: UPDATING
N> ===================================================================
N> RCS file: /home/ncvs/ports/UPDATING,v
N> retrieving revision 1.397
N> diff -u -r1.397 UPDATING
N> --- UPDATING 22 Sep 2006 09:24:04 -0000 1.397
N> +++ UPDATING 23 Sep 2006 11:59:59 -0000
N> @@ -6,6 +6,13 @@
N> time you update your ports collection, before attempting any port
N> upgrades.
N>
N> +20060923:
N> + AFFECTS: users of net/mpd4
N> + AUTHOR: nork@FreeBSD.org
N> +
N> + The mpd4 port must now be enabled / disabled and configured in
N> + rc.conf. See the rcNG script for details.
N> +
N> 20060922:
N> AFFECTS: users of mail/tmda
N> AUTHOR: sergei@FreeBSD.org
N> #!/bin/sh
N> #
N> # $FreeBSD$
N> #
N> # PROVIDE: mpd4
N> # REQUIRE: netif
N>
N> mpd4_enable=${mpd4_enable-"NO"}
N> mpd4_flags=${mpd4_flags-"-b"}
N> mpd4_pidfile=${mpd4_pidfile-"/var/run/mpd4.pid"}
N>
N> . %%RC_SUBR%%
N>
N> name=mpd4
N> rcvar=`set_rcvar`
N> command=%%PREFIX%%/sbin/mpd4
N>
N> load_rc_config ${name}
N>
N> case "${mpd4_flags}" in
N> *-p\ *)
N> echo "Warning: \$mpd4_flags includes -p option." \
N> "Please use \$mpd4_pidfile instead."
N> ;;
N> *)
N> mpd4_flags="-p ${mpd4_pidfile} ${mpd4_flags}"
N> ;;
N> esac
N>
N> pidfile=${mpd4_pidfile}
N>
N> run_rc_command "$1"
--
Totus tuus, Glebius.
GLEBIUS-RIPN GLEB-RIPE
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060925090211.GR27667>