Re-add multimedia/fxtv and mplex

 - update Mastersite
 - take maintainership from ports@FreeBSD.org.

Feature safe:	yes

9 files changed, 217 insertions, 0 deletions

diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile
new file mode 100644
index 000000000000..f0a38afeb093
--- /dev/null
+++ b/multimedia/mplex/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:    mplex
+# Date created:         Wed Jul 31 20:54:54 CDT 1996
+# Whom:                 erich@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME=	mplex
+PORTVERSION=	1.1
+CATEGORIES=	multimedia
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=     sanpei
+
+MAINTAINER=	sanpei@FreeBSD.org
+COMMENT=	Multiplexes MPEG component streams into system layers
+
+CONFLICTS=	mjpegtools-*
+
+MAN1=		mplex.1
+PLIST_FILES=	bin/mplex
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/mplex ${PREFIX}/bin
+	${INSTALL_MAN} ${FILESDIR}/mplex.1 ${PREFIX}/man/man1
+
+.include <bsd.port.mk>
diff --git a/multimedia/mplex/distinfo b/multimedia/mplex/distinfo
new file mode 100644
index 000000000000..079e5f164def
--- /dev/null
+++ b/multimedia/mplex/distinfo
@@ -0,0 +1,2 @@
+SHA256 (mplex-1.1.tar.gz) = d88dce2bac31b2516a3740602c786f35b1c61871a2e134460fdfd66e9cc8f900
+SIZE (mplex-1.1.tar.gz) = 34902
diff --git a/multimedia/mplex/files/mplex.1 b/multimedia/mplex/files/mplex.1
new file mode 100644
index 000000000000..0d7b0c0be1a5
--- /dev/null
+++ b/multimedia/mplex/files/mplex.1
@@ -0,0 +1,18 @@
+.\" The following requests are required for all man pages.
+.Dd Thu Aug  1 09:36:57 CDT 1996
+.Os
+.Dt mplex 1
+.Sh NAME
+.Nm mplex
+.Sh SYNOPSIS
+.Nm mplex
+.Ar file1
+.Op file2
+.Ar file3
+.Sh DESCRIPTION
+.Nm mplex
+multiplexes MPEG audio and video streams into system layers.
+
+.Sh AUTHORS
+mplex was written by Christoph Moar <moar@informatik.tu-muenchen.de>.
+This man page was written by Eric L. Hernes <erich@FreeBSD.org>
diff --git a/multimedia/mplex/files/patch-ab b/multimedia/mplex/files/patch-ab
new file mode 100644
index 000000000000..cee34107968d
--- /dev/null
+++ b/multimedia/mplex/files/patch-ab
@@ -0,0 +1,17 @@
+--- Makefile.orig	Tue Apr 11 02:46:13 1995
++++ Makefile	Mon Sep  4 18:13:42 2000
+@@ -19,10 +19,12 @@
+ 
+ #CFLAGS =  -g
+ 
+-CFLAGS =  -O
++CFLAGS?=  -O
+ LDFLAGS=  -lm
+-CC     =  cc
++CC     ?=  cc
+ RM     =  /bin/rm -f
++
++CFLAGS+= -DTIMER
+ 
+ OBJS = main.o bitstrm.o buffer.o inits.o inptstrm.o interact.o multplex.o systems.o timecode.o
+ 
diff --git a/multimedia/mplex/files/patch-ac b/multimedia/mplex/files/patch-ac
new file mode 100644
index 000000000000..92e720da93e8
--- /dev/null
+++ b/multimedia/mplex/files/patch-ac
@@ -0,0 +1,24 @@
+--- inptstrm.c.orig	Wed May 31 08:04:11 1995
++++ inptstrm.c	Mon Sep  4 18:17:45 2000
+@@ -1,4 +1,5 @@
+ #include "main.h"
++extern int Interactive;
+ /*************************************************************************
+     MPEG Streams Kontrolle
+ 
+@@ -310,6 +311,7 @@
+     fclose (info_file);
+     output_info_video (video_info);
+ 
++  if( Interactive )
+     ask_continue ();
+ }
+ 
+@@ -565,6 +567,7 @@
+     close_bit_stream_r (&audio_bs);
+     fclose (info_file);
+     output_info_audio (audio_info);
++  if( Interactive )
+     ask_continue ();
+ 
+ }
diff --git a/multimedia/mplex/files/patch-ad b/multimedia/mplex/files/patch-ad
new file mode 100644
index 000000000000..7830a3668993
--- /dev/null
+++ b/multimedia/mplex/files/patch-ad
@@ -0,0 +1,59 @@
+--- multplex.c.orig	Tue Jun  6 07:16:52 1995
++++ multplex.c	Mon Sep  4 18:17:45 2000
+@@ -1,4 +1,5 @@
+ #include "main.h"
++extern int Interactive;
+ #ifdef TIMER
+     extern long total_sec;
+     extern long total_usec;
+@@ -129,6 +130,7 @@
+ 	picture_start = TRUE;
+     }
+ 
++if( Interactive ) {
+ printf("\nMerging elementary streams to MPEG/SYSTEMS multiplexed stream.\n");
+ printf("\n+------------------ MPEG/SYSTEMS INFORMATION -----------------+\n");
+     
+@@ -144,6 +146,12 @@
+     scanf ("%ld", &video_buffer_size);
+     printf   ("STD audio buffer in kB (CSPS: max  4 kB) : ");
+     scanf ("%ld", &audio_buffer_size);
++} else {
++    sector_size=2324;
++    packets_per_pack=1;
++    video_buffer_size=46;
++    audio_buffer_size=4;
++}
+ 
+     write_pack = packets_per_pack;
+     video_buffer_size *= 1024;
+@@ -197,6 +205,7 @@
+ 		 (double)(packets_per_pack-1.))) / (double)(packets_per_pack) );
+     data_rate = ceil(dmux_rate/50.)*50;
+ 
++if( Interactive ) {
+     printf ("\ncomputed multiplexed stream data rate    : %7.3f\n",dmux_rate);
+     printf ("target data rate (e.g. %6u)           : ",data_rate);
+     scanf  ("%lf", &dmux_rate);
+@@ -206,12 +215,21 @@
+     scanf  ("%u", &video_delay_ms);
+     printf ("audio stream startup offset (ms)         : ");
+     scanf  ("%u", &audio_delay_ms);
++} else {
++    dmux_rate=data_rate;
++    sectors_delay=8;
++    video_delay_ms=0;
++    audio_delay_ms=0;
++}
+ 
+     video_delay = (double)video_delay_ms*(double)(CLOCKS/1000);
+     audio_delay = (double)audio_delay_ms*(double)(CLOCKS/1000);
+ 
++if( Interactive ) {
+     verbose=ask_verbose();
+     printf ("\n");
++} else
++    verbose=1;
+ 
+ #ifdef TIMER
+     gettimeofday (&tp_global_start,NULL);
diff --git a/multimedia/mplex/files/patch-ae b/multimedia/mplex/files/patch-ae
new file mode 100644
index 000000000000..41149fd1580f
--- /dev/null
+++ b/multimedia/mplex/files/patch-ae
@@ -0,0 +1,20 @@
+--- interact.c.orig	Wed May 31 20:18:33 1995
++++ interact.c	Fri Feb 11 10:04:07 2000
+@@ -67,7 +67,7 @@
+     char input[20];
+ 
+     printf ("\nContinue processing (y/n) : ");
+-    do gets (input);
++    do fgets (input, sizeof(input), stdin);
+     while (input[0]!='N'&&input[0]!='n'&&input[0]!='y'&&input[0]!='Y');
+ 
+     if (input[0]=='N' || input[0]=='n')
+@@ -92,7 +92,7 @@
+     char input[20];
+ 
+     printf ("\nVery verbose mode (y/n) : ");
+-    do gets (input);
++    do fgets (input, sizeof(input), stdin);
+     while (input[0]!='N'&&input[0]!='n'&&input[0]!='y'&&input[0]!='Y');
+ 
+     if (input[0]=='N' || input[0]=='n') return (FALSE); else return (TRUE);
diff --git a/multimedia/mplex/files/patch-af b/multimedia/mplex/files/patch-af
new file mode 100644
index 000000000000..12d99a0ca25d
--- /dev/null
+++ b/multimedia/mplex/files/patch-af
@@ -0,0 +1,34 @@
+--- main.c.orig	Wed Apr  5 03:51:53 1995
++++ main.c	Mon Sep  4 18:17:45 2000
+@@ -59,6 +59,7 @@
+ *************************************************************************/
+ 
+ #include "main.h"
++#include <unistd.h>
+ 
+ /*************************************************************************
+     Main
+@@ -75,6 +76,8 @@
+     struct timeval  tp_global_end;
+ #endif
+ 
++int Interactive=0;
++
+ int main (argc, argv)
+ 
+ int argc;
+@@ -93,6 +96,14 @@
+     unsigned int which_streams=0;
+     double	startup_delay=0;
+ 
++    int tmp;
++
++    if( getopt( argc, argv, "i" ) == 'i' )
++      Interactive=1;
++
++    optind -= 1;
++    argc -= optind;
++    argv += optind;
+ 
+     intro (argc);
+     check_files (argc, argv, &audio_file, &video_file, &multi_file,
diff --git a/multimedia/mplex/pkg-descr b/multimedia/mplex/pkg-descr
new file mode 100644
index 000000000000..cb425039c23b
--- /dev/null
+++ b/multimedia/mplex/pkg-descr
@@ -0,0 +1,17 @@
+The mplex multiplexes MPEG audio and video streams into system layers.
+
+From INSTRUCT (in the mplex source):
+>
+> Please note that I do not have a comprehensive instruction manual for this
+> release. I suggest you try the program out with some default values and
+> learn something more about ISO/IEC 11172-1 (aka MPEG1/Systems).
+>
+>
+> Christoph.
+> moar@heaven.zfe.siemens.de
+> +---------------------------------------+--------------------------------+
+> | http://www.informatik.tu-muenchen.de/ |                 Christoph Moar |
+> | cgi-bin/nph-gateway/hphalle6/~moar/   |                Kaulbachstr.29a |
+> | index.html                            |                   80539 Munich |
+> | email:moar@informatik.tu-muenchen.de  |   voice: ++49 - 89 -  23862874 |
+> +---------------------------------------+--------------------------------+