3 files changed, 16 insertions, 18 deletions

diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index a592582e295c..3185178cbf36 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -1,6 +1,6 @@
 # New ports collection makefile for:	libshout
 # Date created:				06 Jun 2000
-# Whom:					zach@pabst.bendnet.com
+# Whom:					Zach Zurflu <zach@pabst.bendnet.com>
 #
 # $FreeBSD$
 #
@@ -14,7 +14,7 @@ MASTER_SITES=	http://downloads.xiph.org/releases/libshout/
 DISTNAME=	libshout-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Routines for connecting and transmitting data to the icecast server
+COMMENT=	Connect and transmit data to an Icecast media streaming server
 
 LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex \
 		theora.0:${PORTSDIR}/multimedia/libtheora \
@@ -27,12 +27,13 @@ USE_GMAKE=	yes
 USE_GNOME+=	pkgconfig
 GNU_CONFIGURE=	yes
 CONFLICTS=	libshout-1.0.7
+DOCSDIR=	${PREFIX}/share/doc/libshout
 
 pre-configure:
-	@ ${REINPLACE_CMD} -e "s|-ffast-math||g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s|-ffast-math||g" ${WRKSRC}/configure
 
 post-configure:
-	@ ${REINPLACE_CMD} -e "s|pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g" \
+	@${REINPLACE_CMD} -e "s|pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g" \
 		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/audio/libshout2/pkg-descr b/audio/libshout2/pkg-descr
index 995445d44374..d5c5dec4cb0f 100644
--- a/audio/libshout2/pkg-descr
+++ b/audio/libshout2/pkg-descr
@@ -1,10 +1,7 @@
-A port of the libshout library. Libshout allows applications to easily
-communicate and broadcast to an Icecast streaming media server. It handles the
-socket connections, metadata communication, and data streaming for the calling 
-application, and lets developers focus on feature sets instead of
-implementation details.
+This is a port of the libshout library.  Libshout allows applications to
+easily communicate and broadcast to an Icecast streaming media server.  It
+handles the socket connections, metadata communication, and data streaming
+for the calling application, and lets developers focus on feature sets
+instead of implementation details.
 
 WWW: http://www.icecast.org/
-
-- Michael Nottebrock
-michaelnottebrock@gmx.net
diff --git a/audio/libshout2/pkg-plist b/audio/libshout2/pkg-plist
index 42db494b62e9..1a1f6e7ffc74 100644
--- a/audio/libshout2/pkg-plist
+++ b/audio/libshout2/pkg-plist
@@ -5,10 +5,10 @@ lib/libshout.so
 lib/libshout.so.5
 libdata/pkgconfig/shout.pc
 share/aclocal/shout.m4
-share/doc/libshout/COPYING
-share/doc/libshout/NEWS
-share/doc/libshout/README
-share/doc/libshout/example.c
-share/doc/libshout/nonblocking.c
-@dirrm share/doc/libshout
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/README
+%%DOCSDIR%%/example.c
+%%DOCSDIR%%/nonblocking.c
+@dirrm %%DOCSDIR%%
 @dirrm include/shout