From owner-svn-ports-head@freebsd.org Thu May 12 08:09:21 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7F5FB38463; Thu, 12 May 2016 08:09:21 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9FD2C1722; Thu, 12 May 2016 08:09:21 +0000 (UTC) (envelope-from woodsb02@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4C89KXH017508; Thu, 12 May 2016 08:09:20 GMT (envelope-from woodsb02@FreeBSD.org) Received: (from woodsb02@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4C89K82017505; Thu, 12 May 2016 08:09:20 GMT (envelope-from woodsb02@FreeBSD.org) Message-Id: <201605120809.u4C89K82017505@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: woodsb02 set sender to woodsb02@FreeBSD.org using -f From: Ben Woods Date: Thu, 12 May 2016 08:09:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415051 - in head/audio/forked-daapd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 May 2016 08:09:21 -0000 Author: woodsb02 Date: Thu May 12 08:09:20 2016 New Revision: 415051 URL: https://svnweb.freebsd.org/changeset/ports/415051 Log: audio/forked-daapd: Remove substitions which are not related to variables Remove %%PORTNAME%% and %%RC_NAME%% from: - files/forked-daapd.in - files/pkg-message.in Reported by: mat (mentor) Approved by: xxx (mentor) Reported by: mat Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D6329 Modified: head/audio/forked-daapd/Makefile head/audio/forked-daapd/files/forked-daapd.in head/audio/forked-daapd/files/pkg-message.in Modified: head/audio/forked-daapd/Makefile ============================================================================== --- head/audio/forked-daapd/Makefile Thu May 12 04:43:28 2016 (r415050) +++ head/audio/forked-daapd/Makefile Thu May 12 08:09:20 2016 (r415051) @@ -33,8 +33,6 @@ USE_LDCONFIG= ${LOCALBASE}/lib/forked-da 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 Modified: head/audio/forked-daapd/files/forked-daapd.in ============================================================================== --- head/audio/forked-daapd/files/forked-daapd.in Thu May 12 04:43:28 2016 (r415050) +++ head/audio/forked-daapd/files/forked-daapd.in Thu May 12 08:09:20 2016 (r415051) @@ -2,34 +2,34 @@ # $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" Modified: head/audio/forked-daapd/files/pkg-message.in ============================================================================== --- head/audio/forked-daapd/files/pkg-message.in Thu May 12 04:43:28 2016 (r415050) +++ head/audio/forked-daapd/files/pkg-message.in Thu May 12 08:09:20 2016 (r415051) @@ -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