Date: Tue, 31 Jan 2006 11:43:55 -0800 (PST) From: infofarmer@gmail.com To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92655: update net/mpd4 Message-ID: <43dfbdfb.41e644fc.0881.ffffed03@mx.gmail.com> Resent-Message-ID: <200602010150.k111o2sU027136@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92655
>Category: ports
>Synopsis: update net/mpd4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 01 01:50:02 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Andrew Pantyukhin
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD sat64.net17 6.0-STABLE FreeBSD 6.0-STABLE #0: Tue Jan 31 02:14:13 MSK 2006 root@sat64.net17:/usr/obj/usr/usr60/src/sys/SATCUR32 i386
>Description:
o Fix plist (honor NOPORTDOCS)
o Move plist to Makefile
o Add rcng script
>How-To-Repeat:
>Fix:
--- mpd4.diff begins here ---
diff -urN /usr/ports/net/mpd4/Makefile mpd4/Makefile
--- /usr/ports/net/mpd4/Makefile Tue Jan 24 12:28:21 2006
+++ mpd4/Makefile Tue Jan 31 22:38:27 2006
@@ -20,10 +20,16 @@
MTREE_FILE= ${FILESDIR}/mpd4.mtree
MAN8= mpd4.8
MANCOMPRESSED= maybe
+USE_RC_SUBR= mpd4.sh
+HTMLNUM= 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 \
+ 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 \
+ 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
+CONFSUF= conf links secret script
+PORTDOCS= ${HTMLNUM:S/^/mpd/:S/$/.html/} mpd.html mpd.ps README \
+ mpd_toc.html
+PLIST_DIRS= etc/mpd4
+PLIST_FILES= ${CONFSUF:S/^/etc\/mpd4\/mpd./:S/$/.sample/} sbin/mpd4
USE_OPENSSL= yes
-
-post-install:
- @${INSTALL_SCRIPT} -m 751 ${FILESDIR}/mpd4.sh ${PREFIX}/etc/rc.d/mpd4.sh.sample
.include <bsd.port.mk>
diff -urN /usr/ports/net/mpd4/files/mpd4.sh mpd4/files/mpd4.sh
--- /usr/ports/net/mpd4/files/mpd4.sh Tue Jan 24 12:28:22 2006
+++ mpd4/files/mpd4.sh Thu Jan 1 03:00:00 1970
@@ -1,37 +0,0 @@
-#!/bin/sh
-# $FreeBSD: ports/net/mpd4/files/mpd4.sh,v 1.2 2006/01/24 09:28:22 glebius Exp $
-
-DAEMON=/usr/local/sbin/mpd4
-PIDFILE=/var/run/mpd4.pid
-
-case "$1" in
-start)
- if [ -f "${DAEMON}" -a -x "${DAEMON}" ]; then
- if [ -f "${PIDFILE}" ]; then
- echo ' mpd4 PID file found - not starting'
- else
- "${DAEMON}" -b -p "${PIDFILE}"
- echo -n ' mpd4'
- fi
- else
- echo ' "${DAEMON}" executable not found - mpd4 not starting'
- fi
- ;;
-stop)
- if [ -f "${PIDFILE}" ]; then
- read -r pid junk < "${PIDFILE}"
- kill ${pid}
- else
- echo ' mpd4 PID file not found - not killing'
- fi
- ;;
-restart)
- $0 stop
- sleep 2
- $0 start
- ;;
-*)
- echo "usage: ${0##*/} {start|stop|restart}" >&2
- ;;
-esac
-
diff -urN /usr/ports/net/mpd4/files/mpd4.sh.in mpd4/files/mpd4.sh.in
--- /usr/ports/net/mpd4/files/mpd4.sh.in Thu Jan 1 03:00:00 1970
+++ mpd4/files/mpd4.sh.in Tue Jan 31 22:37:31 2006
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# PROVIDE: mpd4
+# REQUIRE: NETWORKING
+
+#
+# Add the following lines to /etc/rc.conf to enable mpd4:
+#
+# mpd4_enable="YES" # YES or NO (default)
+#
+
+. %%RC_SUBR%%
+
+name=mpd4
+rcvar=`set_rcvar`
+prefix=%%PREFIX%%
+pidfile=/var/run/${name}.pid
+command="${prefix}/sbin/${name}"
+command_args="-b -p ${pidfile}"
+required_files="${prefix}/etc/${name}/mpd.conf ${prefix}/etc/${name}/mpd.links"
+
+load_rc_config $name
+: ${mpd4_enable="NO"}
+
+run_rc_command "$1"
diff -urN /usr/ports/net/mpd4/pkg-plist mpd4/pkg-plist
--- /usr/ports/net/mpd4/pkg-plist Tue Jan 24 12:28:21 2006
+++ mpd4/pkg-plist Thu Jan 1 03:00:00 1970
@@ -1,72 +0,0 @@
-etc/mpd4/mpd.conf.sample
-etc/mpd4/mpd.links.sample
-etc/mpd4/mpd.secret.sample
-etc/mpd4/mpd.script.sample
-etc/rc.d/mpd4.sh.sample
-sbin/mpd4
-share/doc/mpd4/README
-share/doc/mpd4/mpd.ps
-share/doc/mpd4/mpd.html
-share/doc/mpd4/mpd1.html
-share/doc/mpd4/mpd10.html
-share/doc/mpd4/mpd11.html
-share/doc/mpd4/mpd12.html
-share/doc/mpd4/mpd13.html
-share/doc/mpd4/mpd14.html
-share/doc/mpd4/mpd15.html
-share/doc/mpd4/mpd16.html
-share/doc/mpd4/mpd17.html
-share/doc/mpd4/mpd18.html
-share/doc/mpd4/mpd19.html
-share/doc/mpd4/mpd2.html
-share/doc/mpd4/mpd20.html
-share/doc/mpd4/mpd21.html
-share/doc/mpd4/mpd22.html
-share/doc/mpd4/mpd23.html
-share/doc/mpd4/mpd24.html
-share/doc/mpd4/mpd25.html
-share/doc/mpd4/mpd26.html
-share/doc/mpd4/mpd27.html
-share/doc/mpd4/mpd28.html
-share/doc/mpd4/mpd29.html
-share/doc/mpd4/mpd3.html
-share/doc/mpd4/mpd30.html
-share/doc/mpd4/mpd31.html
-share/doc/mpd4/mpd32.html
-share/doc/mpd4/mpd33.html
-share/doc/mpd4/mpd34.html
-share/doc/mpd4/mpd35.html
-share/doc/mpd4/mpd36.html
-share/doc/mpd4/mpd37.html
-share/doc/mpd4/mpd38.html
-share/doc/mpd4/mpd39.html
-share/doc/mpd4/mpd4.html
-share/doc/mpd4/mpd40.html
-share/doc/mpd4/mpd41.html
-share/doc/mpd4/mpd42.html
-share/doc/mpd4/mpd43.html
-share/doc/mpd4/mpd44.html
-share/doc/mpd4/mpd45.html
-share/doc/mpd4/mpd46.html
-share/doc/mpd4/mpd47.html
-share/doc/mpd4/mpd48.html
-share/doc/mpd4/mpd49.html
-share/doc/mpd4/mpd5.html
-share/doc/mpd4/mpd50.html
-share/doc/mpd4/mpd51.html
-share/doc/mpd4/mpd52.html
-share/doc/mpd4/mpd53.html
-share/doc/mpd4/mpd54.html
-share/doc/mpd4/mpd55.html
-share/doc/mpd4/mpd56.html
-share/doc/mpd4/mpd57.html
-share/doc/mpd4/mpd58.html
-share/doc/mpd4/mpd59.html
-share/doc/mpd4/mpd6.html
-share/doc/mpd4/mpd60.html
-share/doc/mpd4/mpd7.html
-share/doc/mpd4/mpd8.html
-share/doc/mpd4/mpd9.html
-share/doc/mpd4/mpd_toc.html
-@dirrm etc/mpd4
-@dirrm share/doc/mpd4
--- mpd4.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?43dfbdfb.41e644fc.0881.ffffed03>