From owner-freebsd-ports Fri May 26 9:30:16 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id D8A5137BE5B for ; Fri, 26 May 2000 09:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id JAA18747; Fri, 26 May 2000 09:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from pabst.bendnet.com (pabst.bendnet.com [199.2.205.10]) by hub.freebsd.org (Postfix) with ESMTP id A21DB37B55E for ; Fri, 26 May 2000 09:25:32 -0700 (PDT) (envelope-from zach@pabst.bendnet.com) Received: (from zach@localhost) by pabst.bendnet.com (8.9.3/8.9.3) id JAA58585; Fri, 26 May 2000 09:29:20 GMT (envelope-from zach) Message-Id: <200005260929.JAA58585@pabst.bendnet.com> Date: Fri, 26 May 2000 09:29:20 GMT From: zach@pabst.bendnet.com Reply-To: zach@pabst.bendnet.com To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/18834: Update port: icecast Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 18834 >Category: ports >Synopsis: Update port: icecast >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri May 26 09:30:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Zach Zurflu >Release: FreeBSD 3.4-STABLE i386 >Organization: >Environment: >Description: >How-To-Repeat: >Fix: diff -ruN icecast.orig/Makefile icecast/Makefile --- icecast.orig/Makefile Fri May 26 08:38:26 2000 +++ icecast/Makefile Fri May 26 08:55:58 2000 @@ -1,62 +1,46 @@ -# New ports collection makefile for: icecast -# Date created: 28 Jan 1999 -# Whom: Chip Marshall +# New ports collection makefile for: icecast +# Date created: 25 May 2000 +# Whom: zach@pabst.bendnet.com # -# $FreeBSD: ports/audio/icecast/Makefile,v 1.10 2000/04/08 21:23:41 mharo Exp $ +# $FreeBSD$ # -PORTNAME= icecast -PORTVERSION= 1.3.0 -CATEGORIES= audio net -MASTER_SITES= http://www.icecast.org/releases/ \ - ftp://ftp.eboai.org/pub/icecast/ +PORTNAME= icecast +PORTVERSION= 1.3.5 +CATEGORIES= audio net +MASTER_SITES= http://www.icecast.org/releases/ -MAINTAINER= chip@eboai.org +MAINTAINER= chip@eboai.org -WRKSRC= ${WRKDIR}/icecast-1.3 - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-libwrap - -ALL_TARGET= all mkpasswd - -post-extract: - @( cd ${WRKSRC}; ${RM} -f shout/calibrate shout/stresstest ) - -post-configure: - @${MAKE} WRKSRC=${WRKSRC}/liveice do-configure - -post-build: - @${MAKE} WRKSRC=${WRKSRC}/liveice ALL_TARGET=all do-build +HAS_CONFIGURE= yes +CONFIGURE_ARGS=--with-libwrap do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/icecast ${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/mkpasswd ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/shout/listen ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/shout/shout ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/shout/calibrate ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/shout/stresstest ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/liveice/liveice ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/shout/iceplay ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/icecast - ${INSTALL_MAN} ${WRKSRC}/doc/* ${PREFIX}/share/doc/icecast - ${INSTALL_MAN} ${WRKSRC}/liveice/README.liveice ${PREFIX}/share/doc/icecast - ${INSTALL_MAN} ${WRKSRC}/liveice/README.xingmp3enc ${PREFIX}/share/doc/icecast - ${INSTALL_MAN} ${WRKSRC}/liveice/README_new_mixer.txt ${PREFIX}/share/doc/icecast - ${MKDIR} ${PREFIX}/share/examples/icecast - ${INSTALL_MAN} ${WRKSRC}/icecast.conf ${PREFIX}/share/examples/icecast - ${INSTALL_MAN} ${WRKSRC}/liveice/liveice.cfg ${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 - ${MKDIR} ${PREFIX}/share/examples/icecast/icedir - ${INSTALL_MAN} ${WRKSRC}/icedir/* ${PREFIX}/share/examples/icecast/icedir - ${MKDIR} ${PREFIX}/share/examples/icecast/templates - ${INSTALL_MAN} ${WRKSRC}/templates/* ${PREFIX}/share/examples/icecast/templates - ${INSTALL_MAN} ${WRKSRC}/liveice/frontend.tcl ${PREFIX}/share/examples/icecast - ${INSTALL_MAN} ${WRKSRC}/liveice/liveiceconfigure.tk ${PREFIX}/share/examples/icecast -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/src/icecast ${PREFIX}/sbin + ${MKDIR} ${PREFIX}/etc/icecast + ${MKDIR} ${PREFIX}/etc/icecast/conf + ${INSTALL_MAN} ${WRKSRC}/conf/groups.aut.dist ${PREFIX}/etc/icecast/conf + ${INSTALL_MAN} ${WRKSRC}/conf/icecast.conf.dist ${PREFIX}/etc/icecast/conf + ${INSTALL_MAN} ${WRKSRC}/conf/mounts.aut.dist ${PREFIX}/etc/icecast/conf + ${INSTALL_MAN} ${WRKSRC}/conf/users.aut.dist ${PREFIX}/etc/icecast/conf + ${MKDIR} ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/306.html ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/400.html ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/403.html ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/404.html ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/504.html ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/bodytag.html ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/info.html ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/list_directory.html ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/mountlist.html ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/statistics.html ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/admin_describe.html ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/admin.html ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/alias_add.html ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/manual.html ${PREFIX}/etc/icecast/templates + ${INSTALL_MAN} ${WRKSRC}/templates/alias_del.html ${PREFIX}/etc/icecast/templates + ${MKDIR} ${PREFIX}/share/doc/icecast/ + ${INSTALL_MAN} ${WRKSRC}/doc/manual.html ${PREFIX}/share/doc/icecast/ @${CAT} ${PKGDIR}/MESSAGE .include diff -ruN icecast.orig/files/md5 icecast/files/md5 --- icecast.orig/files/md5 Fri May 26 08:38:24 2000 +++ icecast/files/md5 Thu May 25 14:54:04 2000 @@ -1 +1 @@ -MD5 (icecast-1.3.0.tar.gz) = d322cc60b5f3185a764bf65adca282e4 +MD5 (icecast-1.3.5.tar.gz) = 29f762ab1f48c9b45b2eec4a7922c063 diff -ruN icecast.orig/patches/patch-ad icecast/patches/patch-ad --- icecast.orig/patches/patch-ad Fri May 26 08:38:24 2000 +++ icecast/patches/patch-ad Wed Dec 31 16:00:00 1969 @@ -1,38 +0,0 @@ ---- configure.orig Tue Jul 13 13:19:28 1999 -+++ configure Tue Jan 25 23:44:38 2000 -@@ -1553,14 +1553,14 @@ - - - if test "$THREADLIBS" = no; then -- echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 --echo "configure:1558: checking for pthread_create in -lc_r" >&5 -+ echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6 -+echo "configure:1558: checking for pthread_create in -pthread" >&5 - ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lc_r $LIBS" -+LIBS="-pthread $LIBS" - cat > conftest.$ac_ext <&6 -- THREADLIBS="-lc_r" -+ THREADLIBS="-pthread" -+ # CFLAGS="${CFLAGS} -D_THREAD_SAFE" - else - echo "$ac_t""no" 1>&6 - fi -@@ -2319,6 +2320,7 @@ - cat > conftest.$ac_ext < - #include - int main() { - typedef socklen_t int; diff -ruN icecast.orig/patches/patch-ae icecast/patches/patch-ae --- icecast.orig/patches/patch-ae Fri May 26 08:38:24 2000 +++ icecast/patches/patch-ae Wed Dec 31 16:00:00 1969 @@ -1,11 +0,0 @@ ---- liveice/configure.orig Tue Jan 25 23:46:00 2000 -+++ liveice/configure Tue Jan 25 23:47:22 2000 -@@ -1154,7 +1154,7 @@ - fi - done - --for ac_hdr in sys/soundcard.h -+for ac_hdr in machine/soundcard.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 diff -ruN icecast.orig/patches/patch-af icecast/patches/patch-af --- icecast.orig/patches/patch-af Fri May 26 08:38:24 2000 +++ icecast/patches/patch-af Wed Dec 31 16:00:00 1969 @@ -1,20 +0,0 @@ ---- shout/Makefile.in.orig Fri Feb 18 10:26:53 2000 -+++ shout/Makefile.in Fri Feb 18 10:28:03 2000 -@@ -17,10 +17,16 @@ - - COMPILE_CFLAGS=$(CFLAGS) $(DEFS) - --all: shout listen -+all: shout listen calibrate stresstest - - shout: shout.c rand.o mpeg.o configfile.o - $(CC) $(COMPILE_CFLAGS) -o shout shout.c rand.o mpeg.o configfile.o $(LDFLAGS) -+ -+calibrate: calibrate.c -+ $(CC) $(COMPILE_CFLAGS) -o $@ $@.c -+ -+stresstest: stresstest.c -+ $(CC) $(COMPILE_CFLAGS) -o $@ $@.c - - configfile.o: configfile.c - $(CC) $(COMPILE_CFLAGS) -c -o configfile.o configfile.c diff -ruN icecast.orig/pkg/COMMENT icecast/pkg/COMMENT --- icecast.orig/pkg/COMMENT Fri May 26 08:38:24 2000 +++ icecast/pkg/COMMENT Thu May 25 15:01:55 2000 @@ -1 +1 @@ -A SHOUTcast-compatible streaming MP3 server +Icecast is a streaming mp3 audio server diff -ruN icecast.orig/pkg/DESCR icecast/pkg/DESCR --- icecast.orig/pkg/DESCR Fri May 26 08:38:24 2000 +++ icecast/pkg/DESCR Thu May 25 15:06:03 2000 @@ -1,7 +1,7 @@ -Icecast provides nearly all the functionality of the Shoutcast -server. It will accept encoding streams from either iceplay or WinAmp. -It can also add itself to a directory server such as our own -icecast.linuxpower.org or Nullsoft's yp.shoutcast.com. It does not yet -support redirection of streams from other icecast servers, but soon will. +This is a port for icecast. Icecast is a streaming mp3 audio server. +Icecast provides nearly all the functionality of the Shoutcast server. +It will accept encoding streams from either iceplay or WinAmp. It can +also add itself to a directory server such as our own +icecast.linuxpower.org or Nullsoft's yp.shoutcast.com. WWW: http://www.icecast.org/ diff -ruN icecast.orig/pkg/MESSAGE icecast/pkg/MESSAGE --- icecast.orig/pkg/MESSAGE Fri May 26 08:38:24 2000 +++ icecast/pkg/MESSAGE Thu May 25 17:44:30 2000 @@ -1,11 +1,15 @@ -********************************************************************** +----------------------------------------------------------------- - 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. +Icecast's various components have been installed in the following +directories: -********************************************************************** + - The icecast server: + /usr/local/sbin/icecast + + - Icecast configuration files have been installed in: + /usr/local/etc/icecast/ + + - Icecast documentation is located in: + /usr/local/share/doc/icecast/ + +----------------------------------------------------------------- diff -ruN icecast.orig/pkg/PLIST icecast/pkg/PLIST --- icecast.orig/pkg/PLIST Fri May 26 08:38:24 2000 +++ icecast/pkg/PLIST Thu May 25 17:41:56 2000 @@ -1,53 +1,26 @@ -bin/mkpasswd -bin/listen -bin/shout -bin/calibrate -bin/stresstest -bin/liveice -bin/iceplay sbin/icecast -share/doc/icecast/AUTHORS -share/doc/icecast/BUGS -share/doc/icecast/CHANGES -share/doc/icecast/COPYING -share/doc/icecast/FAQ -share/doc/icecast/INSTALL -share/doc/icecast/README -share/doc/icecast/TESTED -share/doc/icecast/TODO +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/bodytag.html +etc/icecast/templates/info.html +etc/icecast/templates/list_directory.html +etc/icecast/templates/mountlist.html +etc/icecast/templates/statistics.html +etc/icecast/templates/admin_describe.html +etc/icecast/templates/admin.html +etc/icecast/templates/alias_add.html +etc/icecast/templates/manual.html +etc/icecast/templates/alias_del.html share/doc/icecast/manual.html -share/doc/icecast/README.liveice -share/doc/icecast/README.xingmp3enc -share/doc/icecast/README_new_mixer.txt -share/examples/icecast/icecast.conf -share/examples/icecast/liveice.cfg -share/examples/icecast/shoutrc.example -share/examples/icecast/playlist.example -share/examples/icecast/icedir/addsrv -share/examples/icecast/icedir/byserver.php3 -share/examples/icecast/icedir/bystream.php3 -share/examples/icecast/icedir/db_mysql.inc -share/examples/icecast/icedir/example.html -share/examples/icecast/icedir/example.phtml -share/examples/icecast/icedir/functions.phps -share/examples/icecast/icedir/gen-playlist -share/examples/icecast/icedir/gen-playlist.pls -share/examples/icecast/icedir/icedir_cleanup.pl -share/examples/icecast/icedir/remsrv -share/examples/icecast/icedir/servers.sql -share/examples/icecast/icedir/sources.sql -share/examples/icecast/icedir/tchsrv -share/examples/icecast/icedir/touch -share/examples/icecast/icedir/yp.inc -share/examples/icecast/radio.tcl.example -share/examples/icecast/templates/bodytag.html -share/examples/icecast/templates/info.html -share/examples/icecast/templates/list_directory.html -share/examples/icecast/templates/mountlist.html -share/examples/icecast/templates/statistics.html -share/examples/icecast/frontend.tcl -share/examples/icecast/liveiceconfigure.tk + +@dirrm etc/icecast/conf +@dirrm etc/icecast/templates +@dirrm etc/icecast @dirrm share/doc/icecast -@dirrm share/examples/icecast/icedir -@dirrm share/examples/icecast/templates -@dirrm share/examples/icecast >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message