3 files changed, 176 insertions, 136 deletions

diff --git a/net/DarwinStreamingServer/files/patch-Buildit b/net/DarwinStreamingServer/files/patch-Buildit
index 49061f64c4bb..cb43a26747be 100644
--- a/net/DarwinStreamingServer/files/patch-Buildit
+++ b/net/DarwinStreamingServer/files/patch-Buildit
@@ -1,6 +1,6 @@
---- Buildit.orig	Sat Nov  2 10:08:06 2002
-+++ Buildit	Tue Jan  7 10:56:12 2003
-@@ -78,20 +78,20 @@
+--- Buildit.orig	Thu Nov 13 10:02:58 2003
++++ Buildit	Sun Jan 18 07:23:31 2004
+@@ -81,20 +81,20 @@ case $PLAT in
  		fi
  		;;
  
diff --git a/net/DarwinStreamingServer/files/patch-Install b/net/DarwinStreamingServer/files/patch-Install
index ba79026ec844..569d7f0563c2 100644
--- a/net/DarwinStreamingServer/files/patch-Install
+++ b/net/DarwinStreamingServer/files/patch-Install
@@ -1,49 +1,65 @@
---- Install.orig	Sat Jul  6 09:20:05 2002
-+++ Install	Tue Sep 24 02:30:09 2002
-@@ -15,6 +15,7 @@
+--- Install.orig	Thu Nov 13 10:02:58 2003
++++ Install	Mon Feb  2 02:56:41 2004
+@@ -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
  
-+    if false; then
++if false; then
  	echo Checking for and Killing currently running Darwin Streaming Server
  	if [ `uname` = "FreeBSD" ]; then
  		ps -ax | awk '/DarwinStreamingServer/ {print $1}' | xargs kill -9  
-@@ -110,14 +111,15 @@
+@@ -113,14 +114,15 @@
  	fi
  
  	echo
-+    fi
++fi
  
  ## CHANGE PERL PATH IN streamingadminserver.pl AND parse_xml.cgi ##
  
  # Look for perl in the default locations
- if [ -x /usr/bin/perl ]; then
- 	perldef=/usr/bin/perl
+ if [ -x /usr/freeware/bin/perl ]; then
+ 	perldef=/usr/freeware/bin/perl
 -elif [ -x /usr/local/bin/perl ]; then
 -	perldef=/usr/local/bin/perl
 +elif [ -x ${LOCALBASE}/bin/perl ]; then
 +	perldef=${LOCALBASE}/bin/perl
+ elif [ -x /usr/bin/perl ]; then
+ 	perldef=/usr/bin/perl
  else
- 	perldef=""
- fi
-@@ -184,127 +186,130 @@
+@@ -189,159 +191,160 @@
  fi
  
+ # Add the unprivileged user qtss as the server's run user
++if false; then
+ 	echo "Creating unprivileged user to run the server = \"qtss\"."
+     if [ $INSTALL_OS = "Linux" ]; then
+         /usr/sbin/useradd -M qtss > /dev/null 2>&1
+     else
+         /usr/sbin/useradd qtss > /dev/null 2>&1
+     fi
++fi
+ 	
  ## INSTALL NEW VERSION ##
--        if [ ! -d /usr/local/sbin ]; then
--                echo creating "/usr/local/sbin" directory
--                mkdir -p /usr/local/sbin
-+        if [ ! -d ${PREFIX}/sbin ]; then
-+                echo creating "${PREFIX}/sbin" directory
-+                mkdir -p ${PREFIX}/sbin
-         fi              
--        if [ ! -d /usr/local/bin ]; then
--                echo creating "/usr/local/bin" directory
--                mkdir -p /usr/local/bin
-+        if [ ! -d ${PREFIX}/bin ]; then
-+                echo creating "${PREFIX}/bin" directory
-+                mkdir -p ${PREFIX}/bin
-         fi              
+-    if [ ! -d /usr/local/sbin ]; then
+-            echo creating "/usr/local/sbin" directory
+-            mkdir -p /usr/local/sbin
++    if [ ! -d ${PREFIX}/sbin ]; then
++            echo creating "${PREFIX}/sbin" directory
++            mkdir -p ${PREFIX}/sbin
+     fi              
+-    if [ ! -d /usr/local/bin ]; then
+-            echo creating "/usr/local/bin" directory
+-            mkdir -p /usr/local/bin
++    if [ ! -d ${PREFIX}/bin ]; then
++            echo creating "${PREFIX}/bin" directory
++            mkdir -p ${PREFIX}/bin
+     fi              
  
 -	echo copying "DarwinStreamingServer" to "/usr/local/sbin/DarwinStreamingServer"
 -	cp -f DarwinStreamingServer /usr/local/sbin/
