Update to 5.0.3.2.

o Disable over-optimaization for problem of ports/75291. [1]
o Clean-up some patches (to post-patch phase)

PR:		ports/75291 [1]
Pointed out by:	Lars Eggert <lars.eggert@netlab.nec.de> [1]
Informed by:	Yoshihiro Yanagida <yosh@yanagi.to>
Inquiried by:	many people
Sponsored by:	Ensure Technology Ltd.

8 files changed, 176 insertions, 231 deletions

diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile
index 9440e7cfe0b6..c4662e0a388b 100644
--- a/net/DarwinStreamingServer/Makefile
+++ b/net/DarwinStreamingServer/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	DarwinStreamingServer
-PORTVERSION=	5.0.1.1
-PORTREVISION=	2
+PORTVERSION=	5.0.3.2
+PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	#http://developer.apple.com/darwin/projects/streaming/source/
 #		You must accept APSL (Apple Public Source License),  and get
-#		DarwinStreamingSrc5.0.zip.
-DISTNAME=	DarwinStreamingSrc${PORTVERSION}
+#		DSS-v5_0_3_2.zip.
+DISTNAME=	DSS-v${PORTVERSION:S/./_/g}
 
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	Darwin Streaming Server, a MP3, MPEG4 and QuickTime streaming server
@@ -55,37 +55,66 @@ pre-fetch:
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local/,${PREFIX}/,' \
+		${WRKSRC}/Install							\
 		${WRKSRC}/defaultPaths.h						\
 		${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}/streamingserver.xml-POSIX
 	@${REINPLACE_CMD} -e 's,${PREFIX}/movies,${DATADIR}/movies,' \
+		${WRKSRC}/Install							\
 		${WRKSRC}/defaultPaths.h						\
 		${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}/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}/streamingserver.xml-POSIX					\
 		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
 		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
 	@${REINPLACE_CMD} -e 's,/var/streaming/AdminHtml,${DATADIR}/AdminHtml,' \
+		${WRKSRC}/Install							\
 		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
 		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
 	@${REINPLACE_CMD} -e 's,/var/streaming/playlists,/var/spool/streaming.playlists,' \
+		${WRKSRC}/Install							\
 		${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
+	@${REINPLACE_CMD} -e '/-O[23]/d' \
+		${WRKSRC}/Makefile.POSIX						\
+		${WRKSRC}/QTFileLib/Makefile.POSIX					\
+		${WRKSRC}/qtpasswd.tproj/Makefile.POSIX					\
+		${WRKSRC}/MP3Broadcaster/Makefile.POSIX					\
+		${WRKSRC}/HTTPUtilitiesLib/Makefile.POSIX				\
+		${WRKSRC}/CommonUtilitiesLib/Makefile.POSIX				\
+		${WRKSRC}/StreamingProxy.tproj/Makefile.POSIX				\
+		${WRKSRC}/StreamingServer.pbproj/project.pbxproj			\
+		${WRKSRC}/PlaylistBroadcaster.tproj/Makefile.POSIX			\
+		${WRKSRC}/QTFileTools/QTRTPGen.tproj/Makefile.POSIX			\
+		${WRKSRC}/QTFileTools/QTSDPGen.tproj/Makefile.POSIX			\
+		${WRKSRC}/QTFileTools/QTFileInfo.tproj/Makefile.POSIX			\
+		${WRKSRC}/QTFileTools/QTFileTest.tproj/Makefile.POSIX			\
+		${WRKSRC}/APIModules/QTSSRefMovieModule/Makefile.POSIX			\
+		${WRKSRC}/QTFileTools/QTTrackInfo.tproj/Makefile.POSIX			\
+		${WRKSRC}/QTFileTools/QTBroadcaster.tproj/Makefile.POSIX		\
+		${WRKSRC}/QTFileTools/QTRTPFileTest.tproj/Makefile.POSIX		\
+		${WRKSRC}/QTFileTools/QTSampleLister.tproj/Makefile.POSIX		\
+		${WRKSRC}/APIModules/QTSSRawFileModule.bproj/Makefile.POSIX		\
+		${WRKSRC}/APIModules/QTSSSpamDefenseModule.bproj/Makefile.POSIX		\
+		${WRKSRC}/APIModules/QTSSDemoAuthorizationModule.bproj/Makefile.POSIX
 
 do-build:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./Buildit)
