o Update to 2002.02.03a.

o Clean up header file handling(only Makefile).

3 files changed, 32 insertions, 92 deletions

diff --git a/net/liveMedia/Makefile b/net/liveMedia/Makefile
index f90e83f3b02f..1ff5a587d129 100644
--- a/net/liveMedia/Makefile
+++ b/net/liveMedia/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	liveMedia
-PORTVERSION=	2003.01.28
+PORTVERSION=	2003.02.03a
 CATEGORIES=	net devel
 MASTER_SITES=	http://www.LIVE.COM/liveMedia/public/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
@@ -18,6 +18,7 @@ MAINTAINER=	nork@FreeBSD.org
 NO_CDROM=	'dated material'
 
 WRKSRC=		${WRKDIR}/live
+PLIST=		${WRKDIR}/pkg-plist
 
 USE_REINPLACE=	YES
 
@@ -40,6 +41,7 @@ groupsock=		\
 		groupsock/include/GroupsockHelper.hh \
 		groupsock/include/IOHandlers.hh \
 		groupsock/include/NetAddress.hh \
+		groupsock/include/NetCommon.h \
 		groupsock/include/NetInterface.hh \
 		groupsock/include/TunnelEncaps.hh \
 		groupsock/include/groupsock_version.hh
@@ -54,7 +56,6 @@ liveMedia=		\
 		liveMedia/include/FramedFilter.hh \
 		liveMedia/include/FramedSource.hh \
 		liveMedia/include/GSMAudioRTPSink.hh \
-		liveMedia/include/GroupsockHelper.hh \
 		liveMedia/include/H263plusVideoRTPSink.hh \
 		liveMedia/include/H263plusVideoRTPSource.hh \
 		liveMedia/include/HTTPSink.hh \
@@ -107,38 +108,56 @@ post-extract:
 do-configure:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./genMakefiles fixed-${OPSYS:L})
 
+pre-install:
+	@${RM} -f ${PLIST}
+	@${TOUCH} ${PLIST}
+	@${INSTALL} -d ${_SHROWNGRP} -m ${SHAREMODE} ${PREFIX}/live
+	@${INSTALL} -d ${_SHROWNGRP} -m ${SHAREMODE} ${PREFIX}/live/groupsock
+	@${INSTALL} -d ${_SHROWNGRP} -m ${SHAREMODE} ${PREFIX}/live/liveMedia
+	@${INSTALL} -d ${_SHROWNGRP} -m ${SHAREMODE} ${PREFIX}/live/UsageEnvironment
+	@${INSTALL} -d ${_SHROWNGRP} -m ${SHAREMODE} ${PREFIX}/live/BasicUsageEnvironment
+	@${INSTALL} -d ${_SHROWNGRP} -m ${SHAREMODE} ${PREFIX}/live/groupsock/include
+	@${INSTALL} -d ${_SHROWNGRP} -m ${SHAREMODE} ${PREFIX}/live/liveMedia/include
+	@${INSTALL} -d ${_SHROWNGRP} -m ${SHAREMODE} ${PREFIX}/live/UsageEnvironment/include
+	@${INSTALL} -d ${_SHROWNGRP} -m ${SHAREMODE} ${PREFIX}/live/BasicUsageEnvironment/include
+
 do-install::
+	@${ECHO_CMD} bin/playSIP  >> ${PLIST}
+	@${ECHO_CMD} bin/openRTSP >> ${PLIST}
+	@${ECHO_CMD} bin/sapWatch >> ${PLIST}
+	@${INSTALL_PROGRAM} ${WRKSRC}/testProgs/playSIP  ${PREFIX}/bin/
 	@${INSTALL_PROGRAM} ${WRKSRC}/testProgs/openRTSP ${PREFIX}/bin/
-	@${INSTALL_PROGRAM} ${WRKSRC}/testProgs/playSIP ${PREFIX}/bin/
 	@${INSTALL_PROGRAM} ${WRKSRC}/testProgs/sapWatch ${PREFIX}/bin/
 
 do-install::
