Update to 2.3.0

4 files changed, 13 insertions, 19 deletions

diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index 619cfc1fdca5..024f9114b478 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	icecast2
-PORTVERSION=	2.2.0
-PORTREVISION=	3
+PORTVERSION=	2.3.0
 PORTEPOCH=	1
 CATEGORIES=	audio net ipv6
 MASTER_SITES=	http://svn.xiph.org/releases/icecast/
@@ -19,6 +18,7 @@ COMMENT=	A streaming mp3/ogg-vorbis audio server
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		shout.4:${PORTSDIR}/audio/libshout2 \
 		theora.1:${PORTSDIR}/multimedia/libtheora \
+		speex.3:${PORTSDIR}/audio/speex \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		xslt.2:${PORTSDIR}/textproc/libxslt
 
@@ -27,7 +27,7 @@ USE_LIBTOOL_VER=15
 USE_RC_SUBR=	icecast2.sh
 SUB_FILES+=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
-CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE}
+CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE} CFLAGS=-I${LOCALBASE}/include
 
 WRKSRC=		${WRKDIR}/icecast-${PORTVERSION}
 
diff --git a/audio/icecast2/distinfo b/audio/icecast2/distinfo
index cf88c91e6cef..0ec6e4a08b6a 100644
--- a/audio/icecast2/distinfo
+++ b/audio/icecast2/distinfo
@@ -1,2 +1,2 @@
-MD5 (icecast-2.2.0.tar.gz) = 7958347af55651384298828175e32dcf
-SIZE (icecast-2.2.0.tar.gz) = 702418
+MD5 (icecast-2.3.0.tar.gz) = 35256fbc4a93571662af2ed18fbbfcc5
+SIZE (icecast-2.3.0.tar.gz) = 1091422
diff --git a/audio/icecast2/pkg-message b/audio/icecast2/pkg-message
deleted file mode 100644
index ec84301aade8..000000000000
--- a/audio/icecast2/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
-To start icecast at system boot add:
-
-icecast_enable="YES"
-
-to /etc/rc.conf. See the icecast -h command for optional additional
-flags. To specify a config file for example add:
-
-icecast_flags="-c /usr/local/etc/icecast.xml"
-
-Customize /usr/local/etc/icecast.xml for your environment.  In
-particular if you use chroot in the config file ensure the pid
-directive in icecast.xml matches the setting in
-/usr/local/etc/rc.d/icecast.sh.
-
diff --git a/audio/icecast2/pkg-plist b/audio/icecast2/pkg-plist
index 7fd31b8a28bf..cfa8a63a0fd7 100644
--- a/audio/icecast2/pkg-plist
+++ b/audio/icecast2/pkg-plist
@@ -8,6 +8,7 @@ share/doc/icecast/README
 share/doc/icecast/TODO
 share/doc/icecast/icecast2_admin.html
 share/doc/icecast/icecast2_basicsetup.html
+share/doc/icecast/icecast2_changes.html
 share/doc/icecast/icecast2_config_file.html
 share/doc/icecast/icecast2_faq.html
 share/doc/icecast/icecast2_glossary.html
@@ -18,6 +19,9 @@ share/doc/icecast/icecast2_stats.html
 share/doc/icecast/icecast2_win32.html
 share/doc/icecast/icecast2_yp.html
 share/doc/icecast/index.html
+share/doc/icecast/listener_auth1.jpg
+share/doc/icecast/listener_auth2.jpg
+share/doc/icecast/listener_auth3.jpg
 share/icecast/admin/listclients.xsl
 share/icecast/admin/listmounts.xsl
 share/icecast/admin/manageauth.xsl
@@ -28,6 +32,7 @@ share/icecast/admin/updatemetadata.xsl
 share/icecast/doc/icecast.xml.dist
 share/icecast/doc/icecast_minimal.xml.dist
 share/icecast/doc/icecast_shoutcast_compat.xml.dist
+share/icecast/doc/icecast_urlauth.xml.dist
 share/icecast/web/auth.xsl
 share/icecast/web/corner_bottomleft.jpg
 share/icecast/web/corner_bottomright.jpg
@@ -35,9 +40,12 @@ share/icecast/web/corner_topleft.jpg
 share/icecast/web/corner_topright.jpg
 share/icecast/web/icecast.png
 share/icecast/web/key.gif
+share/icecast/web/key.png
+share/icecast/web/server_version.xsl
 share/icecast/web/status.xsl
 share/icecast/web/status2.xsl
 share/icecast/web/style.css
+share/icecast/web/tunein.png
 @dirrm share/icecast/web
 @dirrm share/icecast/doc
 @dirrm share/icecast/admin