aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/ezstream/Makefile3
-rw-r--r--audio/gstreamer-plugins-shout2/Makefile2
-rw-r--r--audio/gstreamer-plugins-shout280/Makefile2
-rw-r--r--audio/icecast2/Makefile3
-rw-r--r--audio/icegenerator/Makefile3
-rw-r--r--audio/ices/Makefile3
-rw-r--r--audio/ices0/Makefile4
-rw-r--r--audio/libshout2/Makefile8
-rw-r--r--audio/libshout2/distinfo4
-rw-r--r--audio/libshout2/files/patch-configure10
-rw-r--r--audio/libshout2/files/patch-examples_Makefile.in11
-rw-r--r--audio/libshout2/pkg-plist3
-rw-r--r--audio/p5-Shout/Makefile3
-rw-r--r--audio/ruby-shout/Makefile3
14 files changed, 37 insertions, 25 deletions
diff --git a/audio/ezstream/Makefile b/audio/ezstream/Makefile
index 08f069169acb..2e41910f68d8 100644
--- a/audio/ezstream/Makefile
+++ b/audio/ezstream/Makefile
@@ -7,13 +7,14 @@
PORTNAME= ezstream
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://svn.xiph.org/releases/ezstream/
MAINTAINER= laszlof@vonostingroup.com
COMMENT= A command line utility for streaming to icecast servers
-LIB_DEPENDS= shout.3:${PORTSDIR}/audio/libshout2 \
+LIB_DEPENDS= shout.4:${PORTSDIR}/audio/libshout2 \
vorbis.3:${PORTSDIR}/audio/libvorbis \
xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/audio/gstreamer-plugins-shout2/Makefile b/audio/gstreamer-plugins-shout2/Makefile
index dd26475a1497..3f09aaf02501 100644
--- a/audio/gstreamer-plugins-shout2/Makefile
+++ b/audio/gstreamer-plugins-shout2/Makefile
@@ -5,6 +5,8 @@
# $FreeBSD$
#
+PORTREVISION= 4
+
CATEGORIES= audio
GST_PLUGIN= shout2
diff --git a/audio/gstreamer-plugins-shout280/Makefile b/audio/gstreamer-plugins-shout280/Makefile
index dd26475a1497..3f09aaf02501 100644
--- a/audio/gstreamer-plugins-shout280/Makefile
+++ b/audio/gstreamer-plugins-shout280/Makefile
@@ -5,6 +5,8 @@
# $FreeBSD$
#
+PORTREVISION= 4
+
CATEGORIES= audio
GST_PLUGIN= shout2
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index b88225a4e76a..28eb2ab06a1c 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= icecast2
PORTVERSION= 2.2.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= audio net ipv6
MASTER_SITES= http://svn.xiph.org/releases/icecast/
@@ -16,7 +17,7 @@ MAINTAINER= lofi@freebsd.org
COMMENT= A streaming mp3/ogg-vorbis audio server
LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
- shout.3:${PORTSDIR}/audio/libshout2 \
+ shout.4:${PORTSDIR}/audio/libshout2 \
theora.1:${PORTSDIR}/multimedia/libtheora \
vorbis.3:${PORTSDIR}/audio/libvorbis \
xslt.2:${PORTSDIR}/textproc/libxslt
diff --git a/audio/icegenerator/Makefile b/audio/icegenerator/Makefile
index 38eb2720c750..bca4aa253a52 100644
--- a/audio/icegenerator/Makefile
+++ b/audio/icegenerator/Makefile
@@ -7,6 +7,7 @@
PORTNAME= icegenerator
PORTVERSION= 0.5.4
+PORTREVISION= 1
CATEGORIES= audio net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= funkblaster@n11.bmstu.ru
COMMENT= Direct streaming generator for Icecast/Shoutcast
-LIB_DEPENDS= shout.3:${PORTSDIR}/audio/libshout2
+LIB_DEPENDS= shout.4:${PORTSDIR}/audio/libshout2
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/audio/ices/Makefile b/audio/ices/Makefile
index 6917c0ebc06f..77e24b4be34a 100644
--- a/audio/ices/Makefile
+++ b/audio/ices/Makefile
@@ -7,13 +7,14 @@
PORTNAME= ices
PORTVERSION= 2.0.1
+PORTREVISION= 1
CATEGORIES= audio net
MASTER_SITES= http://svn.xiph.org/releases/ices/
MAINTAINER= lofi@freebsd.org
COMMENT= A streaming source client for icecast 2
-LIB_DEPENDS= shout.3:${PORTSDIR}/audio/libshout2 \
+LIB_DEPENDS= shout.4:${PORTSDIR}/audio/libshout2 \
vorbis.3:${PORTSDIR}/audio/libvorbis \
xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/audio/ices0/Makefile b/audio/ices0/Makefile
index 2dca4a358414..728b270a26ca 100644
--- a/audio/ices0/Makefile
+++ b/audio/ices0/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ices
PORTVERSION= 0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio net
MASTER_SITES= http://svn.xiph.org/releases/ices/
@@ -17,7 +17,7 @@ COMMENT= A streaming source client for icecast 2
LIB_DEPENDS= FLAC.7:${PORTSDIR}/audio/flac \
faad:${PORTSDIR}/audio/faad \
mp3lame:${PORTSDIR}/audio/lame \
- shout.3:${PORTSDIR}/audio/libshout2 \
+ shout.4:${PORTSDIR}/audio/libshout2 \
vorbis.3:${PORTSDIR}/audio/libvorbis \
xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index 70480d436837..380d2b6dd5b6 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libshout2
-PORTVERSION= 2.0
-PORTREVISION= 5
+PORTVERSION= 2.1
PORTEPOCH= 1
CATEGORIES= audio net
MASTER_SITES= http://www.icecast.org/files/libshout/
@@ -16,14 +15,15 @@ DISTNAME= libshout-${PORTVERSION}
MAINTAINER= lofi@freebsd.org
COMMENT= Routines for connecting and transmitting data to the icecast server
-LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS= theora:${PORTSDIR}/multimedia/libtheora \
+ vorbis:${PORTSDIR}/audio/libvorbis
CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
USE_GMAKE= yes
USE_GNOME+= pkgconfig
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
CONFLICTS= libshout-1.0.7
USE_REINPLACE= yes
diff --git a/audio/libshout2/distinfo b/audio/libshout2/distinfo
index 1b1682e8185a..d4e6a327ecb2 100644
--- a/audio/libshout2/distinfo
+++ b/audio/libshout2/distinfo
@@ -1,2 +1,2 @@
-MD5 (libshout-2.0.tar.gz) = 627f3eede05b2237bee1369e4a95143c
-SIZE (libshout-2.0.tar.gz) = 326556
+MD5 (libshout-2.1.tar.gz) = ca6e98af87fd17c709821d9be82b37d5
+SIZE (libshout-2.1.tar.gz) = 455243
diff --git a/audio/libshout2/files/patch-configure b/audio/libshout2/files/patch-configure
deleted file mode 100644
index 086b3d4b1a77..000000000000
--- a/audio/libshout2/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Mon May 31 05:09:07 2004
-+++ configure Mon May 31 05:09:16 2004
-@@ -7681,6 +7681,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/audio/libshout2/files/patch-examples_Makefile.in b/audio/libshout2/files/patch-examples_Makefile.in
new file mode 100644
index 000000000000..4245362095d0
--- /dev/null
+++ b/audio/libshout2/files/patch-examples_Makefile.in
@@ -0,0 +1,11 @@
+--- examples/Makefile.in.orig Sun Apr 3 23:38:30 2005
++++ examples/Makefile.in Sun Apr 3 23:38:52 2005
+@@ -222,7 +222,7 @@
+ nonblocking_SOURCES = nonblocking.c
+ nonblocking_LDADD = $(top_builddir)/src/libshout.la
+ AM_CFLAGS = @XIPH_CFLAGS@
+-AM_CPPFLAGS = @XIPH_CPPFLAGS@ -I$(top_builddir)/include
++AM_CPPFLAGS = -I$(top_builddir)/include @XIPH_CPPFLAGS@
+ all: all-am
+
+ .SUFFIXES:
diff --git a/audio/libshout2/pkg-plist b/audio/libshout2/pkg-plist
index 35bf1faeee96..ef675545a775 100644
--- a/audio/libshout2/pkg-plist
+++ b/audio/libshout2/pkg-plist
@@ -1,12 +1,13 @@
include/shout/shout.h
lib/libshout.a
lib/libshout.so
-lib/libshout.so.3
+lib/libshout.so.4
libdata/pkgconfig/shout.pc
share/aclocal/shout.m4
share/doc/libshout/COPYING
share/doc/libshout/README
share/doc/libshout/example.c
+share/doc/libshout/nonblocking.c
@dirrm share/doc/libshout
@dirrm libdata/pkgconfig
@dirrm include/shout
diff --git a/audio/p5-Shout/Makefile b/audio/p5-Shout/Makefile
index 368583fde7e6..d62e51c6cda7 100644
--- a/audio/p5-Shout/Makefile
+++ b/audio/p5-Shout/Makefile
@@ -7,6 +7,7 @@
PORTNAME= Shout
PORTVERSION= 2.0.1
+PORTREVISION= 1
CATEGORIES= audio perl5
MASTER_SITES= http://www.icecast.org/releases/libshout/
PKGNAMEPREFIX= p5-
@@ -14,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mat@FreeBSD.org
COMMENT= Perl glue for libshout MP3 streaming source library
-LIB_DEPENDS= shout.3:${PORTSDIR}/audio/libshout2
+LIB_DEPENDS= shout.4:${PORTSDIR}/audio/libshout2
PERL_CONFIGURE= yes
diff --git a/audio/ruby-shout/Makefile b/audio/ruby-shout/Makefile
index a8f33a016e5b..c6e882eedd01 100644
--- a/audio/ruby-shout/Makefile
+++ b/audio/ruby-shout/Makefile
@@ -7,6 +7,7 @@
PORTNAME= shout
PORTVERSION= 2.0
+PORTREVISION= 1
CATEGORIES= audio ruby
MASTER_SITES= http://www.dingoskidneys.com/~jaredj/downloads/
MASTER_SITE_SUBDIR= ruby-${PORTNAME}
@@ -17,7 +18,7 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
COMMENT= A Ruby binding to the libshout library
-LIB_DEPENDS= shout.3:${PORTSDIR}/audio/libshout2
+LIB_DEPENDS= shout.4:${PORTSDIR}/audio/libshout2
USE_RUBY= yes
USE_RUBY_EXTCONF= yes