6 files changed, 32 insertions, 22 deletions

diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index e6b84034cd21..6d197e6630fa 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -3,10 +3,10 @@
 # Date created:		28 Jan 1999
 # Whom:			Chip Marshall <chip@eboai.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/04/02 04:23:49 steve Exp $
 #
 
-DISTNAME=	icecast-1.1.0
+DISTNAME=	icecast-1.1.3
 CATEGORIES=	audio net
 MASTER_SITES=	http://icecast.linuxpower.org/releases/	\
 		ftp://ftp.eboai.org/pub/icecast/
@@ -14,19 +14,22 @@ MASTER_SITES=	http://icecast.linuxpower.org/releases/	\
 MAINTAINER=	chip@eboai.org
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-crypt --with-libwrap
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/icecast ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/iceplay/listen ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/iceplay/shout ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/iceplay/iceplay ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/liveice/liveice ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/shout/listen ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/shout/shout ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/misc/iceplay ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/icecast
 	${INSTALL_MAN} ${WRKSRC}/doc/* ${PREFIX}/share/doc/icecast
 	${MKDIR} ${PREFIX}/share/examples/icecast
-	${INSTALL_MAN} ${WRKSRC}/iceplay/shoutrc.example ${PREFIX}/share/examples/icecast
-	${INSTALL_MAN} ${WRKSRC}/iceplay/playlist.example ${PREFIX}/share/examples/icecast
-	${INSTALL_MAN} ${WRKSRC}/iceplay/radio.tcl.example ${PREFIX}/share/examples/icecast
+	${INSTALL_MAN} ${WRKSRC}/shout/shoutrc.example ${PREFIX}/share/examples/icecast
+	${INSTALL_MAN} ${WRKSRC}/shout/playlist.example ${PREFIX}/share/examples/icecast
+	${INSTALL_MAN} ${WRKSRC}/shout/radio.tcl.example ${PREFIX}/share/examples/icecast
+	${INSTALL_MAN} ${WRKSRC}/liveice/liveice.cfg ${PREFIX}/share/examples/icecast
 	${MKDIR} ${PREFIX}/share/examples/icecast/icedir
 	${INSTALL_MAN} ${WRKSRC}/icedir/* ${PREFIX}/share/examples/icecast/icedir
 .endif
diff --git a/audio/icecast/distinfo b/audio/icecast/distinfo
index d0636c6e867e..e6ee1c153bd6 100644
--- a/audio/icecast/distinfo
+++ b/audio/icecast/distinfo
@@ -1 +1 @@
-MD5 (icecast-1.1.0.tar.gz) = f0bd176b2aea0583716a5ab110472213
+MD5 (icecast-1.1.3.tar.gz) = 986afc6e343b6bce159ff267e6f7120d
diff --git a/audio/icecast/pkg-plist b/audio/icecast/pkg-plist
index f0e2c420aa5a..9e47d1bcbb83 100644
--- a/audio/icecast/pkg-plist
+++ b/audio/icecast/pkg-plist
@@ -1,7 +1,8 @@
-sbin/icecast
 bin/iceplay
-bin/shout
 bin/listen
+bin/liveice
+bin/shout
+sbin/icecast
 share/doc/icecast/AUTHORS
 share/doc/icecast/BUGS
 share/doc/icecast/BUGS.iceplay
@@ -16,6 +17,7 @@ share/doc/icecast/README.iceplay
 share/doc/icecast/README.shout
 share/doc/icecast/TESTED
 share/doc/icecast/TODO.shout
+share/examples/icecast/liveice.cfg
 share/examples/icecast/playlist.example
 share/examples/icecast/radio.tcl.example
 share/examples/icecast/shoutrc.example
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index e6b84034cd21..6d197e6630fa 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -3,10 +3,10 @@
 # Date created:		28 Jan 1999
 # Whom:			Chip Marshall <chip@eboai.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/04/02 04:23:49 steve Exp $
 #
 
-DISTNAME=	icecast-1.1.0
+DISTNAME=	icecast-1.1.3
 CATEGORIES=	audio net
 MASTER_SITES=	http://icecast.linuxpower.org/releases/	\
 		ftp://ftp.eboai.org/pub/icecast/
@@ -14,19 +14,22 @@ MASTER_SITES=	http://icecast.linuxpower.org/releases/	\
 MAINTAINER=	chip@eboai.org
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-crypt --with-libwrap
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/icecast ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/iceplay/listen ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/iceplay/shout ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/iceplay/iceplay ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/liveice/liveice ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/shout/listen ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/shout/shout ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/misc/iceplay ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/icecast
 	${INSTALL_MAN} ${WRKSRC}/doc/* ${PREFIX}/share/doc/icecast
 	${MKDIR} ${PREFIX}/share/examples/icecast
-	${INSTALL_MAN} ${WRKSRC}/iceplay/shoutrc.example ${PREFIX}/share/examples/icecast
-	${INSTALL_MAN} ${WRKSRC}/iceplay/playlist.example ${PREFIX}/share/examples/icecast
-	${INSTALL_MAN} ${WRKSRC}/iceplay/radio.tcl.example ${PREFIX}/share/examples/icecast
+	${INSTALL_MAN} ${WRKSRC}/shout/shoutrc.example ${PREFIX}/share/examples/icecast
+	${INSTALL_MAN} ${WRKSRC}/shout/playlist.example ${PREFIX}/share/examples/icecast
+	${INSTALL_MAN} ${WRKSRC}/shout/radio.tcl.example ${PREFIX}/share/examples/icecast
+	${INSTALL_MAN} ${WRKSRC}/liveice/liveice.cfg ${PREFIX}/share/examples/icecast
 	${MKDIR} ${PREFIX}/share/examples/icecast/icedir
 	${INSTALL_MAN} ${WRKSRC}/icedir/* ${PREFIX}/share/examples/icecast/icedir
 .endif
diff --git a/audio/icecast2/distinfo b/audio/icecast2/distinfo
index d0636c6e867e..e6ee1c153bd6 100644
--- a/audio/icecast2/distinfo
+++ b/audio/icecast2/distinfo
@@ -1 +1 @@
-MD5 (icecast-1.1.0.tar.gz) = f0bd176b2aea0583716a5ab110472213
+MD5 (icecast-1.1.3.tar.gz) = 986afc6e343b6bce159ff267e6f7120d
diff --git a/audio/icecast2/pkg-plist b/audio/icecast2/pkg-plist
index f0e2c420aa5a..9e47d1bcbb83 100644
--- a/audio/icecast2/pkg-plist
+++ b/audio/icecast2/pkg-plist
@@ -1,7 +1,8 @@
-sbin/icecast
 bin/iceplay
-bin/shout
 bin/listen
+bin/liveice
+bin/shout
+sbin/icecast
 share/doc/icecast/AUTHORS
 share/doc/icecast/BUGS
 share/doc/icecast/BUGS.iceplay
@@ -16,6 +17,7 @@ share/doc/icecast/README.iceplay
 share/doc/icecast/README.shout
 share/doc/icecast/TESTED
 share/doc/icecast/TODO.shout
+share/examples/icecast/liveice.cfg
 share/examples/icecast/playlist.example
 share/examples/icecast/radio.tcl.example
 share/examples/icecast/shoutrc.example