@@ -71,69 +87,75 @@
 -	if [ ! -d /usr/local/sbin/StreamingServerModules ]; then
 -		echo creating "/usr/local/sbin/StreamingServerModules" directory
 -		mkdir /usr/local/sbin/StreamingServerModules
--	fi
--	# cp -f StreamingServerModules/* /usr/local/sbin/StreamingServerModules/
--	
++	# echo copying modules to "${PREFIX}/libexec/StreamingServerModules"
++	if [ ! -d ${PREFIX}/libexec/StreamingServerModules ]; then
++		echo creating "${PREFIX}/libexec/StreamingServerModules" directory
++		mkdir ${PREFIX}/libexec/StreamingServerModules
+ 	fi
+-	cp -f StreamingServerModules/* /usr/local/sbin/StreamingServerModules/
++	${BSD_INSTALL_PROGRAM} StreamingServerModules/* ${PREFIX}/libexec/StreamingServerModules/
+ 
+-	if [ -e /usr/local/sbin/StreamingServerModules/QTSSHomeDirectoryModule ]; then
+-		echo copying "createuserstreamingdir" to "/usr/local/bin/createuserstreamingdir"
+-		cp -f createuserstreamingdir $INSTALLROOT/usr/local/bin/
++	if [ -e ${PREFIX}/libexec/StreamingServerModules/QTSSHomeDirectoryModule ]; then
++		echo copying "createuserstreamingdir" to "${PREFIX}/bin/createuserstreamingdir"
++		${BSD_INSTALL_SCRIPT} createuserstreamingdir ${PREFIX}/bin/
+ 	fi
+ 	
 -	if [ ! -d /etc/streaming ]; then
 -		echo creating "/etc/streaming" directory
 -		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;echo copying "streamingserver.xml" to "/etc/streaming/streamingserver.xml"
--	cp -f streamingserver.xml /etc/streaming/streamingserver.xml
++	if [ ! -d ${PREFIX}/etc/streaming ]; then
++		echo creating "${PREFIX}/etc/streaming" directory
++		mkdir -p ${PREFIX}/etc/streaming
+ 	fi
+ 	
+-	if [ ! -e /etc/streaming/streamingserver.xml ]; then
+-		/usr/local/sbin/DarwinStreamingServer -x
++	echo;echo copying "streamingserver.xml" to "${PREFIX}/etc/streaming/streamingserver.xml-dist"
++	${BSD_INSTALL_DATA} streamingserver.xml ${PREFIX}/etc/streaming/streamingserver.xml-dist
++	if [ ! -e ${PREFIX}/etc/streaming/streamingserver.xml ]; then
++		echo;echo copying "streamingserver.xml" to "${PREFIX}/etc/streaming/streamingserver.xml"
++		${BSD_INSTALL_DATA} streamingserver.xml ${PREFIX}/etc/streaming/streamingserver.xml
+ 	fi
+ 	
 -	chmod 600 /etc/streaming/streamingserver.xml
--
+-	chown qtss /etc/streaming/streamingserver.xml
++	chmod 600 ${PREFIX}/etc/streaming/streamingserver.xml ${PREFIX}/etc/streaming/streamingserver.xml-dist
++	chown qtss:qtss ${PREFIX}/etc/streaming/streamingserver.xml ${PREFIX}/etc/streaming/streamingserver.xml-dist
+ 	
 -	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
-+	# echo copying modules to "${PREFIX}/sbin/StreamingServerModules"
-+	if [ ! -d ${PREFIX}/libexec/StreamingServerModules ]; then
-+		echo creating "${PREFIX}/libexec/StreamingServerModules" directory
-+		mkdir ${PREFIX}/libexec/StreamingServerModules
-+	fi
-+	# ${BSD_INSTALL_PROGRAM} StreamingServerModules/* ${PREFIX}/libexec/StreamingServerModules/
-+	
-+	if [ ! -d ${PREFIX}/etc/streaming ]; then
-+		echo creating "${PREFIX}/etc/streaming" directory
-+		mkdir -p ${PREFIX}/etc/streaming
-+	fi
-+	
-+	echo copying "streamingserver.xml" to "${PREFIX}/etc/streaming/streamingserver.xml-sample"
-+	${BSD_INSTALL_DATA} streamingserver.xml ${PREFIX}/etc/streaming/streamingserver.xml-sample
-+	
-+	[ -f ${PREFIX}/etc/streaming/streamingserver.xml ] || (
-+	echo;echo copying "streamingserver.xml" to "${PREFIX}/etc/streaming/streamingserver.xml"
-+	${BSD_INSTALL_DATA} streamingserver.xml ${PREFIX}/etc/streaming/streamingserver.xml
-+	)
-+	chmod 600 ${PREFIX}/etc/streaming/streamingserver.xml
-+
-+	echo;echo copying "relayconfig.xml-Sample" to "${PREFIX}/etc/streaming/relayconfig.xml-Sample"
-+	${BSD_INSTALL_DATA} relayconfig.xml-Sample ${PREFIX}/etc/streaming/relayconfig.xml-Sample
-+	chmod 600 ${PREFIX}/etc/streaming/relayconfig.xml-Sample
- 		
+-	if [ -e /etc/streaming/relayconfig.xml ]; then
+-		chown qtss /etc/streaming/relayconfig.xml
++	echo;echo copying "relayconfig.xml-Sample" to "${PREFIX}/etc/streaming/relayconfig.xml-dist"
++	${BSD_INSTALL_DATA} relayconfig.xml-Sample ${PREFIX}/etc/streaming/relayconfig.xml-dist
++	if [ ! -e ${PREFIX}/etc/streaming/relayconfig.xml ]; then
++		echo;echo copying "relayconfig.xml-Sample" to "${PREFIX}/etc/streaming/relayconfig.xml"
++		${BSD_INSTALL_DATA} relayconfig.xml-Sample ${PREFIX}/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 "qtusers" to "${PREFIX}/etc/streaming/qtusers-dist"
-+	${BSD_INSTALL_DATA} qtusers ${PREFIX}/etc/streaming/qtusers-dist
-+	chmod 600 ${PREFIX}/etc/streaming/qtusers-dist
++	install -c -o qtss -g qtss -m 0600 qtusers ${PREFIX}/etc/streaming/qtusers-dist
  
 -	echo;echo copying "qtgroups" to "/etc/streaming/qtgroups"
 -	cp -f qtgroups /etc/streaming/qtgroups
 -	chmod 600 /etc/streaming/qtgroups
-+	echo;echo copying "qtgroups" to "${PREFIX}/etc/streaming/qtgroups-dist"
-+	${BSD_INSTALL_DATA} qtgroups ${PREFIX}/etc/streaming/qtgroups-dist
-+	chmod 600 ${PREFIX}/etc/streaming/qtgroups-dist
+-	chown qtss /etc/streaming/qtgroups
++	echo;echo copying "qtgroups" to "/etc/streaming/qtgroups-dist"
++	install -c -o qtss -g qtss -m 0600  qtgroups ${PREFIX}/etc/streaming/qtgroups-dist
  
 -	#echo;echo copying "streamingadminserver.pem" to "/etc/streaming/streamingadminserver.pem"
 -	#cp -f streamingadminserver.pem /etc/streaming/streamingadminserver.pem
 -	#chmod 400 /etc/streaming/streamingadminserver.pem
 +	#echo;echo copying "streamingadminserver.pem" to "${PREFIX}/etc/streaming/streamingadminserver.pem"
-+	#${BSD_INSTALL_DATA} streamingadminserver.pem ${PREFIX}/etc/streaming/streamingadminserver.pem
-+	#chmod 400 ${PREFIX}/etc/streaming/streamingadminserver.pem
++	#install -c -o qtss -g qtss -m 0400 streamingadminserver.pem ${PREFIX}/etc/streaming/streamingadminserver.pem
  
 -	if [ ! -d /var/streaming ]; then
 -		echo creating "/var/streaming" directory
@@ -143,10 +165,10 @@
 +		mkdir -p ${DATADIR}
  	fi
  	
--	echo copying "readme.pdf" to "/var/streaming/readme.pdf"
--	cp -f readme.pdf /var/streaming/readme.pdf
-+	echo copying "readme.pdf" to "${DATADIR}/readme.pdf"
-+	${BSD_INSTALL_DATA} readme.pdf ${DATADIR}/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
  	
 -	echo copying "3rdPartyAcknowledgements.rtf" to "/var/streaming/3rdPartyAcknowledgements.rtf"
 -	cp -f 3rdPartyAcknowledgements.rtf /var/streaming/3rdPartyAcknowledgements.rtf
@@ -172,47 +194,52 @@
 -	if [ ! -d /var/streaming/playlists ]; then
 -		echo creating "/var/streaming/playlists" directory
 -		mkdir -p /var/streaming/playlists
--		chmod 777 /var/streaming/playlists
 +	if [ ! -d /var/spool/streaming.playlists ]; then
 +		echo creating "/var/spool/streaming.playlists" directory
 +		mkdir -p /var/spool/streaming.playlists
-+		chmod 777 /var/spool/streaming.playlists
  	fi
- 		
--        echo copying "sample_100kbit.mov" into "/usr/local/movies/sample_100kbit.mov"
--        cp -f sample_100kbit.mov /usr/local/movies/
-+        echo copying "sample_100kbit.mov" into "${DATADIR}/movies/sample_100kbit.mov"
-+        ${BSD_INSTALL_DATA} sample_100kbit.mov ${DATADIR}/movies/
- 
--        echo copying "sample_300kbit.mov" into "/usr/local/movies/sample_300kbit.mov"
--        cp -f sample_300kbit.mov /usr/local/movies/
-+        echo copying "sample_300kbit.mov" into "${DATADIR}/movies/sample_300kbit.mov"
-+        ${BSD_INSTALL_DATA} sample_300kbit.mov ${DATADIR}/movies/
- 
--        echo copying "sample_100kbit.mp4" into "/usr/local/movies/sample_100kbit.mp4"
--        cp -f sample_100kbit.mp4 /usr/local/movies/
-+        echo copying "sample_100kbit.mp4" into "${DATADIR}/movies/sample_100kbit.mp4"
-+        ${BSD_INSTALL_DATA} sample_100kbit.mp4 ${DATADIR}/movies/
- 
--        echo copying "sample_300kbit.mp4" into "/usr/local/movies/sample_300kbit.mp4"
--        cp -f sample_300kbit.mp4 /usr/local/movies/
-+        echo copying "sample_300kbit.mp4" into "${DATADIR}/movies/sample_300kbit.mp4"
-+        ${BSD_INSTALL_DATA} sample_300kbit.mp4 ${DATADIR}/movies/
- 
--        echo copying "sample.mp3" into "/usr/local/movies/sample.mp3"
--        cp -f sample.mp3 /usr/local/movies/
-+        echo copying "sample.mp3" into "${DATADIR}/movies/sample.mp3"
-+        ${BSD_INSTALL_DATA} sample.mp3 ${DATADIR}/movies/
+-	chmod 770 /var/streaming/playlists
+-	chmod 775 /usr/local/movies
++	chown qtss:qtss /var/spool/streaming.playlists
++	chmod 770 /var/spool/streaming.playlists
++	chmod 775 ${PREFIX}/movies
+ 	
+-    echo copying "sample_100kbit.mov" into "/usr/local/movies/sample_100kbit.mov"
+-    cp -f sample_100kbit.mov /usr/local/movies/
++    echo copying "sample_100kbit.mov" into "${DATADIR}/movies/sample_100kbit.mov"
++    ${BSD_INSTALL_DATA} sample_100kbit.mov ${DATADIR}/movies/
+ 
+-    echo copying "sample_300kbit.mov" into "/usr/local/movies/sample_300kbit.mov"
+-    cp -f sample_300kbit.mov /usr/local/movies/
++    echo copying "sample_300kbit.mov" into "${DATADIR}/movies/sample_300kbit.mov"
++    ${BSD_INSTALL_DATA} sample_300kbit.mov ${DATADIR}/movies/
+ 
+-    echo copying "sample_100kbit.mp4" into "/usr/local/movies/sample_100kbit.mp4"
+-    cp -f sample_100kbit.mp4 /usr/local/movies/
++    echo copying "sample_100kbit.mp4" into "${DATADIR}/movies/sample_100kbit.mp4"
++    ${BSD_INSTALL_DATA} sample_100kbit.mp4 ${DATADIR}/movies/
+ 
+-    echo copying "sample_300kbit.mp4" into "/usr/local/movies/sample_300kbit.mp4"
+-    cp -f sample_300kbit.mp4 /usr/local/movies/
++    echo copying "sample_300kbit.mp4" into "${DATADIR}/movies/sample_300kbit.mp4"
++    ${BSD_INSTALL_DATA} sample_300kbit.mp4 ${DATADIR}/movies/
  
+-    echo copying "sample.mp3" into "/usr/local/movies/sample.mp3"
+-    cp -f sample.mp3 /usr/local/movies/
++    echo copying "sample.mp3" into "${DATADIR}/movies/sample.mp3"
++    ${BSD_INSTALL_DATA} sample.mp3 ${DATADIR}/movies/
+ 
+ if [ -e StreamingLoadTool ]; then
 -	echo copying "StreamingLoadTool" to "/usr/local/bin/StreamingLoadTool"
 -	cp -f StreamingLoadTool /usr/local/bin/
-+#WHERE?	echo copying "StreamingLoadTool" to "${PREFIX}/bin/StreamingLoadTool"
-+#WHERE?	${BSD_INSTALL_PROGRAM} StreamingLoadTool ${PREFIX}/bin/
++	echo copying "StreamingLoadTool" to "${PREFIX}/bin/StreamingLoadTool"
++	${BSD_INSTALL_PROGRAM} StreamingLoadTool ${PREFIX}/bin/
  	
 -	echo copying "streamingloadtool.conf" to "/etc/streaming/streamingloadtool.conf"
 -	cp -f streamingloadtool.conf /etc/streaming/
-+#WHERE?	echo copying "streamingloadtool.conf" to "${PREFIXX}/etc/streaming/streamingloadtool.conf"
-+#WHERE?	${BSD_INSTALL_DATA} streamingloadtool.conf ${PREFIXX}/etc/streaming/
++	echo copying "streamingloadtool.conf" to "${PREFIX}/etc/streaming/streamingloadtool.conf"
++	${BSD_INSTALL_DATA} streamingloadtool.conf ${PREFIX}/etc/streaming/
+ fi
  	
  	#WebAdmin install
 -	echo copying "streamingadminserver.pl" into "/usr/local/sbin/streamingadminserver.pl"
@@ -224,29 +251,60 @@
 -	    echo removing old version of html from "/var/streaming/AdminHtml"
 -	    rm -r -f /var/streaming/AdminHtml/*
 +	if [ -d ${DATADIR}/AdminHtml/ ]; then
-+	    echo removing old version of html from "${DATADIR}/AdminHtml"
++	    echo removing old version of html from "/${DATADIR}/AdminHtml"
 +	    rm -r -f ${DATADIR}/AdminHtml/*
  	fi    
+ 	
 -	if [ ! -d /var/streaming/ ]; then
 -		echo creating "/var/streaming/AdminHtml" directory
-+	if [ ! -d ${DATADIR} ]; then
+-		mkdir -p /var/streaming/AdminHtml
++	if [ ! -d ${DATADIR}/AdminHtml ]; then
 +		echo creating "${DATADIR}/AdminHtml" directory
- 		mkdir -p /var/streaming/AdminHtml
++		mkdir -p ${DATADIR}/AdminHtml
  	fi
 -	echo copying Admin HTML to "/var/streaming/AdminHtml" directory
 -	cp -f -r AdminHtml /var/streaming/
 +	echo copying Admin HTML to "${DATADIR}/AdminHtml" directory
 +	tar -cf - AdminHtml | tar -xf - -C ${DATADIR}
  	
-+    if false; then
- 	echo;echo "Launching streamingadminserver.pl"
- 	/usr/local/sbin/streamingadminserver.pl
+ 
+-	chown -R -f qtss /var/streaming/
+-	chown -R -f qtss /etc/streaming/
+-	chown -R -f qtss /usr/local/movies/
++	chown -R -f qtss:qtss ${DATADIR}/
++	chown -R -f qtss:qtss ${PREFIX}/etc/streaming/
+ 
+-	echo;echo "Launching streamingadminserver.pl"
+-	/usr/local/sbin/streamingadminserver.pl
++#	echo;echo "Launching streamingadminserver.pl"
++#	${PREFIX}/sbin/streamingadminserver.pl
  	
-@@ -368,6 +373,7 @@
- 	/usr/local/bin/qtpasswd -F -d 'aGFja21l' > /dev/null
+ 	echo;echo Installation Complete
+ 
++if false; then
+ 	# Setup for DSS
+ 	# Prompts for a username and password
+ 	# that can be used to administer the server
+@@ -391,7 +394,7 @@
+ 	echo ""
+ 	
+ 	# Add the new admin username to /etc/streaming/qtusers
+-	/usr/local/bin/qtpasswd -p $password $username
++	${PREFIX}/bin/qtpasswd -p $password $username
+ 	
+ 	# Add the new admin username to /etc/streaming/qtgroups
+ 	# and delete the default admin username
+@@ -399,11 +402,12 @@
+ 	mv /etc/streaming/qtgroups.tmp /etc/streaming/qtgroups
+ 	
+ 	# Remove the default admin username to /etc/streaming/qtusers
+-	/usr/local/bin/qtpasswd -F -d 'aGFja21l' > /dev/null
++	${PREFIX}/bin/qtpasswd -F -d 'aGFja21l' > /dev/null
  		
+ 	chown -R -f qtss /etc/streaming/
+ 	
  	echo Setup Complete!
-+    fi
++fi
  	
  else
  
diff --git a/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl b/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl
index da672e1f0377..457903b764a7 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	Wed Apr 24 09:22:15 2002
-+++ WebAdmin/src/streamingadminserver.pl	Mon Sep 30 02:48:53 2002
-@@ -43,7 +43,7 @@
- }
- else
- {
--    eval "use Net::SSleay";
-+    eval "use Net::SSLeay";
- }
- $ssl_available = 0;
- if (!$@) {
-@@ -241,7 +241,7 @@
+--- WebAdmin/src/streamingadminserver.pl.orig	Tue Oct 28 09:43:24 2003
++++ WebAdmin/src/streamingadminserver.pl	Sun Jan 18 07:25:04 2004
+@@ -255,7 +255,7 @@ else {
  	  "gbrowse", "0",
  	  "ssl", "0",
  	  "crtfile", "/etc/streaming/streamingadminserver.pem",
@@ -18,12 +9,3 @@
  	  #"keypasswordfile", "",
  	  "qtssQTPasswd", "/usr/local/bin/qtpasswd",
  	  "qtssPlaylistBroadcaster", "/usr/local/bin/PlaylistBroadcaster",
-@@ -249,7 +249,7 @@
- 	  "helpurl", "http://helpqt.apple.com/dssWebAdminHelpR3/dssWebAdmin.help/DSSHelp.htm",
- 	  "qtssAdmin", "streamingadmin",
- 	  "cacheMessageFiles", "0",
--	  #"pidfile", "/var/streaming/streamingadminserver.pid"
-+	  "pidfile", "/var/run/streamingadminserver.pid"
- 	  );
- }
-