@@ -93,7 +122,7 @@ 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} ./DSS_MakeRoot -f ${OPSYS} dss)
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./DSS_MakeRoot -f ${OPSYS})
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
diff --git a/net/DarwinStreamingServer/distinfo b/net/DarwinStreamingServer/distinfo
index 67a2a0a53f33..2dc16c70e095 100644
--- a/net/DarwinStreamingServer/distinfo
+++ b/net/DarwinStreamingServer/distinfo
@@ -1 +1,2 @@
-MD5 (DarwinStreamingSrc5.0.1.1.zip) = 09988fb421053f8222715a7746973fae
+MD5 (DSS-v5_0_3_2.zip) = 394e74199a01e5f54c743bb02f898edd
+SIZE (DSS-v5_0_3_2.zip) = 10859092
diff --git a/net/DarwinStreamingServer/files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp b/net/DarwinStreamingServer/files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp
index 396d5789835d..819d74603870 100644
--- a/net/DarwinStreamingServer/files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp
+++ b/net/DarwinStreamingServer/files/patch-APIModules::QTSSReflectorModule::ReflectorStream.cpp
@@ -1,6 +1,6 @@
---- APIModules/QTSSReflectorModule/ReflectorStream.cpp.orig	Sat Aug 16 08:52:46 2003
-+++ APIModules/QTSSReflectorModule/ReflectorStream.cpp	Thu Dec 16 23:29:41 2004
-@@ -173,7 +173,7 @@
+--- APIModules/QTSSReflectorModule/ReflectorStream.cpp.orig	Thu Jun 10 09:03:34 2004
++++ APIModules/QTSSReflectorModule/ReflectorStream.cpp	Fri Jan 21 10:23:11 2005
+@@ -179,7 +179,7 @@
      theRRWriter++;
      *theRRWriter = htonl(theSsrc);
      theRRWriter++;
diff --git a/net/DarwinStreamingServer/files/patch-Buildit b/net/DarwinStreamingServer/files/patch-Buildit
index cb43a26747be..3e50bc935041 100644
--- a/net/DarwinStreamingServer/files/patch-Buildit
+++ b/net/DarwinStreamingServer/files/patch-Buildit
@@ -1,6 +1,6 @@
---- Buildit.orig	Thu Nov 13 10:02:58 2003
-+++ Buildit	Sun Jan 18 07:23:31 2004
-@@ -81,20 +81,20 @@ case $PLAT in
+--- Buildit.orig	Thu Jun 10 09:03:33 2004
++++ Buildit	Sun Feb 20 17:19:01 2005
+@@ -78,20 +78,20 @@
  		fi
  		;;
  
diff --git a/net/DarwinStreamingServer/files/patch-DSS_MakeRoot b/net/DarwinStreamingServer/files/patch-DSS_MakeRoot
new file mode 100644
index 000000000000..2ef6dcdd5ad9
--- /dev/null
+++ b/net/DarwinStreamingServer/files/patch-DSS_MakeRoot
@@ -0,0 +1,24 @@
+--- 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 569d7f0563c2..ca3a32d35f3e 100644
--- a/net/DarwinStreamingServer/files/patch-Install
+++ b/net/DarwinStreamingServer/files/patch-Install
@@ -1,12 +1,6 @@
---- 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 @@
+--- Install.orig	Wed Jul 24 07:00:31 2002
++++ Install	Sun Feb 20 22:31:51 2005
+@@ -15,6 +15,7 @@
  
  if [ $USERID = 0 ]; then
  
@@ -14,7 +8,7 @@
  	echo Checking for and Killing currently running Darwin Streaming Server
  	if [ `uname` = "FreeBSD" ]; then
  		ps -ax | awk '/DarwinStreamingServer/ {print $1}' | xargs kill -9  
-@@ -113,14 +114,15 @@
+@@ -110,6 +111,7 @@
  	fi
  
  	echo
@@ -22,140 +16,88 @@
  
  ## CHANGE PERL PATH IN streamingadminserver.pl AND parse_xml.cgi ##
  
- # Look for perl in the default locations
- 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
-@@ -189,159 +191,160 @@
- fi
+@@ -196,64 +198,72 @@
+         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              
- 
--	echo copying "DarwinStreamingServer" to "/usr/local/sbin/DarwinStreamingServer"
+ 	echo copying "DarwinStreamingServer" to "/usr/local/sbin/DarwinStreamingServer"
 -	cp -f DarwinStreamingServer /usr/local/sbin/
