diff options
8 files changed, 108 insertions, 97 deletions
| diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile index 8f4a6da1b379..e7f1fafee34d 100644 --- a/net/DarwinStreamingServer/Makefile +++ b/net/DarwinStreamingServer/Makefile @@ -6,13 +6,14 @@  #  PORTNAME=	DarwinStreamingServer -PORTVERSION=	5.0.3.2 -PORTREVISION=	1 +PORTVERSION=	5.5 +PORTREVISION=	0  CATEGORIES=	net  MASTER_SITES=	#http://developer.apple.com/darwin/projects/streaming/source/  #		You must accept APSL (Apple Public Source License),  and get -#		DSS-v5_0_3_2.zip. -DISTNAME=	DSS-v${PORTVERSION:S/./_/g} +#		DarwinStreamingSrvr5.5-Source.tar. +DISTNAME=	DarwinStreamingSrvr${PORTVERSION}-Source +EXTRACT_SUFX=	.tar  MAINTAINER=	nork@FreeBSD.org  COMMENT=	Darwin Streaming Server, a MP3, MPEG4 and QuickTime streaming server @@ -27,7 +28,6 @@ NO_PACKAGE=	${RESTRICTED}  IGNORE=		${RESTRICTED}  .endif -USE_ZIP=	YES  USE_REINPLACE=	YES  PKGMESSAGE=	${WRKDIR}/pkg-message @@ -57,28 +57,33 @@ post-patch:  	@${REINPLACE_CMD} -e 's,/usr/local/,${PREFIX}/,' \  		${WRKSRC}/Install							\  		${WRKSRC}/defaultPaths.h						\ +		${WRKSRC}/Documentation/readme.txt					\  		${WRKSRC}/streamingserver.xml-POSIX					\  		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\  		${WRKSRC}/WebAdmin/WebAdminHtml/adminprotocol-lib.pl  	@${REINPLACE_CMD} -e 's,${PREFIX}/sbin/StreamingServerModules,${PREFIX}/libexec/StreamingServerModules,' \  		${WRKSRC}/Install							\  		${WRKSRC}/defaultPaths.h						\ +		${WRKSRC}/Documentation/readme.txt					\  		${WRKSRC}/streamingserver.xml-POSIX  	@${REINPLACE_CMD} -e 's,${PREFIX}/movies,${DATADIR}/movies,' \  		${WRKSRC}/Install							\  		${WRKSRC}/defaultPaths.h						\ +		${WRKSRC}/Documentation/readme.txt					\  		${WRKSRC}/streamingserver.xml-POSIX					\  		${WRKSRC}/WebAdmin/WebAdminHtml/adminprotocol-lib.pl  	@${REINPLACE_CMD} -e 's,/etc/streaming,${PREFIX}/etc/streaming,' \  		${WRKSRC}/Install							\  		${WRKSRC}/qtaccess							\  		${WRKSRC}/defaultPaths.h						\ +		${WRKSRC}/Documentation/readme.txt					\  		${WRKSRC}/streamingserver.xml-POSIX					\  		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\  		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf  	@${REINPLACE_CMD} -e 's,/var/streaming/logs,/var/log/streaming,' \  		${WRKSRC}/Install							\  		${WRKSRC}/defaultPaths.h						\ +		${WRKSRC}/Documentation/readme.txt					\  		${WRKSRC}/streamingserver.xml-POSIX					\  		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\  		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf @@ -88,11 +93,11 @@ post-patch:  		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf  	@${REINPLACE_CMD} -e 's,/var/streaming/playlists,/var/spool/streaming.playlists,' \  		${WRKSRC}/Install							\ +		${WRKSRC}/Documentation/readme.txt					\  		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\  		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf  	@${REINPLACE_CMD} -e 's,/var/streaming/streamingadminserver.pid,/var/run/streamingadminserver.pid,' \ -		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\ -		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf +		${WRKSRC}/WebAdmin/src/streamingadminserver.pl  	@${REINPLACE_CMD} -e '/-O[23]/d' \  		${WRKSRC}/Makefile.POSIX						\  		${WRKSRC}/QTFileLib/Makefile.POSIX					\ @@ -101,10 +106,11 @@ post-patch:  		${WRKSRC}/HTTPUtilitiesLib/Makefile.POSIX				\  		${WRKSRC}/CommonUtilitiesLib/Makefile.POSIX				\  		${WRKSRC}/StreamingProxy.tproj/Makefile.POSIX				\ -		${WRKSRC}/StreamingServer.pbproj/project.pbxproj			\ +		${WRKSRC}/StreamingServer.xcode/project.pbxproj				\  		${WRKSRC}/PlaylistBroadcaster.tproj/Makefile.POSIX			\  		${WRKSRC}/QTFileTools/QTRTPGen.tproj/Makefile.POSIX			\  		${WRKSRC}/QTFileTools/QTSDPGen.tproj/Makefile.POSIX			\ +		${WRKSRC}/StreamingServer.pbproject/project.pbxproj			\  		${WRKSRC}/QTFileTools/QTFileInfo.tproj/Makefile.POSIX			\  		${WRKSRC}/QTFileTools/QTFileTest.tproj/Makefile.POSIX			\  		${WRKSRC}/APIModules/QTSSRefMovieModule/Makefile.POSIX			\ @@ -112,6 +118,7 @@ post-patch:  		${WRKSRC}/QTFileTools/QTBroadcaster.tproj/Makefile.POSIX		\  		${WRKSRC}/QTFileTools/QTRTPFileTest.tproj/Makefile.POSIX		\  		${WRKSRC}/QTFileTools/QTSampleLister.tproj/Makefile.POSIX		\ +		${WRKSRC}/APIModules/QTSSHomeDirectoryModule/Makefile.POSIX		\  		${WRKSRC}/APIModules/QTSSRawFileModule.bproj/Makefile.POSIX		\  		${WRKSRC}/APIModules/QTSSSpamDefenseModule.bproj/Makefile.POSIX		\  		${WRKSRC}/APIModules/QTSSDemoAuthorizationModule.bproj/Makefile.POSIX diff --git a/net/DarwinStreamingServer/distinfo b/net/DarwinStreamingServer/distinfo index 2dc16c70e095..502e9dae3ae0 100644 --- a/net/DarwinStreamingServer/distinfo +++ b/net/DarwinStreamingServer/distinfo @@ -1,2 +1,2 @@ -MD5 (DSS-v5_0_3_2.zip) = 394e74199a01e5f54c743bb02f898edd -SIZE (DSS-v5_0_3_2.zip) = 10859092 +MD5 (DarwinStreamingSrvr5.5-Source.tar) = 9bafc371f6d1b2c2326f985d8bce4d05 +SIZE (DarwinStreamingSrvr5.5-Source.tar) = 32225280 diff --git a/net/DarwinStreamingServer/files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp b/net/DarwinStreamingServer/files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp index 7339daf83f93..31bb480f960f 100644 --- a/net/DarwinStreamingServer/files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp +++ b/net/DarwinStreamingServer/files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp @@ -1,14 +1,5 @@ ---- APIModules/QTSSReflectorModule/ReflectorStream.cpp.orig	Thu Jun 10 09:03:34 2004 -+++ APIModules/QTSSReflectorModule/ReflectorStream.cpp	Sun May  1 19:53:44 2005 -@@ -179,7 +179,7 @@ -     theRRWriter++; -     *theRRWriter = htonl(theSsrc); -     theRRWriter++; --    *theRRWriter = FOUR_CHARS_TO_INT('Q','T','S','S'); -+    *theRRWriter = htonl(FOUR_CHARS_TO_INT('Q','T','S','S')); -     theRRWriter++; -     *theRRWriter = htonl(0); -     theRRWriter++; +--- APIModules/QTSSReflectorModule/ReflectorStream.cpp.orig	Thu Sep 30 23:40:54 2004 ++++ APIModules/QTSSReflectorModule/ReflectorStream.cpp	Sun Jul 10 15:16:15 2005  @@ -381,11 +381,11 @@       // specified by the source info, we can use that to demultiplex separate broadcasts on       // the same port. If the src IP addr is 0, we cannot do this and must dedicate 1 port per diff --git a/net/DarwinStreamingServer/files/patch-Buildit b/net/DarwinStreamingServer/files/patch-Buildit index 3e50bc935041..be749ba93e92 100644 --- a/net/DarwinStreamingServer/files/patch-Buildit +++ b/net/DarwinStreamingServer/files/patch-Buildit @@ -1,6 +1,6 @@ ---- Buildit.orig	Thu Jun 10 09:03:33 2004 -+++ Buildit	Sun Feb 20 17:19:01 2005 -@@ -78,20 +78,20 @@ +--- Buildit.orig	Tue May 31 19:54:23 2005 ++++ Buildit	Sun Jul 10 15:22:41 2005 +@@ -93,20 +93,20 @@   		fi   		;; @@ -22,7 +22,7 @@  +	        INCLUDE_FLAG="-include"  -		CORE_LINK_LIBS="-pthread -lm -lcrypt" -+		CORE_LINK_LIBS="${PTHREAD_LIBS} -lcrypt -lm" ++		CORE_LINK_LIBS="${PTHREAD_LIBS} -lm -lcrypt"   		SHARED=-shared  -		MODULE_LIBS="-lgcc -lstdc++" diff --git a/net/DarwinStreamingServer/files/patch-DSS_MakeRoot b/net/DarwinStreamingServer/files/patch-DSS_MakeRoot deleted file mode 100644 index 2ef6dcdd5ad9..000000000000 --- a/net/DarwinStreamingServer/files/patch-DSS_MakeRoot +++ /dev/null @@ -1,24 +0,0 @@ ---- DSS_MakeRoot.orig	Tue Mar 11 12:13:25 2003 -+++ DSS_MakeRoot	Sat Jan 22 05:08:36 2005 -@@ -249,21 +249,6 @@ - 	cp -f WebAdmin/WebAdminHtml/html_en/messages $INSTALLROOT/AdminHtml/html_en/ - 	cp -f WebAdmin/WebAdminHtml/html_en/genres $INSTALLROOT/AdminHtml/html_en/ - 	 --	echo creating "$INSTALLROOT/AdminHtml/html_de/" directory --	mkdir -p $INSTALLROOT/AdminHtml/html_de/ --	cp -f WebAdmin/WebAdminHtml/html_de/messages $INSTALLROOT/AdminHtml/html_de/ --	cp -f WebAdmin/WebAdminHtml/html_de/genres $INSTALLROOT/AdminHtml/html_de/ -- --	echo creating "$INSTALLROOT/AdminHtml/html_fr/" directory --	mkdir -p $INSTALLROOT/AdminHtml/html_fr/ --	cp -f WebAdmin/WebAdminHtml/html_fr/messages $INSTALLROOT/AdminHtml/html_fr/ --	cp -f WebAdmin/WebAdminHtml/html_fr/genres $INSTALLROOT/AdminHtml/html_fr/ -- --	echo creating "$INSTALLROOT/AdminHtml/html_ja/" directory --	mkdir -p $INSTALLROOT/AdminHtml/html_ja/ --	cp -f WebAdmin/WebAdminHtml/html_ja/messages $INSTALLROOT/AdminHtml/html_ja/ --	cp -f WebAdmin/WebAdminHtml/html_ja/genres $INSTALLROOT/AdminHtml/html_ja/ -- - fi -  -  diff --git a/net/DarwinStreamingServer/files/patch-Install b/net/DarwinStreamingServer/files/patch-Install index ca3a32d35f3e..2ab9fe78306e 100644 --- a/net/DarwinStreamingServer/files/patch-Install +++ b/net/DarwinStreamingServer/files/patch-Install @@ -1,6 +1,12 @@ ---- Install.orig	Wed Jul 24 07:00:31 2002 -+++ Install	Sun Feb 20 22:31:51 2005 -@@ -15,6 +15,7 @@ +--- Install.orig	Fri May 27 18:55:01 2005 ++++ Install	Sun Jul 10 20:10:31 2005 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh +  + # Install script for the Darwin Streaming Server + # source release +@@ -16,6 +16,7 @@   if [ $USERID = 0 ]; then @@ -8,7 +14,7 @@   	echo Checking for and Killing currently running Darwin Streaming Server   	if [ `uname` = "FreeBSD" ]; then   		ps -ax | awk '/DarwinStreamingServer/ {print $1}' | xargs kill -9   -@@ -110,6 +111,7 @@ +@@ -113,6 +114,7 @@   	fi   	echo @@ -16,8 +22,8 @@   ## CHANGE PERL PATH IN streamingadminserver.pl AND parse_xml.cgi ## -@@ -196,64 +198,72 @@ -         fi               +@@ -207,29 +209,29 @@ +     fi                 	echo copying "DarwinStreamingServer" to "/usr/local/sbin/DarwinStreamingServer"  -	cp -f DarwinStreamingServer /usr/local/sbin/ @@ -37,62 +43,74 @@  +	${BSD_INSTALL_PROGRAM} qtpasswd /usr/local/bin/   	# For now, do not copy modules as there are no supported dynamic modules --	# echo copying modules to "/usr/local/sbin/StreamingServerModules" + 	# echo copying modules to "/usr/local/sbin/StreamingServerModules"  -	if [ ! -d /usr/local/sbin/StreamingServerModules ]; then  -		echo creating "/usr/local/sbin/StreamingServerModules" directory  -		mkdir /usr/local/sbin/StreamingServerModules -+	# echo copying modules to "/usr/local/libexec/StreamingServerModules"  +	if [ ! -d /usr/local/libexec/StreamingServerModules ]; then  +		echo creating "/usr/local/libexec/StreamingServerModules" directory  +		mkdir /usr/local/libexec/StreamingServerModules   	fi --	# cp -f StreamingServerModules/* /usr/local/sbin/StreamingServerModules/ -+	# ${BSD_INSTALL_PROGRAM} StreamingServerModules/* /usr/local/libexec/StreamingServerModules/ +-	cp -f StreamingServerModules/* /usr/local/sbin/StreamingServerModules/ ++	${BSD_INSTALL_PROGRAM} StreamingServerModules/* /usr/local/libexec/StreamingServerModules/ +  +-	if [ -e /usr/local/sbin/StreamingServerModules/QTSSHomeDirectoryModule ]; then ++	if [ -e /usr/local/libexec/StreamingServerModules/QTSSHomeDirectoryModule ]; then + 		echo copying "createuserstreamingdir" to "/usr/local/bin/createuserstreamingdir" +-		cp -f createuserstreamingdir $INSTALLROOT/usr/local/bin/ ++		${BSD_INSTALL_PROGRAM} createuserstreamingdir $INSTALLROOT/usr/local/bin/ + 	fi   	if [ ! -d /etc/streaming ]; then - 		echo creating "/etc/streaming" directory +@@ -237,44 +239,53 @@   		mkdir -p /etc/streaming   	fi --	echo copying "streamingserver.xml" to "/etc/streaming/streamingserver.xml-sample" --	cp -f streamingserver.xml /etc/streaming/streamingserver.xml-sample  +	echo copying "streamingserver.xml" to "/etc/streaming/streamingserver.xml-dist"  +	${BSD_INSTALL_DATA} streamingserver.xml /etc/streaming/streamingserver.xml-dist + 	if [ ! -e /etc/streaming/streamingserver.xml ]; then ++		echo;echo copying "streamingserver.xml" to "/etc/streaming/streamingserver.xml" ++		${BSD_INSTALL_DATA} streamingserver.xml /etc/streaming/streamingserver.xml ++if false; then + 		/usr/local/sbin/DarwinStreamingServer -x ++fi + 	fi -+	if [ ! -e /etc/streaming/streamingserver.xml ]; then - 	echo;echo copying "streamingserver.xml" to "/etc/streaming/streamingserver.xml" --	cp -f streamingserver.xml /etc/streaming/streamingserver.xml -+	${BSD_INSTALL_DATA} streamingserver.xml /etc/streaming/streamingserver.xml   	chmod 600 /etc/streaming/streamingserver.xml -+	fi -  + 	chown qtss /etc/streaming/streamingserver.xml + 	  -	echo;echo copying "relayconfig.xml-Sample" to "/etc/streaming/relayconfig.xml-Sample"  -	cp -f relayconfig.xml-Sample /etc/streaming/relayconfig.xml-Sample  -	chmod 600 /etc/streaming/relayconfig.xml-Sample +-	if [ -e /etc/streaming/relayconfig.xml ]; then  +	echo;echo copying "relayconfig.xml-Sample" to "/etc/streaming/relayconfig.xml-dist"  +	${BSD_INSTALL_DATA} relayconfig.xml-Sample /etc/streaming/relayconfig.xml-dist  +	chmod 600 /etc/streaming/relayconfig.xml-dist -+		  +	if [ ! -e /etc/streaming/relayconfig.xml ]; then -+	echo;echo copying "relayconfig.xml-Sample" to "/etc/streaming/relayconfig.xml" -+	${BSD_INSTALL_DATA} relayconfig.xml-Sample /etc/streaming/relayconfig.xml -+	chmod 600 /etc/streaming/relayconfig.xml -+	fi - 		 ++		echo;echo copying "relayconfig.xml-Sample" to "/etc/streaming/relayconfig.xml" ++		${BSD_INSTALL_DATA} relayconfig.xml-Sample /etc/streaming/relayconfig.xml + 		chown qtss /etc/streaming/relayconfig.xml ++		chmod 600 /etc/streaming/relayconfig.xml + 	fi + 	  -	echo;echo copying "qtusers" to "/etc/streaming/qtusers"  -	cp -f qtusers /etc/streaming/qtusers  -	chmod 600 /etc/streaming/qtusers +-	chown qtss /etc/streaming/qtusers  -  -	echo;echo copying "qtgroups" to "/etc/streaming/qtgroups"  -	cp -f qtgroups /etc/streaming/qtgroups  -	chmod 600 /etc/streaming/qtgroups +-	chown qtss /etc/streaming/qtgroups  +	echo;echo copying "qtusers" to "/etc/streaming/qtusers-dist"  +	${BSD_INSTALL_DATA} qtusers /etc/streaming/qtusers-dist  +	chmod 600 /etc/streaming/qtusers-dist ++	chown qtss /etc/streaming/qtusers-dist  +  +	echo;echo copying "qtgroups" to "/etc/streaming/qtgroups-dist"  +	${BSD_INSTALL_DATA} qtgroups /etc/streaming/qtgroups-dist  +	chmod 600 /etc/streaming/qtgroups-dist ++	chown qtss /etc/streaming/qtgroups-dist   	#echo;echo copying "streamingadminserver.pem" to "/etc/streaming/streamingadminserver.pem"  -	#cp -f streamingadminserver.pem /etc/streaming/streamingadminserver.pem @@ -107,8 +125,8 @@  +		mkdir -p ${DATADIR}   	fi --	echo copying "readme.pdf" to "/var/streaming/readme.pdf" --	cp -f readme.pdf /var/streaming/readme.pdf +-	echo copying "readme.txt" to "/var/streaming/readme.txt" +-	cp -f readme.txt /var/streaming/readme.txt  +	echo copying "readme.txt" to "${DATADIR}/readme.txt"  +	${BSD_INSTALL_DATA} readme.txt ${DATADIR}/readme.txt @@ -119,8 +137,8 @@   	if [ ! -d /var/streaming/logs ]; then   		echo creating "/var/streaming/logs" directory -@@ -272,46 +282,49 @@ - 	fi +@@ -294,66 +305,69 @@ + 	chmod 775 /usr/local/movies       echo copying "sample_100kbit.mov" into "/usr/local/movies/sample_100kbit.mov"  -    cp -f sample_100kbit.mov /usr/local/movies/ @@ -142,7 +160,24 @@  -    cp -f sample.mp3 /usr/local/movies/  +    ${BSD_INSTALL_DATA} sample.mp3 /usr/local/movies/ -+	if false; then +     echo copying "sample_50kbit.3gp" into "/usr/local/movies/sample_50kbit.3gp" +-    cp -f sample_50kbit.3gp /usr/local/movies/ ++    ${BSD_INSTALL_DATA} sample_50kbit.3gp /usr/local/movies/ +  +     echo copying "sample_h264_100kbit.mp4" into "/usr/local/movies/sample_h264_100kbit.mp4" +-    cp -f sample_h264_100kbit.mp4 /usr/local/movies/ ++    ${BSD_INSTALL_DATA} sample_h264_100kbit.mp4 /usr/local/movies/ +  +     echo copying "sample_h264_300kbit.mp4" into "/usr/local/movies/sample_h264_300kbit.mp4" +-    cp -f sample_h264_300kbit.mp4 /usr/local/movies/ ++    ${BSD_INSTALL_DATA} sample_h264_300kbit.mp4 /usr/local/movies/ +  +     echo copying "sample_h264_1mbit.mp4" into "/usr/local/movies/sample_h264_1mbit.mp4" +-    cp -f sample_h264_1mbit.mp4 /usr/local/movies/ ++    ${BSD_INSTALL_DATA} sample_h264_1mbit.mp4 /usr/local/movies/ +  ++if false; then + if [ -e StreamingLoadTool ]; then   	echo copying "StreamingLoadTool" to "/usr/local/bin/StreamingLoadTool"  -	cp -f StreamingLoadTool /usr/local/bin/  +	${BSD_INSTALL_PROGRAM} StreamingLoadTool /usr/local/bin/ @@ -151,7 +186,8 @@  -	cp -f streamingloadtool.conf /etc/streaming/  +	echo copying "streamingloadtool.conf" to "/etc/streaming/streamingloadtool.conf-dist"  +	${BSD_INSTALL_DATA} streamingloadtool.conf /etc/streaming/streamingloadtool.conf-dist -+	fi ++fi + fi   	#WebAdmin install   	echo copying "streamingadminserver.pl" into "/usr/local/sbin/streamingadminserver.pl" @@ -162,6 +198,7 @@   	    echo removing old version of html from "/var/streaming/AdminHtml"   	    rm -r -f /var/streaming/AdminHtml/*   	fi     + 	  -	if [ ! -d /var/streaming/ ]; then  +	if [ ! -d /var/streaming/AdminHtml ]; then   		echo creating "/var/streaming/AdminHtml" directory @@ -171,6 +208,11 @@  -	cp -f -r AdminHtml /var/streaming/  +	tar -cf - AdminHtml | tar -xf - -C ${DATADIR} +  + 	chown -R -f qtss /var/streaming/ + 	chown -R -f qtss /etc/streaming/ + 	chown -R -f qtss /usr/local/movies/ +   -	echo;echo "Launching streamingadminserver.pl"  -	/usr/local/sbin/streamingadminserver.pl  +#	echo;echo "Launching streamingadminserver.pl" @@ -182,9 +224,9 @@   	# Setup for DSS   	# Prompts for a username and password   	# that can be used to administer the server -@@ -372,6 +385,7 @@ - 	/usr/local/bin/qtpasswd -F -d 'aGFja21l' > /dev/null - 		 +@@ -416,6 +430,7 @@ + 	chown -R -f qtss /etc/streaming/ + 	   	echo Setup Complete!  +fi diff --git a/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl b/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl index 9bb84e0d82a3..39d4d946f272 100644 --- a/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl +++ b/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl @@ -1,15 +1,6 @@ ---- WebAdmin/src/streamingadminserver.pl.orig	Thu Aug 28 08:21:55 2003 -+++ WebAdmin/src/streamingadminserver.pl	Sat Jan 22 09:55:56 2005 -@@ -40,7 +40,7 @@ - } - else - { --    eval "use Net::SSleay"; -+    eval "use Net::SSLeay"; - } - $ssl_available = 0; - if (!$@) { -@@ -248,7 +248,7 @@ +--- WebAdmin/src/streamingadminserver.pl.orig	Thu Jul  7 07:57:00 2005 ++++ WebAdmin/src/streamingadminserver.pl	Sun Jul 10 15:18:05 2005 +@@ -255,7 +255,7 @@   	  "gbrowse", "0",   	  "ssl", "0",   	  "crtfile", "/etc/streaming/streamingadminserver.pem", diff --git a/net/DarwinStreamingServer/pkg-plist b/net/DarwinStreamingServer/pkg-plist index ff2c78ee58a7..4c7324be4788 100644 --- a/net/DarwinStreamingServer/pkg-plist +++ b/net/DarwinStreamingServer/pkg-plist @@ -3,8 +3,8 @@ bin/MP3Broadcaster  bin/PlaylistBroadcaster  sbin/DarwinStreamingServer  sbin/streamingadminserver.pl -@comment libexec/StreamingServerModules/QTSSHomeDirectoryModule -@comment libexec/StreamingServerModules/QTSSRefMovieModule +libexec/StreamingServerModules/QTSSRefMovieModule +libexec/StreamingServerModules/QTSSHomeDirectoryModule  @exec   mkdir %D/%%DATADIR%%                 2>/dev/null || true  @exec   mkdir %D/%%DATADIR%%/movies          2>/dev/null || true  %%DATADIR%%/readme.txt @@ -135,6 +135,10 @@ sbin/streamingadminserver.pl  %%DATADIR%%/movies/sample_100kbit.mp4  %%DATADIR%%/movies/sample_300kbit.mov  %%DATADIR%%/movies/sample_300kbit.mp4 +%%DATADIR%%/movies/sample_50kbit.3gp +%%DATADIR%%/movies/sample_h264_100kbit.mp4 +%%DATADIR%%/movies/sample_h264_1mbit.mp4 +%%DATADIR%%/movies/sample_h264_300kbit.mp4  etc/rc.d/streamingadminserver.sh  etc/rc.d/darwin_streaming_server.sh  etc/streaming/qtusers-dist | 
