- Fix MASTER_SITES. [1]

- Use USE_RC_SUBR and add rc.d script.
- Preserve .conf file
- Bump PORTREVISION
- portlint(1)

PR:		94248
Submitted by:	Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com>
Reported by:	fenner's distfile survey [1]
Approved by:	portmgr (marcus)

4 files changed, 35 insertions, 41 deletions

diff --git a/net/xbms/Makefile b/net/xbms/Makefile
index 688b8328fa0b..0764f7effc55 100644
--- a/net/xbms/Makefile
+++ b/net/xbms/Makefile
@@ -7,21 +7,24 @@
 
 PORTNAME=	xbms
 PORTVERSION=	0.30.6
+PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	http://wipux2.wifo.uni-mannheim.de/~ck/
-DISTNAME=       ${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	http://www.xboxmediaplayer.de/downloads/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Xbms, the unix streaming server for xbox mediaplayer
 
-USE_REINPLACE=	yes
+USE_RC_SUBR=	${PORTNAME}
 
 post-patch:
-	${REINPLACE_CMD} -e 's|@@PREFIX@@|${PREFIX}|g' ${WRKSRC}/server.c
+	@${REINPLACE_CMD} -e 's|@@PREFIX@@|${PREFIX}|g' ${WRKSRC}/server.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xbms ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/xbms.conf ${PREFIX}/etc/xbms.conf.sample
-	${INSTALL_DATA} ${FILESDIR}/xbms.sh.sample ${PREFIX}/etc/rc.d/xbms.sh.sample
+	@if ! [ -f ${PREFIX}/etc/xbms.conf ]; then \
+		${INSTALL_DATA} ${WRKSRC}/xbms.conf ${PREFIX}/etc/ ; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/net/xbms/files/xbms.in b/net/xbms/files/xbms.in
new file mode 100644
index 000000000000..4e6967906d68
--- /dev/null
+++ b/net/xbms/files/xbms.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# PROVIDE: xbms
+# REQUIRE: LOGIN
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# xbms_enable (bool):	Set to NO by default.
+#			Set it to YES to enable xbms.
+#
+
+. %%RC_SUBR%%
+
+name="xbms"
+rcvar=${name}_enable
+
+command=%%PREFIX%%/sbin/${name}
+pidfile=/var/run/${name}.pid
+required_files=%%PREFIX%%/etc/$[name}.conf
+
+load_rc_config $name
+
+: ${xbms_enable="NO"}
+
+run_rc_command "$1"
diff --git a/net/xbms/files/xbms.sh.sample b/net/xbms/files/xbms.sh.sample
deleted file mode 100644
index dd1105ec56bf..000000000000
--- a/net/xbms/files/xbms.sh.sample
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# Start or stop the xbms server
-#
-# $FreeBSD$
-
-pidfile="/var/run/xbms.pid"
-name="xbms"
-
-case "$1" in
-	start)
-		echo -n " xbms"
-		if [ -f /usr/local/etc/xbms.conf ]; then
-			/usr/local/bin/xbms
-		fi
-		;;
-
-	stop)
-		if [ ! -f /var/run/xbms.pid ]; then
-			echo "XBMS not running"
-			exit 64
-		fi
-		kill `cat /var/run/xbms.pid`
-		;;
-status)
-        ps -auxww | egrep ${name} | egrep -v "($0|egrep)"
-        ;;
-
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop | status}"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/net/xbms/pkg-plist b/net/xbms/pkg-plist
index 004b9769cfa4..d2599d6af4fa 100644
--- a/net/xbms/pkg-plist
+++ b/net/xbms/pkg-plist
@@ -1,4 +1,4 @@
 @comment $FreeBSD$
 bin/xbms
+@unexec if cmp -s %D/etc/xbms.conf %D/etc/xbms.conf.sample; then rm -f %D/etc/xbms.conf; fi
 etc/xbms.conf.sample
-etc/rc.d/xbms.sh.sample