-+	echo copying "DarwinStreamingServer" to "${PREFIX}/sbin/DarwinStreamingServer"
-+	${BSD_INSTALL_PROGRAM} DarwinStreamingServer ${PREFIX}/sbin/
++	${BSD_INSTALL_PROGRAM} DarwinStreamingServer /usr/local/sbin/
  	
  	
--	echo copying "PlaylistBroadcaster" to "/usr/local/bin/PlaylistBroadcaster"
+ 	echo copying "PlaylistBroadcaster" to "/usr/local/bin/PlaylistBroadcaster"
 -	cp -f PlaylistBroadcaster /usr/local/bin/
-+	echo copying "PlaylistBroadcaster" to "${PREFIX}/bin/PlaylistBroadcaster"
-+	${BSD_INSTALL_PROGRAM} PlaylistBroadcaster ${PREFIX}/bin/
++	${BSD_INSTALL_PROGRAM} PlaylistBroadcaster /usr/local/bin/
  	
--	echo copying "MP3Broadcaster" to "/usr/local/bin/MP3Broadcaster"
+ 	echo copying "MP3Broadcaster" to "/usr/local/bin/MP3Broadcaster"
 -	cp -f MP3Broadcaster /usr/local/bin/
-+	echo copying "MP3Broadcaster" to "${PREFIX}/bin/MP3Broadcaster"
-+	${BSD_INSTALL_PROGRAM} MP3Broadcaster ${PREFIX}/bin/
++	${BSD_INSTALL_PROGRAM} MP3Broadcaster /usr/local/bin/
  	
--	echo copying "qtpasswd" to "/usr/local/bin/qtpasswd"
+ 	echo copying "qtpasswd" to "/usr/local/bin/qtpasswd"
 -	cp -f qtpasswd /usr/local/bin/
