Upgrade to icecast-2.3.2

5 files changed, 31 insertions, 27 deletions

diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index f4f269e6912..09e1492f9a9 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.44 2008/01/18 05:06:20 tnn Exp $
+# $NetBSD: Makefile,v 1.45 2008/08/10 11:09:01 kim Exp $
 #
 
-DISTNAME=		icecast-2.3.0
-PKGREVISION=		3
+DISTNAME=		icecast-2.3.2
 CATEGORIES=		audio
 MASTER_SITES=		http://downloads.xiph.org/releases/icecast/
 
-MAINTAINER=		pancake@phreaker.net
+MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://www.icecast.org/
 COMMENT=		Live streaming audio server
 
diff --git a/audio/icecast/PLIST b/audio/icecast/PLIST
index 9d25c81ef68..5c27964d647 100644
--- a/audio/icecast/PLIST
+++ b/audio/icecast/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2005/10/12 22:26:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/08/10 11:09:01 kim Exp $
 bin/icecast
 share/doc/icecast/AUTHORS
 share/doc/icecast/COPYING
@@ -22,6 +22,8 @@ share/doc/icecast/index.html
 share/doc/icecast/listener_auth1.jpg
 share/doc/icecast/listener_auth2.jpg
 share/doc/icecast/listener_auth3.jpg
+share/doc/icecast/masterslave.png
+share/doc/icecast/relay.png
 share/examples/icecast/icecast.xml
 share/examples/rc.d/icecast
 share/icecast/admin/listclients.xsl
@@ -47,5 +49,5 @@ share/icecast/web/tunein.png
 @dirrm share/icecast/web
 @dirrm share/icecast/admin
 @dirrm share/icecast
-@dirrm share/doc/icecast
 @dirrm share/examples/icecast
+@dirrm share/doc/icecast
diff --git a/audio/icecast/distinfo b/audio/icecast/distinfo
index 4da6fb6885a..c2147f7ac16 100644
--- a/audio/icecast/distinfo
+++ b/audio/icecast/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.15 2005/10/12 22:26:59 wiz Exp $
+$NetBSD: distinfo,v 1.16 2008/08/10 11:09:01 kim Exp $
 
-SHA1 (icecast-2.3.0.tar.gz) = 9210403649d178591d5f750bc88896352480ccb8
-RMD160 (icecast-2.3.0.tar.gz) = 59ffe3fa53ef20d4a31c2d9ac3b73d2edc064911
-Size (icecast-2.3.0.tar.gz) = 1091422 bytes
-SHA1 (patch-aa) = 907083be5ba10710180a58054358d53dbbce37e4
-SHA1 (patch-ab) = a0a1c457d772446e16caba1eec925ac3c4b760b7
+SHA1 (icecast-2.3.2.tar.gz) = a52b13505548c2eff2c64aab95a42dcafda11227
+RMD160 (icecast-2.3.2.tar.gz) = ec14553cce652fb80823316c9705f4cb6179cc2a
+Size (icecast-2.3.2.tar.gz) = 1152319 bytes
+SHA1 (patch-aa) = 2d85cabe25cf3860e42110eaf3fa5e2b1775e0cf
+SHA1 (patch-ab) = 3b9ecb2caf222f6c08646d856419595f3585f70b
diff --git a/audio/icecast/patches/patch-aa b/audio/icecast/patches/patch-aa
index 87297a1458e..55d3d6d09bf 100644
--- a/audio/icecast/patches/patch-aa
+++ b/audio/icecast/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2005/10/12 22:26:59 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2008/08/10 11:09:01 kim Exp $
 
---- Makefile.in.orig	2005-09-23 16:18:44.000000000 -0500
-+++ Makefile.in
-@@ -128,7 +128,7 @@ install_sh = @install_sh@
- AUTOMAKE_OPTIONS = 1.6 foreign dist-zip
+--- Makefile.in.orig	2008-05-30 02:58:59.000000000 +0300
++++ Makefile.in	2008-06-21 13:05:29.000000000 +0300
+@@ -236,7 +236,7 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign dist-zip
  ACLOCAL_AMFLAGS = -I m4
- 
 -SUBDIRS = src conf debian doc web admin win32 examples
 +SUBDIRS = src doc web admin
- 
  EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 \
      m4/theora.m4 m4/vorbis.m4 m4/speex.m4 \
+     m4/xiph_compiler.m4 m4/xiph_curl.m4 m4/xiph_net.m4 \
diff --git a/audio/icecast/patches/patch-ab b/audio/icecast/patches/patch-ab
index 33fe059258c..a8640e4437d 100644
--- a/audio/icecast/patches/patch-ab
+++ b/audio/icecast/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2005/10/12 22:26:59 wiz Exp $
+$NetBSD: patch-ab,v 1.8 2008/08/10 11:09:01 kim Exp $
 
---- conf/icecast.fixme.orig	2005-09-08 16:03:51.000000000 +0200
-+++ conf/icecast.fixme
-@@ -132,14 +132,15 @@
+--- conf/icecast.fixme.orig	2008-04-04 18:14:10.000000000 +0300
++++ conf/icecast.fixme	2008-06-21 13:12:37.000000000 +0300
+@@ -125,14 +125,14 @@
  
      <paths>
  		<!-- basedir is only used if chroot is enabled -->
@@ -15,20 +15,23 @@ $NetBSD: patch-ab,v 1.7 2005/10/12 22:26:59 wiz Exp $
 -        <webroot>@pkgdatadir@/web</webroot>
 -        <adminroot>@pkgdatadir@/admin</adminroot>
 -        <!-- <pidfile>@pkgdatadir@/icecast.pid</pidfile> -->
-+
-+        <logdir>@LOGDIR@/</logdir>
++        <logdir>@LOGDIR@</logdir>
 +        <webroot>@WEBROOT@</webroot>
 +        <adminroot>@ADMINROOT@</adminroot>
 +        <pidfile>@PIDDIR@/icecast.pid</pidfile>
  
          <!-- Aliases: treat requests for 'source' path as being for 'dest' path
               May be made specific to a port or bound address using the "port"
-@@ -159,15 +160,15 @@
+@@ -152,7 +152,7 @@
          <accesslog>access.log</accesslog>
          <errorlog>error.log</errorlog>
          <!-- <playlistlog>playlist.log</playlistlog> -->
--      	<loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+-      	<loglevel>3</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
 +      	<loglevel>2</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error -->
+       	<logsize>10000</logsize> <!-- Max size of a logfile -->
+         <!-- If logarchive is enabled (1), then when logsize is reached
+              the logfile will be moved to [error|access|playlist].log.DATESTAMP,
+@@ -163,11 +163,11 @@
      </logging>
  
      <security>