o Quiet remove MOVIES directory. [1]

o Remove debug code.
o Add pkg-install, which should be committed previous.  I forgot it.
o Bump PORTREVISION accodingly.

Submitted by:	Yoshihiro Yanagida <yosh@yanagi.to> [1]

3 files changed, 47 insertions, 5 deletions

diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile
index 010e1107c032..9e0fa07cdd9c 100644
--- a/net/DarwinStreamingServer/Makefile
+++ b/net/DarwinStreamingServer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	DarwinStreamingServer
 PORTVERSION=	5.0
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	#http://developer.apple.com/darwin/projects/streaming/source/
 #		You must accept APSL (Apple Public Source License),  and get
@@ -93,14 +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)
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./DSS_MakeRoot -f ${OPSYS} dss)
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 
 do-install:
-	@(cd ${WRKSRC}/${OPSYS}; ${SETENV} ${MAKE_ENV} /bin/sh -x ./Install)
+	@(cd ${WRKSRC}/${OPSYS}; ${SETENV} ${MAKE_ENV} ./Install)
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/streamingadminserver.sh    ${PREFIX}/etc/rc.d/
diff --git a/net/DarwinStreamingServer/pkg-install b/net/DarwinStreamingServer/pkg-install
new file mode 100644
index 000000000000..15a263f356c7
--- /dev/null
+++ b/net/DarwinStreamingServer/pkg-install
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# $FreeBSD$
+
+PATH=/bin:/usr/sbin
+
+case $2 in
+PRE-INSTALL)
+	USER=qtss
+	GROUP=${USER}
+	UID=554
+	GID=${UID}
+
+	if pw group show "${GROUP}" 2>/dev/null; then
+		echo "You already have a group \"${GROUP}\", so I will use it."
+	else
+		if pw groupadd ${GROUP} -g ${GID}; then
+			echo "Added group \"${GROUP}\"."
+		else
+			echo "Adding group \"${GROUP}\" failed..."
+			exit 1
+		fi
+	fi
+
+	if pw user show "${USER}" 2>/dev/null; then
+		echo "You already have a user \"${USER}\", so I will use it."
+	else
+		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+			-d /noexistant -c "Darwin Streaming Server"
+		then
+			echo "Added user \"${USER}\"."
+		else
+			echo "Adding user \"${USER}\" failed..."
+			exit 1
+		fi
+	fi
+
+	;;
+
+esac
diff --git a/net/DarwinStreamingServer/pkg-plist b/net/DarwinStreamingServer/pkg-plist
index 9c80e1d2d3fc..a86b0daa318d 100644
--- a/net/DarwinStreamingServer/pkg-plist
+++ b/net/DarwinStreamingServer/pkg-plist
@@ -6,6 +6,8 @@ sbin/DarwinStreamingServer
 sbin/streamingadminserver.pl
 libexec/StreamingServerModules/QTSSHomeDirectoryModule
 libexec/StreamingServerModules/QTSSRefMovieModule
+@exec   mkdir %D/%%DATADIR%%                 2>/dev/null || true
+@exec   mkdir %D/%%DATADIR%%/movies          2>/dev/null || true
 %%DATADIR%%/readme.txt
 %%DATADIR%%/3rdPartyAcknowledgements.rtf
 %%DATADIR%%/AdminHtml/MapUTF.pl
@@ -151,8 +153,8 @@ etc/streaming/streamingserver.xml-dist
 @dirrm %%DATADIR%%/AdminHtml/images
 @dirrm %%DATADIR%%/AdminHtml/html_en
 @dirrm %%DATADIR%%/AdminHtml
-@dirrm %%DATADIR%%/movies
-@dirrm %%DATADIR%%
+@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