5 files changed, 29 insertions, 67 deletions

diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile
index aeb888a4e7b2..6af38ef09d77 100644
--- a/audio/libshout/Makefile
+++ b/audio/libshout/Makefile
@@ -2,22 +2,37 @@
 # $FreeBSD$
 
 PORTNAME=	libshout
-PORTVERSION=	1.0.7
+PORTVERSION=	2.3.1
 CATEGORIES=	audio net
-#MASTER_SITES=	http://downloads.xiph.org/releases/libshout/
+MASTER_SITES=	http://downloads.xiph.org/releases/${PORTNAME}/ \
+		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Connect and transmit data to an Icecast media streaming server
 
-CONFLICTS=	libshout2-*
+LICENSE=	LGPL20
 
-USE_AUTOTOOLS=	libtool
+LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex \
+		libtheora.so:${PORTSDIR}/multimedia/libtheora \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
+
+CONFLICTS=	libshout2-[0-9]*
+
+CFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 USE_LDCONFIG=	yes
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}-${PORTVERSION}
+USES=		gmake libtool pathfix pkgconfig
+
+PORTDOCS=	*
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O20||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-ffast-math||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|^Requires: |Requires.private: |' ${WRKSRC}/shout.pc.in
+	@${REINPLACE_CMD} -e '/^AM_CPPFLAGS = / s|^\(.*\) \(@XIPH_CPPFLAGS@\) \(.*\)$$|\1 \3 \2|' ${WRKSRC}/examples/Makefile.in
+	@${REINPLACE_CMD} -e 's|#ifdef IPV6_V6ONLY|#if defined(__BSD_VISIBLE) \&\& defined(IPV6_V6ONLY)|' ${WRKSRC}/src/net/sock.c
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libshout.so.3.2.0
 
 .include <bsd.port.mk>
diff --git a/audio/libshout/distinfo b/audio/libshout/distinfo
index 617e47a0ab23..a9d2d97caa3f 100644
--- a/audio/libshout/distinfo
+++ b/audio/libshout/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libshout-1.0.7.tar.gz) = 5babdb9dffdc96a8094d2d61edf992f49b5deaa3845ce55c08d3572a22e047ca
-SIZE (libshout-1.0.7.tar.gz) = 130197
+SHA256 (libshout-2.3.1.tar.gz) = cf3c5f6b4a5e3fcfbe09fb7024aa88ad4099a9945f7cb037ec06bcee7a23926e
+SIZE (libshout-2.3.1.tar.gz) = 464229
diff --git a/audio/libshout/files/patch-aa b/audio/libshout/files/patch-aa
deleted file mode 100644
index 7787a49dec2f..000000000000
--- a/audio/libshout/files/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.in.orig	Wed Aug  1 17:56:09 2001
-+++ Makefile.in	Tue Dec 11 08:50:30 2001
-@@ -507,9 +507,10 @@
- 
- install-data-local:
- 	mkdir -p $(DESTDIR)$(includedir)/shout
--	mkdir -p $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)/example
--	$(INSTALL) -m 0644 $(top_srcdir)/README $(top_srcdir)/AUTHORS $(top_srcdir)/COPYING $(top_srcdir)/CHANGES $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)
--	$(INSTALL) -m 0644 $(top_srcdir)/example/Makefile $(top_srcdir)/example/example.c $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)/example
-+	mkdir -p $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-+	mkdir -p $(DESTDIR)$(prefix)/share/examples/$(PACKAGE)-$(VERSION)
-+	$(INSTALL) -m 0644 $(top_srcdir)/README $(top_srcdir)/AUTHORS $(top_srcdir)/COPYING $(top_srcdir)/CHANGES $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-+	$(INSTALL) -m 0644 $(top_srcdir)/example/Makefile $(top_srcdir)/example/example.c $(DESTDIR)$(prefix)/share/examples/$(PACKAGE)-$(VERSION)
- 	$(INSTALL) -m 0644 $(top_srcdir)/shout.h $(DESTDIR)$(includedir)/shout
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/audio/libshout/files/patch-ab b/audio/libshout/files/patch-ab
deleted file mode 100644
index 65112e1f5765..000000000000
--- a/audio/libshout/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Tue Dec 11 09:28:01 2001
-+++ doc/Makefile.in	Tue Dec 11 09:28:08 2001
-@@ -76,7 +76,7 @@
- 
- AUTOMAKE_OPTIONS = foreign
- 
--docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
- 
- doc_DATA = index.html overview.html initialization.html 		connection.html datastreaming.html metadata.html 		datastructures.html shout_conn_t.html 		shout_connect.html shout_disconnect.html shout_sleep.html 		shout_init_connection.html shout_send_data.html 		shout_update_metadata.html style.css 		example.html example_c.html reference.html 		errorhandling.html shout_strerror.html
- 
diff --git a/audio/libshout/pkg-plist b/audio/libshout/pkg-plist
index 46752a8d7b77..36d7c0fccb1c 100644
--- a/audio/libshout/pkg-plist
+++ b/audio/libshout/pkg-plist
@@ -1,34 +1,8 @@
 include/shout/shout.h
-lib/libshout.so.2
-lib/libshout.so
-lib/libshout.la
 lib/libshout.a
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/overview.html
-%%DOCSDIR%%/initialization.html
-%%DOCSDIR%%/connection.html
-%%DOCSDIR%%/datastreaming.html
-%%DOCSDIR%%/metadata.html
-%%DOCSDIR%%/datastructures.html
-%%DOCSDIR%%/shout_conn_t.html
-%%DOCSDIR%%/shout_connect.html
-%%DOCSDIR%%/shout_disconnect.html
-%%DOCSDIR%%/shout_sleep.html
-%%DOCSDIR%%/shout_init_connection.html
-%%DOCSDIR%%/shout_send_data.html
-%%DOCSDIR%%/shout_update_metadata.html
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/example.html
-%%DOCSDIR%%/example_c.html
-%%DOCSDIR%%/reference.html
-%%DOCSDIR%%/errorhandling.html
-%%DOCSDIR%%/shout_strerror.html
-%%DOCSDIR%%/README
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/CHANGES
-%%EXAMPLESDIR%%/Makefile
-%%EXAMPLESDIR%%/example.c
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%
+lib/libshout.so
+lib/libshout.so.3
+lib/libshout.so.3.2.0
+libdata/pkgconfig/shout.pc
+share/aclocal/shout.m4
 @dirrm include/shout