From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jan 24 10:40:09 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB4841065673 for ; Tue, 24 Jan 2012 10:40:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B14DB8FC1D for ; Tue, 24 Jan 2012 10:40:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q0OAe9x6028425 for ; Tue, 24 Jan 2012 10:40:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q0OAe9Nj028424; Tue, 24 Jan 2012 10:40:09 GMT (envelope-from gnats) Resent-Date: Tue, 24 Jan 2012 10:40:09 GMT Resent-Message-Id: <201201241040.q0OAe9Nj028424@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jarrod Sayers Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E5C5106564A; Tue, 24 Jan 2012 10:31:41 +0000 (UTC) (envelope-from jarrod@burbank.downtools.com.au) Received: from mail.downtools.com.au (mail.downtools.com.au [123.136.33.243]) by mx1.freebsd.org (Postfix) with ESMTP id 266E48FC15; Tue, 24 Jan 2012 10:31:40 +0000 (UTC) Received: from burbank.downtools.com.au (burbank.downtools.com.au [123.136.33.245]) by mail.downtools.com.au (8.14.4/8.14.4) with ESMTP id q0OAKaVc078793 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 24 Jan 2012 20:50:36 +1030 (CST) (envelope-from jarrod@burbank.downtools.com.au) Received: from burbank.downtools.com.au (localhost [127.0.0.1]) by burbank.downtools.com.au (8.14.5/8.14.5) with ESMTP id q0OAKau7078790; Tue, 24 Jan 2012 20:50:36 +1030 (CST) (envelope-from jarrod@burbank.downtools.com.au) Received: (from jarrod@localhost) by burbank.downtools.com.au (8.14.5/8.14.5/Submit) id q0OAKa3k078789; Tue, 24 Jan 2012 20:50:36 +1030 (CST) (envelope-from jarrod) Message-Id: <201201241020.q0OAKa3k078789@burbank.downtools.com.au> Date: Tue, 24 Jan 2012 20:50:36 +1030 (CST) From: Jarrod Sayers To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: scheidell@FreeBSD.org Subject: ports/164440: [maintainer-update] audio/shoutcast: Update to 2.0.0.29 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jarrod Sayers List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jan 2012 10:40:09 -0000 >Number: 164440 >Category: ports >Synopsis: [maintainer-update] audio/shoutcast: Update to 2.0.0.29 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jan 24 10:40:08 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Jarrod Sayers >Release: FreeBSD 8.2-RELEASE-p5 i386 >Organization: >Environment: System: FreeBSD burbank.downtools.com.au 8.2-RELEASE-p5 FreeBSD 8.2-RELEASE-p5 #11: Tue Dec 27 18:00:01 CST 2011 root@burbank.downtools.com.au:/usr/obj/usr/src/sys/BURBANK i386 >Description: Update to 2.0.0.29. * Bump from beta (build 14) to release (build 29) * Resolve oddities surrounding PLIST_SUB and SUB_LIST (thanks Michael and Gabor) * Update pkg-plist to reflect updated documentation * Support creation of both sc_serv.log and sc_w3c.log on startup >How-To-Repeat: >Fix: Downloadable diff is available from: http://www.downtools.com.au/~jarrod/FreeBSD/audio-shoutcast-2.0.0.29.diff --- audio-shoutcast-2.0.0.29.diff begins here --- diff -ruN ports/audio/shoutcast.orig/Makefile ports/audio/shoutcast/Makefile --- ports/audio/shoutcast.orig/Makefile 2012-01-23 03:25:21.000000000 +1030 +++ ports/audio/shoutcast/Makefile 2012-01-24 20:22:10.000000000 +1030 @@ -6,10 +6,10 @@ # PORTNAME= shoutcast -PORTVERSION= 2.0.b14 +PORTVERSION= 2.0.0.29 CATEGORIES= audio net MASTER_SITES= http://download.nullsoft.com/shoutcast/tools/ -DISTNAME= sc_serv2_bsd_8_x_01_25_2011 +DISTNAME= sc_serv2_bsd_8_x_07_31_2011 MAINTAINER= jarrod@downtools.com.au COMMENT= SHOUTcast Distributed Network Audio Server @@ -27,15 +27,15 @@ SHOUTCASTGROUP= ${PORTNAME} SHOUTCASTDIR= /var/run/${PORTNAME} -PLIST_SUB= SHOUTCASTUSER=${SHOUTCASTUSER} \ +SHOUTCAST_SUB= SHOUTCASTUSER=${SHOUTCASTUSER} \ SHOUTCASTGROUP=${SHOUTCASTGROUP} \ SHOUTCASTDIR=${SHOUTCASTDIR} +PLIST_SUB= ${SHOUTCAST_SUB} + SUB_FILES= pkg-message -SUB_LIST= SHOUTCASTUSER=${SHOUTCASTUSER} \ - SHOUTCASTGROUP=${SHOUTCASTGROUP} \ - SHOUTCASTDIR=${SHOUTCASTDIR} +SUB_LIST= ${SHOUTCAST_SUB} USERS= ${SHOUTCASTUSER} GROUPS= ${SHOUTCASTGROUP} @@ -43,11 +43,10 @@ .include post-patch: - @${REINPLACE_CMD} -e '/^logfile=.*\/logfile.log/d' \ - -e '/sc_serv2 directory/d' \ + @${REINPLACE_CMD} -e '/sc_serv2 directory/d' \ -e 's#=.*/sc_serv.log#=/var/log/sc_serv.log#g' \ -e 's#=.*/sc_w3c.log#=/var/log/sc_w3c.log#g' \ - -e 's#=./control/#=${SHOUTCASTDIR}/#g' ${WRKSRC}/sc_serv_basic.conf + -e 's#=control/#=${SHOUTCASTDIR}/#g' ${WRKSRC}/sc_serv_basic.conf do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sc_serv ${PREFIX}/sbin @@ -64,7 +63,9 @@ ${INSTALL_DATA} ${WRKSRC}/docs/dsp_sc/dsp_sc.txt ${DOCSDIR}/dsp_sc.txt ${INSTALL_DATA} ${WRKSRC}/docs/dsp_sc/dsp_sc_config.txt ${DOCSDIR}/dsp_sc_config.txt ${INSTALL_DATA} ${WRKSRC}/docs/getting_started.txt ${DOCSDIR}/getting_started.txt - ${INSTALL_DATA} ${WRKSRC}/docs/sc2_xml_metadata.txt ${DOCSDIR}/sc2_xml_metadata.txt + ${INSTALL_DATA} ${WRKSRC}/docs/sc_serv2.txt ${DOCSDIR}/sc_serv2.txt + ${INSTALL_DATA} ${WRKSRC}/docs/sc_serv2_authhash.txt ${DOCSDIR}/sc_serv2_authhash.txt + ${INSTALL_DATA} ${WRKSRC}/docs/sc_serv2_xml_responses.txt ${DOCSDIR}/sc_serv2_xml_responses.txt ${INSTALL_DATA} ${WRKSRC}/docs/shoutcast_system_overview.txt ${DOCSDIR}/shoutcast_system_overview.txt .endif diff -ruN ports/audio/shoutcast.orig/distinfo ports/audio/shoutcast/distinfo --- ports/audio/shoutcast.orig/distinfo 2012-01-19 11:53:55.000000000 +1030 +++ ports/audio/shoutcast/distinfo 2012-01-24 19:30:27.000000000 +1030 @@ -1,2 +1,2 @@ -SHA256 (sc_serv2_bsd_8_x_01_25_2011.tar.gz) = ecf72ec571d61c0967c522b14443e126cd82033d79d1f301daa6e3abab640ba9 -SIZE (sc_serv2_bsd_8_x_01_25_2011.tar.gz) = 696256 +SHA256 (sc_serv2_bsd_8_x_07_31_2011.tar.gz) = a4815602ad4abfb5b844667a0faf907bf151bcf0c06651f0756b89f35e35753c +SIZE (sc_serv2_bsd_8_x_07_31_2011.tar.gz) = 820208 diff -ruN ports/audio/shoutcast.orig/files/pkg-message.in ports/audio/shoutcast/files/pkg-message.in --- ports/audio/shoutcast.orig/files/pkg-message.in 2012-01-19 11:53:55.000000000 +1030 +++ ports/audio/shoutcast/files/pkg-message.in 2012-01-24 19:36:39.000000000 +1030 @@ -6,7 +6,7 @@ shoutcast_enable="YES" - Configuration templates are available in %%PREFIX%%/%%ETCDIR%% as + Configuration templates are available in %%ETCDIR%% as *.sample files. A basic installation can be completed by copying sc_serv_basic.conf.sample to sc_serv.conf. diff -ruN ports/audio/shoutcast.orig/files/shoutcast.in ports/audio/shoutcast/files/shoutcast.in --- ports/audio/shoutcast.orig/files/shoutcast.in 2012-01-23 03:25:21.000000000 +1030 +++ ports/audio/shoutcast/files/shoutcast.in 2012-01-24 20:26:25.000000000 +1030 @@ -9,36 +9,39 @@ # Add the following lines to /etc/rc.conf to enable SHOUTcast: # shoutcast_enable (bool): Set to "NO" by default. # Set it to "YES" to enable SHOUTcast. -# shoutcast_configfile (str): Set to "%%PREFIX%%/%%ETCDIR%%/sc_serv.conf" by default. -# shoutcast_user (str): Set to %%SHOUTCASTUSER%% by default -# shoutcast_chdir (str): Set to %%SHOUTCASTDIR%% by default +# shoutcast_configfile (str): Set to "%%ETCDIR%%/sc_serv.conf" by default. +# shoutcast_user (str): Set to "%%SHOUTCASTUSER%%" by default. +# shoutcast_chdir (str): Set to "%%SHOUTCASTDIR%%" by default. +# shoutcast_logfile (str): Set to "/var/log/sc_serv.log" by default. +# shoutcast_w3clog (str): Set to "/var/log/sc_w3c.log" by default. . /etc/rc.subr name=shoutcast rcvar=shoutcast_enable -load_rc_config shoutcast +load_rc_config ${name} : ${shoutcast_enable:="NO"} +: ${shoutcast_configfile:="%%ETCDIR%%/sc_serv.conf"} : ${shoutcast_user:="%%SHOUTCASTUSER%%"} : ${shoutcast_chdir:="%%SHOUTCASTDIR%%"} +: ${shoutcast_logfile:="/var/log/sc_serv.log"} +: ${shoutcast_w3clog:="/var/log/sc_w3c.log"} command="%%PREFIX%%/sbin/sc_serv" -shoutcast_logfile="/var/log/sc_serv.log" -required_dirs="${shoutcast_chdir}" -required_files="${shoutcast_configfile:="%%PREFIX%%/%%ETCDIR%%/sc_serv.conf"}" +required_files="${shoutcast_configfile}" -command_args="${required_files} >/dev/null 2>&1 &" +command_args="${shoutcast_configfile} >/dev/null 2>&1 &" start_precmd="shoutcast_prestart" shoutcast_prestart() { - touch ${shoutcast_logfile} - chown %%SHOUTCASTUSER%%:wheel ${shoutcast_logfile} - chmod 0640 ${shoutcast_logfile} + touch "${shoutcast_logfile}" "${shoutcast_w3clog}" + chown %%SHOUTCASTUSER%%:wheel "${shoutcast_logfile}" "${shoutcast_w3clog}" + chmod 0640 "${shoutcast_logfile}" "${shoutcast_w3clog}" } run_rc_command "$1" diff -ruN ports/audio/shoutcast.orig/pkg-plist ports/audio/shoutcast/pkg-plist --- ports/audio/shoutcast.orig/pkg-plist 2012-01-19 11:53:55.000000000 +1030 +++ ports/audio/shoutcast/pkg-plist 2012-01-24 19:35:18.000000000 +1030 @@ -12,7 +12,9 @@ %%PORTDOCS%%%%DOCSDIR%%/dsp_sc.txt %%PORTDOCS%%%%DOCSDIR%%/dsp_sc_config.txt %%PORTDOCS%%%%DOCSDIR%%/getting_started.txt -%%PORTDOCS%%%%DOCSDIR%%/sc2_xml_metadata.txt +%%PORTDOCS%%%%DOCSDIR%%/sc_serv2.txt +%%PORTDOCS%%%%DOCSDIR%%/sc_serv2_authhash.txt +%%PORTDOCS%%%%DOCSDIR%%/sc_serv2_xml_responses.txt %%PORTDOCS%%%%DOCSDIR%%/shoutcast_system_overview.txt @dirrmtry %%ETCDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% --- audio-shoutcast-2.0.0.29.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: