Update to 5.0.

Requested by:	many people
Sponsored by:	Ensure Technology Ltd.

6 files changed, 339 insertions, 305 deletions

diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile
index fddffa556948..010e1107c032 100644
--- a/net/DarwinStreamingServer/Makefile
+++ b/net/DarwinStreamingServer/Makefile
@@ -6,21 +6,19 @@
 #
 
 PORTNAME=	DarwinStreamingServer
-PORTVERSION=	4.1.3g
+PORTVERSION=	5.0
 #PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	#http://developer.apple.com/darwin/projects/streaming/source/
 #		You must accept APSL (Apple Public Source License),  and get
-#		DSS-4_1_3.src.tar.gz.
-DISTNAME=	DSS-${PORTVERSION:S/./_/g:S/g//}.src
+#		DarwinStreamingSrc5.0.zip.
+DISTNAME=	DarwinStreamingSrc${PORTVERSION}
 
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	Darwin Streaming Server, a MP3, MPEG4 and QuickTime streaming server
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/${PERL_VER}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay
 
-WRKSRC=		${WRKDIR}/DSS-${PORTVERSION:S/./_/g}.src
-
 RESTRICTED=	"See http://www.opensource.apple.com/apsl/"
 NO_CDROM=	${RESTRICTED}
 NO_PACKAGE=	${RESTRICTED}
@@ -29,6 +27,7 @@ NO_PACKAGE=	${RESTRICTED}
 IGNORE=		${RESTRICTED}
 .endif
 
+USE_ZIP=	YES
 USE_REINPLACE=	YES
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -40,6 +39,9 @@ MAKE_ENV+=	CC="${CC}"				\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"		\
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
 
+post-extract:
+	@${RM} -rf ${WRKSRC}/dssPackageMetaData ${WRKSRC}/pubPackageMetaData ${WRKSRC}/qtssPackageMetaData
+
 pre-fetch:
 	@[ -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ] || ( \
 	${ECHO} "********************************************************************";	\
@@ -53,41 +55,28 @@ pre-fetch:
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local/,${PREFIX}/,' \
+		${WRKSRC}/defaultPaths.h						\
 		${WRKSRC}/streamingserver.xml-POSIX					\
-		${WRKSRC}/Server.tproj/QTSServerPrefs.cpp				\
 		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
-		${WRKSRC}/StreamingProxy.tproj/StreamingProxy.html			\
 		${WRKSRC}/WebAdmin/WebAdminHtml/adminprotocol-lib.pl
 	@${REINPLACE_CMD} -e 's,${PREFIX}/sbin/StreamingServerModules,${PREFIX}/libexec/StreamingServerModules,' \
-		${WRKSRC}/streamingserver.xml-POSIX					\
-		${WRKSRC}/Server.tproj/QTSServerPrefs.cpp
+		${WRKSRC}/defaultPaths.h						\
+		${WRKSRC}/streamingserver.xml-POSIX
 	@${REINPLACE_CMD} -e 's,${PREFIX}/movies,${DATADIR}/movies,' \
+		${WRKSRC}/defaultPaths.h						\
 		${WRKSRC}/streamingserver.xml-POSIX					\
-		${WRKSRC}/Server.tproj/QTSServerPrefs.cpp				\
 		${WRKSRC}/WebAdmin/WebAdminHtml/adminprotocol-lib.pl
 	@${REINPLACE_CMD} -e 's,/etc/streaming,${PREFIX}/etc/streaming,' \
 		${WRKSRC}/qtaccess							\
-		${WRKSRC}/Server.tproj/main.cpp						\
+		${WRKSRC}/defaultPaths.h						\
 		${WRKSRC}/streamingserver.xml-POSIX					\
-		${WRKSRC}/Documentation/DevNotes.html					\
-		${WRKSRC}/qtpasswd.tproj/QTSSPasswd.cpp					\
-		${WRKSRC}/MP3Broadcaster/MP3Broadcaster.cpp				\
-		${WRKSRC}/StreamingProxy.tproj/proxy_unix.c				\
 		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
-		${WRKSRC}/StreamingProxy.tproj/StreamingProxy.html			\
-		${WRKSRC}/APIModules/QTSSAccessModule/QTSSAccessModule.cpp		\
-		${WRKSRC}/APIModules/QTSSReflectorModule/QTSSRelayModule.cpp		\
-		${WRKSRC}/APIModules/QTSSDemoAuthorizationModule.bproj/QTSSDemoModule.cpp
-	@${REINPLACE_CMD} -e 's,/var/streaming/broadcast_sdpfiles,/var/run/streaming.broadcast_sdpfiles,' \
-		${WRKSRC}/Server.tproj/SDPTimeoutTask.cpp
+		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
 	@${REINPLACE_CMD} -e 's,/var/streaming/logs,/var/log/streaming,' \
+		${WRKSRC}/defaultPaths.h						\
 		${WRKSRC}/streamingserver.xml-POSIX					\
-		${WRKSRC}/Server.tproj/QTSServerPrefs.cpp				\
-		${WRKSRC}/Server.tproj/RTPPacketResender.cpp				\
-		${WRKSRC}/Server.tproj/RTPSessionInterface.cpp				\
-		${WRKSRC}/APIModules/QTSSHttpFileModule/QTSSHttpFileModule.cpp		\
-		${WRKSRC}/APIModules/QTSSAccessLogModule/QTSSAccessLogModule.cpp	\
-		${WRKSRC}/APIModules/QTSSMP3StreamingModule/QTSSMP3StreamingModule.cpp
+		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
+		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
 	@${REINPLACE_CMD} -e 's,/var/streaming/AdminHtml,${DATADIR}/AdminHtml,' \
 		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
 		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
@@ -104,12 +93,14 @@ do-build:
 post-build:
 	@${CP} ${.CURDIR}/pkg-message ${WRKDIR}/pkg-message
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKDIR}/pkg-message
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} /bin/sh -x ./DSS_MakeRoot -f ${OPSYS} dss)
 
 pre-install:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./DSS_MakeRoot -f ${OPSYS})
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 
 do-install:
-	@(cd ${WRKSRC}/${OPSYS}; ${SETENV} ${MAKE_ENV} ./Install)
+	@(cd ${WRKSRC}/${OPSYS}; ${SETENV} ${MAKE_ENV} /bin/sh -x ./Install)
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/streamingadminserver.sh    ${PREFIX}/etc/rc.d/
diff --git a/net/DarwinStreamingServer/distinfo b/net/DarwinStreamingServer/distinfo
index f35cdbd9d6dc..225e63959f1f 100644
--- a/net/DarwinStreamingServer/distinfo
+++ b/net/DarwinStreamingServer/distinfo
@@ -1 +1 @@
-MD5 (DSS-4_1_3.src.tar.gz) = 52e0399b963443062670c5185d030957
+MD5 (DarwinStreamingSrc5.0.zip) = bc6307f866f931434840f690de19b802
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"
- 	  );
- }
- 
diff --git a/net/DarwinStreamingServer/pkg-plist b/net/DarwinStreamingServer/pkg-plist
index 63f6c14ce598..9c80e1d2d3fc 100644
--- a/net/DarwinStreamingServer/pkg-plist
+++ b/net/DarwinStreamingServer/pkg-plist
@@ -1,155 +1,158 @@
+bin/createuserstreamingdir
 bin/qtpasswd
 bin/MP3Broadcaster
 bin/PlaylistBroadcaster
 sbin/DarwinStreamingServer
 sbin/streamingadminserver.pl
-share/DarwinStreamingServer/3rdPartyAcknowledgements.rtf
-share/DarwinStreamingServer/AdminHtml/MapUTF.pl
-share/DarwinStreamingServer/AdminHtml/access_log.html
-share/DarwinStreamingServer/AdminHtml/adminprotocol-lib.pl
-share/DarwinStreamingServer/AdminHtml/broadcaster_lib.pl
-share/DarwinStreamingServer/AdminHtml/broadcaster_settings.html
-share/DarwinStreamingServer/AdminHtml/cgi-lib.pl
-share/DarwinStreamingServer/AdminHtml/change_broadcast_password.html
-share/DarwinStreamingServer/AdminHtml/change_mp3_password.html
-share/DarwinStreamingServer/AdminHtml/change_password.html
-share/DarwinStreamingServer/AdminHtml/change_password_redirect.html
-share/DarwinStreamingServer/AdminHtml/confirm.html
-share/DarwinStreamingServer/AdminHtml/connected.html
-share/DarwinStreamingServer/AdminHtml/error_log.html
-share/DarwinStreamingServer/AdminHtml/format.html
-share/DarwinStreamingServer/AdminHtml/frameset.html
-share/DarwinStreamingServer/AdminHtml/general_settings.html
-share/DarwinStreamingServer/AdminHtml/html_de/genres
-share/DarwinStreamingServer/AdminHtml/html_de/messages
-share/DarwinStreamingServer/AdminHtml/html_en/genres
-share/DarwinStreamingServer/AdminHtml/html_en/messages
-share/DarwinStreamingServer/AdminHtml/html_fr/genres
-share/DarwinStreamingServer/AdminHtml/html_fr/messages
-share/DarwinStreamingServer/AdminHtml/html_ja/genres
-share/DarwinStreamingServer/AdminHtml/html_ja/messages
-share/DarwinStreamingServer/AdminHtml/images/LB_arrow_dn.gif
-share/DarwinStreamingServer/AdminHtml/images/LB_arrow_up.gif
-share/DarwinStreamingServer/AdminHtml/images/apple_logo.gif
-share/DarwinStreamingServer/AdminHtml/images/arrow_down.gif
-share/DarwinStreamingServer/AdminHtml/images/back.gif
-share/DarwinStreamingServer/AdminHtml/images/blackpixel.gif
-share/DarwinStreamingServer/AdminHtml/images/clearpixel.gif
-share/DarwinStreamingServer/AdminHtml/images/dialog_alert.gif
-share/DarwinStreamingServer/AdminHtml/images/dialog_bottom.gif
-share/DarwinStreamingServer/AdminHtml/images/dialog_bottom_sm.gif
-share/DarwinStreamingServer/AdminHtml/images/dialog_middle.gif
-share/DarwinStreamingServer/AdminHtml/images/dialog_middle_sm.gif
-share/DarwinStreamingServer/AdminHtml/images/dialog_qtss.gif
-share/DarwinStreamingServer/AdminHtml/images/dialog_side.gif
-share/DarwinStreamingServer/AdminHtml/images/dialog_top.gif
-share/DarwinStreamingServer/AdminHtml/images/dialog_top_sm.gif
-share/DarwinStreamingServer/AdminHtml/images/divider.gif
-share/DarwinStreamingServer/AdminHtml/images/divider_vert.gif
-share/DarwinStreamingServer/AdminHtml/images/dot.gif
-share/DarwinStreamingServer/AdminHtml/images/folder.gif
-share/DarwinStreamingServer/AdminHtml/images/greypixel.gif
-share/DarwinStreamingServer/AdminHtml/images/headerpixel.gif
-share/DarwinStreamingServer/AdminHtml/images/help.gif
-share/DarwinStreamingServer/AdminHtml/images/highlight.gif
-share/DarwinStreamingServer/AdminHtml/images/horz_line.gif
-share/DarwinStreamingServer/AdminHtml/images/icon_alert.gif
-share/DarwinStreamingServer/AdminHtml/images/icon_doc.gif
-share/DarwinStreamingServer/AdminHtml/images/icon_error.gif
-share/DarwinStreamingServer/AdminHtml/images/icon_folder.gif
-share/DarwinStreamingServer/AdminHtml/images/icon_generic.gif
-share/DarwinStreamingServer/AdminHtml/images/icon_movie.gif
-share/DarwinStreamingServer/AdminHtml/images/icon_movie_off.gif
-share/DarwinStreamingServer/AdminHtml/images/icon_playlist.gif
-share/DarwinStreamingServer/AdminHtml/images/icon_playlist_off.gif
-share/DarwinStreamingServer/AdminHtml/images/icon_start_playlist.gif
-share/DarwinStreamingServer/AdminHtml/images/icon_stop_playlist.gif
-share/DarwinStreamingServer/AdminHtml/images/line.gif
-share/DarwinStreamingServer/AdminHtml/images/link.gif
-share/DarwinStreamingServer/AdminHtml/images/link_disabled.gif
-share/DarwinStreamingServer/AdminHtml/images/mp3_file.gif
-share/DarwinStreamingServer/AdminHtml/images/nav_help.gif
-share/DarwinStreamingServer/AdminHtml/images/nav_logo.gif
-share/DarwinStreamingServer/AdminHtml/images/pixel.gif
-share/DarwinStreamingServer/AdminHtml/images/scroll_arrow_down.gif
-share/DarwinStreamingServer/AdminHtml/images/scroll_arrow_up.gif
-share/DarwinStreamingServer/AdminHtml/images/scroll_bg.gif
-share/DarwinStreamingServer/AdminHtml/images/scroll_bg_inactive.gif
-share/DarwinStreamingServer/AdminHtml/images/scroll_thumb.gif
-share/DarwinStreamingServer/AdminHtml/images/sort_arrow.gif
-share/DarwinStreamingServer/AdminHtml/images/sort_arrow_desc.gif
-share/DarwinStreamingServer/AdminHtml/images/spacer.gif
-share/DarwinStreamingServer/AdminHtml/images/stripes_gray.gif
-share/DarwinStreamingServer/AdminHtml/images/stripes_gray_dark.gif
-share/DarwinStreamingServer/AdminHtml/images/trashcan.gif
-share/DarwinStreamingServer/AdminHtml/images/vert_line.gif
-share/DarwinStreamingServer/AdminHtml/images/weight_up_arrow.gif
-share/DarwinStreamingServer/AdminHtml/images/whitepixel.gif
-share/DarwinStreamingServer/AdminHtml/images/wieght_down_arrow.gif
-share/DarwinStreamingServer/AdminHtml/includes/draglib.js
-share/DarwinStreamingServer/AdminHtml/includes/encode_unicode.js
-share/DarwinStreamingServer/AdminHtml/includes/standardNav.js
-share/DarwinStreamingServer/AdminHtml/index.html
-share/DarwinStreamingServer/AdminHtml/log_settings.html
-share/DarwinStreamingServer/AdminHtml/login.html
-share/DarwinStreamingServer/AdminHtml/nav.html
-share/DarwinStreamingServer/AdminHtml/parse_xml.cgi
-share/DarwinStreamingServer/AdminHtml/password-utils.pl
-share/DarwinStreamingServer/AdminHtml/playlist-lib.pl
-share/DarwinStreamingServer/AdminHtml/playlist_detail.html
-share/DarwinStreamingServer/AdminHtml/playlist_error_log.html
-share/DarwinStreamingServer/AdminHtml/playlists.html
-share/DarwinStreamingServer/AdminHtml/ports.html
-share/DarwinStreamingServer/AdminHtml/relay.html
-share/DarwinStreamingServer/AdminHtml/relay_details.html
-share/DarwinStreamingServer/AdminHtml/relay_details_default.html
-share/DarwinStreamingServer/AdminHtml/relay_status.html
-share/DarwinStreamingServer/AdminHtml/relay_targets.html
-share/DarwinStreamingServer/AdminHtml/relayxmlparser.pl
-share/DarwinStreamingServer/AdminHtml/restart_broadcaster.html
-share/DarwinStreamingServer/AdminHtml/setup_assistant.html
-share/DarwinStreamingServer/AdminHtml/setup_assistant2.html
-share/DarwinStreamingServer/AdminHtml/setup_assistant3.html
-share/DarwinStreamingServer/AdminHtml/setup_assistant4.html
-share/DarwinStreamingServer/AdminHtml/setup_assistant5.html
-share/DarwinStreamingServer/AdminHtml/start_broadcaster.html
-share/DarwinStreamingServer/AdminHtml/start_server.html
-share/DarwinStreamingServer/AdminHtml/startplaylists.pl
-share/DarwinStreamingServer/AdminHtml/tag_formats.pl
-share/DarwinStreamingServer/AdminHtml/tag_types.pl
-share/DarwinStreamingServer/AdminHtml/tag_vals.pl
-share/DarwinStreamingServer/AdminHtml/template.html
-share/DarwinStreamingServer/AdminHtml/template_blank.html
-share/DarwinStreamingServer/AdminHtml/top.html
-share/DarwinStreamingServer/AdminHtml/view_broadcast.cgi
-share/DarwinStreamingServer/AdminHtml/welcome.html
-share/DarwinStreamingServer/movies/sample.mp3
-share/DarwinStreamingServer/movies/sample_100kbit.mov
-share/DarwinStreamingServer/movies/sample_100kbit.mp4
-share/DarwinStreamingServer/movies/sample_300kbit.mov
-share/DarwinStreamingServer/movies/sample_300kbit.mp4
-share/DarwinStreamingServer/readme.pdf
+libexec/StreamingServerModules/QTSSHomeDirectoryModule
+libexec/StreamingServerModules/QTSSRefMovieModule
+%%DATADIR%%/readme.txt
+%%DATADIR%%/3rdPartyAcknowledgements.rtf
+%%DATADIR%%/AdminHtml/MapUTF.pl
+%%DATADIR%%/AdminHtml/access_log.html
+%%DATADIR%%/AdminHtml/adminprotocol-lib.pl
+%%DATADIR%%/AdminHtml/broadcaster_lib.pl
+%%DATADIR%%/AdminHtml/broadcaster_settings.html
+%%DATADIR%%/AdminHtml/cgi-lib.pl
+%%DATADIR%%/AdminHtml/change_broadcast_password.html
+%%DATADIR%%/AdminHtml/change_mp3_password.html
+%%DATADIR%%/AdminHtml/change_password.html
+%%DATADIR%%/AdminHtml/change_password_redirect.html
+%%DATADIR%%/AdminHtml/confirm.html
+%%DATADIR%%/AdminHtml/connected.html
+%%DATADIR%%/AdminHtml/error_log.html
+%%DATADIR%%/AdminHtml/format.html
+%%DATADIR%%/AdminHtml/frameset.html
+%%DATADIR%%/AdminHtml/general_settings.html
+%%DATADIR%%/AdminHtml/html_en/genres
+%%DATADIR%%/AdminHtml/html_en/messages
+%%DATADIR%%/AdminHtml/images/LB_arrow_dn.gif
+%%DATADIR%%/AdminHtml/images/LB_arrow_up.gif
+%%DATADIR%%/AdminHtml/images/apple_logo.gif
+%%DATADIR%%/AdminHtml/images/arrow_down.gif
+%%DATADIR%%/AdminHtml/images/back.gif
+%%DATADIR%%/AdminHtml/images/blackpixel.gif
+%%DATADIR%%/AdminHtml/images/clearpixel.gif
+%%DATADIR%%/AdminHtml/images/dialog_alert.gif
+%%DATADIR%%/AdminHtml/images/dialog_bottom.gif
+%%DATADIR%%/AdminHtml/images/dialog_bottom_sm.gif
+%%DATADIR%%/AdminHtml/images/dialog_middle.gif
+%%DATADIR%%/AdminHtml/images/dialog_middle_sm.gif
+%%DATADIR%%/AdminHtml/images/dialog_qtss.gif
+%%DATADIR%%/AdminHtml/images/dialog_side.gif
+%%DATADIR%%/AdminHtml/images/dialog_top.gif
+%%DATADIR%%/AdminHtml/images/dialog_top_sm.gif
+%%DATADIR%%/AdminHtml/images/divider.gif
+%%DATADIR%%/AdminHtml/images/divider_vert.gif
+%%DATADIR%%/AdminHtml/images/dot.gif
+%%DATADIR%%/AdminHtml/images/folder.gif
+%%DATADIR%%/AdminHtml/images/greypixel.gif
+%%DATADIR%%/AdminHtml/images/headerpixel.gif
+%%DATADIR%%/AdminHtml/images/help.gif
+%%DATADIR%%/AdminHtml/images/highlight.gif
+%%DATADIR%%/AdminHtml/images/horz_line.gif
+%%DATADIR%%/AdminHtml/images/icon_alert.gif
+%%DATADIR%%/AdminHtml/images/icon_doc.gif
+%%DATADIR%%/AdminHtml/images/icon_error.gif
+%%DATADIR%%/AdminHtml/images/icon_folder.gif
+%%DATADIR%%/AdminHtml/images/icon_generic.gif
+%%DATADIR%%/AdminHtml/images/icon_group.gif
+%%DATADIR%%/AdminHtml/images/icon_movie.gif
+%%DATADIR%%/AdminHtml/images/icon_movie_off.gif
+%%DATADIR%%/AdminHtml/images/icon_playlist.gif
+%%DATADIR%%/AdminHtml/images/icon_playlist_off.gif
+%%DATADIR%%/AdminHtml/images/icon_start_playlist.gif
+%%DATADIR%%/AdminHtml/images/icon_stop_playlist.gif
+%%DATADIR%%/AdminHtml/images/icon_user.gif
+%%DATADIR%%/AdminHtml/images/invis_dragcover.gif
+%%DATADIR%%/AdminHtml/images/line.gif
+%%DATADIR%%/AdminHtml/images/link.gif
+%%DATADIR%%/AdminHtml/images/link_disabled.gif
+%%DATADIR%%/AdminHtml/images/mp3_file.gif
+%%DATADIR%%/AdminHtml/images/nav_help.gif
+%%DATADIR%%/AdminHtml/images/nav_logo.gif
+%%DATADIR%%/AdminHtml/images/nav_logo_small.gif
+%%DATADIR%%/AdminHtml/images/pixel.gif
+%%DATADIR%%/AdminHtml/images/scroll_arrow_down.gif
+%%DATADIR%%/AdminHtml/images/scroll_arrow_up.gif
+%%DATADIR%%/AdminHtml/images/scroll_bg.gif
+%%DATADIR%%/AdminHtml/images/scroll_bg_inactive.gif
+%%DATADIR%%/AdminHtml/images/scroll_thumb.gif
+%%DATADIR%%/AdminHtml/images/sort_arrow.gif
+%%DATADIR%%/AdminHtml/images/sort_arrow_desc.gif
+%%DATADIR%%/AdminHtml/images/spacer.gif
+%%DATADIR%%/AdminHtml/images/stripes_gray.gif
+%%DATADIR%%/AdminHtml/images/stripes_gray_dark.gif
+%%DATADIR%%/AdminHtml/images/trashcan.gif
+%%DATADIR%%/AdminHtml/images/vert_line.gif
+%%DATADIR%%/AdminHtml/images/weight_up_arrow.gif
+%%DATADIR%%/AdminHtml/images/whitepixel.gif
+%%DATADIR%%/AdminHtml/images/wieght_down_arrow.gif
+%%DATADIR%%/AdminHtml/includes/DarwinListbox.js
+%%DATADIR%%/AdminHtml/includes/draglib.js
+%%DATADIR%%/AdminHtml/includes/encode_unicode.js
+%%DATADIR%%/AdminHtml/includes/standardNav.js
+%%DATADIR%%/AdminHtml/index.html
+%%DATADIR%%/AdminHtml/listbox.html
+%%DATADIR%%/AdminHtml/listbox2.html
+%%DATADIR%%/AdminHtml/log_settings.html
+%%DATADIR%%/AdminHtml/login.html
+%%DATADIR%%/AdminHtml/nav.html
+%%DATADIR%%/AdminHtml/parse_xml.cgi
+%%DATADIR%%/AdminHtml/password-utils.pl
+%%DATADIR%%/AdminHtml/playlist-lib.pl
+%%DATADIR%%/AdminHtml/playlist_detail.html
+%%DATADIR%%/AdminHtml/playlist_error_log.html
+%%DATADIR%%/AdminHtml/playlists.html
+%%DATADIR%%/AdminHtml/ports.html
+%%DATADIR%%/AdminHtml/relay.html
+%%DATADIR%%/AdminHtml/relay_details.html
+%%DATADIR%%/AdminHtml/relay_details_default.html
+%%DATADIR%%/AdminHtml/relay_status.html
+%%DATADIR%%/AdminHtml/relay_targets.html
+%%DATADIR%%/AdminHtml/relayxmlparser.pl
+%%DATADIR%%/AdminHtml/restart_broadcaster.html
+%%DATADIR%%/AdminHtml/setup_assistant.html
+%%DATADIR%%/AdminHtml/setup_assistant2.html
+%%DATADIR%%/AdminHtml/setup_assistant3.html
+%%DATADIR%%/AdminHtml/setup_assistant4.html
+%%DATADIR%%/AdminHtml/setup_assistant5.html
+%%DATADIR%%/AdminHtml/start_broadcaster.html
+%%DATADIR%%/AdminHtml/start_server.html
+%%DATADIR%%/AdminHtml/startplaylists.pl
+%%DATADIR%%/AdminHtml/tag_formats.pl
+%%DATADIR%%/AdminHtml/tag_types.pl
+%%DATADIR%%/AdminHtml/tag_vals.pl
+%%DATADIR%%/AdminHtml/template.html
+%%DATADIR%%/AdminHtml/template_blank.html
+%%DATADIR%%/AdminHtml/top.html
+%%DATADIR%%/AdminHtml/users.html
+%%DATADIR%%/AdminHtml/view_broadcast.cgi
+%%DATADIR%%/AdminHtml/welcome.html
+%%DATADIR%%/movies/sample.mp3
+%%DATADIR%%/movies/sample_100kbit.mov
+%%DATADIR%%/movies/sample_100kbit.mp4
+%%DATADIR%%/movies/sample_300kbit.mov
+%%DATADIR%%/movies/sample_300kbit.mp4
 etc/rc.d/streamingadminserver.sh
 etc/rc.d/darwin_streaming_server.sh
 etc/streaming/qtusers-dist
 etc/streaming/qtgroups-dist
