3 files changed, 5 insertions, 87 deletions

diff --git a/audio/slimserver/Makefile b/audio/slimserver/Makefile
index b04d2d204202..a7992a17f307 100644
--- a/audio/slimserver/Makefile
+++ b/audio/slimserver/Makefile
@@ -50,11 +50,11 @@ CPIOARGS=	--quiet -pdum -R
 PLIST=		${WRKDIR}/pkg-plist
 PLIST_SUB=	SLIMDIR=${SLIMDIR}
 
-SED_SCRIPT+=	-e 's,%%LOCALBASE%%,${LOCALBASE},g' \
-		-e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%PGREPBASE%%,${PGREPBASE},g' \
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-		-e 's,%%SLIMDIR%%,${SLIMDIR},g'
+SUB_FILES=	slimserver.sh \
+		softsqueeze.sh
+SUB_LIST=	PGREPBASE=${PGREPBASE} \
+		RC_SUBR=${RC_SUBR} \
+		SLIMDIR=${SLIMDIR}
 
 pre-fetch:
 .if !defined(SLIMDIR)
@@ -63,10 +63,6 @@ pre-fetch:
 	@${ECHO_MSG} ""
 .endif
 
-post-patch:
-	@${SED} ${SED_SCRIPT} <${FILESDIR}/slimserver.sh >${WRKDIR}/slimserver.sh
-	@${SED} ${SED_SCRIPT} <${FILESDIR}/softsqueeze.sh >${WRKDIR}/softsqueeze.sh
-
 SLIMDIR?=	slimserver
 
 do-build:
diff --git a/audio/slimserver/files/slimserver.sh b/audio/slimserver/files/slimserver.sh
deleted file mode 100644
index 18f2381edf9f..000000000000
--- a/audio/slimserver/files/slimserver.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: slimserver
-# REQUIRE: LOGIN
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable slimserver:
-#
-#slimserver_enable="YES"
-#
-
-. %%RC_SUBR%%
-
-name=slimserver
-start_precmd="slimserver_start_precmd"
-stop_cmd="slimserver_stop"
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/%%SLIMDIR%%/slimserver.pl
-pidfile=/var/run/${name}.pid
-conffile=/var/db/slimserver/slimserver.conf
-logfile=/var/log/slimserver.log
-u=slimserv
-g=slimserv
-command_args="--daemon --prefsfile=${conffile} --logfile=${logfile} --user=${u} --group=${g} --pidfile=${pidfile}"
-
-PGREP=%%PGREPBASE%%/bin/pgrep
-
-slimserver_start_precmd()
-{
-	if [ ! -f ${conffile} ]; then
-		touch ${conffile}
-		chown slimserv:slimserv ${conffile}
-	fi
-}
-
-slimserver_stop()
-{
-	if [ ! -f ${pidfile} ]; then
-		exit
-	fi
-	echo 'Stopping SlimServer.'
-	rc_pid=`cat ${pidfile}`
-	rc_pid=`${PGREP} -u ${u} | grep ${rc_pid}`
-	if [ -n "${rc_pid}" ]; then
-		# Should be mDNSResponderPosix, but the port truncates
-		rc_pids="${rc_pid} `${PGREP} -u ${u} mDNSResponderPos`"
-
-		kill $sig_stop $rc_pids
-		wait_for_pids $rc_pids
-	else
-		echo "${name} not running? (check ${pidfile})"
-	fi
-
-	rm -f ${pidfile}
-}
-
-# set defaults
-
-slimserver_enable=${slimserver_enable:-"NO"}
-slimserver_flags=${slimserver_flags:-""}
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/audio/slimserver/files/softsqueeze.sh b/audio/slimserver/files/softsqueeze.sh
deleted file mode 100644
index c33b7161cc82..000000000000
--- a/audio/slimserver/files/softsqueeze.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# This script requires that that java/javavmwrapper port and a JDK
-# version 1.4 or greater be installed.
-#
-# The javavmwrapper port is not installed by default lest the JDK
-# requirement drag this port down into oblivion.  Perhaps someday Sun
-# will release the JDK under a license that makes dependencies on the
-# JDK reasionable.
-#
-%%LOCALBASE%%/bin/javavm -jar /usr/local/slimserver/HTML/EN/html/softsqueeze/SoftSqueeze.jar