-	@${MKDIR} ${PREFIX}/live
-	@${MKDIR} ${PREFIX}/live/BasicUsageEnvironment
-	@${MKDIR} ${PREFIX}/live/UsageEnvironment
-	@${MKDIR} ${PREFIX}/live/groupsock
-	@${MKDIR} ${PREFIX}/live/liveMedia
+	@${ECHO_CMD} live/BasicUsageEnvironment/libBasicUsageEnvironment.a >> ${PLIST}
+	@${ECHO_CMD} live/UsageEnvironment/libUsageEnvironment.a           >> ${PLIST}
+	@${ECHO_CMD} live/groupsock/libgroupsock.a                         >> ${PLIST}
+	@${ECHO_CMD} live/liveMedia/libliveMedia.a                         >> ${PLIST}
 	@${INSTALL_DATA} ${WRKSRC}/BasicUsageEnvironment/libBasicUsageEnvironment.a ${PREFIX}/live/BasicUsageEnvironment/
 	@${INSTALL_DATA} ${WRKSRC}/UsageEnvironment/libUsageEnvironment.a           ${PREFIX}/live/UsageEnvironment/
 	@${INSTALL_DATA} ${WRKSRC}/groupsock/libgroupsock.a                         ${PREFIX}/live/groupsock/
 	@${INSTALL_DATA} ${WRKSRC}/liveMedia/libliveMedia.a                         ${PREFIX}/live/liveMedia/
 
 do-install::
-	@${MKDIR} ${PREFIX}/live/BasicUsageEnvironment/include
-	@${MKDIR} ${PREFIX}/live/UsageEnvironment/include
-	@${MKDIR} ${PREFIX}/live/groupsock/include
-	@${MKDIR} ${PREFIX}/live/liveMedia/include
 .for file in ${BasicUsageEnvironment}
+	@${ECHO_CMD} live/BasicUsageEnvironment/include/${file:T} >> ${PLIST}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/live/BasicUsageEnvironment/include/
 .endfor
 .for file in ${UsageEnvironment}
+	@${ECHO_CMD} live/UsageEnvironment/include/${file:T}      >> ${PLIST}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/live/UsageEnvironment/include/
 .endfor
 .for file in ${groupsock}
+	@${ECHO_CMD} live/groupsock/include/${file:T}             >> ${PLIST}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/live/groupsock/include/
 .endfor
 .for file in ${liveMedia}
+	@${ECHO_CMD} live/liveMedia/include/${file:T}             >> ${PLIST}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/live/liveMedia/include/
 .endfor
 
+do-install::
+	@${CAT} ${.CURDIR}/pkg-plist >> ${PLIST}
+
 .include <bsd.port.mk>
diff --git a/net/liveMedia/distinfo b/net/liveMedia/distinfo
index fa99517ae9e1..b8c68373d6cb 100644
--- a/net/liveMedia/distinfo
+++ b/net/liveMedia/distinfo
@@ -1 +1 @@
-MD5 (live.2003.01.28.tar.gz) = 9e9523e7fc537ee5d9f96e7cb20ab016
+MD5 (live.2003.02.03a.tar.gz) = aa5565952e5d10a6e43d7c85f337d6ad
diff --git a/net/liveMedia/pkg-plist b/net/liveMedia/pkg-plist
index 71e8b745ce5d..143ed83ba5eb 100644
--- a/net/liveMedia/pkg-plist
+++ b/net/liveMedia/pkg-plist
@@ -1,82 +1,3 @@
-bin/openRTSP
-bin/playSIP
-bin/sapWatch
-live/BasicUsageEnvironment/libBasicUsageEnvironment.a
-live/BasicUsageEnvironment/include/BasicHashTable.hh
-live/BasicUsageEnvironment/include/BasicUsageEnvironment.hh
-live/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh
-live/BasicUsageEnvironment/include/DelayQueue.hh
-live/BasicUsageEnvironment/include/Lock.hh
-live/UsageEnvironment/libUsageEnvironment.a
-live/UsageEnvironment/include/Boolean.hh
-live/UsageEnvironment/include/HashTable.hh
-live/UsageEnvironment/include/UsageEnvironment.hh
-live/UsageEnvironment/include/UsageEnvironment_version.hh
-live/groupsock/libgroupsock.a
-live/groupsock/include/GroupEId.hh
-live/groupsock/include/Groupsock.hh
-live/groupsock/include/GroupsockHelper.hh
-live/groupsock/include/IOHandlers.hh
-live/groupsock/include/NetAddress.hh
-live/groupsock/include/NetInterface.hh
-live/groupsock/include/TunnelEncaps.hh
-live/groupsock/include/groupsock_version.hh
-live/liveMedia/libliveMedia.a
-live/liveMedia/include/BasicUDPSource.hh
-live/liveMedia/include/ByteStreamFileSource.hh
-live/liveMedia/include/ByteStreamMultiFileSource.hh
-live/liveMedia/include/DeviceSource.hh
-live/liveMedia/include/FileSink.hh
-live/liveMedia/include/FramedFileSource.hh
-live/liveMedia/include/FramedFilter.hh
-live/liveMedia/include/FramedSource.hh
-live/liveMedia/include/GSMAudioRTPSink.hh
-live/liveMedia/include/GroupsockHelper.hh
-live/liveMedia/include/H263plusVideoRTPSink.hh
-live/liveMedia/include/H263plusVideoRTPSource.hh
-live/liveMedia/include/HTTPSink.hh
-live/liveMedia/include/JPEGVideoRTPSource.hh
-live/liveMedia/include/MP3ADU.hh
-live/liveMedia/include/MP3ADURTPSink.hh
-live/liveMedia/include/MP3ADURTPSource.hh
-live/liveMedia/include/MP3ADUTranscoder.hh
-live/liveMedia/include/MP3ADUinterleaving.hh
-live/liveMedia/include/MP3FileSource.hh
-live/liveMedia/include/MP3HTTPSource.hh
-live/liveMedia/include/MP3Transcoder.hh
-live/liveMedia/include/MPEG4LATMAudioRTPSource.hh
-live/liveMedia/include/MPEGAudioRTPSink.hh
-live/liveMedia/include/MPEGAudioRTPSource.hh
-live/liveMedia/include/MPEGAudioStreamFramer.hh
-live/liveMedia/include/MPEGDemux.hh
-live/liveMedia/include/MPEGDemuxedElementaryStream.hh
-live/liveMedia/include/MPEGVideoHTTPSink.hh
-live/liveMedia/include/MPEGVideoRTPSink.hh
-live/liveMedia/include/MPEGVideoRTPSource.hh
-live/liveMedia/include/MPEGVideoStreamFramer.hh
-live/liveMedia/include/Media.hh
-live/liveMedia/include/MediaSession.hh
-live/liveMedia/include/MediaSink.hh
-live/liveMedia/include/MediaSource.hh
-live/liveMedia/include/MultiFramedRTPSink.hh
-live/liveMedia/include/MultiFramedRTPSource.hh
-live/liveMedia/include/PassiveServerMediaSession.hh
-live/liveMedia/include/PrioritizedRTPStreamSelector.hh
-live/liveMedia/include/QCELPAudioRTPSource.hh
-live/liveMedia/include/QuickTimeFileSink.hh
-live/liveMedia/include/QuickTimeGenericRTPSource.hh
-live/liveMedia/include/RTCP.hh
-live/liveMedia/include/RTPInterface.hh
-live/liveMedia/include/RTPSink.hh
-live/liveMedia/include/RTPSource.hh
-live/liveMedia/include/RTSPClient.hh
-live/liveMedia/include/RTSPServer.hh
-live/liveMedia/include/SIPClient.hh
-live/liveMedia/include/ServerMediaSession.hh
-live/liveMedia/include/SimpleRTPSink.hh
-live/liveMedia/include/SimpleRTPSource.hh
-live/liveMedia/include/liveMedia.hh
-live/liveMedia/include/liveMedia_version.hh
 @dirrm live/BasicUsageEnvironment/include
 @dirrm live/UsageEnvironment/include
 @dirrm live/groupsock/include