diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile
new file mode 100644
index 000000000000..2d5fcc31db4f
--- /dev/null
+++ b/net/DarwinStreamingServer/Makefile
@@ -0,0 +1,114 @@
+# New ports collection makefile for:	DarwinStreamingServer
+# Date created:				2002/02/23
+# Whom:					steve@stevenwills.com
+#
+# $FreeBSD$
+#
+
+PORTNAME=	DarwinStreamingServer
+PORTVERSION=	4.1.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_1.src.tar.gz.
+DISTNAME=	DSS-4_1_1.src
+
+MAINTAINER=	nork@FreeBSD.org
+
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/${PERL_VER}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay
+
+RESTRICTED=	"See http://www.opensource.apple.com/apsl/"
+NO_CDROM=	${RESTRICTED}
+NO_PACKAGE=	${RESTRICTED}
+
+.if defined(BATCH) || defined(PACKAGE_BUILDING)
+IGNORE=		${RESTRICTED}
+.endif
+
+USE_REINPLACE=	YES
+
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+MAKE_ENV+=	CC="${CC}"				\
+		CXX="${CXX}"				\
+		MAKE="${MAKE}"				\
+		DATADIR="${DATADIR}"			\
+		PTHREAD_LIBS="${PTHREAD_LIBS}"		\
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"	\
+
+pre-fetch:
+	@[ -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ] || ( \
+	${ECHO} "********************************************************************";	\
+	${ECHO} "Please get ${DISTNAME}${EXTRACT_SUFX} from";				\
+	${ECHO} "	http://developer.apple.com/darwin/projects/streaming/source/";	\
+	${ECHO} "And, you must accept APSL (Apple Public Source License).";		\
+	${ECHO} "********************************************************************";	\
+	${FALSE}                                                                        \
+	)
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,/usr/local/,${PREFIX}/,' \
+		${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
+	@${REINPLACE_CMD} -e 's,${PREFIX}/movies,${DATADIR}/movies,' \
+		${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}/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
+	@${REINPLACE_CMD} -e 's,/var/streaming/logs,/var/log/streaming,' \
+		${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
+	@${REINPLACE_CMD} -e 's,/var/streaming/AdminHtml,${DATADIR}/AdminHtml,' \
+		${WRKSRC}/WebAdmin/src/streamingadminserver.pl				\
+		${WRKSRC}/WebAdmin/streamingadminserver_Darwin.conf
+	@${REINPLACE_CMD} -e 's,/var/streaming/playlists,/var/spool/streaming.playlists,' \
+		${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
+
+do-build:
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./Buildit)
+
+post-build:
+	@${CP} ${.CURDIR}/pkg-message ${WRKDIR}/pkg-message
+	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKDIR}/pkg-message
+
+pre-install:
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./DSS_MakeRoot -f ${OPSYS})
+
+do-install:
+	@(cd ${WRKSRC}/${OPSYS}; ${SETENV} ${MAKE_ENV} ./Install)
+
+post-install:
+	${INSTALL_SCRIPT} ${FILESDIR}/streamingadminserver.sh    ${PREFIX}/etc/rc.d/
+	${INSTALL_SCRIPT} ${FILESDIR}/darwin_streaming_server.sh ${PREFIX}/etc/rc.d/
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/net/DarwinStreamingServer/distinfo b/net/DarwinStreamingServer/distinfo
new file mode 100644
index 000000000000..1c3cf1d4363f
--- /dev/null
+++ b/net/DarwinStreamingServer/distinfo
@@ -0,0 +1 @@
+MD5 (DSS-4_1_1.src.tar.gz) = 8179cb514ea7c5d3ed6a366cb681aff0
diff --git a/net/DarwinStreamingServer/files/darwin_streaming_server.sh b/net/DarwinStreamingServer/files/darwin_streaming_server.sh
new file mode 100644
index 000000000000..3883701ec10f
--- /dev/null
+++ b/net/DarwinStreamingServer/files/darwin_streaming_server.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/${0##*/}\$"); then
+	echo "$0: Cannot determine the PREFIX" >&2
+	exit 64
+fi
+
+if [ -r /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+	source_rc_confs
+elif [ -r /etc/rc.conf ]; then
+	. /etc/rc.conf
+fi
+
+case "$1" in
+start)
+	case ${darwin_streaming_server_enable} in
+	[Yy][Ee][Ss])
+		/usr/bin/nice -5 ${darwin_streaming_server_program:-${PREFIX}/sbin/DarwinStreamingServer} ${darwin_streaming_server_flags} && \
+		echo -n ' DarwinStreamingServer'
+		;;
+	esac
+	;;
+stop)
+	case ${darwin_streaming_server_enable} in
+	[Yy][Ee][Ss])
+		/usr/bin/killall DarwinStreamingS && echo -n ' DarwinStreamingServer'
+		;;
+	esac
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/net/DarwinStreamingServer/files/patch-Buildit b/net/DarwinStreamingServer/files/patch-Buildit
new file mode 100644
index 000000000000..c0e98d018f84
--- /dev/null
+++ b/net/DarwinStreamingServer/files/patch-Buildit
@@ -0,0 +1,29 @@
+--- Buildit.orig	Sat Jun 15 11:11:37 2002
++++ Buildit	Mon Sep 23 01:05:07 2002
+@@ -80,18 +80,18 @@
+ 
+ 	FreeBSD.i386)
+         echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
+-		CPLUS=gcc
+-		CCOMP=gcc
+-		LINKER="gcc"
+- 		MAKE=make
++		CPLUS=${CXX}
++		CCOMP=${CC}
++		LINKER=${CXX}
++ 		MAKE=${MAKE}
+  		
+-		COMPILER_FLAGS=
+-        INCLUDE_FLAG="-include"
++		COMPILER_FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
++	        INCLUDE_FLAG="-include"
+ 		
+-		CORE_LINK_LIBS="-pthread -lm -lcrypt"
++		CORE_LINK_LIBS="${PTHREAD_LIBS} -lcrypt -lm"
+ 
+ 		SHARED=-shared
+-		MODULE_LIBS="-lgcc -lstdc++"
++		MODULE_LIBS=""
+ 		;;
+ 	
+ #	SunOS.sun4m | \
diff --git a/net/DarwinStreamingServer/files/patch-DSS_MakeRoot b/net/DarwinStreamingServer/files/patch-DSS_MakeRoot
new file mode 100644
index 000000000000..980574443756
--- /dev/null
+++ b/net/DarwinStreamingServer/files/patch-DSS_MakeRoot
@@ -0,0 +1,11 @@
+--- DSS_MakeRoot.orig	Fri Jul 12 03:58:59 2002
++++ DSS_MakeRoot	Mon Sep 23 23:37:12 2002
+@@ -95,7 +95,7 @@
+         echo copying "sample.mp3" into "$INSTALLROOT/usr/local/movies"
+         cp sample.mp3 $INSTALLROOT/usr/local/movies/
+ 
+-    if [-d SpamPro.tproj ]; then
++    if [ -d SpamPro.tproj ]; then
+ 	echo copying "StreamingLoadTool" to "$INSTALLROOT/usr/local/bin/StreamingLoadTool"
+ 	cp SpamPro.tproj/StreamingLoadTool $INSTALLROOT/usr/local/bin/
+ 	
diff --git a/net/DarwinStreamingServer/files/patch-Install b/net/DarwinStreamingServer/files/patch-Install
new file mode 100644
index 000000000000..ba79026ec844
--- /dev/null
+++ b/net/DarwinStreamingServer/files/patch-Install
@@ -0,0 +1,252 @@
+--- Install.orig	Sat Jul  6 09:20:05 2002
++++ Install	Tue Sep 24 02:30:09 2002
+@@ -15,6 +15,7 @@
+ 
+ if [ $USERID = 0 ]; 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 @@
+ 	fi
+ 
+ 	echo
++    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
+-elif [ -x /usr/local/bin/perl ]; then
+-	perldef=/usr/local/bin/perl
++elif [ -x ${LOCALBASE}/bin/perl ]; then
++	perldef=${LOCALBASE}/bin/perl
+ else
+ 	perldef=""
+ fi
+@@ -184,127 +186,130 @@
+ 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"
+-	cp -f DarwinStreamingServer /usr/local/sbin/
++	echo copying "DarwinStreamingServer" to "${PREFIX}/sbin/DarwinStreamingServer"
++	${BSD_INSTALL_PROGRAM} DarwinStreamingServer ${PREFIX}/sbin/
+ 	
+ 	
+-	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/
+ 	
+-	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/
+ 	
+-	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/
+ 
+ 	# 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
+-	fi
+-	# cp -f StreamingServerModules/* /usr/local/sbin/StreamingServerModules/
+-	
+-	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
+-	chmod 600 /etc/streaming/streamingserver.xml
+-
+-	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
+ 		
+-	echo;echo copying "qtusers" to "/etc/streaming/qtusers"
+-	cp -f qtusers /etc/streaming/qtusers
+-	chmod 600 /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
+ 
+-	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
+ 
+-	#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
+ 
+-	if [ ! -d /var/streaming ]; then
+-		echo creating "/var/streaming" directory
+-		mkdir -p /var/streaming
++	if [ ! -d ${DATADIR} ]; then
++		echo creating "${DATADIR}" directory
++		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 "3rdPartyAcknowledgements.rtf" to "/var/streaming/3rdPartyAcknowledgements.rtf"
+-	cp -f 3rdPartyAcknowledgements.rtf /var/streaming/3rdPartyAcknowledgements.rtf
++	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
+ 	fi
+ 	
+-	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/
+ 
+-	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.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/
+ 	
+ 	#WebAdmin install
+-	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
+ 	
+-	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/*
+ 	fi    
+-	if [ ! -d /var/streaming/ ]; then
+-		echo creating "/var/streaming/AdminHtml" directory
++	if [ ! -d ${DATADIR} ]; then
++		echo creating "${DATADIR}/AdminHtml" directory
+ 		mkdir -p /var/streaming/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
+ 	
+@@ -368,6 +373,7 @@
+ 	/usr/local/bin/qtpasswd -F -d 'aGFja21l' > /dev/null
+ 		
+ 	echo Setup Complete!
++    fi
+ 	
+ else
+ 
diff --git a/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl b/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl
new file mode 100644
index 000000000000..d4bcba526baf
--- /dev/null
+++ b/net/DarwinStreamingServer/files/patch-WebAdmin::src::streamingadminserver.pl
@@ -0,0 +1,29 @@
+--- 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 @@
+ 	  "gbrowse", "0",
+ 	  "ssl", "0",
+ 	  "crtfile", "/etc/streaming/streamingadminserver.pem",
+-	  "keyfile", "/etc/streaming/streamingadminserver.pem",
++	  "keyfile", "/etc/streaming/streamingadminserver.key",
+ 	  #"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/streaming/streamingadminserver.pid"
+ 	  );
+ }
+ 
diff --git a/net/DarwinStreamingServer/files/streamingadminserver.sh b/net/DarwinStreamingServer/files/streamingadminserver.sh
new file mode 100644
index 000000000000..58e69805821e
--- /dev/null
+++ b/net/DarwinStreamingServer/files/streamingadminserver.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/${0##*/}\$"); then
+	echo "$0: Cannot determine the PREFIX" >&2
+	exit 64
+fi
+
+if [ -r /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+	source_rc_confs
+elif [ -r /etc/rc.conf ]; then
+	. /etc/rc.conf
+fi
+
+case "$1" in
+start)
+	case ${streamingadminserver_enable} in
+	[Yy][Ee][Ss])
+		${streamingadminserver_program:-${PREFIX}/sbin/streamingadminserver.pl} ${streamingadminserver_flags} && \
+		echo -n ' StreamingAdminServer'
+		;;
+	esac
+	;;
+stop)
+	case ${streamingadminserver_enable} in
+	[Yy][Ee][Ss])
+		if [ -f /var/run/streamingadminserver.pid ]; then
+			/bin/kill `/bin/cat /var/run/streamingadminserver.pid`
+			echo -n ' StreamingAdminServer'
+		fi
+		;;
+	esac
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/net/DarwinStreamingServer/pkg-comment b/net/DarwinStreamingServer/pkg-comment
new file mode 100644
index 000000000000..ca946c7c2f65
--- /dev/null
+++ b/net/DarwinStreamingServer/pkg-comment
@@ -0,0 +1 @@
+Darwin Streaming Server, a MP3, MPEG4 and QuickTime streaming server
diff --git a/net/DarwinStreamingServer/pkg-descr b/net/DarwinStreamingServer/pkg-descr
new file mode 100644
index 000000000000..41567dbd8ba0
--- /dev/null
+++ b/net/DarwinStreamingServer/pkg-descr
@@ -0,0 +1,6 @@
+Darwin Streaming Server is server technology which allows you to send
+streaming QuickTime data to clients across the Internet using the industry
+standard RTP and RTSP protocols. It is based on the same code as Apple's
+QuickTime Streaming Server.
+
+WWW: http://developer.apple.com/darwin/projects/streaming/
diff --git a/net/DarwinStreamingServer/pkg-message b/net/DarwinStreamingServer/pkg-message
new file mode 100644
index 000000000000..ab89edf7b7ad
--- /dev/null
+++ b/net/DarwinStreamingServer/pkg-message
@@ -0,0 +1,63 @@
+===============================================================================
+
+		* IMPORTANT SETUP NOTICE * IMPORTANT SETUP NOTICE *
+
+o Set up DSS Administrator Username/Password.
+
+    $Username$ is an account for DSS Administration, e.g. admin, root, etc...
+
+    # qtpasswd -c $Username$
+    # echo admin: $Username$ > %%PREFIX%%/etc/streaming/qtgroups
+
+    NOTICE: qtpasswd will create new file with -c option.  Please
+            see also `qtpasswd -h'(mostly same as htpasswd).
+
+    NOTICE: qtgroups file will contain user(s) separated by white space
+            of group(s).
+
+o Set up SSL for DSS Administration Tool  (If you need)
+
+    Install your SSL Keys to %%PREFIX%%/etc/streaming/
+	streamingadminserver.key: SSL Private key
+	streamingadminserver.pem: SSL Public key
+
+o Boot DSS Administration Tool
+
+    # echo 'streamingadminserver_enable="YES"' >> /etc/rc.conf
+    # cd /; env - %%PREFIX%%/etc/rc.d/streamingadminserver.sh start
+
+o Set up DSS Administration Tool with MSIE(Microsoft Internet Explorer)
+
+    Mozilla, Netscape4/7 are not useful.  DSS Administration Tool requires
+    MSIE(perhaps 5.0 or later) J-Script feature.
+
+	http://YOUR.STREAMING.SERVER:1220/
+
+    If you need SSL, select 'Secure Administration (SSL)' in setup.
+    After setup, you can access to
+
+	https://YOUR.STREAMING.SERVER:1240/
+
+===============================================================================
+
+Related directories
+
+  %%PREFIX%%/etc/streaming			- DSS Configuration Directory
+  %%PREFIX%%/share/DarwinStreamingServer/movies	- *Default* Movies Directory
+  /var/log/streaming				- DSS Streaming Log Directory
+  /var/spool/streaming.playlists		- DSS Playlists Directory
+
+===============================================================================
+
+  If you want to invoke Darwin Streaming Server from start-up, put following
+  lines into /etc/rc.conf.
+
+    darwin_streaming_server_enable="YES"
+    darwin_streaming_server_flags=""
+
+  If you want to invoke DSS Administration Tool from start-up, do too.
+
+    streamingadminserver_enable="YES"
+    streamingadminserver_flags=""
+
+===============================================================================
diff --git a/net/DarwinStreamingServer/pkg-plist b/net/DarwinStreamingServer/pkg-plist
new file mode 100644
index 000000000000..63f6c14ce598
--- /dev/null
+++ b/net/DarwinStreamingServer/pkg-plist
@@ -0,0 +1,158 @@
+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
+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
+@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 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
diff --git a/net/Makefile b/net/Makefile
index af2650898878..8bb6f38acbf1 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -4,6 +4,7 @@
     SUBDIR += 44bsd-rdist
     SUBDIR += 6tunnel
     SUBDIR += 6to4
+    SUBDIR += DarwinStreamingServer
     SUBDIR += GeoIP
     SUBDIR += NeTraMet
     SUBDIR += SSLtelnet