ports/145713: [UPDATE] audio/darkice: update to 0.20.1

[Takefu]

>Number:         145713
>Category:       ports
>Synopsis:       [UPDATE] audio/darkice: update to 0.20.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 15 07:00:13 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Takefu
>Release:        
>Organization:
FOX Amateur Radio Club
>Environment:
>Description:
update to 0.20 -> 0.20.1
Use new USE_RC_SUBR format
Fix config file handling

Added file(s):
- files/darkice.in
- files/pkg-message.in

>How-To-Repeat:
>Fix:

--- darkice-0.20.1.diff begins here ---
diff -rubN darkice/Makefile /usr/ports/audio/darkice/Makefile
--- darkice/Makefile	2010-04-15 15:00:54.000000000 +0900
+++ /usr/ports/audio/darkice/Makefile	2009-11-12 19:52:34.000000000 +0900
@@ -1,3 +1,4 @@
+# ex:ts=8
 # New ports collection makefile for:	darkice
 # Date created:			Dec 28, 2001
 # Whom:				ijliao
@@ -7,10 +8,8 @@

 PORTNAME=	darkice
 PORTVERSION=	0.20
-PORTREVISION=	1
 CATEGORIES=	audio net
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-DISTNAME=	${PORTNAME}-${PORTVERSION}.1

 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	An IceCast, IceCast2 and ShoutCast live audio streamer
@@ -27,12 +26,10 @@
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \
 		ac_cv_prog_acx_pthread_config=no
 CONFIGURE_ARGS=	--without-alsa --without-aacplus
-SUB_FILES=	pkg-message
-USE_RC_SUBR=	${PORTNAME}

 MAN1=		darkice.1
 MAN5=		darkice.cfg.5
-PLIST_FILES=	bin/darkice etc/darkice.cfg.dist
+PLIST_FILES=	bin/darkice etc/darkice.cfg

 .include <bsd.port.pre.mk>

@@ -75,11 +72,4 @@
 	@${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure.in
 	@${REINPLACE_CMD} -e 's|-O2 -pedantic||g' ${WRKSRC}/src/Makefile.am

-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.cfg ${PREFIX}/etc/${PORTNAME}.cfg.dist
-	@${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${MANPREFIX}/man/man1
-	@${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.cfg.5 ${MANPREFIX}/man/man5
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>
diff -rubN darkice/distinfo /usr/ports/audio/darkice/distinfo
--- darkice/distinfo	2010-04-15 14:07:46.000000000 +0900
+++ /usr/ports/audio/darkice/distinfo	2009-11-12 19:52:34.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (darkice-0.20.1.tar.gz) = cf4b8f81b9e4a92a8cd57d15fcbb4969
-SHA256 (darkice-0.20.1.tar.gz) = 0f166e1d315982e8a9e702d5a63f26810794484b235835a0e44b1c452cdbc4bb
-SIZE (darkice-0.20.1.tar.gz) = 309319
+MD5 (darkice-0.20.tar.gz) = bcc41ac68a5bf64b12ed8c82f183f767
+SHA256 (darkice-0.20.tar.gz) = 791acb54ce0ddf413bc38d54df4800e5d0d4f843c1c0de9b291f74ce7d3528dd
+SIZE (darkice-0.20.tar.gz) = 311239
diff -rubN darkice/files/darkice.in /usr/ports/audio/darkice/files/darkice.in
--- darkice/files/darkice.in	2010-04-15 15:09:19.000000000 +0900
+++ /usr/ports/audio/darkice/files/darkice.in	1970-01-01 09:00:00.000000000 +0900
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: darkice
-# REQUIRE: DAEMON
-# BEFORE:  LOGIN
-# KEYWORD: SHUTDOWN
-
-. "/etc/rc.subr"
-
-name="darkice"
-rcvar=`set_rcvar`
-
-command="%%PREFIX%%/bin/$name"
-command_args="& 1>/dev/null"
-required_files="%%ETCDIR%%.cfg"
-
-# read configuration and set defaults
-load_rc_config "$name"
-: ${darkice_enable="NO"}
-: ${darkice_flags="-c ${required_files}"}
-
-run_rc_command "$1"
diff -rubN darkice/files/pkg-message.in /usr/ports/audio/darkice/files/pkg-message.in
--- darkice/files/pkg-message.in	2010-04-15 15:14:44.000000000 +0900
+++ /usr/ports/audio/darkice/files/pkg-message.in	1970-01-01 09:00:00.000000000 +0900
@@ -1,19 +0,0 @@
-********************************************************************
-Unless this file already existed, a sample configuration file
-has been placed in %%ETCDIR%%.cfg.
-
-Please edit it according to your needs.
-
-********************************************************************
-
-The Munin client will *not* be started automatically. To allow it
-to start, put this line in /etc/rc.conf:
-
-darkice_enable="YES"
-
-Then, it will be started on the next boot. If this line is already
-present, the client will be started now.  Otherwise, edit
-/etc/rc.conf and execute this command:
-
-    %%ETCDIR%%/rc.d/darkice start
-********************************************************************
--- darkice-0.20.1.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: