Fixed ebuild so that it installs files in an FHS compliant manner.

Also adjust icecast.conf.dist so that by default it is pointing to
the proper static, templates, and logging directories.

4 files changed, 134 insertions, 2 deletions

diff --git a/net-misc/icecast/ChangeLog b/net-misc/icecast/ChangeLog
index a3ceb68fa8d8..552e99400c49 100644
--- a/net-misc/icecast/ChangeLog
+++ b/net-misc/icecast/ChangeLog
@@ -1,10 +1,20 @@
 # ChangeLog for net-misc/icecast
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.4 2002/07/07 08:12:08 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.5 2002/07/24 00:09:55 raker Exp $
+
+*icecast-1.3.12-r1 (23 Jul 2002)
+
+  23 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  icecast-1.3.12-r1.ebuild, files/digest-icecast-1.3.12-r1,
+  files/variables.diff :
+
+  Fixed ebuild so that it installs files in an FHS compliant manner.
+  Also adjust icecast.conf.dist so that by default it is pointing to
+  the proper static, templates, and logging directories.
 
 *icecast-1.3.12 (25 Apr 2002)
 
-  07 Jul 2002: phoen][x <phoenix@gentoo.org> icecast-1.3.12.ebuild :
+  07 Jul 2002; phoen][x <phoenix@gentoo.org> icecast-1.3.12.ebuild :
   Added KEYWORDS, LICENSE, SLOT.
 
   25 Apr 2002: M.Jones <ashmodai@gentoo.org> icecast-1.3.12.ebuild :
diff --git a/net-misc/icecast/files/digest-icecast-1.3.12-r1 b/net-misc/icecast/files/digest-icecast-1.3.12-r1
new file mode 100644
index 000000000000..12bd2d747ed3
--- /dev/null
+++ b/net-misc/icecast/files/digest-icecast-1.3.12-r1
@@ -0,0 +1 @@
+MD5 69ba36d30722884ea538b70628f1de80 icecast-1.3.12.tar.gz 269822
diff --git a/net-misc/icecast/files/variables.diff b/net-misc/icecast/files/variables.diff
new file mode 100644
index 000000000000..f9d99e3cdb6c
--- /dev/null
+++ b/net-misc/icecast/files/variables.diff
@@ -0,0 +1,62 @@
+diff -urN icecast-1.3.12/Makefile.in icecast-1.3.12-modified/Makefile.in
+--- icecast-1.3.12/Makefile.in	Wed Apr 10 17:51:24 2002
++++ icecast-1.3.12-modified/Makefile.in	Tue Jul 23 18:16:26 2002
+@@ -59,17 +59,17 @@
+ POST_UNINSTALL = :
+ CC = @CC@
+ CRYPTLIB = @CRYPTLIB@
+-ICECAST_BINDIR = @ICECAST_BINDIR@
+-ICECAST_DOCDIR = @ICECAST_DOCDIR@
+-ICECAST_ETCDIR = @ICECAST_ETCDIR@
+-ICECAST_ETCDIR_INST = @ICECAST_ETCDIR_INST@
+-ICECAST_LOGDIR = @ICECAST_LOGDIR@
+-ICECAST_LOGDIR_INST = @ICECAST_LOGDIR_INST@
+-ICECAST_SBINDIR = @ICECAST_SBINDIR@
+-ICECAST_STATICDIR = @ICECAST_STATICDIR@
+-ICECAST_STATICDIR_INST = @ICECAST_STATICDIR_INST@
+-ICECAST_TEMPLATEDIR = @ICECAST_TEMPLATEDIR@
+-ICECAST_TEMPLATEDIR_INST = @ICECAST_TEMPLATEDIR_INST@
++ICECAST_BINDIR = /usr/bin
++ICECAST_DOCDIR = /usr/share/doc/${P}
++ICECAST_ETCDIR = /etc/icecast
++ICECAST_ETCDIR_INST = /etc/icecast
++ICECAST_LOGDIR = /var/log/icecast
++ICECAST_LOGDIR_INST = /var/log/icecast
++ICECAST_SBINDIR = /usr/sbin
++ICECAST_STATICDIR = /usr/share/icecast/static
++ICECAST_STATICDIR_INST = /usr/share/icecast/static
++ICECAST_TEMPLATEDIR = /usr/share/icecast/templates
++ICECAST_TEMPLATEDIR_INST = /usr/share/icecast/templates
+ MAINT = @MAINT@
+ MAKEINFO = @MAKEINFO@
+ PACKAGE = @PACKAGE@
+diff -urN icecast-1.3.12/conf/icecast.conf.dist.in icecast-1.3.12-modified/conf/icecast.conf.dist.in
+--- icecast-1.3.12/conf/icecast.conf.dist.in	Fri Dec 10 22:11:02 1999
++++ icecast-1.3.12-modified/conf/icecast.conf.dist.in	Tue Jul 23 18:31:02 2002
+@@ -210,7 +210,7 @@
+ ######################
+ 
+ #staticdir c:\windows\desktop
+-staticdir @ICECAST_STATICDIR_INST@
++staticdir /usr/share/icecast/static
+ 
+ ############################# Templates ######################################
+ # the icecast server uses templtes to format output for list.cgi and
+@@ -218,7 +218,7 @@
+ # please use absolute paths if possible
+ #############################
+ 
+-templatedir @ICECAST_TEMPLATEDIR_INST@
++templatedir /usr/share/icecast/templates
+ 
+ ############################# Statistics ######################################
+ # The icecast server dumps statistics to a file on a regular basis.
+@@ -228,7 +228,7 @@
+ # X > 0 means dump stats every X seconds to the file specified by stats_log
+ #############################
+ 
+-logdir @ICECAST_LOGDIR_INST@
++logdir /var/log/icecast
+ stats_log stats.log
+ statshtml_log stats.html
+ stats_time 60
diff --git a/net-misc/icecast/icecast-1.3.12-r1.ebuild b/net-misc/icecast/icecast-1.3.12-r1.ebuild
new file mode 100644
index 000000000000..15a3b04e44df
--- /dev/null
+++ b/net-misc/icecast/icecast-1.3.12-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Icecast is an Internet based broadcasting system based on the Mpeg Layer III streaming technology."
+SRC_URI="http://www.icecast.org/releases/${P}.tar.gz"
+HOMEPAGE="http://www.icecast.org"
+KEYWORDS="x86 -ppc -sparc -sparc64"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/variables.diff
+
+}
+
+src_compile() {
+
+	local myconf
+
+	use crypt && myconf="--with-crypt" || myconf="--without-crypt"	
+	
+	./configure 	--with-libwrap              \
+			${myconf}                   \
+			--prefix=/usr               \
+			--sysconfdir=/etc/icecast   \
+			--localstatedir=/var        \
+			--infodir=/usr/share/info   \
+			--mandir=/usr/share/man     \
+			--host=${CHOST} || die "configure failed"
+
+	emake || die "emake failed"
+}
+
+
+src_install () {
+
+	make DESTDIR=${D} \
+		ICECAST_BINDIR=/usr/bin \
+		ICECAST_DOCDIR=/usr/share/doc/${P} \
+		ICECAST_ETCDIR=/etc/icecast \
+		ICECAST_ETCDIR_INST=/etc/icecast \
+		ICECAST_LOGDIR=/var/log/icecast \
+		ICECAST_LOGDIR_INST=/var/log/icecast \
+		ICECAST_SBINDIR=/usr/sbin \
+		ICECAST_STATICDIR=/usr/share/icecast/static \
+		ICECAST_STATICDIR_INST=/usr/share/icecast/static \
+        	ICECAST_TEMPLATEDIR=/usr/share/icecast/templates \
+		ICECAST_TEMPLATEDIR_INST=/usr/share/icecast/templates \
+		install || die "make install failed"
+
+	dodoc AUTHORS BUGS CHANGES COPYING FAQ INSTALL README TESTED TODO
+}