Make this port compile on -current. Fix CFLAGS and libc_r usage.

Reformat MESSAGE so it is more visible.

No response from:	maintainer

4 files changed, 36 insertions, 26 deletions

diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index ac3cd551aac..b0485d7dc03 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -18,14 +18,13 @@ WRKSRC=		${WRKDIR}/icecast-1.3
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libwrap
 
-do-configure:
-	cd ${WRKSRC} && ${SH} ./configure ${CONFIGURE_ARGS}
-	cd ${WRKSRC}/liveice && ${SH} ./configure ${CONFIGURE_ARGS}
-
-do-build:
-	cd ${WRKSRC} && ${MAKE}
-	cd ${WRKSRC} && ${MAKE} mkpasswd
-	cd ${WRKSRC}/liveice && ${MAKE}
+ALL_TARGET=	all mkpasswd
+
+post-configure:
+	@${MAKE} WRKSRC=${WRKSRC}/liveice do-configure
+
+post-build:
+	@${MAKE} WRKSRC=${WRKSRC}/liveice ALL_TARGET=all do-build
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/icecast ${PREFIX}/sbin
diff --git a/audio/icecast/pkg-message b/audio/icecast/pkg-message
index 3d0177c12f6..dff2cbd9185 100644
--- a/audio/icecast/pkg-message
+++ b/audio/icecast/pkg-message
@@ -1,5 +1,11 @@
-FYI, there a several useful programs included in the icecast distribution that
-are not installed as part of this port. These include two ways of sending
-data to the server, a program for listening to the server, and another for
-managing a listing of servers. These are located in the subdirectories
-icedir and iceplay under the working directory.
+**********************************************************************
+
+	FYI, there a several useful programs included in the
+	icecast distribution that are not installed as part
+	of this port. These include two ways of sending data
+	to the server, a program for listening to the server,
+	and another for managing a listing of servers. These
+	are located in the subdirectories icedir and iceplay
+	under the working directory.
+
+**********************************************************************
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index ac3cd551aac..b0485d7dc03 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -18,14 +18,13 @@ WRKSRC=		${WRKDIR}/icecast-1.3
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libwrap
 
-do-configure:
-	cd ${WRKSRC} && ${SH} ./configure ${CONFIGURE_ARGS}
-	cd ${WRKSRC}/liveice && ${SH} ./configure ${CONFIGURE_ARGS}
-
-do-build:
-	cd ${WRKSRC} && ${MAKE}
-	cd ${WRKSRC} && ${MAKE} mkpasswd
-	cd ${WRKSRC}/liveice && ${MAKE}
+ALL_TARGET=	all mkpasswd
+
+post-configure:
+	@${MAKE} WRKSRC=${WRKSRC}/liveice do-configure
+
+post-build:
+	@${MAKE} WRKSRC=${WRKSRC}/liveice ALL_TARGET=all do-build
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/icecast ${PREFIX}/sbin
diff --git a/audio/icecast2/pkg-message b/audio/icecast2/pkg-message
index 3d0177c12f6..dff2cbd9185 100644
--- a/audio/icecast2/pkg-message
+++ b/audio/icecast2/pkg-message
@@ -1,5 +1,11 @@
-FYI, there a several useful programs included in the icecast distribution that
-are not installed as part of this port. These include two ways of sending
-data to the server, a program for listening to the server, and another for
-managing a listing of servers. These are located in the subdirectories
-icedir and iceplay under the working directory.
+**********************************************************************
+
+	FYI, there a several useful programs included in the
+	icecast distribution that are not installed as part
+	of this port. These include two ways of sending data
+	to the server, a program for listening to the server,
+	and another for managing a listing of servers. These
+	are located in the subdirectories icedir and iceplay
+	under the working directory.
+
+**********************************************************************