10 files changed, 46 insertions, 144 deletions

diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index 704cb8a95e69..18a3b7e9a384 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -5,40 +5,51 @@
 # $FreeBSD$
 #
 
-PORTNAME=	icecast
-PORTVERSION=	1.3.12
-PORTREVISION=	1
+PORTNAME=	icecast2
+PORTVERSION=	20021112
 CATEGORIES=	audio net
-MASTER_SITES=	http://www.icecast.org/releases/
+MASTER_SITES=	http://tigress.com/lofi/\
+		http://lofi.dyndns.org/
+DISTNAME=	icecast-devel-${PORTVERSION}
 
-MAINTAINER=	zach@pabst.bendnet.com
+MAINTAINER=	michaelnottebrock@gmx.net
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libwrap
+LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg \
+		shout.3:${PORTSDIR}/audio/libshout2 \
+		vorbis.2:${PORTSDIR}/audio/libvorbis
+
+AUTOMAKE_ARGS=	--add-missing
+AUTOMAKE_ENV=	CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-oggtest --disable-vorbistest --disable-shouttest
+CONFIGURE_ENV=	CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+USE_AUTOMAKE=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|<history.h>|<readline/history.h>|' \
-		-e 's|<readline.h>|<readline/readline.h>|' \
-		${WRKSRC}/src/admin.c
-	@${REINPLACE_CMD} -e 's|#undef HAVE_HISTORY_H|#undef HAVE_READLINE_HISTORY_H|g' \
-		${WRKSRC}/config.h.in
+WRKSRC=		${WRKDIR}/icecast
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/icecast ${PREFIX}/sbin
-	${MKDIR} ${PREFIX}/etc/icecast/conf
-	${MKDIR} ${PREFIX}/etc/icecast/templates
-.for CONF in groups.aut.dist icecast.conf.dist mounts.aut.dist users.aut.dist
-	${INSTALL_DATA} ${WRKSRC}/conf/${CONF} ${PREFIX}/etc/icecast/conf
-.endfor
-.for TEMPL in 306.html 400.html 403.html 404.html 504.html bodytag.html info.html \
-	      list_directory.html mountlist.html statistics.html admin_describe.html \
-	      admin.html alias_add.html manual.html alias_del.html header.html \
-	      footer.html admin_change.html
-	${INSTALL_DATA} ${WRKSRC}/templates/${TEMPL} ${PREFIX}/etc/icecast/templates
-.endfor
-	${MKDIR} ${PREFIX}/share/doc/icecast/
-	${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${PREFIX}/share/doc/icecast/
-	@${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g'
+post-configure:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/src/Makefile
+	@${REINPLACE_CMD} -e 's|-O20|${CFLAGS}|' ${WRKSRC}/conf/Makefile \
+						${WRKSRC}/doc/Makefile \
+						${WRKSRC}/src/avl/Makefile \
+						${WRKSRC}/src/log/Makefile \
+						${WRKSRC}/src/net/Makefile \
+						${WRKSRC}/src/httpp/Makefile \
+						${WRKSRC}/src/thread/Makefile \
+						${WRKSRC}/src/timing/Makefile \
+						${WRKSRC}/src/Makefile \
+						${WRKSRC}/web/Makefile \
+						${WRKSRC}/win32/res/Makefile \
+						${WRKSRC}/win32/Makefile \
+						${WRKSRC}/Makefile
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/conf/icecast.xml ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/audio/icecast2/distinfo b/audio/icecast2/distinfo
index ccc9fcffd73a..c17bfe450804 100644
--- a/audio/icecast2/distinfo
+++ b/audio/icecast2/distinfo
@@ -1 +1 @@
-MD5 (icecast-1.3.12.tar.gz) = 69ba36d30722884ea538b70628f1de80
+MD5 (icecast-devel-20021112.tar.gz) = b0098cd736a7605b93f230b33ca32d0c
diff --git a/audio/icecast2/files/patch-configure b/audio/icecast2/files/patch-configure
deleted file mode 100644
index 99b42e7b4e83..000000000000
--- a/audio/icecast2/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Wed Apr 10 18:50:20 2002
-+++ configure	Tue Aug  6 05:36:56 2002
-@@ -2113,7 +2113,7 @@
-   fi
- fi
- 
--opt_readline="no"
-+opt_readline="unset"
- 
- if test "$opt_readline" = "unset"; then
- 	if test -f "$withval/include/readline/readline.h"; then
-@@ -3118,7 +3118,7 @@
- 
- fi
- 
--for ac_hdr in fcntl.h sys/time.h unistd.h sys/soundcard.h machine/soundcard.h pthread.h assert.h sys/resource.h math.h signal.h sys/signal.h mcheck.h malloc.h history.h Python.h
-+for ac_hdr in fcntl.h sys/time.h unistd.h sys/soundcard.h machine/soundcard.h pthread.h assert.h sys/resource.h math.h signal.h sys/signal.h mcheck.h malloc.h readline/history.h Python.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/audio/icecast2/files/patch-src::connection.c b/audio/icecast2/files/patch-src::connection.c
deleted file mode 100644
index 9fb9b0f7a136..000000000000
--- a/audio/icecast2/files/patch-src::connection.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/connection.c.orig	Mon Aug  5 20:39:21 2002
-+++ src/connection.c	Mon Aug  5 20:40:08 2002
-@@ -18,6 +18,7 @@
-  *
-  */
- 
-+#include <sys/types.h>
- #ifdef HAVE_CONFIG_H
- #ifdef _WIN32
- #include <win32config.h>
-@@ -42,7 +43,6 @@
- #include <unistd.h>
- #endif
- 
--#include <sys/types.h>
- #include <ctype.h>
- #include <errno.h>
- #include <time.h>
diff --git a/audio/icecast2/files/patch-src::sock.c b/audio/icecast2/files/patch-src::sock.c
deleted file mode 100644
index 67c50425f9cb..000000000000
--- a/audio/icecast2/files/patch-src::sock.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/sock.c.orig	Mon Aug  5 20:57:27 2002
-+++ src/sock.c	Mon Aug  5 20:57:48 2002
-@@ -19,6 +19,7 @@
-  *
-  */
- 
-+#include <sys/types.h>
- #ifdef HAVE_CONFIG_H
- #ifdef _WIN32
- #include <win32config.h>
-@@ -35,7 +36,6 @@
- 
- #include "definitions.h"
- 
--#include <sys/types.h>
- #include <ctype.h>
- 
- #ifdef HAVE_UNISTD_H
diff --git a/audio/icecast2/files/patch-src::threads.c b/audio/icecast2/files/patch-src::threads.c
deleted file mode 100644
index 9f97408f4cb3..000000000000
--- a/audio/icecast2/files/patch-src::threads.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/threads.c.old	Mon Jul 31 14:52:19 2000
-+++ src/threads.c	Mon Nov 18 12:19:41 2002
-@@ -39,7 +39,10 @@
- #include <errno.h>
- #include <sys/types.h>
- #include <time.h>
-+
-+#define __XSI_VISIBLE 1
- #include <signal.h>
-+#undef __XSI_VISIBLE
- 
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
diff --git a/audio/icecast2/pkg-comment b/audio/icecast2/pkg-comment
index 627383078592..394b453accae 100644
--- a/audio/icecast2/pkg-comment
+++ b/audio/icecast2/pkg-comment
@@ -1 +1 @@
-A streaming mp3 audio server
+A streaming mp3/ogg-vorbis audio server
diff --git a/audio/icecast2/pkg-descr b/audio/icecast2/pkg-descr
index c683f3434b65..2ba0e61729d2 100644
--- a/audio/icecast2/pkg-descr
+++ b/audio/icecast2/pkg-descr
@@ -1,4 +1,4 @@
-Icecast is a streaming mp3 audio server.
+Icecast is a streaming mp3/ogg-vorbis audio server.
 
 Icecast provides nearly all the functionality of the Shoutcast server.
 It will accept encoding streams from encoders like winamp, shout and ices.
diff --git a/audio/icecast2/pkg-message b/audio/icecast2/pkg-message
deleted file mode 100644
index 34690c5d02ae..000000000000
--- a/audio/icecast2/pkg-message
+++ /dev/null
@@ -1,15 +0,0 @@
------------------------------------------------------------------
-
-Icecast's various components have been installed in the following
-directories:
-
-  - The icecast server:
-    %%PREFIX%%/sbin/icecast
-
-  - Icecast configuration files have been installed in:
-    %%PREFIX%%/etc/icecast/
-
-  - Icecast documentation is located in:
-    %%PREFIX%%/share/doc/icecast/
-
------------------------------------------------------------------
diff --git a/audio/icecast2/pkg-plist b/audio/icecast2/pkg-plist
index 5ed338f1a9f0..e9e270b92c4c 100644
--- a/audio/icecast2/pkg-plist
+++ b/audio/icecast2/pkg-plist
@@ -1,28 +1,3 @@
-etc/icecast/conf/groups.aut.dist
-etc/icecast/conf/icecast.conf.dist
-etc/icecast/conf/mounts.aut.dist
-etc/icecast/conf/users.aut.dist
-etc/icecast/templates/306.html
-etc/icecast/templates/400.html
-etc/icecast/templates/403.html
-etc/icecast/templates/404.html
-etc/icecast/templates/504.html
-etc/icecast/templates/admin.html
-etc/icecast/templates/admin_change.html
-etc/icecast/templates/admin_describe.html
-etc/icecast/templates/alias_add.html
-etc/icecast/templates/alias_del.html
-etc/icecast/templates/bodytag.html
-etc/icecast/templates/footer.html
-etc/icecast/templates/header.html
-etc/icecast/templates/info.html
-etc/icecast/templates/list_directory.html
-etc/icecast/templates/manual.html
-etc/icecast/templates/mountlist.html
-etc/icecast/templates/statistics.html
-sbin/icecast
-share/doc/icecast/manual.html
-@dirrm etc/icecast/conf
-@dirrm etc/icecast/templates
-@dirrm etc/icecast
-@dirrm share/doc/icecast
+bin/icecast
+%%PORTDOCS%%share/doc/icecast2/icecast.xml
+%%PORTDOCS%%@dirrm share/doc/icecast2