From 093e451222844d9b8d5f2d737a59c92e82ca1cfc Mon Sep 17 00:00:00 2001
From: kim <kim>
Date: Fri, 24 Sep 2004 01:39:30 +0000
Subject: Upgrade to ices-mp3-0.4: * FLAC transcoding support. * Crossfader
 added.

---
 audio/ices-mp3/Makefile         | 11 ++++++++---
 audio/ices-mp3/distinfo         |  8 ++++----
 audio/ices-mp3/patches/patch-aa | 25 +++++++++++--------------
 3 files changed, 23 insertions(+), 21 deletions(-)

(limited to 'audio')

diff --git a/audio/ices-mp3/Makefile b/audio/ices-mp3/Makefile
index 5a56a7ef532..8c10171dcf1 100644
--- a/audio/ices-mp3/Makefile
+++ b/audio/ices-mp3/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2004/05/29 16:01:14 kim Exp $
+# $NetBSD: Makefile,v 1.3 2004/09/24 01:39:30 kim Exp $
 #
 
 DISTNAME=		ices-${ICES_VERSION}
 PKGNAME=		ices-mp3-${ICES_VERSION}
-ICES_VERSION=		0.3
+ICES_VERSION=		0.4
 CATEGORIES=		audio
-MASTER_SITES=		http://www.icecast.org/files/ices/
+MASTER_SITES=		http://svn.xiph.org/releases/ices/
 
 MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://www.icecast.org/ices.php
@@ -31,6 +31,9 @@ DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 MODDIR=			${PREFIX}/share/${PKGBASE}
 
+pre-configure:
+	cd ${WRKSRC} && ${AUTORECONF} --force
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ices ${PREFIX}/bin/${PKGBASE}
 	${INSTALL_MAN} ${WRKSRC}/doc/ices.1 ${PREFIX}/man/man1/${PKGBASE}.1
@@ -47,6 +50,7 @@ do-install:
 	done
 	${INSTALL_DATA_DIR} ${MODDIR}
 
+.include "../../audio/flac/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libshout/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
@@ -61,4 +65,5 @@ CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
 .include "../../textproc/libxml2/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/ices-mp3/distinfo b/audio/ices-mp3/distinfo
index bfc4fdce16c..3ea852f7f43 100644
--- a/audio/ices-mp3/distinfo
+++ b/audio/ices-mp3/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/24 18:08:13 kim Exp $
+$NetBSD: distinfo,v 1.2 2004/09/24 01:39:30 kim Exp $
 
-SHA1 (ices-0.3.tar.gz) = 46a31cd63e6efcf45247f02a91f787bb96a39a9b
-Size (ices-0.3.tar.gz) = 252705 bytes
-SHA1 (patch-aa) = 96412d08bcdd212e30c8836bb8f553fe3d3dbf27
+SHA1 (ices-0.4.tar.gz) = 427f39d3ac4a45e84222c8f8a4007767a754749c
+Size (ices-0.4.tar.gz) = 372837 bytes
+SHA1 (patch-aa) = 39818857ea23f620e8d85e36a1c9225a3787c490
diff --git a/audio/ices-mp3/patches/patch-aa b/audio/ices-mp3/patches/patch-aa
index 0e45e455092..a3dadf434fb 100644
--- a/audio/ices-mp3/patches/patch-aa
+++ b/audio/ices-mp3/patches/patch-aa
@@ -1,16 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/24 18:08:13 kim Exp $
+$NetBSD: patch-aa,v 1.2 2004/09/24 01:39:30 kim Exp $
 
---- src/definitions.h.orig	2003-06-19 18:17:27.000000000 -0400
-+++ src/definitions.h	2004-04-17 03:04:00.000000000 -0400
-@@ -53,9 +53,11 @@
- # define __USE_POSIX
- #endif
+--- configure.ac.orig	2004-08-28 14:54:44.000000000 -0400
++++ configure.ac	2004-09-23 21:28:38.000000000 -0400
+@@ -367,7 +367,7 @@
+     LDFLAGS="$LDFLAGS -L$with_flac/lib"
+   fi
  
-+#ifndef __NetBSD__
- #ifndef _POSIX_C_SOURCE
- #define _POSIX_C_SOURCE 199506L
- #endif
-+#endif
- 
- /* This for freebsd (needed on 3.2 at least) */
- #ifdef SOMEBSD
+-  AC_CHECK_HEADER(faad.h, have_flac="maybe")
++  AC_CHECK_HEADER(FLAC/stream_decoder.h, have_flac="maybe")
+   if test "$have_flac" != "no"
+   then
+     AC_CHECK_LIB(FLAC, FLAC__stream_decoder_new, [
-- 
cgit v1.2.3