- Clean up Makefile header and port description

- Handle DOCSDIR and EXAMPLESDIR in a better way
- Improve on COMMENT
- Respect CFLAGS

3 files changed, 40 insertions, 39 deletions

diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile
index 1bafd0a6adcd..7b1e39fbeaa2 100644
--- a/audio/libshout/Makefile
+++ b/audio/libshout/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$
 #
@@ -11,13 +11,17 @@ CATEGORIES=	audio net
 #MASTER_SITES=	http://downloads.xiph.org/releases/libshout/
 
 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
 
 CONFLICTS=	libshout2-*
 
 USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}-${PORTVERSION}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-O20||' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/audio/libshout/pkg-descr b/audio/libshout/pkg-descr
index 101adf32c351..d5c5dec4cb0f 100644
--- a/audio/libshout/pkg-descr
+++ b/audio/libshout/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/
-
-- Zach
-zach@pabst.bendnet.com
diff --git a/audio/libshout/pkg-plist b/audio/libshout/pkg-plist
index 79fb2776eac0..46752a8d7b77 100644
--- a/audio/libshout/pkg-plist
+++ b/audio/libshout/pkg-plist
@@ -3,32 +3,32 @@ lib/libshout.so.2
 lib/libshout.so
 lib/libshout.la
 lib/libshout.a
-%%DOCSDIR%%-%%PORTVERSION%%/index.html
-%%DOCSDIR%%-%%PORTVERSION%%/overview.html
-%%DOCSDIR%%-%%PORTVERSION%%/initialization.html
-%%DOCSDIR%%-%%PORTVERSION%%/connection.html
-%%DOCSDIR%%-%%PORTVERSION%%/datastreaming.html
-%%DOCSDIR%%-%%PORTVERSION%%/metadata.html
-%%DOCSDIR%%-%%PORTVERSION%%/datastructures.html
-%%DOCSDIR%%-%%PORTVERSION%%/shout_conn_t.html
-%%DOCSDIR%%-%%PORTVERSION%%/shout_connect.html
-%%DOCSDIR%%-%%PORTVERSION%%/shout_disconnect.html
-%%DOCSDIR%%-%%PORTVERSION%%/shout_sleep.html
-%%DOCSDIR%%-%%PORTVERSION%%/shout_init_connection.html
-%%DOCSDIR%%-%%PORTVERSION%%/shout_send_data.html
-%%DOCSDIR%%-%%PORTVERSION%%/shout_update_metadata.html
-%%DOCSDIR%%-%%PORTVERSION%%/style.css
-%%DOCSDIR%%-%%PORTVERSION%%/example.html
-%%DOCSDIR%%-%%PORTVERSION%%/example_c.html
-%%DOCSDIR%%-%%PORTVERSION%%/reference.html
-%%DOCSDIR%%-%%PORTVERSION%%/errorhandling.html
-%%DOCSDIR%%-%%PORTVERSION%%/shout_strerror.html
-%%DOCSDIR%%-%%PORTVERSION%%/README
-%%DOCSDIR%%-%%PORTVERSION%%/AUTHORS
-%%DOCSDIR%%-%%PORTVERSION%%/COPYING
-%%DOCSDIR%%-%%PORTVERSION%%/CHANGES
-share/examples/libshout-%%PORTVERSION%%/Makefile
-share/examples/libshout-%%PORTVERSION%%/example.c
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/overview.html
+%%DOCSDIR%%/initialization.html
+%%DOCSDIR%%/connection.html
+%%DOCSDIR%%/datastreaming.html
+%%DOCSDIR%%/metadata.html
+%%DOCSDIR%%/datastructures.html
+%%DOCSDIR%%/shout_conn_t.html
+%%DOCSDIR%%/shout_connect.html
+%%DOCSDIR%%/shout_disconnect.html
+%%DOCSDIR%%/shout_sleep.html
+%%DOCSDIR%%/shout_init_connection.html
+%%DOCSDIR%%/shout_send_data.html
+%%DOCSDIR%%/shout_update_metadata.html
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/example.html
+%%DOCSDIR%%/example_c.html
+%%DOCSDIR%%/reference.html
+%%DOCSDIR%%/errorhandling.html
+%%DOCSDIR%%/shout_strerror.html
+%%DOCSDIR%%/README
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/CHANGES
+%%EXAMPLESDIR%%/Makefile
+%%EXAMPLESDIR%%/example.c
+@dirrm %%EXAMPLESDIR%%
+@dirrm %%DOCSDIR%%
 @dirrm include/shout
-@dirrm %%DOCSDIR%%-%%PORTVERSION%%
-@dirrm share/examples/libshout-%%PORTVERSION%%