3 files changed, 43 insertions, 13 deletions

diff --git a/net/liveMedia/Makefile b/net/liveMedia/Makefile
index 333a2c5b2f56..170b159ffb01 100644
--- a/net/liveMedia/Makefile
+++ b/net/liveMedia/Makefile
@@ -6,34 +6,34 @@
 #
 
 PORTNAME=	liveMedia
-PORTVERSION=	2011.06.16
-PORTREVISION=	0
+PORTVERSION=	2012.04.04
 PORTEPOCH=	2
 CATEGORIES=	net devel
 MASTER_SITES=	http://www.live555.com/liveMedia/public/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	nork
+MASTER_SITE_SUBDIR=	rm
 DISTNAME=	live.${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LIVE.COM Streaming Media
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 NO_CDROM=	'dated material'
 
 WRKSRC=		${WRKDIR}/live
 PLIST=		${WRKDIR}/pkg-plist
 
-HAS_CONFIGURE=	YES
-MAKE_JOBS_SAFE=	YES
+HAS_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_SCRIPT=	genMakefiles
 CONFIGURE_ARGS=		fixed-${OPSYS:L}
 
 INSTALL_DATADIR=	${INSTALL} -d ${_SHROWNGRP} -m 755
 
+CFLAGS+=	-DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1
+
 BasicUsageEnvironment=	\
 		BasicUsageEnvironment/include/BasicHashTable.hh \
 		BasicUsageEnvironment/include/BasicUsageEnvironment.hh \
@@ -80,14 +80,15 @@ liveMedia=		\
 		liveMedia/include/BasicUDPSink.hh \
 		liveMedia/include/BasicUDPSource.hh \
 		liveMedia/include/ByteStreamFileSource.hh \
+		liveMedia/include/ByteStreamMemoryBufferSource.hh \
 		liveMedia/include/ByteStreamMultiFileSource.hh \
-		liveMedia/include/DarwinInjector.hh \
-		liveMedia/include/DeviceSource.hh \
-		liveMedia/include/DigestAuthentication.hh \
 		liveMedia/include/DVVideoFileServerMediaSubsession.hh \
 		liveMedia/include/DVVideoRTPSink.hh \
 		liveMedia/include/DVVideoRTPSource.hh \
 		liveMedia/include/DVVideoStreamFramer.hh \
+		liveMedia/include/DarwinInjector.hh \
+		liveMedia/include/DeviceSource.hh \
+		liveMedia/include/DigestAuthentication.hh \
 		liveMedia/include/FileServerMediaSubsession.hh \
 		liveMedia/include/FileSink.hh \
 		liveMedia/include/FramedFileSource.hh \
@@ -105,7 +106,6 @@ liveMedia=		\
 		liveMedia/include/H264VideoRTPSource.hh \
 		liveMedia/include/H264VideoStreamDiscreteFramer.hh \
 		liveMedia/include/H264VideoStreamFramer.hh \
-		liveMedia/include/HTTPSink.hh \
 		liveMedia/include/InputFile.hh \
 		liveMedia/include/JPEGVideoRTPSink.hh \
 		liveMedia/include/JPEGVideoRTPSource.hh \
@@ -128,7 +128,6 @@ liveMedia=		\
 		liveMedia/include/MPEG1or2DemuxedServerMediaSubsession.hh \
 		liveMedia/include/MPEG1or2FileServerDemux.hh \
 		liveMedia/include/MPEG1or2VideoFileServerMediaSubsession.hh \
-		liveMedia/include/MPEG1or2VideoHTTPSink.hh \
 		liveMedia/include/MPEG1or2VideoRTPSink.hh \
 		liveMedia/include/MPEG1or2VideoRTPSource.hh \
 		liveMedia/include/MPEG1or2VideoStreamDiscreteFramer.hh \
@@ -141,6 +140,7 @@ liveMedia=		\
 		liveMedia/include/MPEG2TransportStreamIndexFile.hh \
 		liveMedia/include/MPEG2TransportStreamMultiplexor.hh \
 		liveMedia/include/MPEG2TransportStreamTrickModeFilter.hh \
+		liveMedia/include/MPEG2TransportUDPServerMediaSubsession.hh \
 		liveMedia/include/MPEG4ESVideoRTPSink.hh \
 		liveMedia/include/MPEG4ESVideoRTPSource.hh \
 		liveMedia/include/MPEG4GenericRTPSink.hh \
@@ -151,6 +151,8 @@ liveMedia=		\
 		liveMedia/include/MPEG4VideoStreamDiscreteFramer.hh \
 		liveMedia/include/MPEG4VideoStreamFramer.hh \
 		liveMedia/include/MPEGVideoStreamFramer.hh \
+		liveMedia/include/MatroskaFile.hh \
+		liveMedia/include/MatroskaFileServerDemux.hh \
 		liveMedia/include/Media.hh \
 		liveMedia/include/MediaSession.hh \
 		liveMedia/include/MediaSink.hh \
@@ -170,11 +172,20 @@ liveMedia=		\
 		liveMedia/include/RTSPClient.hh \
 		liveMedia/include/RTSPCommon.hh \
 		liveMedia/include/RTSPServer.hh \
+		liveMedia/include/RTSPServerSupportingHTTPStreaming.hh \
 		liveMedia/include/SIPClient.hh \
 		liveMedia/include/ServerMediaSession.hh \
 		liveMedia/include/SimpleRTPSink.hh \
 		liveMedia/include/SimpleRTPSource.hh \
+		liveMedia/include/StreamReplicator.hh \
+		liveMedia/include/T140TextRTPSink.hh \
+		liveMedia/include/TCPStreamSink.hh \
+		liveMedia/include/TextRTPSink.hh \
+		liveMedia/include/VP8VideoRTPSink.hh \
+		liveMedia/include/VP8VideoRTPSource.hh \
 		liveMedia/include/VideoRTPSink.hh \
+		liveMedia/include/VorbisAudioRTPSink.hh \
+		liveMedia/include/VorbisAudioRTPSource.hh \
 		liveMedia/include/WAVAudioFileServerMediaSubsession.hh \
 		liveMedia/include/WAVAudioFileSource.hh \
 		liveMedia/include/liveMedia.hh \
diff --git a/net/liveMedia/distinfo b/net/liveMedia/distinfo
index aa8df6f44f6c..11e18944876d 100644
--- a/net/liveMedia/distinfo
+++ b/net/liveMedia/distinfo
@@ -1,2 +1,2 @@
-SHA256 (live.2011.06.16.tar.gz) = 08b776a28c0a385d83556d5ce3910bf8a32acf67d20022feade0a24d9033bac4
-SIZE (live.2011.06.16.tar.gz) = 477340
+SHA256 (live.2012.04.04.tar.gz) = 673ec5b14157a4ba4fed2dd49b2c3c0a63378439df1b9cc392eaf2bdad892412
+SIZE (live.2012.04.04.tar.gz) = 541301
diff --git a/net/liveMedia/files/patch-liveMedia-include_Locale.hh b/net/liveMedia/files/patch-liveMedia-include_Locale.hh
new file mode 100644
index 000000000000..9790c334c0e7
--- /dev/null
+++ b/net/liveMedia/files/patch-liveMedia-include_Locale.hh
@@ -0,0 +1,19 @@
+--- ./liveMedia/include/Locale.hh.orig	2012-04-04 05:07:24.000000000 +0400
++++ ./liveMedia/include/Locale.hh	2012-04-13 20:40:10.000000000 +0400
+@@ -32,11 +32,15 @@
+ // (or their development environments) don't have "newlocale()".  If, however, your Windows system *does* have "newlocale()",
+ // then you can override this by defining "XLOCALE_USED" before #including this file.
+ 
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #ifdef XLOCALE_USED
+ #undef LOCALE_NOT_USED
+ #undef XLOCALE_NOT_USED
+ #else
+-#if defined(__WIN32__) || defined(_WIN32)
++#if defined(__WIN32__) || defined(_WIN32) || (__FreeBSD_version < 1000010)
+ #define XLOCALE_NOT_USED 1
+ #endif
+ #endif