Remove unsupported and old ices0 (consider using audio/ices if you need the functionnality)

Modernize audio/ices

12 files changed, 7 insertions, 675 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 1feca1f49422..9f97e7f62427 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -325,7 +325,6 @@
     SUBDIR += icecast2
     SUBDIR += icegenerator
     SUBDIR += ices
-    SUBDIR += ices0
     SUBDIR += id3ed
     SUBDIR += id3el
     SUBDIR += id3lib
diff --git a/audio/ices/Makefile b/audio/ices/Makefile
index 6a9766dbdbcf..ffb4dff6bb7a 100644
--- a/audio/ices/Makefile
+++ b/audio/ices/Makefile
@@ -13,11 +13,11 @@ COMMENT=	Vorbis streaming source client for icecast 2
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
-		shout:${PORTSDIR}/audio/libshout2 \
-		vorbis:${PORTSDIR}/audio/libvorbis \
-		speex:${PORTSDIR}/audio/speex \
-		theora:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
+		libshout.so:${PORTSDIR}/audio/libshout2 \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libspeex.so:${PORTSDIR}/audio/speex \
+		libtheora.so:${PORTSDIR}/multimedia/libtheora
 
 OPTIONS_DEFINE=	ALSA
 
@@ -30,12 +30,7 @@ CONFIGURE_ARGS=	--disable-roaraudio --disable-sun-audio
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
-.else
-CONFIGURE_ARGS+=--disable-alsa
-.endif
+ALSA_LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_CONFIGURE_ENABLE+=	alsa
 
 .include <bsd.port.mk>
