After repocopy from net/elsa to net/tcserver:

* Update to tcserver-1.1
* Finally out of beta, TeraCast server replaces Elsa as the lite (free)
  version of this standards-based RTSP server

6 files changed, 96 insertions, 29 deletions

diff --git a/net/tcserver/Makefile b/net/tcserver/Makefile
index 78e6ed5c76b6..7c861024a1a3 100644
--- a/net/tcserver/Makefile
+++ b/net/tcserver/Makefile
@@ -1,24 +1,27 @@
-# New ports collection makefile for:	elsa
+# New ports collection makefile for:	tcserver
 # Date created:				06 October 1999
 # Whom:					Chris D. Faulhaber <jedgar@fxp.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	elsa
-PORTVERSION=	1.0.b018
+PORTNAME=	tcserver
+PORTVERSION=	1.1
 CATEGORIES=	net
 MASTER_SITES=
-DISTNAME=	elsa-freebsd_x86
+DISTNAME=	tcserver-freebsd_x86.sh
+EXTRACT_SUFX=
 
 MAINTAINER=	jedgar@FreeBSD.org
 
 ONLY_FOR_ARCHS=	i386
 RESTRICTED=	"LIC: redistribution not allowed"
+IS_INTERACTIVE=	yes
 
-WRKSRC=		${WRKDIR}/ELSA-1_0b-018-freebsd_x86
+WRKSRC=		${WRKDIR}/TCSERVER-1_1-freebsd_x86
 NO_BUILD=	yes
-LOG_DIR?=	/var/log/elsa
+LOG_DIR?=	/var/log/tcserver
+PID_DIR?=	/var/run
 
 .include <bsd.port.pre.mk>
 
@@ -27,7 +30,7 @@ IGNORE='The source to this port may not be automatically fetched due to licensin
 .endif
 
 pre-fetch:
-	@for library in libc_r.so.3 libstdc++.so.2 libg++.so.4; do \
+	@for library in libc_r.so.3 libm.so.2 libstdc++.so.2 libg++.so.4; do \
 		if [ -z "`ldconfig -r -elf | ${GREP} $$library`" ]; then \
 			${ECHO}; \
 			${ECHO} "This port requires the following FreeBSD 3.x compatibility"; \
@@ -40,23 +43,37 @@ pre-fetch:
 		fi \
 	done
 
+do-extract:
+	@${MKDIR} ${WRKDIR}
+	@${SED} -e 's|read extractdir|extractdir=\.|' \
+		< ${DISTDIR}/${DISTNAME} > ${WRKDIR}/${DISTNAME}
+	@(cd ${WRKDIR} && sh ${DISTNAME})
+
 do-configure:
-	@${PERL} -pi.orig -e 's|__PREFIX__|${PREFIX}|' ${WRKSRC}/elsa.cfg
-	@${PERL} -pi.orig -e 's|__LOG_DIR__|${LOG_DIR}|' ${WRKSRC}/elsa.cfg
+	for file in tcserver.cfg-dist scripts/tcserver.init; do \
+		${MV} ${WRKSRC}/$$file ${WRKSRC}/$$file.orig; \
+		${SED} -e 's|__PREFIX__|${PREFIX}|' \
+			-e 's|__LOG_DIR__|${LOG_DIR}|' \
+			-e 's|__PID_DIR__|${PID_DIR}|' \
+			< ${WRKSRC}/$$file.orig > ${WRKSRC}/$$file; \
+	done
 
 do-install:
-	${MKDIR} ${PREFIX}/share/elsa/content
+	${MKDIR} ${PREFIX}/share/tcserver/content
 	${MKDIR} ${LOG_DIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/elsa ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/elsa.cfg ${PREFIX}/etc
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/elsa
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/elsa
-	${INSTALL_DATA} ${WRKSRC}/content/elsa-test.mov ${PREFIX}/share/elsa/content
-
-post-install:
-	@if [ ! -f ${PREFIX}/etc/rc.d/elsa.sh ]; then \
-		${ECHO} "Installing ${PREFIX}/etc/rc.d/elsa.sh startup file."; \
-		${INSTALL_SCRIPT} ${FILESDIR}/elsa.sh ${PREFIX}/etc/rc.d/elsa.sh; \
+	${INSTALL_PROGRAM} ${WRKSRC}/tcserver ${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/tcserver.cfg-dist ${PREFIX}/etc/tcserver.cfg
+	${INSTALL_DATA} ${WRKSRC}/tcserver.cfg-full ${PREFIX}/etc
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/tcserver
+.if !defined(NOPORTDOCS)
+	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/docs/TeraCASTAdmin11.pdf \
+		${PREFIX}/share/tcserver
+.endif
+	${INSTALL_DATA} ${WRKSRC}/content/tcserver-test.mov ${PREFIX}/share/tcserver/content
+	if [ ! -f ${PREFIX}/etc/rc.d/tcserver.sh ]; then \
+		${ECHO} "Installing ${PREFIX}/etc/rc.d/tcserver.sh startup file."; \
+		${INSTALL_SCRIPT} ${WRKSRC}/scripts/tcserver.init \
+			${PREFIX}/etc/rc.d/tcserver.sh; \
 	fi
 
 .include <bsd.port.post.mk>
diff --git a/net/tcserver/distinfo b/net/tcserver/distinfo
index e83a64080fca..5c0fc2ffdfe3 100644
--- a/net/tcserver/distinfo
+++ b/net/tcserver/distinfo
@@ -1 +1 @@
-MD5 (elsa-freebsd_x86.tar.gz) = b1f7cd4468afdf1f89e14933cb0084e2
+MD5 (tcserver-freebsd_x86.sh) = f9e2026aca0fae699fd4244fb7e9955e
diff --git a/net/tcserver/files/patch-ab b/net/tcserver/files/patch-ab
new file mode 100644
index 000000000000..d00f1e06e89a
--- /dev/null
+++ b/net/tcserver/files/patch-ab
@@ -0,0 +1,17 @@
+--- tcserver.cfg-dist.orig	Mon Jun 12 16:29:03 2000
++++ tcserver.cfg-dist	Tue Jun 20 11:56:29 2000
+@@ -1,12 +1,8 @@
+ [config]
+ 
+-CONTENT_DIR=content
++CONTENT_DIR=__PREFIX__/share/tcserver/content
+ 
+ RTSP_PORTS=554,7070
+ 
+-#RTSP_PORTS=80,554,7070
+-# use the above RTSP_PORTS line if you want to support QuickTime
+-# HTTP Streaming on port 80
+-
+-LOGGING_DIR=logs
++LOGGING_DIR=__LOG_DIR__
+ LOGGING=yes
diff --git a/net/tcserver/files/patch-ac b/net/tcserver/files/patch-ac
new file mode 100644
index 000000000000..4bff6c204878
--- /dev/null
+++ b/net/tcserver/files/patch-ac
@@ -0,0 +1,20 @@
+--- scripts/tcserver.init.orig	Wed Apr 12 01:22:35 2000
++++ scripts/tcserver.init	Tue Jun 20 11:59:40 2000
+@@ -15,14 +15,14 @@
+ # ============================================================================
+ 
+ # replace this with the full path to tcserver
+-BIN=../tcserver
++BIN=__PREFIX__/sbin/tcserver
+ 
+ # replace this with the full path to the configuration directory
+-DIR=..
++DIR=__PREFIX__/etc
+ 
+ # replace this with the full path to the file specified in your PID_FILE
+ # variable in tcserver.cfg
+-PIDFILE=../tcserver.pid
++PIDFILE=__PID_DIR__/tcserver.pid
+ 
+ if [ ! -f $BIN ]; then
+ 	echo "$BIN not found.  TeraCAST not started"
diff --git a/net/tcserver/files/tcserver-freebsd_x86.sh.diff b/net/tcserver/files/tcserver-freebsd_x86.sh.diff
new file mode 100644
index 000000000000..81ed52836c70
--- /dev/null
+++ b/net/tcserver/files/tcserver-freebsd_x86.sh.diff
@@ -0,0 +1,11 @@
+--- tcserver-freebsd_x86.sh.orig	Tue Jun 20 11:18:24 2000
++++ tcserver-freebsd_x86.sh	Tue Jun 20 11:39:56 2000
+@@ -174,7 +174,7 @@
+ dirdone=0
+ while [ $dirdone -eq 0 ]; do
+ 	echon "Enter directory in which TeraCAST will be unpacked [.] "
+-	read extractdir
++	extractdir=.   
+ 	if [ -z "$extractdir" ]; then
+ 		extractdir=.
+ 	fi
diff --git a/net/tcserver/pkg-plist b/net/tcserver/pkg-plist
index 44c373db72e4..4a8fd5bc388c 100644
--- a/net/tcserver/pkg-plist
+++ b/net/tcserver/pkg-plist
@@ -1,8 +1,10 @@
-sbin/elsa
-etc/elsa.cfg
-etc/rc.d/elsa.sh
-share/elsa/LICENSE
-share/elsa/README
-share/elsa/content/elsa-test.mov
-@dirrm share/elsa/content
-@dirrm share/elsa
+sbin/tcserver
+etc/tcserver.cfg
+etc/tcserver.cfg-full
+etc/rc.d/tcserver.sh
+share/tcserver/LICENSE
+share/tcserver/README
+share/tcserver/TeraCASTAdmin11.pdf
+share/tcserver/content/tcserver-test.mov
+@dirrm share/tcserver/content
+@dirrm share/tcserver