-etc/streaming/relayconfig.xml-Sample
-@unexec if cmp -s %D/etc/streaming/streamingserver.xml %D/etc/streaming/streamingserver.xml-sample; then rm -f %D/etc/streaming/streamingserver.xml; fi
-etc/streaming/streamingserver.xml-sample
+@unexec if cmp -s %D/etc/streaming/relayconfig.xml %D/etc/streaming/relayconfig.xml-dist; then rm -f %D/etc/streaming/relayconfig.xml; fi
+etc/streaming/relayconfig.xml-dist
+@exec [ ! -f %B/relayconfig.xml ] && cp %B/%f %B/relayconfig.xml
+@unexec if cmp -s %D/etc/streaming/streamingserver.xml %D/etc/streaming/streamingserver.xml-dist; then rm -f %D/etc/streaming/streamingserver.xml; fi
+etc/streaming/streamingserver.xml-dist
 @exec [ ! -f %B/streamingserver.xml ] && cp %B/%f %B/streamingserver.xml
 @comment @unexec if cmp -s %D/etc/streaming/streamingloadtool.conf %D/etc/streaming/streamingloadtool.conf-dist; then rm -f %D/etc/streaming/streamingloadtool.conf; fi
 @comment etc/streaming/streamingloadtool.conf-dist
 @comment @exec [ ! -f %B/streamingloadtool.conf ] && cp %B/%f %B/streamingloadtool.conf
-@comment @dirrm share/DarwinStreamingServer/AdminHtml
-@dirrm share/DarwinStreamingServer/AdminHtml/includes/
-@dirrm share/DarwinStreamingServer/AdminHtml/images/
-@dirrm share/DarwinStreamingServer/AdminHtml/html_ja/
-@dirrm share/DarwinStreamingServer/AdminHtml/html_fr/
-@dirrm share/DarwinStreamingServer/AdminHtml/html_en/
-@dirrm share/DarwinStreamingServer/AdminHtml/html_de/
-@dirrm share/DarwinStreamingServer/AdminHtml
-@dirrm share/DarwinStreamingServer/movies
-@dirrm share/DarwinStreamingServer
+@dirrm %%DATADIR%%/AdminHtml/includes
+@dirrm %%DATADIR%%/AdminHtml/images
+@dirrm %%DATADIR%%/AdminHtml/html_en
+@dirrm %%DATADIR%%/AdminHtml
+@dirrm %%DATADIR%%/movies
+@dirrm %%DATADIR%%
 @dirrm libexec/StreamingServerModules
 @unexec rmdir %D/etc/streaming               2>/dev/null || true
 @unexec rmdir /var/spool/streaming.playlists 2>/dev/null || true