diff --git a/audio/ices0/Makefile b/audio/ices0/Makefile
deleted file mode 100644
index eb9abf0c6436..000000000000
--- a/audio/ices0/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# Created by: Michael Nottebrock <michaelnottebrock@gmx.net>
-# $FreeBSD$
-
-PORTNAME=	ices
-PORTVERSION=	0.4
-PORTREVISION=	10
-CATEGORIES=	audio net
-MASTER_SITES=	http://svn.xiph.org/releases/ices/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	MP3 streaming source client for Icecast 2
-
-LIB_DEPENDS=	shout:${PORTSDIR}/audio/libshout2 \
-		xml2:${PORTSDIR}/textproc/libxml2
-
-OPTIONS_DEFINE=	FLAC FAAD VORBIS PYTHON
-OPTIONS_DEFAULT=	PYTHON
-
-USES=		gmake perl5 pkgconfig
-GNU_CONFIGURE=	yes
-USE_RC_SUBR=	ices0
-
-LATEST_LINK=	ices0
-SUB_FILES=	message message-bin
-CONFIGURE_ARGS=	--program-suffix=0
-
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.if !defined(PACKAGE_BUILDING)
-PKGMESSAGE=	${WRKDIR}/message
-.else
-PKGMESSAGE=	${WRKDIR}/message-bin
-.endif
-
-MAN1=		ices0.1
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac \
-		mp3lame:${PORTSDIR}/audio/lame
-.else
-CONFIGURE_ARGS+=	--without-flac
-.endif
-
-.if ${PORT_OPTIONS:MFAAD}
-LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad \
-		mp3lame:${PORTSDIR}/audio/lame
-.else
-CONFIGURE_ARGS+=	--without-faad
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-BUILD_DEPENDS+=	python:${PORTSDIR}/lang/python
-RUN_DEPENDS+=	python:${PORTSDIR}/lang/python
-.else
-CONFIGURE_ARGS+=	--without-python
-.endif
-
-.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis \
-		mp3lame:${PORTSDIR}/audio/lame
-.else
-CONFIGURE_ARGS+=	--without-vorbis
-.endif
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
-.include <bsd.port.mk>
diff --git a/audio/ices0/distinfo b/audio/ices0/distinfo
deleted file mode 100644
index 138fc0cb17c6..000000000000
--- a/audio/ices0/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ices-0.4.tar.gz) = 6e71f7c2a5d7415565a3af4f4c688ada4915312714c74bb7567f2b4b6d183074
-SIZE (ices-0.4.tar.gz) = 372837
diff --git a/audio/ices0/files/ices0.in b/audio/ices0/files/ices0.in
deleted file mode 100644
index 698128f462d7..000000000000
--- a/audio/ices0/files/ices0.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: ices0
-# REQUIRE: DAEMON
-# BEFORE:  login
-# KEYWORD: shutdown
-
-# Add the following lines to /etc/rc.conf to enable ices0:
-#
-# ices0_enable="YES"
-# ices0_flags="<set as needed>"
-
-. /etc/rc.subr
-
-name="ices0"
-rcvar=ices0_enable
-
-command="%%PREFIX%%/bin/$name"
-command_args="1>/dev/null 2>&1"
-required_files="%%PREFIX%%/etc/ices.conf"
-
-# read configuration and set defaults
-load_rc_config "$name"
-: ${ices0_enable="NO"}
-
-run_rc_command "$1"
diff --git a/audio/ices0/files/message-bin.in b/audio/ices0/files/message-bin.in
deleted file mode 100644
index 07816f0a253f..000000000000
--- a/audio/ices0/files/message-bin.in
+++ /dev/null
@@ -1,12 +0,0 @@
-To start ices at system boot, copy %%PREFIX%%/etc/ices.conf.dist to
-%%PREFIX%%/etc/ices.conf, modify it to suit your environment and add:
-
-ices0_enable="YES"
-
-to /etc/rc.conf.
-
-
-ATTENTION: Due to mp3 licensing restrictions, this binary package of
-	   ices0 does not feature transcoding support. If you want
-	   support for transcoding FLAC, mp4 and vorbis data to mp3
-	   on-the-fly, you need to compile the audio/ices0 port.
diff --git a/audio/ices0/files/message.in b/audio/ices0/files/message.in
deleted file mode 100644
index fed7d2b3aac3..000000000000
--- a/audio/ices0/files/message.in
+++ /dev/null
@@ -1,6 +0,0 @@
-To start ices at system boot, copy %%PREFIX%%/etc/ices.conf.dist to
-%%PREFIX%%/etc/ices.conf, modify it to suit your environment and add:
-
-ices0_enable="YES"
-
-to /etc/rc.conf.
diff --git a/audio/ices0/files/patch-configure b/audio/ices0/files/patch-configure
deleted file mode 100644
index 2186643ebb22..000000000000
--- a/audio/ices0/files/patch-configure
+++ /dev/null
@@ -1,194 +0,0 @@
---- configure.orig.orig	Sat Aug 28 21:03:47 2004
-+++ configure	Mon Oct 15 19:24:28 2007
-@@ -22725,6 +22725,12 @@
- 
-   if test "$have_faad" != "no"
-   then
-+    ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-     echo "$as_me:$LINENO: checking for MP4Read in -lmp4v2" >&5
- echo $ECHO_N "checking for MP4Read in -lmp4v2... $ECHO_C" >&6
- if test "${ac_cv_lib_mp4v2_MP4Read+set}" = set; then
-@@ -22763,7 +22769,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
-+	 { ac_try='test -z "$ac_cxx_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-@@ -22804,6 +22810,12 @@
-   have_faad="no"
- fi
- 
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-   fi
- fi
- 
-@@ -22851,18 +22863,18 @@
-     LDFLAGS="$LDFLAGS -L$with_flac/lib"
-   fi
- 
--  if test "${ac_cv_header_faad_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for faad.h" >&5
--echo $ECHO_N "checking for faad.h... $ECHO_C" >&6
--if test "${ac_cv_header_faad_h+set}" = set; then
-+  if test "${ac_cv_header_FLAC_stream_decoder_h+set}" = set; then
-+  echo "$as_me:$LINENO: checking for FLAC/stream_decoder.h" >&5
-+echo $ECHO_N "checking for FLAC/stream_decoder.h... $ECHO_C" >&6
-+if test "${ac_cv_header_FLAC_stream_decoder_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_faad_h" >&5
--echo "${ECHO_T}$ac_cv_header_faad_h" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_FLAC_stream_decoder_h" >&5
-+echo "${ECHO_T}$ac_cv_header_FLAC_stream_decoder_h" >&6
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking faad.h usability" >&5
--echo $ECHO_N "checking faad.h usability... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking FLAC/stream_decoder.h usability" >&5
-+echo $ECHO_N "checking FLAC/stream_decoder.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22870,7 +22882,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <faad.h>
-+#include <FLAC/stream_decoder.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -22906,15 +22918,15 @@
- echo "${ECHO_T}$ac_header_compiler" >&6
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking faad.h presence" >&5
--echo $ECHO_N "checking faad.h presence... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking FLAC/stream_decoder.h presence" >&5
-+echo $ECHO_N "checking FLAC/stream_decoder.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <faad.h>
-+#include <FLAC/stream_decoder.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -22948,25 +22960,25 @@
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: faad.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: faad.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: faad.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: faad.h: proceeding with the compiler's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FLAC/stream_decoder.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: FLAC/stream_decoder.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FLAC/stream_decoder.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: FLAC/stream_decoder.h: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: faad.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: faad.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: faad.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: faad.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: faad.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: faad.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: faad.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: faad.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: faad.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: faad.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: faad.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: faad.h: in the future, the compiler will take precedence" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FLAC/stream_decoder.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: FLAC/stream_decoder.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FLAC/stream_decoder.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: FLAC/stream_decoder.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FLAC/stream_decoder.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: FLAC/stream_decoder.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FLAC/stream_decoder.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: FLAC/stream_decoder.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FLAC/stream_decoder.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: FLAC/stream_decoder.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: FLAC/stream_decoder.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: FLAC/stream_decoder.h: in the future, the compiler will take precedence" >&2;}
-     (
-       cat <<\_ASBOX
- ## ------------------------------- ##
-@@ -22977,24 +22989,30 @@
-       sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--echo "$as_me:$LINENO: checking for faad.h" >&5
--echo $ECHO_N "checking for faad.h... $ECHO_C" >&6
--if test "${ac_cv_header_faad_h+set}" = set; then
-+echo "$as_me:$LINENO: checking for FLAC/stream_decoder.h" >&5
-+echo $ECHO_N "checking for FLAC/stream_decoder.h... $ECHO_C" >&6
-+if test "${ac_cv_header_FLAC_stream_decoder_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_header_faad_h=$ac_header_preproc
-+  ac_cv_header_FLAC_stream_decoder_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_faad_h" >&5
--echo "${ECHO_T}$ac_cv_header_faad_h" >&6
-+echo "$as_me:$LINENO: result: $ac_cv_header_FLAC_stream_decoder_h" >&5
-+echo "${ECHO_T}$ac_cv_header_FLAC_stream_decoder_h" >&6
- 
- fi
--if test $ac_cv_header_faad_h = yes; then
-+if test $ac_cv_header_FLAC_stream_decoder_h = yes; then
-   have_flac="maybe"
- fi
- 
- 
-   if test "$have_flac" != "no"
-   then
-+    ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-     echo "$as_me:$LINENO: checking for FLAC__stream_decoder_new in -lFLAC" >&5
- echo $ECHO_N "checking for FLAC__stream_decoder_new in -lFLAC... $ECHO_C" >&6
- if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set}" = set; then
-@@ -23033,7 +23051,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
-+	 { ac_try='test -z "$ac_cxx_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-@@ -23073,6 +23091,12 @@
- else
-   have_flac="no"
- fi
-+
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
-   fi
- fi
diff --git a/audio/ices0/files/patch-src-Makefile.in b/audio/ices0/files/patch-src-Makefile.in
deleted file mode 100644
index 1c4c6e4470d1..000000000000
--- a/audio/ices0/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,247 +0,0 @@
---- src/Makefile.in	Sat Aug 28 21:03:44 2004
-+++ src/Makefile.in	Thu Sep 16 01:12:38 2004
-@@ -64,21 +64,23 @@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/crossfade.Po ./$(DEPDIR)/cue.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/ices.Po ./$(DEPDIR)/ices_config.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/id3.Po ./$(DEPDIR)/in_flac.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/in_mp4.Po ./$(DEPDIR)/in_vorbis.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/log.Po ./$(DEPDIR)/metadata.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/mp3.Po ./$(DEPDIR)/reencode.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/setup.Po ./$(DEPDIR)/signals.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/stream.Po ./$(DEPDIR)/util.Po
-+@AMDEP_TRUE@	./$(DEPDIR)/dummy.Po ./$(DEPDIR)/ices.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/ices_config.Po ./$(DEPDIR)/id3.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/in_flac.Po ./$(DEPDIR)/in_mp4.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/in_vorbis.Po ./$(DEPDIR)/log.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/metadata.Po ./$(DEPDIR)/mp3.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/reencode.Po ./$(DEPDIR)/setup.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/signals.Po ./$(DEPDIR)/stream.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/util.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXLD = $(CXX)
-+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-+	-o $@
- SOURCES = $(ices_SOURCES) $(EXTRA_ices_SOURCES)
- DIST_SOURCES = $(ices_SOURCES) $(EXTRA_ices_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -96,7 +98,6 @@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
--AR = @AR@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
-@@ -107,20 +108,16 @@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
--CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
- ICES_OBJECTS = @ICES_OBJECTS@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -129,9 +126,7 @@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBTOOL = @LIBTOOL@
- LIBTOOL_DEPS = @LIBTOOL_DEPS@
--LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-@@ -148,7 +143,6 @@
- PKGCONFIG = @PKGCONFIG@
- PLAYLIST_OBJECTS = @PLAYLIST_OBJECTS@
- PYTHON = @PYTHON@
--RANLIB = @RANLIB@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- SHOUTCONFIG = @SHOUTCONFIG@
-@@ -157,11 +151,8 @@
- USE_XML_TRUE = @USE_XML_TRUE@
- VERSION = @VERSION@
- XMLCONFIG = @XMLCONFIG@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-@@ -208,14 +199,16 @@
- ices_SOURCES = ices.c log.c setup.c stream.c util.c mp3.c cue.c metadata.c \
- 	id3.c signals.c crossfade.c
- 
--EXTRA_ices_SOURCES = ices_config.c reencode.c in_vorbis.c in_mp4.c in_flac.c
-+EXTRA_ices_SOURCES = ices_config.c reencode.c in_vorbis.c in_mp4.c in_flac.c \
-+	dummy.cc
-+
- ices_LDADD = $(ICES_OBJECTS) playlist/libplaylist.a
- ices_DEPENDENCIES = $(ices_LDADD)
- AM_CPPFLAGS = -DICES_ETCDIR=\"$(sysconfdir)\" -DICES_MODULEDIR=\"$(moddir)\"
- all: all-recursive
- 
- .SUFFIXES:
--.SUFFIXES: .c .lo .o .obj
-+.SUFFIXES: .c .cc .o .obj
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
-@@ -251,11 +244,10 @@
- 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
--	     || test -f $$p1 \
- 	  ; then \
- 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
--	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- 	  else :; fi; \
- 	done
- 
-@@ -268,14 +260,10 @@
- 	done
- 
- clean-binPROGRAMS:
--	@list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
--	  echo " rm -f $$p $$f"; \
--	  rm -f $$p $$f ; \
--	done
-+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
- ices$(EXEEXT): $(ices_OBJECTS) $(ices_DEPENDENCIES) 
- 	@rm -f ices$(EXEEXT)
--	$(LINK) $(ices_LDFLAGS) $(ices_OBJECTS) $(ices_LDADD) $(LIBS)
-+	$(CXXLINK) $(ices_LDFLAGS) $(ices_OBJECTS) $(ices_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -285,6 +273,7 @@
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crossfade.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cue.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ices.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ices_config.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id3.Po@am__quote@
-@@ -316,22 +305,21 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
--.c.lo:
--@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
--
--mostlyclean-libtool:
--	-rm -f *.lo
--
--clean-libtool:
--	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
-+.cc.o:
-+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-+
-+.cc.obj:
-+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
- uninstall-info-am:
- 
- # This directory's subdirectories are mostly independent; you can cd
-@@ -528,13 +516,13 @@
- 	@echo "it deletes files that may require special tools to rebuild."
- clean: clean-recursive
- 
--clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
- 
- distclean: distclean-recursive
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -563,8 +551,7 @@
- 
- mostlyclean: mostlyclean-recursive
- 
--mostlyclean-am: mostlyclean-compile mostlyclean-generic \
--	mostlyclean-libtool
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic
- 
- pdf: pdf-recursive
- 
-@@ -579,9 +566,8 @@
- uninstall-info: uninstall-info-recursive
- 
- .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-binPROGRAMS clean-generic clean-libtool \
--	clean-recursive ctags ctags-recursive distclean \
--	distclean-compile distclean-generic distclean-libtool \
-+	clean clean-binPROGRAMS clean-generic clean-recursive ctags \
-+	ctags-recursive distclean distclean-compile distclean-generic \
- 	distclean-recursive distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-binPROGRAMS \
- 	install-data install-data-am install-exec install-exec-am \
-@@ -589,10 +575,13 @@
- 	installcheck installcheck-am installdirs installdirs-am \
- 	maintainer-clean maintainer-clean-generic \
- 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
--	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
--	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
-+	tags tags-recursive uninstall uninstall-am \
- 	uninstall-binPROGRAMS uninstall-info-am
- 
-+
-+dummy.cc:
-+	echo 'static void dummy();' > $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/audio/ices0/files/patch-src_in_flac.c b/audio/ices0/files/patch-src_in_flac.c
deleted file mode 100644
index 7a12748e20b4..000000000000
--- a/audio/ices0/files/patch-src_in_flac.c
+++ /dev/null
@@ -1,86 +0,0 @@
---- src/in_flac.c.orig	Sat Jul 31 19:52:24 2004
-+++ src/in_flac.c	Mon Oct 15 19:27:01 2007
-@@ -45,9 +45,14 @@
- static int ices_flac_close (input_stream_t* self);
- 
- /* -- FLAC callbacks -- */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
-+# define FLAC_BUFSIZE_TYPE unsigned
-+#else
-+# define FLAC_BUFSIZE_TYPE size_t
-+#endif /* !FLAC_API_VERSION_CURRENT || FLAC_API_VERSION_CURRENT <= 7 */
- static FLAC__StreamDecoderReadStatus
- flac_read_cb(const FLAC__StreamDecoder* decoder, FLAC__byte buffer[],
--	     unsigned* bytes, void* client_data);
-+	     FLAC_BUFSIZE_TYPE* bytes, void* client_data);
- static FLAC__StreamDecoderWriteStatus
- flac_write_cb(const FLAC__StreamDecoder* decoder, const FLAC__Frame* frame,
- 	      const FLAC__int32* const buffer[], void* client_data);
-@@ -76,10 +81,32 @@
-     return -1;
-   }
- 
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
-   FLAC__stream_decoder_set_read_callback(decoder, flac_read_cb);
-   FLAC__stream_decoder_set_write_callback(decoder, flac_write_cb);
-   FLAC__stream_decoder_set_metadata_callback(decoder, flac_metadata_cb);
-   FLAC__stream_decoder_set_error_callback(decoder, flac_error_cb);
-+  FLAC__stream_decoder_set_client_data(decoder, self);
-+
-+  switch (FLAC__stream_decoder_init(decoder)) {
-+  case FLAC__STREAM_DECODER_SEARCH_FOR_METADATA:
-+    break;
-+  case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
-+    ices_log_error("Could not allocate memory during FLAC decoder init");
-+    goto errDecoder;
-+  default:
-+    ices_log_error("Unexpected error during FLAC decoder init");
-+    goto errDecoder;
-+  }
-+#else
-+  if (FLAC__stream_decoder_init_stream(decoder, flac_read_cb, NULL, NULL, NULL,
-+                                       NULL, flac_write_cb, flac_metadata_cb,
-+                                       flac_error_cb, self)
-+      != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
-+    ices_log_error("ices_flac_open: Error initializing FLAC decoder");
-+    goto errDecoder;
-+  }
-+#endif /* !FLAC_API_VERSION_CURRENT || FLAC_API_VERSION_CURRENT <= 7 */
- 
-   FLAC__stream_decoder_set_metadata_respond(decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
- 
-@@ -87,7 +114,6 @@
-     ices_log_error ("Malloc failed in ices_flac_open");
-     goto errDecoder;
-   }
--  FLAC__stream_decoder_set_client_data(decoder, self);
- 
-   flac_data->decoder = decoder;
-   flac_data->parsed = 0;
-@@ -96,17 +122,6 @@
- 
-   self->data = flac_data;
- 
--  switch (FLAC__stream_decoder_init(decoder)) {
--  case FLAC__STREAM_DECODER_SEARCH_FOR_METADATA:
--    break;
--  case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR:
--    ices_log_error("Could not allocate memory during FLAC decoder init");
--    goto errData;
--  default:
--    ices_log_error("Unexpected error during FLAC decoder init");
--    goto errData;
--  }
--
-   if (!FLAC__stream_decoder_process_single(decoder)) {
-     ices_log_error("Could not find FLAC metadata header");
-     free(flac_data);
-@@ -179,7 +194,7 @@
- /* -- callbacks -- */
- static FLAC__StreamDecoderReadStatus
- flac_read_cb(const FLAC__StreamDecoder* decoder, FLAC__byte buffer[],
--	     unsigned* bytes, void* client_data)
-+	     FLAC_BUFSIZE_TYPE* bytes, void* client_data)
- {
-   input_stream_t* self = (input_stream_t*)client_data;
-   flac_in_t* flac_data = (flac_in_t*)self->data;
diff --git a/audio/ices0/pkg-descr b/audio/ices0/pkg-descr
deleted file mode 100644
index 4eb3e2d5a336..000000000000
--- a/audio/ices0/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-IceS0 is an mp3 streaming source client for icecast 2 servers. It provides 
-flexible and powerful static and live streaming capabilities and can transcode 
-various audio formats to mp3 on-the-fly.
-
-WWW: http://www.icecast.org/
diff --git a/audio/ices0/pkg-plist b/audio/ices0/pkg-plist
deleted file mode 100644
index 6c47428a4cf0..000000000000
--- a/audio/ices0/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/ices0
-doc/ices/icesmanual.html
-etc/ices.conf.dist
-etc/modules/ices.pm.dist
-etc/modules/ices.py.dist
-@dirrm etc/modules
-@dirrm doc/ices
-@dirrm doc