Index: head/audio/forked-daapd/Makefile
===================================================================
--- head/audio/forked-daapd/Makefile	(revision 415050)
+++ head/audio/forked-daapd/Makefile	(revision 415051)
@@ -1,67 +1,65 @@
 # Created by: Takumi Takahashi <takumiiinn@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	forked-daapd
 PORTVERSION=	24.1
 CATEGORIES=	audio
 
 MAINTAINER=	takumiiinn@gmail.com
 COMMENT=	DAAP (iTunes), MPD (Music Player Daemon) and RSP (Roku) media server
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	antlr3:devel/antlr3
 LIB_DEPENDS=	libantlr3c.so:devel/libantlr3c \
 		libavahi-client.so:net/avahi-app \
 		libavcodec.so:multimedia/ffmpeg \
 		libconfuse.so:devel/libconfuse \
 		libevent.so:devel/libevent2 \
 		libgcrypt.so:security/libgcrypt \
 		libinotify.so:devel/libinotify \
 		libmxml.so:textproc/mxml \
 		libunistring.so:devel/libunistring
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ejurgensen
 
 USES=		autoreconf gettext gmake gperf iconv libtool localbase pathfix pkgconfig sqlite
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	${LOCALBASE}/lib/forked-daapd
 CONFIGURE_ARGS+=--localstatedir=/var
 
 USE_RC_SUBR=	${PORTNAME}
-RC_NAME=	forked_daapd
-SUB_LIST=	PORTNAME=${PORTNAME} RC_NAME=${RC_NAME}
 SUB_FILES=	pkg-message
 
 USERS=		daapd
 GROUPS=		daapd
 
 OPTIONS_DEFINE=	ALSA ITUNES LASTFM MPD
 OPTIONS_DEFAULT=ITUNES LASTFM MPD
 
 ITUNES_DESC=	iTunes XML support
 MPD_DESC=	Music Player Daemon protocol support
 
 ALSA_CONFIGURE_WITH=	alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ITUNES_CONFIGURE_ENABLE=itunes
 ITUNES_LIB_DEPENDS=	libplist.so:devel/libplist
 LASTFM_CONFIGURE_ENABLE=lastfm
 LASTFM_LIB_DEPENDS=	libcurl.so:ftp/curl
 MPD_CONFIGURE_ENABLE=	mpd
 
 .include <bsd.port.pre.mk>
 
 # Ensure FreeBSD 9 can find zlib library
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000712
 CONFIGURE_ENV+=	ZLIB_CFLAGS="-I/usr/include" ZLIB_LIBS="-lz"
 .endif
 
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf.sample
 
 .include <bsd.port.post.mk>
Index: head/audio/forked-daapd/files/forked-daapd.in
===================================================================
--- head/audio/forked-daapd/files/forked-daapd.in	(revision 415050)
+++ head/audio/forked-daapd/files/forked-daapd.in	(revision 415051)
@@ -1,35 +1,35 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
-# PROVIDE: %%PORTNAME%%
+# PROVIDE: forked-daapd
 # REQUIRE: avahi_daemon dbus
 # KEYWORD: shutdown
 #
 # Add these lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
-# %%RC_NAME%%_enable (bool):	Set to NO by default.
-#				Set it to YES to enable %%PORTNAME%%.
-# %%RC_NAME%%_config (path):	Set to %%PREFIX%%/etc/forked-daapd.conf
+# forked_daapd_enable (bool):	Set to NO by default.
+#				Set it to YES to enable forked-daapd.
+# forked_daapd_config (path):	Set to %%PREFIX%%/etc/forked-daapd.conf
 #				by default.
-# %%RC_NAME%%_flags (str):	Set to "" by default
+# forked_daapd_flags (str):	Set to "" by default
 
 . /etc/rc.subr
 
-name=%%RC_NAME%%
+name=forked_daapd
 rcvar=${name}_enable
 
 load_rc_config $name
 
-: ${%%RC_NAME%%_enable:="NO"}
-: ${%%RC_NAME%%_config:="%%PREFIX%%/etc/forked-daapd.conf"}
-: ${%%RC_NAME%%_flags:=""}
+: ${forked_daapd_enable:="NO"}
+: ${forked_daapd_config:="%%PREFIX%%/etc/forked-daapd.conf"}
+: ${forked_daapd_flags:=""}
 
-pidfile="/var/run/%%PORTNAME%%.pid"
-required_files="$%%RC_NAME%%_config"
+pidfile="/var/run/forked-daapd.pid"
+required_files="$forked_daapd_config"
 
-command="%%PREFIX%%/sbin/%%PORTNAME%%"
-command_args="-P $pidfile -c $%%RC_NAME%%_config $%%RC_NAME%%_flags"
+command="%%PREFIX%%/sbin/forked-daapd"
+command_args="-P $pidfile -c $forked_daapd_config $forked_daapd_flags"
 
 run_rc_command "$1"
Index: head/audio/forked-daapd/files/pkg-message.in
===================================================================
--- head/audio/forked-daapd/files/pkg-message.in	(revision 415050)
+++ head/audio/forked-daapd/files/pkg-message.in	(revision 415051)
@@ -1,21 +1,21 @@
-%%PORTNAME%% uses FFmpeg for transcoding audio playback.
+forked-daapd uses FFmpeg for transcoding audio playback.
 The default ports/pkg build of FFmpeg on FreeBSD has a number
 of options which could be SET/UNSET to provide support for
 additional audio codecs.
 
-If you find %%PORTNAME%% does not support the audio codecs you
+If you find forked-daapd does not support the audio codecs you
 require, it is recommended to recompile the multimedia/ffmpeg
 package from ports with the necessary options ENABLED (SET).
 
-You should review and edit the %%PORTNAME%% configuration
-file %%PREFIX%%/etc/%%PORTNAME%%.conf before first use.
+You should review and edit the forked-daapd configuration
+file %%PREFIX%%/etc/forked-daapd.conf before first use.
 
-To automatically start %%PORTNAME%% at boot time:
+To automatically start forked-daapd at boot time:
 # sysrc 'dbus_enable=YES'
 # sysrc 'avahi_daemon_enable=YES'
-# sysrc '%%RC_NAME%%_enable=YES'
+# sysrc 'forked_daapd_enable=YES'
 
-To then manually start %%PORTNAME%% without rebooting:
+To then manually start forked-daapd without rebooting:
 # service dbus start
 # service avahi-daemon start
-# service %%PORTNAME%% start
+# service forked-daapd start