4 files changed, 20 insertions, 14 deletions

diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile
index 340961967be0..1e41b2d8c484 100644
--- a/net/DarwinStreamingServer/Makefile
+++ b/net/DarwinStreamingServer/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	DarwinStreamingServer
-PORTVERSION=	5.5.3
-PORTREVISION=	2
+PORTVERSION=	5.5.4
+PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	#http://developer.apple.com/darwin/projects/streaming/source/
 #		You must accept APSL (Apple Public Source License),  and get
-#		DarwinStreamingSrvr5.5.3-Source.tar.
+#		DarwinStreamingSrvr5.5.4-Source.tar.
 DISTNAME=	DarwinStreamingSrvr${PORTVERSION}-Source
 EXTRACT_SUFX=	.tar
 
@@ -101,6 +101,7 @@ post-patch:
 		${WRKSRC}/qtpasswd.tproj/Makefile.POSIX					\
 		${WRKSRC}/MP3Broadcaster/Makefile.POSIX					\
 		${WRKSRC}/HTTPUtilitiesLib/Makefile.POSIX				\
+		${WRKSRC}/StreamingLoadTool/Makefile.POSIX				\
 		${WRKSRC}/CommonUtilitiesLib/Makefile.POSIX				\
 		${WRKSRC}/StreamingProxy.tproj/Makefile.POSIX				\
 		${WRKSRC}/StreamingServer.xcode/project.pbxproj				\
diff --git a/net/DarwinStreamingServer/distinfo b/net/DarwinStreamingServer/distinfo
index 9a2bfdacc551..7bd8994eb90a 100644
--- a/net/DarwinStreamingServer/distinfo
+++ b/net/DarwinStreamingServer/distinfo
@@ -1,3 +1,3 @@
-MD5 (DarwinStreamingSrvr5.5.3-Source.tar) = e96da2a5893a3031138cb8e3cd3c92ef
-SHA256 (DarwinStreamingSrvr5.5.3-Source.tar) = 2dfa3b7a7831d84a82650ee997816540ffaf0bfc11d21d991752570b81e80bb7
-SIZE (DarwinStreamingSrvr5.5.3-Source.tar) = 32798720
+MD5 (DarwinStreamingSrvr5.5.4-Source.tar) = 0a1b699cd2c3a91fc64d8582320d61a3
+SHA256 (DarwinStreamingSrvr5.5.4-Source.tar) = 26882e3306deeeba93e93a94c763c233770eaa744ac953d6d6b1d3c05c900fe3
+SIZE (DarwinStreamingSrvr5.5.4-Source.tar) = 32829440
diff --git a/net/DarwinStreamingServer/files/patch-Install b/net/DarwinStreamingServer/files/patch-Install
index 2ab9fe78306e..bbb0d2ada5e0 100644
--- a/net/DarwinStreamingServer/files/patch-Install
+++ b/net/DarwinStreamingServer/files/patch-Install
@@ -1,5 +1,5 @@
 --- Install.orig	Fri May 27 18:55:01 2005
-+++ Install	Sun Jul 10 20:10:31 2005
++++ Install	Wed Jan 10 01:05:07 2007
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -137,7 +137,12 @@
  	
  	if [ ! -d /var/streaming/logs ]; then
  		echo creating "/var/streaming/logs" directory
-@@ -294,66 +305,69 @@
+@@ -290,70 +301,72 @@
+ 		echo creating "/var/streaming/playlists" directory
+ 		mkdir -p /var/streaming/playlists
+ 	fi
++	chown -Rh qtss:qtss /var/streaming/playlists
+ 	chmod 770 /var/streaming/playlists
  	chmod 775 /usr/local/movies
  	
      echo copying "sample_100kbit.mov" into "/usr/local/movies/sample_100kbit.mov"
@@ -176,7 +181,6 @@
 -    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/
@@ -186,7 +190,6 @@
 -	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
  	
  	#WebAdmin install
@@ -224,7 +227,7 @@
  	# Setup for DSS
  	# Prompts for a username and password
  	# that can be used to administer the server
-@@ -416,6 +430,7 @@
+@@ -416,6 +429,7 @@
  	chown -R -f qtss /etc/streaming/
  	
  	echo Setup Complete!
diff --git a/net/DarwinStreamingServer/pkg-plist b/net/DarwinStreamingServer/pkg-plist
index 3e83b021caa4..94a5ad587707 100644
--- a/net/DarwinStreamingServer/pkg-plist
+++ b/net/DarwinStreamingServer/pkg-plist
@@ -1,6 +1,7 @@
 bin/qtpasswd
 bin/MP3Broadcaster
 bin/PlaylistBroadcaster
+bin/StreamingLoadTool
 sbin/DarwinStreamingServer
 sbin/streamingadminserver.pl
 libexec/StreamingServerModules/QTSSRefMovieModule
@@ -147,9 +148,9 @@ etc/streaming/relayconfig.xml-dist
 @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
+@unexec if cmp -s %D/etc/streaming/streamingloadtool.conf %D/etc/streaming/streamingloadtool.conf-dist; then rm -f %D/etc/streaming/streamingloadtool.conf; fi
+etc/streaming/streamingloadtool.conf-dist
+@exec [ ! -f %B/streamingloadtool.conf ] && cp %B/%f %B/streamingloadtool.conf
 @dirrm %%DATADIR%%/AdminHtml/includes
 @dirrm %%DATADIR%%/AdminHtml/images
 @dirrm %%DATADIR%%/AdminHtml/html_en
@@ -161,5 +162,6 @@ etc/streaming/streamingserver.xml-dist
 @dirrmtry etc/streaming
 @unexec rmdir /var/spool/streaming.playlists    2>/dev/null || true
 @exec   mkdir /var/spool/streaming.playlists    2>/dev/null || true
+@exec   chown -Rh qtss:qtss /var/spool/streaming.playlists
 @unexec rmdir /var/log/streaming                2>/dev/null || true
 @exec   mkdir /var/log/streaming                2>/dev/null || true