Update to the latest release and fix a couple of bugs.

PR:		12711
Submitted by:	maintainer

5 files changed, 29 insertions, 21 deletions

diff --git a/net/rtsp_proxy/Makefile b/net/rtsp_proxy/Makefile
index 1f474d96eea8..1447d1d6bdca 100644
--- a/net/rtsp_proxy/Makefile
+++ b/net/rtsp_proxy/Makefile
@@ -3,38 +3,28 @@
 # Date created:				8 June 1999
 # Whom:					Richard Kiss <richard@homemail.com>
 #
-# $Id: $
+# $Id: Makefile,v 1.1.1.1 1999/06/16 16:47:36 billf Exp $
 #
 
-DISTNAME=	rtsp_proxy
-PKGNAME=	${DISTNAME}-1.0
+DISTNAME=	SS1.0.1
+PKGNAME=	rtsp_proxy-1.0
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.apple.com/Quicktime/developers/
-EXTRACT_SUFX=	.src.sh
+MASTER_SITES=	http://www.streamingserver.org/priss/
+EXTRACT_SUFX=   .tgz
 
 MAINTAINER=	richard@homemail.com
 
-NO_CDROM=       "Apple has a complex license for this software."
-WRKSRC=		${WRKDIR}/${DISTNAME}/proxy_unix
+WRKSRC=		${WRKDIR}/${DISTNAME}/QTProxy/proxy_unix
 ALL_TARGET=
 
 proxyunix =     ${WRKSRC}/proxy_unix.c
 
-post-patch:
-	@ ${MV} ${proxyunix} ${proxyunix}.bak
-	@ ${SED} -e 's#/etc#${PREFIX}/etc#' < ${proxyunix}.bak > ${proxyunix}
-
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && yes "I AGREE" | ${SH} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/rtsp_proxy ${PREFIX}/sbin
 	@ ${INSTALL_SCRIPT} ${FILESDIR}/rtsp_proxy.sh ${PREFIX}/etc/rc.d
 	@ ${INSTALL_DATA} ${WRKSRC}/../qts_proxy.conf ${PREFIX}/etc/
 
 post-install:
-	@ ${CAT} ${PKGMESSAGE}
+	@ ${CAT} ${PKGMESSAGE} | sed -e 's,@PREFIX@,${PREFIX},g'
 
 .include <bsd.port.mk>
diff --git a/net/rtsp_proxy/distinfo b/net/rtsp_proxy/distinfo
index 973965b9bcbe..fa951bf01e6b 100644
--- a/net/rtsp_proxy/distinfo
+++ b/net/rtsp_proxy/distinfo
@@ -1 +1 @@
-MD5 (rtsp_proxy.src.sh) = 53e444080fe967f055b549460f0c4b51
+MD5 (SS1.0.1.tgz) = b6d9a991576f872b5a8b064e0e52d562
diff --git a/net/rtsp_proxy/files/rtsp_proxy.sh b/net/rtsp_proxy/files/rtsp_proxy.sh
index 9bfd8dcc73b3..8176b0d60d07 100644
--- a/net/rtsp_proxy/files/rtsp_proxy.sh
+++ b/net/rtsp_proxy/files/rtsp_proxy.sh
@@ -1,2 +1,20 @@
 #!/bin/sh
-[ -x /usr/local/sbin/rtsp_proxy ] && /usr/local/sbin/rtsp_proxy > /dev/null & && echo $! > /var/run/rtsp_proxy.pid && echo -n ' rtsp_proxy'
+
+cd `dirname $0`
+cd ../..
+PREFIX=`pwd`
+
+case $1 in
+	start)	echo -n ' rtsp_proxy'
+		RTSP_PROXY=${PREFIX}/sbin/rtsp_proxy
+		CONFIG_FILE=${PREFIX}/etc/qts_proxy.conf
+		PID_FILE=/var/run/rtsp_proxy.pid
+		[ -x ${RTSP_PROXY} ] && ${RTSP_PROXY} -c ${CONFIG_FILE} > /dev/null & && echo $! > ${PID_FILE}
+		;;
+        stop)	if [ -f /var/run/rtsp_proxy.pid ]; then
+			kill `cat /var/run/rtsp_proxy.pid`
+			rm /var/run/rtsp_proxy.pid
+		fi
+		;;
+esac
+
diff --git a/net/rtsp_proxy/pkg-descr b/net/rtsp_proxy/pkg-descr
index 4f6c17a5a4d7..455262f3e66e 100644
--- a/net/rtsp_proxy/pkg-descr
+++ b/net/rtsp_proxy/pkg-descr
@@ -14,4 +14,4 @@ For more information on the RTP and RTSP internet standards:
 - RTSP: http://info.internet.isi.edu:80/in-notes/rfc/files/rfc2326.txt 
 - RTP: http://info.internet.isi.edu:80/in-notes/rfc/files/rfc1889.txt 
 
-WWW: http://www.apple.com/quicktime/developers/rtsproxy.html
+WWW: http://www.apple.com/quicktime/resources/qt4/us/proxy/
diff --git a/net/rtsp_proxy/pkg-message b/net/rtsp_proxy/pkg-message
index 62b88671440b..5e3ca99e387a 100644
--- a/net/rtsp_proxy/pkg-message
+++ b/net/rtsp_proxy/pkg-message
@@ -1,3 +1,3 @@
 **************************************************************************
-You may need to adjust the configuration in ${PREFIX}/etc/qts_proxy.conf.
+You may need to adjust the configuration in @PREFIX@/etc/qts_proxy.conf.
 **************************************************************************