-+	echo copying "qtpasswd" to "${PREFIX}/bin/qtpasswd"
-+	${BSD_INSTALL_PROGRAM} qtpasswd ${PREFIX}/bin/
++	${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"
 -	if [ ! -d /usr/local/sbin/StreamingServerModules ]; then
 -		echo creating "/usr/local/sbin/StreamingServerModules" directory
 -		mkdir /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
-+	if [ ! -d ${PREFIX}/etc/streaming ]; then
-+		echo creating "${PREFIX}/etc/streaming" directory
-+		mkdir -p ${PREFIX}/etc/streaming
++	# 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/
  	
--	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
+ 	if [ ! -d /etc/streaming ]; then
+ 		echo creating "/etc/streaming" directory
+ 		mkdir -p /etc/streaming
  	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 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"
+-	cp -f streamingserver.xml /etc/streaming/streamingserver.xml
++	${BSD_INSTALL_DATA} streamingserver.xml /etc/streaming/streamingserver.xml
+ 	chmod 600 /etc/streaming/streamingserver.xml
++	fi
+ 
 -	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
--		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 "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 "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"
-+	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
--	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
++
 +	echo;echo copying "qtgroups" to "/etc/streaming/qtgroups-dist"
-+	install -c -o qtss -g qtss -m 0600  qtgroups ${PREFIX}/etc/streaming/qtgroups-dist
++	${BSD_INSTALL_DATA} qtgroups /etc/streaming/qtgroups-dist
++	chmod 600 /etc/streaming/qtgroups-dist
  
--	#echo;echo copying "streamingadminserver.pem" to "/etc/streaming/streamingadminserver.pem"
+ 	#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"
-+	#install -c -o qtss -g qtss -m 0400 streamingadminserver.pem ${PREFIX}/etc/streaming/streamingadminserver.pem
++	#${BSD_INSTALL_DATA} streamingadminserver.pem /etc/streaming/streamingadminserver.pem
+ 	#chmod 400 /etc/streaming/streamingadminserver.pem
  
 -	if [ ! -d /var/streaming ]; then
 -		echo creating "/var/streaming" directory
@@ -165,8 +107,8 @@
 +		mkdir -p ${DATADIR}
  	fi
  	
--	echo copying "readme.txt" to "/var/streaming/readme.txt"
--	cp -f readme.txt /var/streaming/readme.txt
+-	echo copying "readme.pdf" to "/var/streaming/readme.pdf"
+-	cp -f readme.pdf /var/streaming/readme.pdf
 +	echo copying "readme.txt" to "${DATADIR}/readme.txt"
 +	${BSD_INSTALL_DATA} readme.txt ${DATADIR}/readme.txt
  	
@@ -175,109 +117,64 @@
 +	echo copying "3rdPartyAcknowledgements.rtf" to "${DATADIR}/3rdPartyAcknowledgements.rtf"
 +	${BSD_INSTALL_DATA} 3rdPartyAcknowledgements.rtf ${DATADIR}/3rdPartyAcknowledgements.rtf
  	
--	if [ ! -d /var/streaming/logs ]; then
--		echo creating "/var/streaming/logs" directory
--		mkdir -p /var/streaming/logs
-+	if [ ! -d /var/log/streaming ]; then
-+		echo creating "/var/log/streaming" directory
-+		mkdir -p /var/log/streaming
- 	fi
- 	
--	if [ ! -d /usr/local/movies ]; then
--		echo creating "/usr/local/movies" directory
--		mkdir -p /usr/local/movies
-+	if [ ! -d ${DATADIR}/movies ]; then
-+		echo creating "${DATADIR}/movies" directory
-+		mkdir -p ${DATADIR}/movies
+ 	if [ ! -d /var/streaming/logs ]; then
+ 		echo creating "/var/streaming/logs" directory
+@@ -272,46 +282,49 @@
  	fi
  	
--	if [ ! -d /var/streaming/playlists ]; then
--		echo creating "/var/streaming/playlists" directory
--		mkdir -p /var/streaming/playlists
-+	if [ ! -d /var/spool/streaming.playlists ]; then
-+		echo creating "/var/spool/streaming.playlists" directory
-+		mkdir -p /var/spool/streaming.playlists
- 	fi
--	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"
+     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/
++    ${BSD_INSTALL_DATA} sample_100kbit.mov /usr/local/movies/
  
--    echo copying "sample_300kbit.mov" into "/usr/local/movies/sample_300kbit.mov"
+     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/
++    ${BSD_INSTALL_DATA} sample_300kbit.mov /usr/local/movies/
  
--    echo copying "sample_100kbit.mp4" into "/usr/local/movies/sample_100kbit.mp4"
+     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/
++    ${BSD_INSTALL_DATA} sample_100kbit.mp4 /usr/local/movies/
  
--    echo copying "sample_300kbit.mp4" into "/usr/local/movies/sample_300kbit.mp4"
+     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/
++    ${BSD_INSTALL_DATA} sample_300kbit.mp4 /usr/local/movies/
  
--    echo copying "sample.mp3" into "/usr/local/movies/sample.mp3"
+     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/
++    ${BSD_INSTALL_DATA} sample.mp3 /usr/local/movies/
  
- if [ -e StreamingLoadTool ]; then
--	echo copying "StreamingLoadTool" to "/usr/local/bin/StreamingLoadTool"
++	if false; then
+ 	echo copying "StreamingLoadTool" to "/usr/local/bin/StreamingLoadTool"
 -	cp -f StreamingLoadTool /usr/local/bin/
-+	echo copying "StreamingLoadTool" to "${PREFIX}/bin/StreamingLoadTool"
-+	${BSD_INSTALL_PROGRAM} StreamingLoadTool ${PREFIX}/bin/
++	${BSD_INSTALL_PROGRAM} StreamingLoadTool /usr/local/bin/
  	
 -	echo copying "streamingloadtool.conf" to "/etc/streaming/streamingloadtool.conf"
 -	cp -f streamingloadtool.conf /etc/streaming/
-+	echo copying "streamingloadtool.conf" to "${PREFIX}/etc/streaming/streamingloadtool.conf"
-+	${BSD_INSTALL_DATA} streamingloadtool.conf ${PREFIX}/etc/streaming/
- fi
++	echo copying "streamingloadtool.conf" to "/etc/streaming/streamingloadtool.conf-dist"
++	${BSD_INSTALL_DATA} streamingloadtool.conf /etc/streaming/streamingloadtool.conf-dist
++	fi
  	
  	#WebAdmin install
--	echo copying "streamingadminserver.pl" into "/usr/local/sbin/streamingadminserver.pl"
+ 	echo copying "streamingadminserver.pl" into "/usr/local/sbin/streamingadminserver.pl"
 -	cp -f streamingadminserver.pl /usr/local/sbin/streamingadminserver.pl
-+	echo copying "streamingadminserver.pl" into "${PREFIX}/sbin/streamingadminserver.pl"
-+	${BSD_INSTALL_SCRIPT} streamingadminserver.pl ${PREFIX}/sbin/streamingadminserver.pl
++	${BSD_INSTALL_SCRIPT} streamingadminserver.pl /usr/local/sbin/streamingadminserver.pl
  	
--	if [ -d /var/streaming/AdminHtml/ ]; then
--	    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"
-+	    rm -r -f ${DATADIR}/AdminHtml/*
+ 	if [ -d /var/streaming/AdminHtml/ ]; then
+ 	    echo removing old version of html from "/var/streaming/AdminHtml"
+ 	    rm -r -f /var/streaming/AdminHtml/*
  	fi    
- 	
 -	if [ ! -d /var/streaming/ ]; then
--		echo creating "/var/streaming/AdminHtml" directory
--		mkdir -p /var/streaming/AdminHtml
-+	if [ ! -d ${DATADIR}/AdminHtml ]; then
-+		echo creating "${DATADIR}/AdminHtml" directory
-+		mkdir -p ${DATADIR}/AdminHtml
++	if [ ! -d /var/streaming/AdminHtml ]; then
+ 		echo creating "/var/streaming/AdminHtml" directory
+ 		mkdir -p /var/streaming/AdminHtml
  	fi
--	echo copying Admin HTML to "/var/streaming/AdminHtml" directory
+ 	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}
  	
- 
--	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
++#	/usr/local/sbin/streamingadminserver.pl
  	
  	echo;echo Installation Complete
  
@@ -285,24 +182,9 @@
  	# 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
+@@ -372,6 +385,7 @@
+ 	/usr/local/bin/qtpasswd -F -d 'aGFja21l' > /dev/null
  		
- 	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 457903b764a7..9bb84e0d82a3 100644
--- a/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl
+++ b/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl
@@ -1,6 +1,15 @@
---- 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 {
+--- 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 @@
  	  "gbrowse", "0",
  	  "ssl", "0",
  	  "crtfile", "/etc/streaming/streamingadminserver.pem",
diff --git a/net/DarwinStreamingServer/pkg-plist b/net/DarwinStreamingServer/pkg-plist
index a86b0daa318d..ff2c78ee58a7 100644
--- a/net/DarwinStreamingServer/pkg-plist
+++ b/net/DarwinStreamingServer/pkg-plist
@@ -1,11 +1,10 @@
-bin/createuserstreamingdir
 bin/qtpasswd
 bin/MP3Broadcaster
 bin/PlaylistBroadcaster
 sbin/DarwinStreamingServer
 sbin/streamingadminserver.pl
-libexec/StreamingServerModules/QTSSHomeDirectoryModule
-libexec/StreamingServerModules/QTSSRefMovieModule
+@comment libexec/StreamingServerModules/QTSSHomeDirectoryModule
+@comment libexec/StreamingServerModules/QTSSRefMovieModule
 @exec   mkdir %D/%%DATADIR%%                 2>/dev/null || true
 @exec   mkdir %D/%%DATADIR%%/movies          2>/dev/null || true
 %%DATADIR%%/readme.txt
@@ -153,11 +152,12 @@ etc/streaming/streamingserver.xml-dist
 @dirrm %%DATADIR%%/AdminHtml/images
 @dirrm %%DATADIR%%/AdminHtml/html_en
 @dirrm %%DATADIR%%/AdminHtml
-@unexec rmdir %D/%%DATADIR%%/movies          2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%%                 2>/dev/null || true
-@dirrm libexec/StreamingServerModules
-@unexec rmdir %D/etc/streaming               2>/dev/null || true
-@unexec rmdir /var/spool/streaming.playlists 2>/dev/null || true
-@exec   mkdir /var/spool/streaming.playlists 2>/dev/null || true
-@unexec rmdir /var/log/streaming             2>/dev/null || true
-@exec   mkdir /var/log/streaming             2>/dev/null || true
+@unexec rmdir %D/%%DATADIR%%/movies             2>/dev/null || true
+@unexec rmdir %D/%%DATADIR%%                    2>/dev/null || true
+@unexec rmdir %D/libexec/StreamingServerModules 2>/dev/null || true
+@exec   mkdir %D/libexec/StreamingServerModules 2>/dev/null || true
+@unexec rmdir %D/etc/streaming                  2>/dev/null || true
+@unexec rmdir /var/spool/streaming.playlists    2>/dev/null || true
+@exec   mkdir /var/spool/streaming.playlists    2>/dev/null || true
+@unexec rmdir /var/log/streaming                2>/dev/null || true
+@exec   mkdir /var/log/streaming                2>/dev/null || true