2 files changed, 29 insertions, 31 deletions

diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index f47e800b247a..684578d13a01 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for:	darkice
-# Date created:			Dec 28, 2001
-# Whom:				ijliao
-#
+# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	darkice
 PORTVERSION=	1.1
@@ -13,7 +8,7 @@ CATEGORIES=	audio net
 MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An IceCast, IceCast2, and ShoutCast live audio streamer
+COMMENT=	IceCast, IceCast2, and ShoutCast live audio streamer
 
 LICENSE=	GPLv3
 
@@ -23,7 +18,6 @@ OPTIONS_MULTI_CODEC=	VORBIS LAME TWOLAME FAAC AACPLUS
 OPTIONS_DEFAULT=	VORBIS
 
 AACPLUS_DESC=	AAC HEv2 and libsamplerate support
-TWOLAME_DESC=	TwoLAME support for MP2
 
 USE_AUTOTOOLS=	aclocal autoconf
 GNU_CONFIGURE=	yes
@@ -41,44 +35,45 @@ MAN5=		darkice.cfg.5
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVORBIS}
+LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=	--with-vorbis-prefix=${LOCALBASE}
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--without-vorbis
 .endif
 
 .if ${PORT_OPTIONS:MLAME}
-LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
+LIB_DEPENDS+=	mp3lame:${PORTSDIR}/audio/lame
 CONFIGURE_ARGS+=	--with-lame-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-lame
 .endif
 
 .if ${PORT_OPTIONS:MTWOLAME}
-LIB_DEPENDS+=	twolame.0:${PORTSDIR}/audio/twolame
+LIB_DEPENDS+=	twolame:${PORTSDIR}/audio/twolame
 CONFIGURE_ARGS+=	--with-twolame-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-twolame
 .endif
 
 .if ${PORT_OPTIONS:MFAAC}
-LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
+LIB_DEPENDS+=	faac:${PORTSDIR}/audio/faac
 CONFIGURE_ARGS+=	--with-faac-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-faac
 .endif
 
 .if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
 CONFIGURE_ARGS+=	--with-jack-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-jack
 .endif
 
 .if ${PORT_OPTIONS:MAACPLUS}
-LIB_DEPENDS+=	aacplus.2:${PORTSDIR}/audio/libaacplus \
-		samplerate.1:${PORTSDIR}/audio/libsamplerate
-CONFIGURE_ARGS+=	--with-aacplus-prefix=${LOCALBASE} --with-samplerate-prefix=${LOCALBASE}
+LIB_DEPENDS+=	aacplus:${PORTSDIR}/audio/libaacplus \
+		samplerate:${PORTSDIR}/audio/libsamplerate
+CONFIGURE_ARGS+=	--with-aacplus-prefix=${LOCALBASE} \
+			--with-samplerate-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-aacplus --without-samplerate
 .endif
@@ -89,13 +84,16 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-O2 -pedantic||g' ${WRKSRC}/src/Makefile.in
 
 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 ${MAN1PREFIX}/man/man1
-	@${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.cfg.5 ${MAN5PREFIX}/man/man5
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.cfg \
+		${PREFIX}/etc/${PORTNAME}.cfg.dist
+	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.cfg.5 ${MAN5PREFIX}/man/man5
 
 post-install:
+	@${ECHO_MSG}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 	@if [ ! -f ${PREFIX}/etc/darkice.cfg ]; then \
 		${CP} -p ${PREFIX}/etc/darkice.cfg.dist ${PREFIX}/etc/darkice.cfg ; \
 	fi
diff --git a/audio/darkice/pkg-descr b/audio/darkice/pkg-descr
index c91e1319d1e2..5b02f87bd042 100644
--- a/audio/darkice/pkg-descr
+++ b/audio/darkice/pkg-descr
@@ -1,20 +1,20 @@
-DarkIce is an IceCast, IceCast2 and ShoutCast live audio streamer. It
+DarkIce is an IceCast, IceCast2, and ShoutCast live audio streamer.  It
 records audio from an audio interface (e.g. sound card), encodes it and
 sends it to a stream server.
 
 DarkIce can encode in the following formats:
 
- mp3 - using the lame library
- mp2 - using the twolame library
- Ogg Vorbis
- AAC - using the faac library
- AAC HEv2 - using libaacplus library 
+  - mp3 (using the lame library)
+  - mp2 (using the twolame library)
+  - Ogg Vorbis
+  - AAC (using the faac library)
+  - AAC HEv2 (using libaacplus library)
 
 DarkIce can send the encoded stream to the following streaming servers:
 
- ShoutCast
- IceCast 1.3.x and 2.x
- Darwin Streaming Server
- archive the encoded audio in files
+  - ShoutCast
+  - IceCast 1.3.x and 2.x
+  - Darwin Streaming Server
+  - Archive the encoded audio in files
 
 WWW: http://darkice.org/