4 files changed, 15 insertions, 43 deletions

diff --git a/net/liveMedia/Makefile b/net/liveMedia/Makefile
index 6a63def85dd3..a69ba025b33a 100644
--- a/net/liveMedia/Makefile
+++ b/net/liveMedia/Makefile
@@ -6,26 +6,28 @@
 #
 
 PORTNAME=	liveMedia
-PORTVERSION=	2012.04.04
-PORTEPOCH=	1
+PORTVERSION=	2011.06.16
+PORTREVISION=	0
+PORTEPOCH=	2
 CATEGORIES=	net devel
 MASTER_SITES=	http://www.live555.com/liveMedia/public/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	rm
+MASTER_SITE_SUBDIR=	nork
 DISTNAME=	live.${PORTVERSION}
 
 MAINTAINER=	nork@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}
@@ -78,15 +80,14 @@ 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 \
@@ -104,6 +105,7 @@ 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 \
@@ -126,6 +128,7 @@ 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 \
@@ -138,7 +141,6 @@ 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 \
@@ -149,8 +151,6 @@ 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,20 +170,11 @@ 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 11e18944876d..aa8df6f44f6c 100644
--- a/net/liveMedia/distinfo
+++ b/net/liveMedia/distinfo
@@ -1,2 +1,2 @@
-SHA256 (live.2012.04.04.tar.gz) = 673ec5b14157a4ba4fed2dd49b2c3c0a63378439df1b9cc392eaf2bdad892412
-SIZE (live.2012.04.04.tar.gz) = 541301
+SHA256 (live.2011.06.16.tar.gz) = 08b776a28c0a385d83556d5ce3910bf8a32acf67d20022feade0a24d9033bac4
+SIZE (live.2011.06.16.tar.gz) = 477340
diff --git a/net/liveMedia/files/patch-liveMedia-include_Locale.hh b/net/liveMedia/files/patch-liveMedia-include_Locale.hh
deleted file mode 100644
index 9790c334c0e7..000000000000
--- a/net/liveMedia/files/patch-liveMedia-include_Locale.hh
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./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
diff --git a/net/liveMedia/pkg-descr b/net/liveMedia/pkg-descr
index 2d029ec9e0fd..57d147e92374 100644
--- a/net/liveMedia/pkg-descr
+++ b/net/liveMedia/pkg-descr
@@ -11,4 +11,4 @@ also be used to build basic RTSP clients and servers, and have been
 used to add streaming support to existing media player applications,
 such as "mplayer".
 
-WWW:	http://www.live555.com/liveMedia/
+WWW: http://www.live555.com/liveMedia/