diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2011-03-06 22:36:23 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2011-03-06 22:36:23 +0000 |
| commit | de05c59dc7246a3a49595d7bb9db844d9a0dd9c2 (patch) | |
| tree | e0c639a12886e6a16b6b23e3aecc811616aa2654 /mbone | |
| parent | 5edd0ddb0bbe600fec0d67dde57590957228358a (diff) | |
| download | ports-de05c59dc7246a3a49595d7bb9db844d9a0dd9c2.tar.gz ports-de05c59dc7246a3a49595d7bb9db844d9a0dd9c2.zip | |
Notes
Diffstat (limited to 'mbone')
152 files changed, 0 insertions, 4668 deletions
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile deleted file mode 100644 index 7ad7149eed3c..000000000000 --- a/mbone/imm/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# New ports collection makefile for: imm -# Date created: 13 October 1994 -# Whom: wollman -# -# $FreeBSD$ -# - -PORTNAME= imm -PORTVERSION= 3.5a1 -PORTREVISION= 3 -CATEGORIES= mbone tk -MASTER_SITES= ftp://ftp.hawaii.edu/paccom/imm-3.5a1/ -DISTNAME= imm.source -EXTRACT_SUFX= .tar.Z - -MAINTAINER= ports@FreeBSD.org -COMMENT= Internet Image(or other data) Multicaster (and receiver) - -USE_TK= 84 -WRKSRC= ${WRKDIR}/mnm - -PORTDOCS= README imm_readme.txt - -.include <bsd.port.pre.mk> - -post-extract: - @${MKDIR} ${WRKSRC}/freebsd - @${CP} ${FILESDIR}/Makefile.work ${WRKSRC}/Makefile - @${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/src - -# The included makefile doesn't have an "install" target. -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/imm ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/immserv ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/lscomp ${PREFIX}/bin -# and no man pages at all yet. -# But include the very limited documentation -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/imm_readme.txt ${DOCSDIR} -.endif -# The sdr plugin is pretty much required. - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/sdr2.plugin.S53.image.imm ${DATADIR} - -.include <bsd.port.post.mk> diff --git a/mbone/imm/distinfo b/mbone/imm/distinfo deleted file mode 100644 index 090e9df901b5..000000000000 --- a/mbone/imm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (imm.source.tar.Z) = bf2713e5dca81daaecbc0bbcaf7af667 -SHA256 (imm.source.tar.Z) = be66dc74b955cf51de1575662d700b87cb423e3562f163d2f0dc70878b73270b -SIZE (imm.source.tar.Z) = 106067 diff --git a/mbone/imm/files/Makefile.freebsd b/mbone/imm/files/Makefile.freebsd deleted file mode 100644 index 379dae4d11a3..000000000000 --- a/mbone/imm/files/Makefile.freebsd +++ /dev/null @@ -1,77 +0,0 @@ -# Some versions of make, like SGI's, use the following variable to -# determine which shell to use for executing commands: -SHELL = /bin/sh -INCLUDE_DIR = -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include -# Libraries to use when linking: -LIBS = -lm - -TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk84 -ltcl84 -lX11 - -TARGET = ../freebsd - -CFLAGS = -g -DSIG_T=void -DMULTICAST -I. -DERROR_TEST - -CC ?= gcc -CC_SWITCHES = ${CFLAGS} - -ROBJS = protocol.o utils.o - -SOBJS = protocol.o immserv.o sorttree.o utils.o - -MOBJS = protocol.o mnmserver.o sorttree.o utils.o - -all: $(TARGET)/imm $(TARGET)/immserv $(TARGET)/lscomp - -$(TARGET)/mnm: $(ROBJS) main.o xlopen.o mcl.o - $(CC) $(CFLAGS) main.o xlopen.o mcl.o $(ROBJS) $(LIBS) -o $(TARGET)/mnm - -$(TARGET)/imm: $(ROBJS) tkAppInit.o imm_init.o imm.o xlopen_imm.o - $(CC) $(CFLAGS) tkAppInit.o imm_init.o imm.o xlopen_imm.o $(ROBJS) $(TKLIBS) $(LIBS) -o $(TARGET)/imm - -$(TARGET)/immserv: $(SOBJS) - $(CC) $(CFLAGS) $(SOBJS) $(LIBS) -o $(TARGET)/immserv - -$(TARGET)/lscomp: lscomp.o protocol.o sorttree.o utils.o - $(CC) $(CFLAGS) lscomp.o protocol.o sorttree.o utils.o $(LIBS) -o $(TARGET)/lscomp - -clean: - rm -f *.o tcl2c $(TARGET)/mnm $(TARGET)/lscomp $(TARGET)/imm $(TARGET)/immserv - -tcl2c: tcl2c.c - $(CC) $(CFLAGS) tcl2c.c $(LIBS) -o tcl2c - -imm_init.c: tcl2c imm_def.tcl mcl.tcl Radio.tcl Listbox.tcl viewbox.tcl filebox.tcl mkHostname.tcl - ./tcl2c IMM_Init < imm_def.tcl > imm_init.c - ./tcl2c MCL < mcl.tcl >> imm_init.c - ./tcl2c RADIO < Radio.tcl >> imm_init.c - ./tcl2c LISTBOX < Listbox.tcl >> imm_init.c - ./tcl2c VIEWBOX < viewbox.tcl >> imm_init.c - ./tcl2c FILEBOX < filebox.tcl >> imm_init.c - ./tcl2c HOSTBOX < mkHostname.tcl >> imm_init.c - ./tcl2c SERVERBOX < mnmserv.tcl >> imm_init.c - -imm_init.o: imm_init.c - -main.o: main.c - -mcl.o: mcl.c - -imm.o: mcl.c - gcc $(CFLAGS) -DIMM $(INCLUDE_DIR) -c mcl.c -o imm.o - -xlopen_imm.o: xlopen.c - gcc $(CFLAGS) -DIMM $(INCLUDE_DIR) -c xlopen.c -o xlopen_imm.o - -tkAppInit.o: tkAppInit.c - gcc $(CFLAGS) $(INCLUDE_DIR) tkAppInit.c -c - -protocol.o: protocol.c - -utils.o: utils.c - -lscomp.o: lscomp.c - -sorttree.o: sorttree.c immserv.h - -immserv.o: immserv.c immserv.h - diff --git a/mbone/imm/files/Makefile.work b/mbone/imm/files/Makefile.work deleted file mode 100644 index cb876d343f9e..000000000000 --- a/mbone/imm/files/Makefile.work +++ /dev/null @@ -1,2 +0,0 @@ -all install: - cd src; ${MAKE} -f Makefile.freebsd $@ diff --git a/mbone/imm/files/patch-aa b/mbone/imm/files/patch-aa deleted file mode 100644 index f7cb9a9cefc8..000000000000 --- a/mbone/imm/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mcl.c.orig Tue Nov 19 12:33:49 1996 -+++ src/mcl.c Tue Nov 19 12:34:23 1996 -@@ -25,7 +25,7 @@ - - #define MAIN - #include "protocol.h" --#include <malloc.h> -+#include <stdlib.h> - #include <fcntl.h> - #include <sys/socket.h> - #include <netinet/in.h> diff --git a/mbone/imm/files/patch-ab b/mbone/imm/files/patch-ab deleted file mode 100644 index 4b1f038304da..000000000000 --- a/mbone/imm/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- src/xlopen.c.orig Tue Nov 19 12:33:53 1996 -+++ src/xlopen.c Tue Nov 19 12:35:01 1996 -@@ -34,7 +34,7 @@ - extern int optind, opterr; - extern int useimageloader; - extern struct hosttype *hosts_tail; --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) /* XXX */ - extern char *sys_errlist[]; - #endif - extern unsigned int total; diff --git a/mbone/imm/files/patch-ac b/mbone/imm/files/patch-ac deleted file mode 100644 index 2da9e3a99e12..000000000000 --- a/mbone/imm/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- src/immserv.c.orig Tue Nov 19 12:36:41 1996 -+++ src/immserv.c Tue Nov 19 12:37:32 1996 -@@ -1407,7 +1407,7 @@ - /******************************************************************************/ - void setackalarm(int nop) {} - /******************************************************************************/ --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) /* XXX */ - /* routine to put process to sleep */ - int usleep( wait) - u_int wait; diff --git a/mbone/imm/files/patch-src-tkAppInit.c b/mbone/imm/files/patch-src-tkAppInit.c deleted file mode 100644 index 8dacd5fa95aa..000000000000 --- a/mbone/imm/files/patch-src-tkAppInit.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/tkAppInit.c.orig Thu Mar 15 10:00:05 2007 -+++ src/tkAppInit.c Thu Mar 15 10:00:12 2007 -@@ -97,9 +97,6 @@ - * Sun shared libraries to be used for Tcl. - */ - --extern int matherr(); --void GetDspStatus(); --int *tclDummyMathPtr = (int *) matherr; - - /***************************************************************************/ - /* fork and initiate server process */ diff --git a/mbone/imm/files/patch-src::utils.c b/mbone/imm/files/patch-src::utils.c deleted file mode 100644 index a7db5d4e2d04..000000000000 --- a/mbone/imm/files/patch-src::utils.c +++ /dev/null @@ -1,200 +0,0 @@ ---- src/utils.c.orig Thu Jul 15 12:37:25 2004 -+++ src/utils.c Thu Jul 15 13:36:09 2004 -@@ -20,7 +20,7 @@ - * These notices must be retained in any copies of any part of this software. - ******************************************************************************/ - #include <stdio.h> --#include <varargs.h> -+#include <stdarg.h> - #include <stdlib.h> - #include <string.h> - #ifdef __NetBSD__ -@@ -40,47 +40,118 @@ - - /*----------------------------------------------------------------------------*/ - --void warn( va_alist ) --va_dcl -+/* Allocate memory for format string buffers */ -+int -+vfsalloc(char *fmt, va_list ap) - { -- va_list args; -- char *fmt; -+ char *s; -+ int i, n = 0, len = 0; - -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( stderr, "Warning: " ); -- vfprintf( stderr, fmt, args ); -- va_end( args ); -+ if (!fmt) -+ return 0; -+ -+ s = strchr(fmt, '%'); -+ -+ while (s) { -+ ++s; -+ ++n; -+ -+ switch (*s) { -+ case 'd': -+ i = va_arg(ap, int); -+ len += 1 + sizeof(int)<<1; -+ break; -+ case 's': -+ len += strlen(va_arg(ap, char *)); -+ break; -+ } -+ s = strchr(s, '%'); -+ } -+ -+ len += strlen(fmt) - (2 * n); -+ -+ return len; -+} -+ -+void warn( char *fmt, ... ) -+{ -+ va_list ap; -+ char *buf, *s; -+ int len; -+ -+ if (!fmt) -+ return; -+ -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; -+ -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "Warning: %s\n", buf); -+ free(buf); - } - - /*----------------------------------------------------------------------------*/ - --void die( va_alist ) --va_dcl -+void die(char *fmt, ... ) - { -- va_list args; -- char *fmt; -+ va_list ap; -+ char *buf, *s; -+ int len; -+ -+ if (!fmt) -+ return; -+ -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; - -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( stderr, "Error: " ); -- vfprintf( stderr, fmt, args ); -- exit( 1 ); -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "Error: %s\n", buf); -+ free(buf); -+ exit(1); - } - - /*----------------------------------------------------------------------------*/ - --void fatal( va_alist ) --va_dcl -+void fatal(char *fmt, ... ) - { -- va_list args; -- char *fmt; -+ va_list ap; -+ char *buf, *s; -+ int len; -+ -+ if (!fmt) -+ return; - -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( stderr, "Internal Error: " ); -- vfprintf( stderr, fmt, args ); -- exit( 2 ); -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; -+ -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "Internal error: %s\n", buf); -+ free(buf); -+ exit(2); - } - - /*----------------------------------------------------------------------------*/ -@@ -142,21 +213,34 @@ - - /*----------------------------------------------------------------------------*/ - --void mailmessage( va_alist ) --va_dcl -+void mailmessage(char *fmt, ... ) - { -- va_list args; -- char *fmt; -+ va_list ap; -+ char *buf, s; -+ int len; - FILE *popen(), *fp; - char cmdline[80]; - if (whome == NULL) whome = getlogin(); - sprintf(cmdline,"%s %s",mailprog,whome); - fp = popen(cmdline,"w"); -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( fp, "MNM Warning: " ); -- vfprintf( fp, fmt, args ); -- va_end( args ); -+ -+ if (!fmt) -+ return; -+ -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; -+ -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(fp, "MNM Warning: %s", buf); -+ free(buf); - pclose(fp); - } diff --git a/mbone/imm/pkg-descr b/mbone/imm/pkg-descr deleted file mode 100644 index 339f05932750..000000000000 --- a/mbone/imm/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -IMM has been designed to efficiently replicate files/file directories -using a reliable dissemination protocol framework and provide archiving -and post processing features. The default mode of operation is for imm -to receive and display compressed imagery files (e.g., jpg,gif) using -xv or xloadimage as a post processor. - -This release includes an sdr plug-in, named sdr2.plugin.S53.image.imm, -which must be installed to participate in MBone alpha testing of imm sessions. -Usually in a directory called ~home/.sdr/plugins to be found by sdr. -See the sdr help pages for information on installing plugins. diff --git a/mbone/imm/pkg-plist b/mbone/imm/pkg-plist deleted file mode 100644 index 726b2b167e2a..000000000000 --- a/mbone/imm/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -bin/imm -bin/immserv -bin/lscomp -%%DATADIR%%/sdr2.plugin.S53.image.imm -@dirrm %%DATADIR%% diff --git a/mbone/mcl/Makefile b/mbone/mcl/Makefile deleted file mode 100644 index d087695902d6..000000000000 --- a/mbone/mcl/Makefile +++ /dev/null @@ -1,83 +0,0 @@ -# New ports collection makefile for: mcl -# Date created: 29 October 2003 -# Whom: past@noc.ntua.gr -# -# $FreeBSD$ -# - -PORTNAME= mcl -PORTVERSION= 2.99.1 -PORTREVISION= 1 -CATEGORIES= mbone net -MASTER_SITES= http://www.inrialpes.fr/planete/people/roca/mcl/bin/ -DISTNAME= mcl_v2.99.1 -EXTRACT_SUFX= .tgz - -MAINTAINER= ports@FreeBSD.org -COMMENT= Implementation of the ALC and NORM Reliable Multicast Protocols - -BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \ - gdome-config:${PORTSDIR}/textproc/gdome2 \ - glib-gettextize:${PORTSDIR}/devel/glib20 - -USE_LDCONFIG= yes -USE_GMAKE= yes -MAN1= fcast.1 fcastn.1 mclrecv2.1 mclsend2.1 -MAN2= mcl_abort.2 mcl_close.2 mcl_ctl.2 mcl_open.2 mcl_recv.2 \ - mcl_send.2 mcl_wait_event.2 - -pre-patch: - @cd ${WRKSRC} && \ - ${MKDIR} bin/freebsd - -post-patch: - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/src/alc/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/check/alc/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/fcast/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/flute/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/mclftp/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/robcast/Makefile - -pre-install: - @${REINPLACE_CMD} -Ee 's#../alc/#alc/#g' \ - ${WRKSRC}/src/common/mcl_lib_api.h - @${REINPLACE_CMD} -Ee 's#../norm/#norm/#g' \ - ${WRKSRC}/src/common/mcl_lib_api.h - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/fcast ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/flute ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/robcast_client ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/robcast_server ${PREFIX}/bin - @${INSTALL_DATA} ${WRKSRC}/bin/freebsd/libmclalc.a ${PREFIX}/lib - @${INSTALL_DATA} ${WRKSRC}/src/common/mcl_lib_api.h ${PREFIX}/include - @${INSTALL_DATA} -d ${PREFIX}/include/alc - @${INSTALL_DATA} ${WRKSRC}/src/alc/mcl_lib_api_alc.h \ - ${PREFIX}/include/alc - @${INSTALL_MAN} ${WRKSRC}/man/fcast.man.1 ${PREFIX}/man/man1/fcast.1 - @${INSTALL_MAN} ${WRKSRC}/man/fcastn.man.1 ${PREFIX}/man/man1/fcastn.1 - @${INSTALL_MAN} ${WRKSRC}/man/mclrecv2.man.1 \ - ${PREFIX}/man/man1/mclrecv2.1 - @${INSTALL_MAN} ${WRKSRC}/man/mclsend2.man.1 \ - ${PREFIX}/man/man1/mclsend2.1 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_abort.man.2 \ - ${PREFIX}/man/man2/mcl_abort.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_close.man.2 \ - ${PREFIX}/man/man2/mcl_close.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_ctl.man.2 ${PREFIX}/man/man2/mcl_ctl.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_open.man.2 \ - ${PREFIX}/man/man2/mcl_open.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_recv.man.2 \ - ${PREFIX}/man/man2/mcl_recv.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_send.man.2 \ - ${PREFIX}/man/man2/mcl_send.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_wait_event.man.2 \ - ${PREFIX}/man/man2/mcl_wait_event.2 - -.include <bsd.port.mk> diff --git a/mbone/mcl/distinfo b/mbone/mcl/distinfo deleted file mode 100644 index c2499bb901b5..000000000000 --- a/mbone/mcl/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (mcl_v2.99.1.tgz) = d4a5c0c384d45dfa6c2a3dcbdcb3a81e -SHA256 (mcl_v2.99.1.tgz) = 141966bf922c2995a29eeb73a536ee3f83438835b0f29f99afb626048decdc35 -SIZE (mcl_v2.99.1.tgz) = 368784 diff --git a/mbone/mcl/files/patch-Makefile b/mbone/mcl/files/patch-Makefile deleted file mode 100644 index 8c38fb03e633..000000000000 --- a/mbone/mcl/files/patch-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.orig Sun Dec 7 18:35:07 2003 -+++ Makefile Sun Dec 7 18:35:20 2003 -@@ -5,8 +5,8 @@ - # We need the GNU make tool, on some systems it is called - # gmake, on others make is an alias to gmake. Choose one... - # --MAKE = make --#MAKE = gmake -+#MAKE = make -+MAKE = gmake - - - # A phony target is one that is not really the name of a file. diff --git a/mbone/mcl/files/patch-Makefile.common b/mbone/mcl/files/patch-Makefile.common deleted file mode 100644 index 4cb001289885..000000000000 --- a/mbone/mcl/files/patch-Makefile.common +++ /dev/null @@ -1,33 +0,0 @@ ---- Makefile.common.orig Sun Dec 7 18:36:25 2003 -+++ Makefile.common Sun Dec 7 18:38:10 2003 -@@ -24,11 +24,15 @@ - ifeq (${SYSTEM},SunOS) - OS = solaris - endif -+ifeq (${SYSTEM},FreeBSD) -+ OS = freebsd -+endif - # - # and the old way (e.g. if the above lines do not work!) - # - #OS = linux - #OS = solaris -+#OS = freebsd - - - # Do you want/need extended memory debugging? -@@ -59,6 +63,14 @@ - # - CC = /opt/SUNWspro/bin/CC - LD = /opt/SUNWspro/bin/CC -+endif -+ifeq (${OS},freebsd) -+ OSFLAGS = -DFREEBSD -I${LOCALBASE}/g++ -I${LOCALBASE}/c++/3.3 -+ # Which compiler? -+ # NB: use -Wall for compilation warnings with gcc -+ # -+ CC = g++ -Wall -+ LD = g++ -Wall - endif - - diff --git a/mbone/mcl/files/patch-alc-Makefile b/mbone/mcl/files/patch-alc-Makefile deleted file mode 100644 index b38cb525c35f..000000000000 --- a/mbone/mcl/files/patch-alc-Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- src/alc/Makefile.orig Tue Jul 22 19:42:18 2003 -+++ src/alc/Makefile Wed Oct 15 17:21:25 2003 -@@ -36,6 +36,13 @@ - LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lpthread - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ BINDIR = ../../bin/freebsd -+ LDPC_BINDIR = ../../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread -+endif -+ - - ###### Other Variables ###### - diff --git a/mbone/mcl/files/patch-check-alc-Makefile b/mbone/mcl/files/patch-check-alc-Makefile deleted file mode 100644 index 65fa32515984..000000000000 --- a/mbone/mcl/files/patch-check-alc-Makefile +++ /dev/null @@ -1,21 +0,0 @@ ---- check/alc/Makefile.orig Wed Oct 15 18:02:27 2003 -+++ check/alc/Makefile Wed Oct 15 17:24:04 2003 -@@ -35,6 +35,18 @@ - LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lposix4 -mt -lpthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - endif - -+ifeq (${OS},freebsd) -+ # Linux version -+ # -+ BINDIR = ../../bin/freebsd -+ LDPC_BINDIR = ../../../ldpc/bin/freebsd -+ # Edit the following two lines as appropriate, according to the FEC -+ # codec in use: if LDPC is used, then add the libbdpc.a library. -+ # -+ LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a -+ #LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+endif -+ - - ###### Other variables ###### - diff --git a/mbone/mcl/files/patch-display.c b/mbone/mcl/files/patch-display.c deleted file mode 100644 index 44ff013dd66f..000000000000 --- a/mbone/mcl/files/patch-display.c +++ /dev/null @@ -1,14 +0,0 @@ ---- flute/display.c.orig Wed Jan 7 12:08:23 2004 -+++ flute/display.c Wed Jan 7 12:07:24 2004 -@@ -65,7 +65,11 @@ - signal (SIGTERM, sig_catcher); - sigaction (SIGTERM, (struct sigaction *) 0, &sa); - sa.sa_flags |= SA_RESTART; -+#if defined(FREEBSD) -+ sa.sa_flags &= ~SA_NOCLDSTOP; -+#else - sa.sa_flags &= ~SA_INTERRUPT; -+#endif - sigaction (SIGTERM, &sa, (struct sigaction *) 0); - sigaction (SIGINT, &sa, (struct sigaction *) 0); - tcsetattr(0, TCSANOW, &new_settings); diff --git a/mbone/mcl/files/patch-fcast-Makefile b/mbone/mcl/files/patch-fcast-Makefile deleted file mode 100644 index dce7b64a9811..000000000000 --- a/mbone/mcl/files/patch-fcast-Makefile +++ /dev/null @@ -1,28 +0,0 @@ ---- fcast/Makefile.orig Tue Jul 22 19:43:25 2003 -+++ fcast/Makefile Wed Oct 15 17:20:46 2003 -@@ -39,6 +39,14 @@ - - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ # -+ BINDIR = ../bin/freebsd -+ LDPC_BINDIR = ../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread -+endif -+ - - ###### Other variables ###### - -@@ -76,8 +84,8 @@ - # codec in use: if LDPC is used, then add the libbdpc.a library. - # If only RSE is used and if you don't have the LDPC archive, then - # remove the libbdpc.a library. --#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc: TARGET_FCAST = ${BINDIR}/fcast - #alc: all - diff --git a/mbone/mcl/files/patch-fcast.h b/mbone/mcl/files/patch-fcast.h deleted file mode 100644 index bd50c0f41eb7..000000000000 --- a/mbone/mcl/files/patch-fcast.h +++ /dev/null @@ -1,20 +0,0 @@ ---- fcast/fcast.h.orig Tue Jul 22 19:37:39 2003 -+++ fcast/fcast.h Wed Oct 15 16:59:13 2003 -@@ -62,12 +62,16 @@ - #include "frecv.h" - - -+ - #if defined(LINUX) /* On Linux systems, signal handlers must be of __sighandler_t type */ - #define sighandler_t __sighandler_t - - #elif defined(SOLARIS) || defined(IRIX) || defined(WIN32) -- - #define sighandler_t void (*)(int) -+ -+#elif defined(FREEBSD) -+#define sighandler_t sig_t -+ - #endif - - diff --git a/mbone/mcl/files/patch-flute-Makefile b/mbone/mcl/files/patch-flute-Makefile deleted file mode 100644 index 159fef2f7960..000000000000 --- a/mbone/mcl/files/patch-flute-Makefile +++ /dev/null @@ -1,52 +0,0 @@ ---- flute/Makefile.orig Wed Nov 26 17:18:21 2003 -+++ flute/Makefile Wed Jan 7 12:38:28 2004 -@@ -36,6 +36,18 @@ - - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version: -+ # CC requires: -mt -lpthread for multithreaded applications -+ # NB: mpatrol not installed ! -+ # -+ BINDIR = ../bin/freebsd -+ LDPC_BINDIR = ../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread -lglib-2.0 -lgdome -lxml2 -L${LOCALBASE}/lib -+ # added -I/usr/local/include for libgdome header files -+ ADD_INCLUDES = -I${LOCALBASE}/include/ -I${LOCALBASE}/include/glib-2.0/ -I${LOCALBASE}/include/libgdome/ -+endif -+ - - ###### Other variables ###### - -@@ -73,24 +85,24 @@ - # codec in use: if LDPC is used, then add the libbdpc.a library. - # If only RSE is used and if you don't have the LDPC archive, then - # remove the libbdpc.a library. --#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc: TARGET_FLUTE = ${BINDIR}/flute - #alc: all - - alc_pure: RM_PROTOCOL = ALC - # Edit the following two lines as appropriate, according to the FEC - # codec in use: if LDPC is used, then add the libbdpc.a library. --#alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc_pure: TARGET_FLUTE = ${BINDIR}/flute - alc_pure: pure - - alc_quantify: RM_PROTOCOL = ALC - # Edit the following two lines as appropriate, according to the FEC - # codec in use: if LDPC is used, then add the libbdpc.a library. --#alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc_quantify: TARGET_FLUTE = ${BINDIR}/flute - alc_quantify: quantify - diff --git a/mbone/mcl/files/patch-flute.h b/mbone/mcl/files/patch-flute.h deleted file mode 100644 index c38ad033f34c..000000000000 --- a/mbone/mcl/files/patch-flute.h +++ /dev/null @@ -1,13 +0,0 @@ ---- flute/flute.h.orig Wed Jan 7 11:13:20 2004 -+++ flute/flute.h Wed Jan 7 11:15:28 2004 -@@ -69,6 +69,10 @@ - #elif defined(SOLARIS) || defined(IRIX) || defined(WIN32) - - #define sighandler_t void (*)(int) -+ -+#elif defined(FREEBSD) -+#define sighandler_t sig_t -+ - #endif - - diff --git a/mbone/mcl/files/patch-mcl_debug.cpp b/mbone/mcl/files/patch-mcl_debug.cpp deleted file mode 100644 index 982503f326c9..000000000000 --- a/mbone/mcl/files/patch-mcl_debug.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common/mcl_debug.cpp.orig Tue Jul 22 19:37:39 2003 -+++ src/common/mcl_debug.cpp Wed Oct 15 17:55:58 2003 -@@ -73,7 +73,7 @@ - PRINT_OUT((mcl_stdout, "\tDUMP %d first bytes...\n\t", i * sizeof(int))) - for (ptr = (int*)buf; i > 0; i--, ptr++) { - /* convert to big endian format to be sure of byte order */ -- PRINT_OUT((mcl_stdout, "%08x ", htonl(*ptr))) -+ PRINT_OUT((mcl_stdout, "%08lx ", htonl(*ptr))) - if (++j == 8) { - j = 0; - PRINT_OUT((mcl_stdout, "\n\t")) diff --git a/mbone/mcl/files/patch-mcl_includes.h b/mbone/mcl/files/patch-mcl_includes.h deleted file mode 100644 index d68a50637331..000000000000 --- a/mbone/mcl/files/patch-mcl_includes.h +++ /dev/null @@ -1,36 +0,0 @@ ---- src/alc/mcl_includes.h.orig Tue Jul 22 19:37:39 2003 -+++ src/alc/mcl_includes.h Tue Oct 14 15:23:54 2003 -@@ -40,11 +40,13 @@ - #include <sys/types.h> - #include <math.h> - -+#ifndef FREEBSD - #if defined(DEBUG) && defined(MPATROL) && !defined(WIN32) - #include <mpatrol.h> - #else - #include <malloc.h> - #endif -+#endif - #include <new> // required by _set_new_handler on linux - - -@@ -58,14 +60,18 @@ - #else /* UNIX Systems */ - - #include <unistd.h> -+ -+#ifndef FREEBSD - #include <values.h> /* for MAXINT */ -+#endif -+ - #include <strings.h> - #include <sys/time.h> - #include <sys/wait.h> - #include <pthread.h> - #include <sys/uio.h> - --#ifdef SOLARIS -+#if defined(SOLARIS) || defined(FREEBSD) - #include <netinet/in_systm.h> - #endif /* SOLARIS */ - diff --git a/mbone/mcl/files/patch-mcl_lib.cpp b/mbone/mcl/files/patch-mcl_lib.cpp deleted file mode 100644 index d40dbe58584c..000000000000 --- a/mbone/mcl/files/patch-mcl_lib.cpp +++ /dev/null @@ -1,27 +0,0 @@ ---- src/alc/mcl_lib.cpp.orig Wed Nov 26 15:38:14 2003 -+++ src/alc/mcl_lib.cpp Tue Dec 16 23:58:46 2003 -@@ -1384,8 +1384,10 @@ - if (id >= MCLCB_MAX_ID || (mclcb = mclcbs[id]) == NULL) { - TRACE((mcl_stdout, " mcl_recvfrom: not an MCL id, switch to standard recvfrom\n")) - return (recvfrom(id, (char*)buf, len, 0, saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) /* linux => uint, solaris => int */ -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - saddr_len)); - } -@@ -1520,8 +1522,11 @@ - if (id >= MCLCB_MAX_ID || (mclcb = mclcbs[id]) == NULL) { - TRACE((mcl_stdout, " mcl_recvfrom: not an MCL id, switch to standard recvfrom\n")) - return (recvfrom(id, (char*)buf, len, 0, saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) /* linux => uint, solaris => int */ -+#elif defined(FREEBSD) -+ (socklen_t*) -+ - #endif - saddr_len)); - } diff --git a/mbone/mcl/files/patch-mcl_network.cpp b/mbone/mcl/files/patch-mcl_network.cpp deleted file mode 100644 index 6e5a8cfaebfe..000000000000 --- a/mbone/mcl/files/patch-mcl_network.cpp +++ /dev/null @@ -1,48 +0,0 @@ ---- src/alc/mcl_network.cpp.orig Tue Jul 22 19:37:39 2003 -+++ src/alc/mcl_network.cpp Tue Oct 14 15:47:45 2003 -@@ -414,8 +414,10 @@ - pkt->pkt_len = recvfrom(mg->ses_sock, - pkt->get_buf(), pkt->get_buf_len(), - 0, &saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - &saddr_len); - #ifdef WIN32 -@@ -483,8 +485,10 @@ - pkt->pkt_len = recvfrom(mg->priv_sock, - pkt->get_buf(), pkt->get_buf_len(), - 0, &saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - &saddr_len); - #ifdef WIN32 -@@ -663,8 +667,10 @@ - err = setsockopt(fd, SOL_SOCKET, buf, (char*)&val, sizeof(val)); - else - err = getsockopt(fd, SOL_SOCKET, buf, (char*)&val, --#ifdef LINUX -- (size_t*) /* linux => uint, solaris => int */ -+#if defined(LINUX) -+ (size_t*) -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - &len); - if (err < 0) { -@@ -938,7 +944,7 @@ - - if (mcl_is_valid_sock(mg->priv_sock) && - getsockname(mg->priv_sock, (struct sockaddr *)&tmp_addr, --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - (socklen_t*) - #endif - &tmp_len) < 0) { diff --git a/mbone/mcl/files/patch-mcl_osdep.h b/mbone/mcl/files/patch-mcl_osdep.h deleted file mode 100644 index 1effff377a98..000000000000 --- a/mbone/mcl/files/patch-mcl_osdep.h +++ /dev/null @@ -1,32 +0,0 @@ ---- src/common/mcl_osdep.h.orig Sun Dec 7 18:58:22 2003 -+++ src/common/mcl_osdep.h Sun Dec 7 19:00:39 2003 -@@ -44,7 +44,7 @@ - * bit field order is compiler/OS dependant - * With linux, see the above LINUX_XXX defines... - */ --#if defined(LINUX_I386) || defined(WIN32) -+#if defined(LINUX_I386) || defined(WIN32) || defined (FREEBSD) - #define _BIT_FIELDS_LTOH - #undef _BIT_FIELDS_HTOL - -@@ -58,7 +58,7 @@ - /* - * sighandler - */ --#if defined(LINUX) -+#if defined(LINUX) || defined (FREEBSD) - /* On Linux systems, signal handlers must be of __sighandler_t type */ - #define sighandler_t __sighandler_t - -@@ -77,9 +77,9 @@ - #define u_int16_t ushort_t /* or uint16_t */ - #define u_int32_t uint_t /* or uint32_t */ - --#elif defined (WIN32) -+#elif defined (WIN32) || defined (FREEBSD) - --/* u_xxx absent from WIN32! */ -+/* u_xxx absent from WIN32 and ulong absent from FreeBSD! */ - #define u_int8_t unsigned char /* or uint8_t */ - #define u_int16_t unsigned short /* or uint16_t */ - #define u_int32_t unsigned int /* or uint32_t */ diff --git a/mbone/mcl/files/patch-mcl_profile.h b/mbone/mcl/files/patch-mcl_profile.h deleted file mode 100644 index 24408a4ddbfe..000000000000 --- a/mbone/mcl/files/patch-mcl_profile.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/alc/mcl_profile.h.orig Tue Dec 16 23:47:58 2003 -+++ src/alc/mcl_profile.h Tue Dec 16 23:48:09 2003 -@@ -130,7 +130,7 @@ - /* - * Do you want to use LDPC large block Forward Error Correction (FEC) ? - */ --#define LDPC_FEC -+//#define LDPC_FEC - - #if defined(RSE_FEC) || defined(LDPC_FEC) - #define FEC diff --git a/mbone/mcl/files/patch-mclftp-Makefile b/mbone/mcl/files/patch-mclftp-Makefile deleted file mode 100644 index 0ddac0210fa9..000000000000 --- a/mbone/mcl/files/patch-mclftp-Makefile +++ /dev/null @@ -1,17 +0,0 @@ ---- mclftp/Makefile.orig Wed Dec 17 00:13:34 2003 -+++ mclftp/Makefile Wed Dec 17 00:15:56 2003 -@@ -36,6 +36,14 @@ - LIBRARIES = -lc -lm -lsocket -lnsl /usr/ucblib/libucb.a -lposix4 -lpthread - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ # MCL library requires -pthread -+ # -+ BINDIR = ../bin/freebsd -+ LIBRARIES = -lm -pthread -+endif -+ - - - ###### Other variables ###### diff --git a/mbone/mcl/files/patch-robcast-Makefile b/mbone/mcl/files/patch-robcast-Makefile deleted file mode 100644 index f6f4a21f0e42..000000000000 --- a/mbone/mcl/files/patch-robcast-Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- robcast/Makefile.orig Wed Oct 15 18:03:36 2003 -+++ robcast/Makefile Wed Oct 15 17:33:36 2003 -@@ -29,6 +29,16 @@ - LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lposix4 -lpthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ # MCL library requires -pthread -+ # -+ BINDIR = ../bin/freebsd -+ LDPC_BINDIR = ../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a -+ #LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+endif -+ - - ###### Other variables ###### - diff --git a/mbone/mcl/files/patch-rse_fec.cpp b/mbone/mcl/files/patch-rse_fec.cpp deleted file mode 100644 index 70ea7a5e9790..000000000000 --- a/mbone/mcl/files/patch-rse_fec.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/common/rse_fec.cpp.orig 2007-08-03 13:59:09.000000000 +0200 -+++ src/common/rse_fec.cpp 2007-08-03 14:00:41.000000000 +0200 -@@ -679,7 +679,7 @@ - struct fec_parms *p = (struct fec_parms *)p_vp; /* VR */ - #endif /* CPLUSPLUS_COMPATIBLE */ - if (p==NULL || -- p->magic != ( ( (FEC_MAGIC ^ p->k) ^ p->n) ^ (int)(p->enc_matrix)) ) { -+ p->magic != ( ( (FEC_MAGIC ^ p->k) ^ p->n) ^ (intptr_t)(p->enc_matrix)) ) { - PRINT_ERR((mcl_stderr, "bad parameters to fec_free\n")) - return ; - } -@@ -715,7 +715,7 @@ - retval->k = k ; - retval->n = n ; - retval->enc_matrix = NEW_GF_MATRIX(n, k); -- retval->magic = ( ( FEC_MAGIC ^ k) ^ n) ^ (int)(retval->enc_matrix) ; -+ retval->magic = ( ( FEC_MAGIC ^ k) ^ n) ^ (intptr_t)(retval->enc_matrix) ; - tmp_m = NEW_GF_MATRIX(n, k); - /* - * fill the matrix with powers of field elements, starting from 0. diff --git a/mbone/mcl/files/patch-test_abort.c b/mbone/mcl/files/patch-test_abort.c deleted file mode 100644 index ad1116943ab0..000000000000 --- a/mbone/mcl/files/patch-test_abort.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_abort.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_abort.c Wed Oct 15 17:10:42 2003 -@@ -26,6 +26,10 @@ - #include <stdio.h> - #include <stdlib.h> /* for exit */ - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #include <io.h> diff --git a/mbone/mcl/files/patch-test_demux_label1_rx.c b/mbone/mcl/files/patch-test_demux_label1_rx.c deleted file mode 100644 index d172c016a3b0..000000000000 --- a/mbone/mcl/files/patch-test_demux_label1_rx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_demux_label1_rx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_demux_label1_rx.c Wed Oct 15 17:13:17 2003 -@@ -26,6 +26,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/mbone/mcl/files/patch-test_demux_label1_tx.c b/mbone/mcl/files/patch-test_demux_label1_tx.c deleted file mode 100644 index 57e1efe5f915..000000000000 --- a/mbone/mcl/files/patch-test_demux_label1_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_demux_label1_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_demux_label1_tx.c Wed Oct 15 17:12:56 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/mbone/mcl/files/patch-test_dyn_tsi.c b/mbone/mcl/files/patch-test_dyn_tsi.c deleted file mode 100644 index bf09722b074f..000000000000 --- a/mbone/mcl/files/patch-test_dyn_tsi.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_dyn_tsi.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_dyn_tsi.c Wed Oct 15 17:13:37 2003 -@@ -30,6 +30,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/mbone/mcl/files/patch-test_multi_sessions1.c b/mbone/mcl/files/patch-test_multi_sessions1.c deleted file mode 100644 index 0b0af22dd2b1..000000000000 --- a/mbone/mcl/files/patch-test_multi_sessions1.c +++ /dev/null @@ -1,14 +0,0 @@ ---- check/alc/test_multi_sessions1.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_multi_sessions1.c Wed Oct 15 17:11:53 2003 -@@ -24,6 +24,11 @@ - */ - - #include <stdio.h> -+ -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/mbone/mcl/files/patch-test_multi_sessions2.c b/mbone/mcl/files/patch-test_multi_sessions2.c deleted file mode 100644 index 0033a72b5a86..000000000000 --- a/mbone/mcl/files/patch-test_multi_sessions2.c +++ /dev/null @@ -1,14 +0,0 @@ ---- check/alc/test_multi_sessions2.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_multi_sessions2.c Wed Oct 15 17:12:13 2003 -@@ -25,6 +25,11 @@ - */ - - #include <stdio.h> -+ -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #include <io.h> diff --git a/mbone/mcl/files/patch-test_no_tx.c b/mbone/mcl/files/patch-test_no_tx.c deleted file mode 100644 index e6f1e0b90d83..000000000000 --- a/mbone/mcl/files/patch-test_no_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_no_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_no_tx.c Wed Oct 15 17:10:20 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/mbone/mcl/files/patch-test_rebootable_client.c b/mbone/mcl/files/patch-test_rebootable_client.c deleted file mode 100644 index 9ee9725b77a9..000000000000 --- a/mbone/mcl/files/patch-test_rebootable_client.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_rebootable_client.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_rebootable_client.c Wed Oct 15 17:18:38 2003 -@@ -35,6 +35,10 @@ - #include <stdio.h> - #include <string.h> - -+#ifdef FREEBSD -+#include <sys/time.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/mbone/mcl/files/patch-test_seq_of_tx_sessions.c b/mbone/mcl/files/patch-test_seq_of_tx_sessions.c deleted file mode 100644 index 31d967ca431e..000000000000 --- a/mbone/mcl/files/patch-test_seq_of_tx_sessions.c +++ /dev/null @@ -1,14 +0,0 @@ ---- check/alc/test_seq_of_tx_sessions.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_seq_of_tx_sessions.c Wed Oct 15 17:11:13 2003 -@@ -25,6 +25,11 @@ - */ - - #include <stdio.h> -+ -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/mbone/mcl/files/patch-test_several_fec_codecs.c b/mbone/mcl/files/patch-test_several_fec_codecs.c deleted file mode 100644 index 34da7be64644..000000000000 --- a/mbone/mcl/files/patch-test_several_fec_codecs.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_several_fec_codecs.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_several_fec_codecs.c Wed Oct 15 17:05:40 2003 -@@ -28,6 +28,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/mbone/mcl/files/patch-test_vtm_rx.c b/mbone/mcl/files/patch-test_vtm_rx.c deleted file mode 100644 index a0cf05b33306..000000000000 --- a/mbone/mcl/files/patch-test_vtm_rx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_vtm_rx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_vtm_rx.c Wed Oct 15 17:14:28 2003 -@@ -27,6 +27,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/mbone/mcl/files/patch-test_vtm_tx.c b/mbone/mcl/files/patch-test_vtm_tx.c deleted file mode 100644 index 8d26b0f60d2d..000000000000 --- a/mbone/mcl/files/patch-test_vtm_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_vtm_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_vtm_tx.c Wed Oct 15 17:14:02 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/mbone/mcl/files/patch-test_wait_rx_receiver.c b/mbone/mcl/files/patch-test_wait_rx_receiver.c deleted file mode 100644 index c03c4a4be206..000000000000 --- a/mbone/mcl/files/patch-test_wait_rx_receiver.c +++ /dev/null @@ -1,12 +0,0 @@ ---- check/alc/test_wait_rx_receiver.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_wait_rx_receiver.c Wed Oct 15 17:09:56 2003 -@@ -27,6 +27,9 @@ - #include <stdio.h> - - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif - - #ifdef WIN32 - #include <winsock2.h> diff --git a/mbone/mcl/files/patch-test_wait_rx_sender.c b/mbone/mcl/files/patch-test_wait_rx_sender.c deleted file mode 100644 index 694af55beed3..000000000000 --- a/mbone/mcl/files/patch-test_wait_rx_sender.c +++ /dev/null @@ -1,12 +0,0 @@ ---- check/alc/test_wait_rx_sender.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_wait_rx_sender.c Wed Oct 15 17:09:33 2003 -@@ -27,6 +27,9 @@ - #include <stdio.h> - - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif - - #ifdef WIN32 - #include <winsock2.h> diff --git a/mbone/mcl/files/patch-test_wait_tx.c b/mbone/mcl/files/patch-test_wait_tx.c deleted file mode 100644 index b0b816cc8cd8..000000000000 --- a/mbone/mcl/files/patch-test_wait_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_wait_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_wait_tx.c Wed Oct 15 17:09:00 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/mbone/mcl/pkg-descr b/mbone/mcl/pkg-descr deleted file mode 100644 index d3de44a68c11..000000000000 --- a/mbone/mcl/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -This is a port of MCLv3, an open source implementation of the ALC and -NORM Reliable Multicast Protocols. - -The MCLv3 project is an Open-Source GNU/GPL, multi-platform -implementation of the two major reliable multicast protocols being -standardized by the RMT IETF working group: ALC/LCT and NORM. It is -composed of a C/C++ library and several applications built on top of it -and provides an easy-to-use and integrated solution for reliable and -highly scalable multicast delivery of data. - -WWW: http://www.inrialpes.fr/planete/people/roca/mcl/mcl.html diff --git a/mbone/mcl/pkg-plist b/mbone/mcl/pkg-plist deleted file mode 100644 index 2e3b802a574e..000000000000 --- a/mbone/mcl/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/fcast -bin/flute -bin/robcast_client -bin/robcast_server -lib/libmclalc.a -include/mcl_lib_api.h -include/alc/mcl_lib_api_alc.h -@dirrm include/alc diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile deleted file mode 100644 index 00cfd4535a75..000000000000 --- a/mbone/rat/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# New ports collection makefile for: rat -# Date created: 3 July 1999 -# Whom: O.Hodson@cs.ucl.ac.uk (Orion Hodson) -# -# $FreeBSD$ -# - -PORTNAME= rat -PORTVERSION= 4.2.25 -PORTREVISION= 4 -CATEGORIES= mbone audio ipv6 tk -MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/releases/${PORTVERSION}/ \ - http://www.icir.org/hodson/ucl-mirror/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= IPv4/v6 Multicast and unicast audio conferencing tool - -USE_TK= yes -USE_XORG= x11 xext sm ice -USE_AUTOTOOLS= autoconf213 -USE_GMAKE= yes -CONFIGURE_ARGS= --enable-ipv6 - -MAN1= rat.1 -MANCOMPRESSED= no - -RAT_BUILD_DIRS= common rat -RAT= ${PORTNAME}-${PORTVERSION} -RAT_SCRIPT= ${PORTNAME} -PLIST_SUB= PORTVERSION=${PORTVERSION} - -.include <bsd.port.pre.mk> - -CONFIGURE_ARGS+= --with-tcltk-version=${TK_VER} - -.if ${ARCH} == "sparc64" -BROKEN= Does not compile: missing header -.endif - -.if ${OSVERSION} >= 700011 -EXTRA_PATCHES= ${FILESDIR}/timet.patch -.endif - -post-patch: - @${REINPLACE_CMD} -e "s,-Werror,," \ - -e 's,^TCL_INC=$${PARENT}.*,TCL_INC=${TCL_INCLUDEDIR},g' \ - -e 's,^TCL_LIB=$${PARENT}.*,TCL_LIB=${LOCALBASE}/lib,g' \ - -e 's,^TK_INC=$${PARENT}.*,TK_INC=${TK_INCLUDEDIR},g' \ - -e 's,^TK_LIB=$${PARENT}.*,TK_LIB=${LOCALBASE}/lib,g' \ - ${WRKSRC}/common/configure.in ${WRKSRC}/rat/configure.in - -do-install: - @${REINPLACE_CMD} 's|#/|#!/|' ${WRKSRC}/rat/${RAT_SCRIPT} - ${INSTALL_PROGRAM} ${WRKSRC}/rat/${RAT} ${PREFIX}/bin/${RAT} - ${INSTALL_PROGRAM} ${WRKSRC}/rat/${RAT}-ui ${PREFIX}/bin/${RAT}-ui - ${INSTALL_PROGRAM} ${WRKSRC}/rat/${RAT}-media ${PREFIX}/bin/${RAT}-media - ${INSTALL_SCRIPT} ${WRKSRC}/rat/${RAT_SCRIPT} ${PREFIX}/bin/${RAT_SCRIPT} - ${INSTALL_MAN} ${WRKSRC}/rat/man/man1/rat.1 ${PREFIX}/man/man1 - ${MKDIR} ${LOCALBASE}/etc/sdr/plugins - ${INSTALL_DATA} ${WRKSRC}/rat/sdr2.plugin.S02.audio.rtp.*.${RAT} ${LOCALBASE}/etc/sdr/plugins - -pre-configure: - cd ${WRKSRC}/common && ${AUTOCONF} && ./configure ${CONFIGURE_ARGS} - cd ${WRKSRC}/common && ${GMAKE} - -do-configure: - cd ${WRKSRC}/rat && ${AUTOCONF} && ./configure ${CONFIGURE_ARGS} - -do-build: - cd ${WRKSRC}/rat && ${GMAKE} - -run-autotools:: - @${DO_NADA} - -.include <bsd.port.post.mk> diff --git a/mbone/rat/distinfo b/mbone/rat/distinfo deleted file mode 100644 index eb629a25ee9f..000000000000 --- a/mbone/rat/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (rat-4.2.25.tar.gz) = d959a507b27573f80511fd6739b33514 -SHA256 (rat-4.2.25.tar.gz) = 15dd38e4d1c21a41349636d26a8b018fac97592ae187798a8bf2799df1739e89 -SIZE (rat-4.2.25.tar.gz) = 726326 diff --git a/mbone/rat/files/patch-ac b/mbone/rat/files/patch-ac deleted file mode 100644 index f2ed68da4800..000000000000 --- a/mbone/rat/files/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ ---- common/src/net_udp.c.orig Sat Jan 11 19:51:14 2003 -+++ common/src/net_udp.c Sat Jan 11 19:51:27 2003 -@@ -43,8 +43,10 @@ - #include "config_win32.h" - #include "debug.h" - #include "memory.h" -+#ifndef __FreeBSD__ - #include "inet_pton.h" - #include "inet_ntop.h" -+#endif - #include "vsnprintf.h" - #include "net_udp.h" - diff --git a/mbone/rat/files/patch-rat_configure.in b/mbone/rat/files/patch-rat_configure.in deleted file mode 100644 index ec2bb83d0633..000000000000 --- a/mbone/rat/files/patch-rat_configure.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- rat/configure.in.orig -+++ rat/configure.in -@@ -147,7 +147,7 @@ - [EXTRAOBJ="$EXTRA_OBJ usleep.o" - AC_DEFINE(NEED_USLEEP)]) - --AC_CHECK_FUNC(snprintf,,AC_DEFINE(NEED_SNPRINTF)) -+#AC_CHECK_FUNC(snprintf,,AC_DEFINE(NEED_SNPRINTF)) - - AC_SUBST(EXTRA_OBJ) - diff --git a/mbone/rat/files/timet.patch b/mbone/rat/files/timet.patch deleted file mode 100644 index 18c099c4316d..000000000000 --- a/mbone/rat/files/timet.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -ruN common/src/mbus.c work.tom/rat-4.2.25/common/src/mbus.c ---- common/src/mbus.c Mon Jun 16 18:57:59 2003 -+++ common/src/mbus.c Sun Jan 1 02:02:07 2006 -@@ -265,9 +265,9 @@ - mb_bufpos = mb_buffer + MBUS_AUTH_LEN; - /* monster kludge */ - if(*dst == '(') -- sprintf(mb_bufpos, "\nmbus/1.0 %6d %ld%03ld %c (%s) %s ", seqnum, ts.tv_sec,ts.tv_usec/1000, reliable, src, dst); -+ sprintf(mb_bufpos, "\nmbus/1.0 %6d %jd%03ld %c (%s) %s ", seqnum, (intmax_t)ts.tv_sec,ts.tv_usec/1000, reliable, src, dst); - else -- sprintf(mb_bufpos, "\nmbus/1.0 %6d %ld%03ld %c (%s) (%s) ", seqnum, ts.tv_sec,ts.tv_usec/1000, reliable, src, dst); -+ sprintf(mb_bufpos, "\nmbus/1.0 %6d %jd%03ld %c (%s) (%s) ", seqnum, (intmax_t)ts.tv_sec,ts.tv_usec/1000, reliable, src, dst); - - mb_bufpos += strlen(mb_bufpos); - if (ackseq == -1) { -diff -ruN rat/mbus_engine.c work.tom/rat-4.2.25/rat/mbus_engine.c ---- rat/mbus_engine.c Mon Jan 12 12:14:38 2004 -+++ rat/mbus_engine.c Sun Jan 1 02:04:57 2006 -@@ -604,11 +604,11 @@ - #endif - gettimeofday(&t, NULL); - gethostname(hname, 64); -- sprintf(fname, "rat-%p-%ld.%06ld-%s-%s.log", sp, t.tv_sec, (long)t.tv_usec, hname, uname); -+ sprintf(fname, "rat-%p-%jd.%06ld-%s-%s.log", sp, (intmax_t)t.tv_sec, (long)t.tv_usec, hname, uname); - cname = rtp_get_sdes(sp->rtp_session[0], rtp_my_ssrc(sp->rtp_session[0]), RTCP_SDES_CNAME); - - sp->logger = fopen(fname, "w"); -- fprintf(sp->logger, "tool_start %lu.%06lu ", t.tv_sec + SECS_BETWEEN_1900_1970, (long)t.tv_usec); -+ fprintf(sp->logger, "tool_start %jd.%06lu ", (intmax_t)t.tv_sec + SECS_BETWEEN_1900_1970, (long)t.tv_usec); - fprintf(sp->logger, "0x%08lx\n", (unsigned long) rtp_my_ssrc(sp->rtp_session[0])); - } else { - fclose(sp->logger); -diff -ruN rat/ui_send_audio.c work.tom/rat-4.2.25/rat/ui_send_audio.c ---- rat/ui_send_audio.c Mon Jan 12 12:14:46 2004 -+++ rat/ui_send_audio.c Sun Jan 1 02:13:08 2006 -@@ -279,7 +279,7 @@ - if (sp->logger != NULL) { - struct timeval t; - gettimeofday(&t, NULL); -- fprintf(sp->logger, "silence %lu.%06lu 0x%08lx %s\n", t.tv_sec + SECS_BETWEEN_1900_1970, t.tv_usec, -+ fprintf(sp->logger, "silence %jd.%06lu 0x%08lx %s\n", (intmax_t)t.tv_sec + SECS_BETWEEN_1900_1970, t.tv_usec, - (unsigned long) rtp_my_ssrc(sp->rtp_session[0]), name); - } - } -@@ -371,8 +371,8 @@ - if (sp->logger != NULL) { - struct timeval t; - gettimeofday(&t, NULL); -- fprintf(sp->logger, "channel %lu.%06lu 0x%08lx redundancy %s\n", -- t.tv_sec + SECS_BETWEEN_1900_1970, t.tv_usec, -+ fprintf(sp->logger, "channel %jd.%06lu 0x%08lx redundancy %s\n", -+ (intmax_t)t.tv_sec + SECS_BETWEEN_1900_1970, t.tv_usec, - (unsigned long) rtp_my_ssrc(sp->rtp_session[0]), scf->long_name); - } - -@@ -453,8 +453,8 @@ - if (sp->logger != NULL) { - struct timeval t; - gettimeofday(&t, NULL); -- fprintf(sp->logger, "channel %lu.%06lu 0x%08lx none\n", -- t.tv_sec+SECS_BETWEEN_1900_1970, t.tv_usec, (unsigned long) rtp_my_ssrc(sp->rtp_session[0])); -+ fprintf(sp->logger, "channel %jd.%06lu 0x%08lx none\n", -+ (intmax_t)t.tv_sec+SECS_BETWEEN_1900_1970, t.tv_usec, (unsigned long) rtp_my_ssrc(sp->rtp_session[0])); - } - break; - case 'r': -@@ -485,8 +485,8 @@ - if (sp->logger != NULL) { - struct timeval t; - gettimeofday(&t, NULL); -- fprintf(sp->logger, "codec %lu.%06lu 0x%08lx %s\n", -- t.tv_sec+SECS_BETWEEN_1900_1970, t.tv_usec, (unsigned long) rtp_my_ssrc(sp->rtp_session[0]), -+ fprintf(sp->logger, "codec %jd.%06lu 0x%08lx %s\n", -+ (intmax_t)t.tv_sec+SECS_BETWEEN_1900_1970, t.tv_usec, (unsigned long) rtp_my_ssrc(sp->rtp_session[0]), - pri_cf->long_name); - } - } diff --git a/mbone/rat/pkg-descr b/mbone/rat/pkg-descr deleted file mode 100644 index 22763c1892ae..000000000000 --- a/mbone/rat/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -RAT is a network audio tool that allows users to particpate in -audio conferences over the internet. These can be between two -participants directly, or between a group of participants on a -common multicast group. RAT features sender based loss mitigation -mechanisms and receiver based audio repair techniques to compensate -for packet loss, and load adaption in response to host performance. - -WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/ diff --git a/mbone/rat/pkg-plist b/mbone/rat/pkg-plist deleted file mode 100644 index b925d308e8c6..000000000000 --- a/mbone/rat/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/rat-%%PORTVERSION%% -bin/rat-%%PORTVERSION%%-ui -bin/rat-%%PORTVERSION%%-media -bin/rat -etc/sdr/plugins/sdr2.plugin.S02.audio.rtp.-.rat-%%PORTVERSION%% -@dirrm etc/sdr/plugins -@dirrm etc/sdr diff --git a/mbone/rat30/Makefile b/mbone/rat30/Makefile deleted file mode 100644 index 56ab15d5ba14..000000000000 --- a/mbone/rat30/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# New ports collection makefile for: rat -# Date created: 6 June 2001 -# Whom: anton -# -# $FreeBSD$ -# - -PORTNAME= rat -PORTVERSION= 3.0.35 -PORTREVISION= 2 -CATEGORIES= mbone audio -MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/releases/${PORTVERSION}/ \ - CENKES - -MAINTAINER= ports@FreeBSD.org -COMMENT= IPv4/v6 Multicast and unicast audio conferencing tool - -USE_TK= 82 -USE_XORG= x11 xext - -WRKSRC= ${WRKDIR}/rat-3.0 - -USE_GMAKE= yes -MAN1= rat.1 -PLIST_FILES= bin/rat30 - -LATEST_LINK= rat30 - -do-build: - cd ${WRKSRC};${SETENV} ${MAKE_ENV} MAKE=${GMAKE} ${SH} ./Build rat - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/rat ${PREFIX}/bin/rat30 - ${INSTALL_MAN} ${WRKSRC}/man/man1/rat.1 ${MAN1PREFIX}/man/man1/ - -.include <bsd.port.mk> diff --git a/mbone/rat30/distinfo b/mbone/rat30/distinfo deleted file mode 100644 index 000488fdfbcf..000000000000 --- a/mbone/rat30/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (rat-3.0.35.tar.gz) = fff6e4a4c9617c5b7ea80f63fda96a9a -SHA256 (rat-3.0.35.tar.gz) = e5373d9014a907167d8a882c3e7a21d70a59139ddee6945854eb029a159fe329 -SIZE (rat-3.0.35.tar.gz) = 185374 diff --git a/mbone/rat30/files/patch-Makefile b/mbone/rat30/files/patch-Makefile deleted file mode 100644 index 58c49275a23d..000000000000 --- a/mbone/rat30/files/patch-Makefile +++ /dev/null @@ -1,30 +0,0 @@ ---- ./Makefile.orig 1999-09-14 14:39:00.000000000 +0400 -+++ ./Makefile 2007-07-14 20:49:46.000000000 +0400 -@@ -10,8 +10,8 @@ - # -DDEBUG_RTP -DREPEAT - - DEFS += -D$(OSTYPE) -D$(OSTYPE)_$(OSMVER) --CC = gcc --CFLAGS = -Wall -Werror -Wno-implicit-int $(INCS) $(DEFS) -g -O -fsigned-char -+CC ?= cc -+CFLAGS += -Wall -Wno-implicit-int $(INCS) $(DEFS) -g -fsigned-char - LDFLAGS= - LDLIBS= $(LDLIBS) -lm - RANLIB = ranlib -@@ -19,7 +19,7 @@ - - GSMFLAGS = -DSASR -DFAST -DUSE_FLOAT_MUL - --include Makefile_$(OSTYPE)_$(OSMVER) -+include Makefile_$(OSTYPE)_4 - - BINDIR = bin/$(USER) - SRCDIR = src -@@ -82,6 +82,7 @@ - $(BINDIR)/rat-$(OSTYPE)-$(OSVERS): $(OBJS) $(GSMOBJS) $(CRYPTOBJS) $(RATOBJS) - rm -f $(BINDIR)/rat-$(OSTYPE)-$(OSVERS) - $(CC) $(RATOBJS) $(OBJS) $(GSMOBJS) $(CRYPTOBJS) $(LDLIBS) $(LDFLAGS) -o $(BINDIR)/rat-$(OSTYPE)-$(OSVERS) -+ cp $(BINDIR)/rat-$(OSTYPE)-$(OSVERS) bin/rat - - $(OBJDIR)/%.o: $(SRCDIR)/%.c - $(CC) $(CFLAGS) $(GSMFLAGS) $(CRYPTFLAGS) -c $(SRCDIR)/$*.c -o $(OBJDIR)/$*.o diff --git a/mbone/rat30/files/patch-Makefile_FreeBSD_4 b/mbone/rat30/files/patch-Makefile_FreeBSD_4 deleted file mode 100644 index d4a838d12316..000000000000 --- a/mbone/rat30/files/patch-Makefile_FreeBSD_4 +++ /dev/null @@ -1,9 +0,0 @@ ---- ./Makefile_FreeBSD_4.orig 2007-07-14 20:49:46.000000000 +0400 -+++ ./Makefile_FreeBSD_4 2007-07-14 20:49:46.000000000 +0400 -@@ -0,0 +1,6 @@ -+TCL_INC = ${LOCALBASE}/include/tcl8.2 -+TK_INC = ${LOCALBASE}/include/tk8.2 -+INCS = -I${LOCALBASE}/include \ -+ -I$(TCL_INC)/generic -I$(TK_INC)/generic -+LDLIBS = -L${LOCALBASE}/lib \ -+ -L${LOCALBASE}/lib -ltk82 -ltcl82 -lXext -lX11 -lm diff --git a/mbone/rat30/files/patch-aa b/mbone/rat30/files/patch-aa deleted file mode 100644 index 5eb716af785e..000000000000 --- a/mbone/rat30/files/patch-aa +++ /dev/null @@ -1,62 +0,0 @@ ---- ./src/auddev_freebsd.c.orig Sun Oct 20 14:05:07 2002 -+++ ./src/auddev_freebsd.c Sun Oct 20 14:05:16 2002 -@@ -45,7 +45,7 @@ - #include "bat_include.h" - #ifdef FreeBSD - --#include <machine/soundcard.h> -+#include <sys/soundcard.h> - - int can_read = FALSE; - int can_write = FALSE; -@@ -204,18 +204,10 @@ - if (audio_fd <= 0) { - return; - } -- switch (iport) { -- case AUDIO_MICROPHONE : if (ioctl(audio_fd, MIXER_WRITE(SOUND_MIXER_MIC), &volume) == -1) { -- perror("Setting gain"); -- } -- return; -- case AUDIO_LINE_IN : if (ioctl(audio_fd, MIXER_WRITE(SOUND_MIXER_LINE), &volume) == -1) { -- perror("Setting gain"); -- } -- return; -+ if (ioctl(audio_fd, SOUND_MIXER_WRITE_RECLEV, &volume) == -1) { -+ perror("Setting gain"); - } -- printf("ERROR: Unknown iport in audio_set_gain!\n"); -- abort(); -+ return; - } - - int -@@ -226,17 +218,8 @@ - if (audio_fd <= 0) { - return (0); - } -- switch (iport) { -- case AUDIO_MICROPHONE : if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_MIC), &volume) == -1) { -- perror("Getting gain"); -- } -- break; -- case AUDIO_LINE_IN : if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_LINE), &volume) == -1) { -- perror("Getting gain"); -- } -- break; -- default : printf("ERROR: Unknown iport in audio_set_gain!\n"); -- abort(); -+ if (ioctl(audio_fd, SOUND_MIXER_READ_RECLEV, &volume) == -1) { -+ perror("Setting gain"); - } - return device_to_bat(volume & 0xff); - } -@@ -263,7 +246,7 @@ - if (audio_fd <= 0) { - return (0); - } -- if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_VOLUME), &volume) == -1) { -+ if (ioctl(audio_fd, MIXER_READ(SOUND_MIXER_PCM), &volume) == -1) { - perror("Getting volume"); - } - return device_to_bat(volume & 0x000000ff); /* Extract left channel volume */ diff --git a/mbone/rat30/files/patch-ab b/mbone/rat30/files/patch-ab deleted file mode 100644 index 6be58d321a47..000000000000 --- a/mbone/rat30/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- src/config.h.orig Sun Oct 20 14:05:43 2002 -+++ src/config.h Sun Oct 20 14:05:49 2002 -@@ -47,7 +47,7 @@ - #define OSNAME "FreeBSD" - #include <unistd.h> - #include <stdlib.h> --#include <machine/soundcard.h> -+#include <sys/soundcard.h> - #define DIFF_BYTE_ORDER 1 - #define AUDIO_SPEAKER 0 - #define AUDIO_HEADPHONE 1 diff --git a/mbone/rat30/files/patch-src:main.c b/mbone/rat30/files/patch-src:main.c deleted file mode 100644 index 37e70d61a38a..000000000000 --- a/mbone/rat30/files/patch-src:main.c +++ /dev/null @@ -1,16 +0,0 @@ ---- src/main.c.orig Fri Feb 3 00:23:21 2006 -+++ src/main.c Fri Feb 3 00:23:37 2006 -@@ -118,11 +118,11 @@ - NEW_QUEUE(pckt_queue_struct, rtcp_pckt_queue) - NEW_QUEUE(rx_queue_struct, rx_unit_queue) - --#define INIT_QUEUE(T,Q) Q##_ptr[0] = &Q##[0]; \ -+#define INIT_QUEUE(T,Q) Q##_ptr[0] = &Q[0]; \ - Q##_ptr[0]->queue_empty_flag = 1; \ - Q##_ptr[0]->head_ptr = NULL; \ - Q##_ptr[0]->tail_ptr = NULL; \ -- Q##_ptr[1] = &Q##[1]; \ -+ Q##_ptr[1] = &Q[1]; \ - Q##_ptr[1]->queue_empty_flag = 1; \ - Q##_ptr[1]->head_ptr = NULL; \ - Q##_ptr[1]->tail_ptr = NULL; diff --git a/mbone/rat30/files/patch-src__codec_encoder.c b/mbone/rat30/files/patch-src__codec_encoder.c deleted file mode 100644 index 7f940d8cafcb..000000000000 --- a/mbone/rat30/files/patch-src__codec_encoder.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ./src/codec_encoder.c.orig 2007-07-14 20:50:06.000000000 +0400 -+++ ./src/codec_encoder.c 2007-07-14 20:53:12.000000000 +0400 -@@ -48,7 +48,8 @@ - int i; - sample *d; - -- d = (sample *)c->data = (sample *)block_alloc(SAMPLES_PER_UNIT * BYTES_PER_SAMPLE); -+ c->data = (sample *)block_alloc(SAMPLES_PER_UNIT * BYTES_PER_SAMPLE); -+ d = (sample *)c->data; - c->data_len = SAMPLES_PER_UNIT * BYTES_PER_SAMPLE; - for (i=0; i < SAMPLES_PER_UNIT; i++) { - *d++ = htons(*data); diff --git a/mbone/rat30/pkg-descr b/mbone/rat30/pkg-descr deleted file mode 100644 index 988875e9800a..000000000000 --- a/mbone/rat30/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -RAT is a network audio tool that allows users to particpate in -audio conferences over the internet. These can be between two -participants directly, or between a group of participants on a -common multicast group. RAT features sender based loss mitigation -mechanisms and receiver based audio repair techniques to compensate -for packet loss, and load adaption in response to host performance. - -This is a stable branch version. Works with half-duplex casrd as well. -This is required mbone/relate. - -WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/ -RAT is a network audio tool that allows users to particpate in -audio conferences over the internet. These can be between two -participants directly, or between a group of participants on a -common multicast group. RAT features sender based loss mitigation -mechanisms and receiver based audio repair techniques to compensate -for packet loss, and load adaption in response to host performance. - -This is a stable branch version. Works with half-duplex casrd as well. -This is required mbone/relate. - -WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/ diff --git a/mbone/rqm/Makefile b/mbone/rqm/Makefile deleted file mode 100644 index bdf424e8ee5d..000000000000 --- a/mbone/rqm/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# New ports collection makefile for: rqm -# Date created: 30 January 2000 -# Whom: fenner -# -# $FreeBSD$ -# - -PORTNAME= rqm -PORTVERSION= 1.0.0 -PORTREVISION= 1 -CATEGORIES= mbone tk -MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/1.0.0/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= A graphical RTP quality monitor - -LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 -BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase - -WRKSRC= ${WRKDIR}/rqm/ - -HAS_CONFIGURE= yes -CONFIGURE_ENV= PREFIX=${PREFIX} X11BASE=${LOCALBASE} - -ALL_TARGET= rqm -PLIST_FILES= bin/rqm -PORTDOCS= README - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/rqm ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ -.endif - -.include <bsd.port.mk> diff --git a/mbone/rqm/distinfo b/mbone/rqm/distinfo deleted file mode 100644 index 386a40bb1a63..000000000000 --- a/mbone/rqm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (rqm-1.0.0.tar.gz) = 406a9bfe4a3e9ad9f1a981701072f54a -SHA256 (rqm-1.0.0.tar.gz) = 8e9a2a0a2ed2abe7feb24f6e7fd47a195cb0e91ee8e0daea736c692f12a01f41 -SIZE (rqm-1.0.0.tar.gz) = 3853534 diff --git a/mbone/rqm/files/patch-aa b/mbone/rqm/files/patch-aa deleted file mode 100644 index 31697563d121..000000000000 --- a/mbone/rqm/files/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.orig Sun Oct 3 08:47:46 1999 -+++ configure Sun Jan 30 16:05:14 2000 -@@ -53,9 +53,9 @@ - - echo "Configuring rqm v$VERSION for $OSTYPE" - --GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Wno-implicit-int -Werror" --TCL_LIBS="../tk-8.0/unix/libtk8.0.a ../tcl-8.0/unix/libtcl8.0.a" --TCL_INCL="-I../tk-8.0/generic -I../tcl-8.0/generic" -+GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Wno-implicit-int" -+TCL_LIBS="-L${PREFIX}/lib -ltk84 -ltcl84" -+TCL_INCL="-I${PREFIX}/include/tk8.4/generic -I${PREFIX}/include/tcl8.4/generic" - DEFS="" - - AR="ar" -@@ -103,7 +103,7 @@ - ;; - FreeBSD ) CC="gcc" - WFLAGS=$GCCWFLAGS -- INCLUDE="-I/usr/local/include" -+ INCLUDE="-I${LOCALBASE}/include" - LDLIBS="-lm" - DEBUG="-g" - CHAR="-fsigned-char" -@@ -172,8 +172,8 @@ - s@__AR__@$AR@ - s@__RANLIB__@$RANLIB@ - s@__WFLAGS__@$WFLAGS@ --s@__INCLUDE__@$TCL_INCL $INCLUDE -I../common@g --s@__LDLIBS__@$TCL_LIBS -L../common -lcommon $LDLIBS@g -+s@__INCLUDE__@$TCL_INCL $INCLUDE -I${PREFIX}/include/uclmmbase@g -+s@__LDLIBS__@$TCL_LIBS -L${PREFIX}/lib -luclmmbase $LDLIBS@g - s@__CHAR__@$CHAR@ - s@__DEBUG__@$DEBUG2@ - s@__OPTIMIZE__@$OPTIMIZE2@ diff --git a/mbone/rqm/files/patch-ab b/mbone/rqm/files/patch-ab deleted file mode 100644 index c6f546039ba6..000000000000 --- a/mbone/rqm/files/patch-ab +++ /dev/null @@ -1,38 +0,0 @@ ---- main.c.orig Wed Mar 8 08:32:07 2000 -+++ main.c Wed Mar 8 08:32:28 2000 -@@ -67,7 +67,7 @@ - } - } - --static void rtp_callback(struct rtp *s, rtp_event *e) -+static void rqm_rtp_callback(struct rtp *s, rtp_event *e) - { - rtp_packet *p = (rtp_packet *) e->data; - rtcp_sr *sr = (rtcp_sr *) e->data; -@@ -177,7 +177,7 @@ - char *addr; - char *port; - char cmd[100]; -- u_int32 curr_rtp_time; -+ u_int32_t curr_rtp_time; - #ifdef WIN32 - WSADATA WSAdata; - if (WSAStartup(WS_VERSION_TWO, &WSAdata) != 0 && WSAStartup(WS_VERSION_ONE, &WSAdata) != 0) { -@@ -199,7 +199,7 @@ - addr = (char *) strtok(argv[1], "/"); - port = (char *) strtok(NULL, "\0"); - -- rtp_session = rtp_init(addr, atoi(port), atoi(port), 15, 64000, rtp_callback, NULL); -+ rtp_session = rtp_init(addr, atoi(port), atoi(port), 15, 64000, rqm_rtp_callback, NULL); - - /* Initialise the user interface... */ - if (tcl_init(argc, argv) == FALSE) { -@@ -215,7 +215,7 @@ - rtp_set_sdes(rtp_session, rtp_my_ssrc(rtp_session), RTCP_SDES_TOOL, VERSION, strlen(VERSION)); - - gettimeofday(&prev_t, NULL); -- curr_rtp_time = (u_int32) lrand48(); -+ curr_rtp_time = (u_int32_t) lrand48(); - while (Tk_GetNumMainWindows() > 0) { - gettimeofday(&curr_t, NULL); - curr_rtp_time += (int) (tv_diff(curr_t, prev_t) * 8000); diff --git a/mbone/rqm/files/patch-ac b/mbone/rqm/files/patch-ac deleted file mode 100644 index 00ed9055e3ea..000000000000 --- a/mbone/rqm/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sun Feb 1 17:22:05 2004 -+++ Makefile.in Sun Feb 1 17:22:12 2004 -@@ -6,7 +6,7 @@ - OBJS = main.o ui.o - BIN = rqm - --$(BIN): $(OBJS) ../common/libcommon.a -+$(BIN): $(OBJS) - $(CC) $(CFLAGS) $(OBJS) __LDLIBS__ __PROFILE__ __OPTIMIZE__ __CHECK_LIB__ -o $(BIN) - - .c.o: diff --git a/mbone/rqm/pkg-descr b/mbone/rqm/pkg-descr deleted file mode 100644 index 0f66e31ecfde..000000000000 --- a/mbone/rqm/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -The Real-time Transport Protocol, RTP [1], provides quality of service -feedback with reception reports sent alongside the media stream. If the -media is sent via IP multicast it is possible for a third party to snoop -on these reception reports, displaying reception quality for all members -of a group. The RQM application performs such snooping. - -WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/ diff --git a/mbone/rtptools/Makefile b/mbone/rtptools/Makefile deleted file mode 100644 index ea02adc0d525..000000000000 --- a/mbone/rtptools/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# New ports collection makefile for: rtptools -# Date created: 5 January 1998 -# Whom: fenner -# -# $FreeBSD$ -# - -PORTNAME= rtptools -PORTVERSION= 1.18 -CATEGORIES= mbone -MASTER_SITES= http://www.cs.columbia.edu/IRT/software/rtptools/download/ - -MAINTAINER= tut@nhamon.com.ua -COMMENT= A set of tools to record, playback and monitor RTPv2 data streams - -GNU_CONFIGURE= yes - -PLIST_FILES= bin/rtpdump bin/rtpplay bin/rtpsend bin/rtptrans -DOCFILES= README ChangeLog.html rtptools.html -PORTDOCS= ${DOCSFILES} - -post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for i in ${DOCFILES} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/ -.endfor -.endif - -.include <bsd.port.mk> diff --git a/mbone/rtptools/distinfo b/mbone/rtptools/distinfo deleted file mode 100644 index 1d1d589b507d..000000000000 --- a/mbone/rtptools/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (rtptools-1.18.tar.gz) = 9a344c5a4fed2c4be0151cc03f043bb3 -SHA256 (rtptools-1.18.tar.gz) = 7fa16f71713ca16c5ce9cf5ccbd6796315f3402bdef9c7f7023ffac32c8e2ab0 -SIZE (rtptools-1.18.tar.gz) = 119272 diff --git a/mbone/rtptools/files/patch-ab b/mbone/rtptools/files/patch-ab deleted file mode 100644 index c1d142b4a914..000000000000 --- a/mbone/rtptools/files/patch-ab +++ /dev/null @@ -1,23 +0,0 @@ ---- rtp.h.orig Thu Mar 9 07:35:26 2000 -+++ rtp.h Sat Apr 21 21:52:49 2001 -@@ -110,13 +110,18 @@ - #define RTCP_VALID_MASK (0xc000 | 0x2000 | 0xfe) - #define RTCP_VALID_VALUE ((RTP_VERSION << 14) | RTCP_SR) - -+#define RTCP_FRACTION(x) (((x) >> 24) & 0xFF) -+#define RTCP_LOST(x) ((((x) & 0xFFFFFF) < 0x800000) ? \ -+ ((x) & 0xFFFFFF) \ -+ : (((x) & 0xFFFFFF) - 0x1000000)) -+ - /* - * Reception report block - */ - typedef struct { - u_int32 ssrc; /* data source being reported */ -- unsigned int fraction:8; /* fraction lost since last SR/RR */ -- int lost:24; /* cumul. no. pkts lost (signed!) */ -+ u_int32 fraclost; /* fraction lost since last SR/RR and */ -+ /* cumul. no. pkts lost (signed!) */ - u_int32 last_seq; /* extended last seq. no. received */ - u_int32 jitter; /* interarrival jitter */ - u_int32 lsr; /* last SR packet from this source */ diff --git a/mbone/rtptools/files/patch-ac b/mbone/rtptools/files/patch-ac deleted file mode 100644 index 28056951ca69..000000000000 --- a/mbone/rtptools/files/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ ---- rtpdump.c.orig Sat Apr 7 08:02:13 2001 -+++ rtpdump.c Sat Apr 21 21:54:10 2001 -@@ -429,8 +429,8 @@ - for (i = 0; i < r->common.count; i++) { - fprintf(out, " (ssrc=0x%lx fraction=%g lost=%lu last_seq=%lu jit=%lu lsr=%lu dlsr=%lu )\n", - (unsigned long)ntohl(r->r.sr.rr[i].ssrc), -- r->r.sr.rr[i].fraction / 256., -- (unsigned long)ntohl(r->r.sr.rr[i].lost), /* XXX I'm pretty sure this is wrong */ -+ RTCP_FRACTION(ntohl(r->r.sr.rr[i].fraclost)) / 256., -+ RTCP_LOST(ntohl(r->r.sr.rr[i].fraclost)), - (unsigned long)ntohl(r->r.sr.rr[i].last_seq), - (unsigned long)ntohl(r->r.sr.rr[i].jitter), - (unsigned long)ntohl(r->r.sr.rr[i].lsr), -@@ -446,8 +446,8 @@ - for (i = 0; i < r->common.count; i++) { - fprintf(out, " (ssrc=0x%lx fraction=%g lost=%lu last_seq=%lu jit=%lu lsr=%lu dlsr=%lu )\n", - (unsigned long)ntohl(r->r.rr.rr[i].ssrc), -- r->r.rr.rr[i].fraction / 256., -- (unsigned long)ntohl(r->r.rr.rr[i].lost), -+ RTCP_FRACTION(ntohl(r->r.rr.rr[i].fraclost)) / 256., -+ RTCP_LOST(ntohl(r->r.rr.rr[i].fraclost)), - (unsigned long)ntohl(r->r.rr.rr[i].last_seq), - (unsigned long)ntohl(r->r.rr.rr[i].jitter), - (unsigned long)ntohl(r->r.rr.rr[i].lsr), diff --git a/mbone/rtptools/files/patch-ad b/mbone/rtptools/files/patch-ad deleted file mode 100644 index 130804a6b732..000000000000 --- a/mbone/rtptools/files/patch-ad +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- rtpsend.c.orig Tue Sep 10 13:24:10 2002 -+++ rtpsend.c Sat Aug 16 08:58:12 2003 -@@ -353,9 +353,9 @@ - if (strcmp(n->type, "ssrc") == 0) - rr->ssrc = htonl(n->num); - else if (strcmp(n->type, "fraction") == 0) -- rr->fraction = (n->num)*256; -- else if (strcmp(n->type, "lost") == 0) /* PP: alignment OK? */ -- rr->lost = htonl(n->num); -+ rr->fraclost = htonl((ntohl(rr->fraclost) & 0x00ffffff) | ((n->num)*256 << 24)); -+ else if (strcmp(n->type, "lost") == 0) -+ rr->fraclost = htonl((ntohl(rr->fraclost) & 0xff000000) | n->num); - else if (strcmp(n->type, "last_seq") == 0) - rr->last_seq = htonl(n->num); - else if (strcmp(n->type, "jit") == 0) -@@ -919,6 +919,8 @@ - local = (struct in_addr *)host->h_addr_list[0];
- sin.sin_addr = *local;
- } -+ } else { -+ usage(argv[0]); - } - - /* create/connect sockets */ diff --git a/mbone/rtptools/pkg-descr b/mbone/rtptools/pkg-descr deleted file mode 100644 index be50ee27bf15..000000000000 --- a/mbone/rtptools/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -The rtptools distribution consists of a number of small applications that -can be used for processing RTP data. - -rtpplay - play back RTP sessions recorded by rtpdump -rtpsend - generate RTP packets from textual description, generated by hand or - rtpdump -rtpdump - parse and print RTP packets, generating output files suitable for - rtpplay and rtpsend -rtptrans - RTP translator between unicast and multicast networks - -WWW: http://www.cs.columbia.edu/irt/software/rtptools/ diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile deleted file mode 100644 index 1b32fc22d111..000000000000 --- a/mbone/sdr/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# New ports collection makefile for: sdr -# Date created: 5 September 1996 -# Whom: Bill Fenner <fenner@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= sdr -PORTVERSION= 3.0 -PORTREVISION= 3 -CATEGORIES= mbone tk -MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Multicast Session Directory - -LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 -BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase - -PLIST_FILES= bin/sdr -WRKSRC= ${WRKDIR}/sdr/freebsd -HAS_CONFIGURE= yes -USE_GMAKE= yes - -post-extract: - @${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/Makefile.freebsd - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 700042 -MAKE_ARGS+= "CC=gcc -g -O" -.endif - -.include <bsd.port.post.mk> diff --git a/mbone/sdr/distinfo b/mbone/sdr/distinfo deleted file mode 100644 index 4be266510e61..000000000000 --- a/mbone/sdr/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (sdr-3.0.tar.gz) = df7df7911b5c08df968296f970f9e31d -SHA256 (sdr-3.0.tar.gz) = 57a6d631e14b2270dad04048a0f50c38dfcf3bfda67b96d8265820d567761460 -SIZE (sdr-3.0.tar.gz) = 304691 diff --git a/mbone/sdr/files/Makefile.freebsd b/mbone/sdr/files/Makefile.freebsd deleted file mode 100644 index 34a7a8c8a943..000000000000 --- a/mbone/sdr/files/Makefile.freebsd +++ /dev/null @@ -1,8 +0,0 @@ -CC = gcc -g -O -fwritable-strings -INCLUDES = -I${LOCALBASE}/include -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/uclmmbase -LIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84 -luclmmbase -lX11 -lz -lm -CFLAGS = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD - -all:: sdr -install: - install -s -c -o root -g wheel -m 555 sdr ${PREFIX}/bin diff --git a/mbone/sdr/files/patch-ab b/mbone/sdr/files/patch-ab deleted file mode 100644 index bb154934fbd1..000000000000 --- a/mbone/sdr/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src/Makefile.template.orig Tue May 25 16:27:44 1999 -+++ ../src/Makefile.template Thu Nov 4 11:05:39 1999 -@@ -88,7 +88,7 @@ - $(SDR_UI_FILES): tcl2c - - parsed_plugins.tcl: ../src/plugin2tcl.tcl -- tclsh8.0 ../src/plugin2tcl.tcl -+ tclsh8.4 ../src/plugin2tcl.tcl - - uweb: $(WWWOBJS) - $(CC) -ggdb -o uweb $(WWWOBJS) $(LIBS) diff --git a/mbone/sdr/files/patch-src-generic.tcl b/mbone/sdr/files/patch-src-generic.tcl deleted file mode 100644 index 6f1ebef5a5c6..000000000000 --- a/mbone/sdr/files/patch-src-generic.tcl +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src/generic.tcl.orig 2008-08-31 12:38:25.000000000 +0800 -+++ ../src/generic.tcl 2008-08-31 12:39:01.000000000 +0800 -@@ -89,8 +89,6 @@ - proc tixAddBalloon {w class msg {initWait 500}} { - global tixBal - if {$class == "Button" } { -- bind $w <Enter> "+tkButtonEnter $w" -- bind $w <Leave> "+tkButtonLeave $w" - bind $w <ButtonPress> "+tixBalEnd $w" - } else { - if { $class == "Entry" } { diff --git a/mbone/sdr/pkg-descr b/mbone/sdr/pkg-descr deleted file mode 100644 index 4c6400374ee6..000000000000 --- a/mbone/sdr/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Sdr is a session directory tool designed to allow the advertisement -and joining of multicast conferences. It was originally based on -sd written by Van Jacobson at LBNL, but implements a later version -of the session description protocol than sd does. - -WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/ diff --git a/mbone/speak_freely/Makefile b/mbone/speak_freely/Makefile deleted file mode 100644 index 9215744498df..000000000000 --- a/mbone/speak_freely/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# New ports collection makefile for: speak_freely -# Date created: 18 Apr 1996 -# Whom: Mister X (to make portlint happy ;) -# -# $FreeBSD$ -# - -PORTNAME= speak_freely -PORTVERSION= 7.6a -CATEGORIES= mbone audio security -MASTER_SITES= SF/speak-freely/speak-freely/${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Voice communication over data networks - -LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm - -UTILS= sfspeaker sfmike sflwl sflaunch -DEMNS= sfecho sflwld sfreflect -DDEMNS= sfvod -SFLIB= ${PREFIX}/lib/speak_freely -MAN1= ${UTILS:S/$/.1/} ${DEMNS:S/$/.1/} ${DDEMNS:S/$/.1/} - -MAKE_ENV= "OPTFLAGS=${CFLAGS}" - -do-install: - if [ ! -d ${SFLIB} ]; then \ - ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 ${SFLIB}; \ - fi - cd ${WRKSRC}; \ - $(INSTALL_DATA) busy.au ring.au ${SFLIB} - cd ${WRKSRC}; \ - for p in ${UTILS}; do \ - $(INSTALL_PROGRAM) $$p ${PREFIX}/bin; \ - $(INSTALL_MAN) $$p.1 ${PREFIX}/man/man1; \ - done; - cd ${WRKSRC}; \ - for p in ${DEMNS}; do \ - $(INSTALL_PROGRAM) $$p ${PREFIX}/sbin; \ - $(INSTALL_MAN) $$p.1 ${PREFIX}/man/man1; \ - done; - cd ${WRKSRC}; \ - for p in ${DDEMNS}; do \ - $(INSTALL_SCRIPT) $$p ${PREFIX}/sbin; \ - $(INSTALL_MAN) $$p.1 ${PREFIX}/man/man1; \ - done; - -.include <bsd.port.mk> diff --git a/mbone/speak_freely/distinfo b/mbone/speak_freely/distinfo deleted file mode 100644 index 480a31ac69a1..000000000000 --- a/mbone/speak_freely/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (speak_freely-7.6a.tar.gz) = 0c35c891d24f8df7f2bdedc3b91ab161 -SHA256 (speak_freely-7.6a.tar.gz) = 7636141d1daca1bd1a0a1e515a3b65adb788625409c503b297dc7c485f471247 -SIZE (speak_freely-7.6a.tar.gz) = 787915 diff --git a/mbone/speak_freely/files/patch-aa b/mbone/speak_freely/files/patch-aa deleted file mode 100644 index f328cf09d01c..000000000000 --- a/mbone/speak_freely/files/patch-aa +++ /dev/null @@ -1,93 +0,0 @@ ---- Makefile.orig Sun Jun 8 22:21:55 2003 -+++ Makefile Sun Jun 8 22:33:37 2003 -@@ -6,7 +6,7 @@ - #DEBUG = -O - #DEBUG = -g -DHEXDUMP - #DEBUG = -g -DHEXDUMP -DNOCRYPTO --DEBUG = -O3 -DHEXDUMP -+#DEBUG = -O3 -DHEXDUMP - - # Installation - -@@ -50,13 +50,13 @@ - # of the available flags which follows these declarations. - # - #CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN --CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER -DHAVE_DEV_RANDOM --CC = gcc -Wall # for GNU's gcc compiler -+#CCFLAGS = -DAUDIO_BLOCKING -DLINUX -DHALF_DUPLEX -DM_LITTLE_ENDIAN -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER -DHAVE_DEV_RANDOM -+#CC = gcc -Wall # for GNU's gcc compiler - # CELPFLAGS below are tweaked for GCC 2.96 on Intel Pentium. - # Comment out if you are using a compiler which doesn't - # understand these options. --CELPFLAGS = -fomit-frame-pointer -ffast-math -funroll-loops --LFLAGS = -lncurses -lm -+#CELPFLAGS = -fomit-frame-pointer -ffast-math -funroll-loops -+#LFLAGS = -lncurses -lm - - - # If you want to use ALSA instead of OSS, uncomment the following -@@ -269,8 +269,8 @@ - # Depending on how your driver handles non-blocking I/O, - # you may also have to add -DAUDIO_BLOCKING to the - # CCFLAGS line. --#CCFLAGS = -DM_LITTLE_ENDIAN --#LFLAGS = -lcurses -ltermcap -lcompat -lm -+CCFLAGS = -DM_LITTLE_ENDIAN -DAUDIO_BLOCKING -DNEEDED_LINEAR -DLINUX_DSP_SMALL_BUFFER -+LFLAGS = -lcurses -ltermcap -lm - - # Hewlett-Packard - # (courtesy of Marc Kilian) -@@ -318,7 +318,7 @@ - - # Compiler flags - --CFLAGS = $(DEBUG) $(PKOPTS) -Iadpcm -Iaes -Icelp -Ilpc -Igsm/inc -Ilpc10 -Imd5 -Ides -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN) -+CFLAGS = $(OPTFLAGS) $(DEBUG) $(PKOPTS) -Iadpcm -Iaes -Icelp -Ilpc -I$(LOCALBASE)/include -Igsm/inc -Ilpc10 -Imd5 -Ides -Iidea -Ilibdes -Iblowfish $(CARGS) $(DUPLEX) $(CCFLAGS) $(DOMAIN) - - BINARIES = sfspeaker sfmike sflaunch sflwld sflwl sfecho sfreflect - -@@ -333,12 +333,12 @@ - SPKROBJS = speaker.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o tempfile.o ulaw.o usleep.o vatpkt.o vox.o audio_hp.o audio_sgi.o audio_alsa.o common.o - - sfspeaker: $(SPKROBJS) adpcmlib.o aeslib.o celplib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o xdsub.o -- $(CC) $(SPKROBJS) adpcm/adpcm-u.o aes/aes.a blowfish/libblowfish.a celp/celp.o des/des.a md5/md5.o idea/idea.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -o sfspeaker -+ $(CC) $(SPKROBJS) adpcm/adpcm-u.o aes/aes.a blowfish/libblowfish.a celp/celp.o des/des.a -lmd idea/idea.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o xdsub.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -o sfspeaker - - MIKEOBJS = mike.o codecs.o deskey.o g711.o rate.o rtpacket.o soundbyte.o tempfile.o ulaw.o usleep.o vatpkt.o xdsub.o audio_hp.o audio_sgi.o audio_alsa.o - - sfmike: $(MIKEOBJS) adpcmlib.o aeslib.o celplib.o libblowfish.o lpclib.o lpc10lib.o gsmlib.o deslib.o md5lib.o idealib.o libdes.o -- $(CC) $(MIKEOBJS) adpcm/adpcm-u.o aes/aes.a celp/celp.o des/des.a md5/md5.o idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -o sfmike -+ $(CC) $(MIKEOBJS) adpcm/adpcm-u.o aes/aes.a celp/celp.o des/des.a -lmd idea/idea.a -lm blowfish/libblowfish.a lpc10/liblpc10.a gsm/lib/libgsm.a lpc/lpc.o libdes/libdes.a $(LFLAGS) $(SOUNDLIB) -o sfmike - - LAUNCHOBJS = launch.o soundbyte.o usleep.o g711.o - -@@ -358,12 +358,12 @@ - ECHOOBJS = echo.o codecs.o g711.o rtpacket.o ulaw.o xdsub.o - - sfecho: $(ECHOOBJS) md5lib.o -- $(CC) $(ECHOOBJS) md5/md5.o adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfecho -+ $(CC) $(ECHOOBJS) -lmd adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfecho - - REFLECTOBJS = reflect.o codecs.o html.o g711.o rtpacket.o ulaw.o xdsub.o - - sfreflect: $(REFLECTOBJS) md5lib.o -- $(CC) $(REFLECTOBJS) md5/md5.o adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfreflect -+ $(CC) $(REFLECTOBJS) -lmd adpcm/adpcm-u.o lpc/lpc.o $(LFLAGS) -o sfreflect - - # Configure the voice on demand server for the platform's - # location of Perl and network constant definitions. -@@ -412,11 +412,11 @@ - echo "BLOWFISH" >libblowfish.o - - libdes.o: -- ( echo "Building LIBDES library."; cd libdes ; make -f Makefile.sf CC="$(CC) $(CCFLAGS) $(DEBUG)" ) -+ ( echo "Building LIBDES library."; cd libdes ; make -f Makefile.sf CC="$(CC) $(OPTFLAGS) $(CCFLAGS) $(DEBUG)" ) - echo "LIBDES" >libdes.o - - lpclib.o: -- ( echo "Building LPC library."; cd lpc ; make CC="$(CC) $(CCFLAGS) $(DEBUG)" ) -+ ( echo "Building LPC library."; cd lpc ; make CC="$(CC) $(OPTFLAGS) $(CCFLAGS) $(DEBUG)" ) - echo "LPC" >lpclib.o - - lpc10lib.o: diff --git a/mbone/speak_freely/files/patch-ac b/mbone/speak_freely/files/patch-ac deleted file mode 100644 index e9d8a5977a47..000000000000 --- a/mbone/speak_freely/files/patch-ac +++ /dev/null @@ -1,69 +0,0 @@ ---- mike.c.orig Mon Aug 19 17:20:52 2002 -+++ mike.c Thu Dec 12 02:46:38 2002 -@@ -130,8 +130,8 @@ - #endif /* UNIX420 */ - - #ifdef UNIX5 --#include <termio.h> --static struct termio old_term_params; -+#include <termios.h> -+static struct termios old_term_params; - #endif /* UNIX5 */ - - /* Set raw mode on terminal file. Basically, get the terminal into a -@@ -150,16 +150,16 @@ - #endif /* UNIX420 */ - - #ifdef UNIX5 -- struct termio term_params; -+ struct termios term_params; - -- ioctl(fileno(stdin), TCGETA, &old_term_params); -+ tcgetattr(fileno(stdin), &old_term_params); - term_params = old_term_params; - term_params.c_iflag &= ~(ICRNL|IXON|IXOFF); /* no cr translation */ - term_params.c_iflag &= ~(ISTRIP); /* no stripping of high order bit */ - term_params.c_oflag &= ~(OPOST); /* no output processing */ - term_params.c_lflag &= ~(ISIG|ICANON|ECHO); /* raw mode */ - term_params.c_cc[4] = 1; /* satisfy read after 1 char */ -- ioctl(fileno(stdin), TCSETAF, &term_params); -+ tcsetattr(fileno(stdin), TCSAFLUSH, &term_params); - #endif /* UNIX5 */ - /*printf("\n(raw)\n");*/ - } -@@ -178,7 +178,7 @@ - #endif /* UNIX420 */ - - #ifdef UNIX5 -- ioctl(fileno(stdin), TCSETAF, &old_term_params); -+ tcsetattr(fileno(stdin), TCSAFLUSH, &old_term_params); - #endif /* UNIX5 */ - /*printf("\n(cooked)\n");*/ - } -@@ -1135,7 +1135,7 @@ - /* SENDFILE -- Send a file or, if the file name is NULL or a - single period, send real-time sound input. */ - --static int sendfile(char *f) -+static int sfsendfile(char *f) - { - soundbuf netbuf; - #define buf netbuf.buffer.buffer_val -@@ -2306,7 +2306,7 @@ - return 1; - } - } else { -- int ok = sendfile(op); -+ int ok = sfsendfile(op); - if (ok != 0) - return ok; - sentfile++; -@@ -2318,7 +2318,7 @@ - usage(); - } else { - if (sentfile == 0) { -- return sendfile(NULL); -+ return sfsendfile(NULL); - } - } - diff --git a/mbone/speak_freely/files/patch-ad b/mbone/speak_freely/files/patch-ad deleted file mode 100644 index b0ebafecdf39..000000000000 --- a/mbone/speak_freely/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- adpcm/Makefile.orig Sat Oct 13 15:00:05 2001 -+++ adpcm/Makefile Thu Dec 12 02:47:59 2002 -@@ -2,7 +2,7 @@ - # Makefile for adpcm and test programs - # ------------------- - --CFLAGS = -I.. -+CFLAGS += -I.. - - all: adpcm-u.o - diff --git a/mbone/speak_freely/files/patch-ae b/mbone/speak_freely/files/patch-ae deleted file mode 100644 index 6a3b0db9c2e1..000000000000 --- a/mbone/speak_freely/files/patch-ae +++ /dev/null @@ -1,24 +0,0 @@ - -$FreeBSD$ - ---- soundbyte.c.orig Fri Feb 28 23:18:38 2003 -+++ soundbyte.c Wed Jun 25 19:42:45 2003 -@@ -13,7 +13,9 @@ - #ifdef Solaris - #include <sys/filio.h> - #else -+#ifndef __FreeBSD__ - #include <sys/dir.h> -+#endif - #include <sys/file.h> - #endif - -@@ -32,7 +34,7 @@ - #ifdef LINUX - #include <linux/soundcard.h> - #else /*!LINUX */ --#include <machine/soundcard.h> -+#include <sys/soundcard.h> - #endif /* LINUX */ - #endif /* sun */ - diff --git a/mbone/speak_freely/files/patch-af b/mbone/speak_freely/files/patch-af deleted file mode 100644 index 8f99c43f7cd2..000000000000 --- a/mbone/speak_freely/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- blowfish/Makefile.orig Wed Jan 5 20:12:14 2000 -+++ blowfish/Makefile Wed Jan 5 20:15:02 2000 -@@ -18,7 +18,7 @@ - - MAKE=make -f Makefile - CC=cc --CFLAG= -O -+CFLAG= $(OPTFLAGS) - - #CC=gcc - #CFLAG= -O4 -funroll-loops -fomit-frame-pointer diff --git a/mbone/speak_freely/files/patch-ag b/mbone/speak_freely/files/patch-ag deleted file mode 100644 index 8de3e742784f..000000000000 --- a/mbone/speak_freely/files/patch-ag +++ /dev/null @@ -1,8 +0,0 @@ ---- des/Makefile.orig Wed Jan 5 20:20:30 2000 -+++ des/Makefile Wed Jan 5 20:20:44 2000 -@@ -1,4 +1,4 @@ --CFLAGS=-O -+CFLAGS=$(OPTFLAGS) - - all: des.a - diff --git a/mbone/speak_freely/files/patch-ah b/mbone/speak_freely/files/patch-ah deleted file mode 100644 index 0986b11e721d..000000000000 --- a/mbone/speak_freely/files/patch-ah +++ /dev/null @@ -1,11 +0,0 @@ ---- lpc10/Makefile.orig Wed Jun 9 04:07:02 2004 -+++ lpc10/Makefile Wed Jun 9 04:07:16 2004 -@@ -14,6 +14,8 @@ - placev.o preemp.o random.o round.o rcchk.o setup.o synths.o \ - tbdm.o voice.o voice_nn.o vparms.o - -+CFLAGS += -D_ANSI_SOURCE -+ - LSRC = $(LOBJECTS:.o=.c) - - LIBS = -lm diff --git a/mbone/speak_freely/files/patch-speakfree.h b/mbone/speak_freely/files/patch-speakfree.h deleted file mode 100644 index 8642a62620fa..000000000000 --- a/mbone/speak_freely/files/patch-speakfree.h +++ /dev/null @@ -1,13 +0,0 @@ ---- speakfree.h -+++ speakfree.h -@@ -13,10 +13,6 @@ - #define BSD_like - #endif - --#ifdef __FreeBSD__ --#define BSD_like --#endif -- - #ifdef sgi - #define _BSD_SIGNALS - #endif diff --git a/mbone/speak_freely/pkg-descr b/mbone/speak_freely/pkg-descr deleted file mode 100644 index 5c79a91fcf60..000000000000 --- a/mbone/speak_freely/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ - Speak Freely allows users of a variety of Unix and Unix- - like workstations equipped with audio hardware connected - by a network to converse, using the audio input and output - facilities of the workstation to digitise and later recon- - struct the sound and the network to relay sound packets. - Optional compression is provided, allowing conversations - over relatively low-bandwidth Internet links as well as - local area networks. - -WWW: http://speak-freely.sourceforge.net/ - http://www.fourmilab.ch/speakfree/unix/index.html - http://www.speakfreely.org/ diff --git a/mbone/speak_freely/pkg-plist b/mbone/speak_freely/pkg-plist deleted file mode 100644 index 39a54f5325c1..000000000000 --- a/mbone/speak_freely/pkg-plist +++ /dev/null @@ -1,11 +0,0 @@ -bin/sfspeaker -bin/sfmike -bin/sflwl -bin/sflaunch -sbin/sfecho -sbin/sflwld -sbin/sfreflect -sbin/sfvod -lib/speak_freely/ring.au -lib/speak_freely/busy.au -@dirrm lib/speak_freely diff --git a/mbone/udpcast/Makefile b/mbone/udpcast/Makefile deleted file mode 100644 index 1c33f6320ea4..000000000000 --- a/mbone/udpcast/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# New ports collection makefile for: udpcast -# Date created: Mon Jul 19 19:10:56 UTC 2004 -# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= udpcast -PORTVERSION= 0.${RELEASE_DATE} -CATEGORIES= mbone sysutils -MASTER_SITES= http://udpcast.linux.lu/download/ -DISTNAME= ${PORTNAME}-${RELEASE_DATE} - -MAINTAINER= ports@FreeBSD.org -COMMENT= A file transfer tool using ethernet's multicast - -USE_GMAKE= yes -USE_PERL5_BUILD= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${RELEASE_DATE} - -RELEASE_DATE= 20081213 - -PROGRAM_SBIN_FILES= udp-receiver udp-sender - -PLIST_FILES= sbin/udp-receiver \ - sbin/udp-sender -PORTDOCS= Changelog.txt cmd.html - -MAN1= udp-receiver.1 udp-sender.1 - -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" - -do-install: -.ifndef(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -. for file in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -. endfor -.endif -.for file in ${PROGRAM_SBIN_FILES} - @${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/sbin/ -.endfor -.for file in ${MAN1} - @${INSTALL_MAN} ${WRKSRC}/${file} ${MANPREFIX}/man/man1/ -.endfor - -.include <bsd.port.mk> diff --git a/mbone/udpcast/distinfo b/mbone/udpcast/distinfo deleted file mode 100644 index 66ccd2a93184..000000000000 --- a/mbone/udpcast/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (udpcast-20081213.tar.gz) = 23f3371cb60a1f66f6be12fa98d4d5ca -SHA256 (udpcast-20081213.tar.gz) = 73adac6869e7653ad33a3b92498080a2a0398c60ac78c50a701057325f612d57 -SIZE (udpcast-20081213.tar.gz) = 160550 diff --git a/mbone/udpcast/files/patch-libbb_udpcast.h b/mbone/udpcast/files/patch-libbb_udpcast.h deleted file mode 100644 index 1f2289b163ae..000000000000 --- a/mbone/udpcast/files/patch-libbb_udpcast.h +++ /dev/null @@ -1,13 +0,0 @@ ---- libbb_udpcast.h.orig 2009-02-10 10:07:40.000000000 +0100 -+++ libbb_udpcast.h 2009-02-10 10:06:51.000000000 +0100 -@@ -24,6 +24,10 @@ - #include <malloc.h> - #endif - -+#ifdef HAVE_STDLIB_H -+ #include <stdlib.h> -+#endif -+ - #define xmalloc malloc - - #endif /* BB_VER */ diff --git a/mbone/udpcast/files/patch-participants.h b/mbone/udpcast/files/patch-participants.h deleted file mode 100644 index 6e7ef8da3d7f..000000000000 --- a/mbone/udpcast/files/patch-participants.h +++ /dev/null @@ -1,13 +0,0 @@ ---- participants.h.orig 2005-12-22 23:59:18.000000000 +0100 -+++ participants.h 2009-02-05 12:18:19.000000000 +0100 -@@ -3,6 +3,10 @@ - - #define MAX_CLIENTS 1024 - -+#include <sys/types.h> -+#include <sys/socket.h> -+ -+ - typedef struct participantsDb *participantsDb_t; - - #define isParticipantValid udpc_isParticipantValid diff --git a/mbone/udpcast/files/patch-rateGovernor.c b/mbone/udpcast/files/patch-rateGovernor.c deleted file mode 100644 index 14de493ebb02..000000000000 --- a/mbone/udpcast/files/patch-rateGovernor.c +++ /dev/null @@ -1,28 +0,0 @@ ---- rateGovernor.c.orig 2008-09-20 09:07:29.000000000 +0200 -+++ rateGovernor.c 2009-02-09 08:20:17.000000000 +0100 -@@ -23,6 +23,25 @@ - #define DL_RATE_GOVERNOR - #endif - -+ -+#ifdef __FreeBSD__ -+char * -+strndup(const char *str, size_t n) -+{ -+ size_t len; -+ char *copy; -+ -+ for (len = 0; len < n && str[len]; len++) -+ continue; -+ -+ if ((copy = malloc(len + 1)) == NULL) -+ return (NULL); -+ memcpy(copy, str, len); -+ copy[len] = '\0'; -+ return (copy); -+} -+#endif -+ - void *rgInitGovernor(struct net_config *cfg, struct rateGovernor_t *gov) - { - if(cfg->nrGovernors == MAX_GOVERNORS) { diff --git a/mbone/udpcast/files/patch-socklib.c b/mbone/udpcast/files/patch-socklib.c deleted file mode 100644 index 974921257f31..000000000000 --- a/mbone/udpcast/files/patch-socklib.c +++ /dev/null @@ -1,46 +0,0 @@ ---- socklib.c.orig 2008-09-18 22:43:15.000000000 +0200 -+++ socklib.c 2009-02-10 10:01:40.000000000 +0100 -@@ -18,6 +18,7 @@ - #endif - - #ifdef HAVE_NET_IF_H -+# include <sys/socket.h> - # include <net/if.h> - #endif - -@@ -66,6 +67,8 @@ - # define DEBUG 0 - #endif - -+#undef SIOCGIFINDEX -+ - #ifdef LOSSTEST - /** - * Packet loss/swap testing... -@@ -353,7 +356,7 @@ - - int setTtl(int sock, int ttl) { - /* set the socket to broadcast */ -- return setsockopt(sock, SOL_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(int)); -+ return setsockopt(sock, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(int)); - } - - #ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX -@@ -422,7 +425,7 @@ - - - int setMcastDestination(int sock, net_if_t *net_if, struct sockaddr_in *addr) { --#ifdef WINDOWS -+#if defined(WINDOWS) || defined(__FreeBSD__) - int r; - struct sockaddr_in interface_addr; - struct in_addr if_addr; -@@ -720,7 +723,7 @@ - - net_if->name = strdup(chosen->ifr_name); - --#ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX -+#ifdef HAVE_STRUCT_IP_MREQN_IMR_IFINDEX__TODO - /* Index for multicast subscriptions */ - if(ioctl(s, SIOCGIFINDEX, chosen) < 0) - udpc_fatal(-1, "Error getting index for %s: %s", net_if->name, diff --git a/mbone/udpcast/files/patch-udpr-negotiate.c b/mbone/udpcast/files/patch-udpr-negotiate.c deleted file mode 100644 index c1a1fddbd386..000000000000 --- a/mbone/udpcast/files/patch-udpr-negotiate.c +++ /dev/null @@ -1,29 +0,0 @@ ---- udpr-negotiate.c.orig 2007-05-25 12:01:59.000000000 +0200 -+++ udpr-negotiate.c 2009-02-06 08:18:02.000000000 +0100 -@@ -3,6 +3,10 @@ - #include <errno.h> - #include <sys/stat.h> - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #include "log.h" - #include "socklib.h" - #include "udpcast.h" -@@ -82,13 +86,13 @@ - if(disk_config->fileName != NULL) { - int oflags = O_CREAT | O_WRONLY; - if((disk_config->flags & FLAG_SYNC)) { -- oflags |= O_SYNC; -+ oflags |= O_FSYNC; - } else if( !(disk_config->flags & FLAG_NOSYNC)) { - struct stat buf; - if(stat(disk_config->fileName, &buf) == 0) { - /* If target is device, open it synchronously */ - if(S_ISCHR(buf.st_mode) || S_ISBLK(buf.st_mode)) -- oflags |= O_SYNC; -+ oflags |= O_FSYNC; - } - } - outFile = open(disk_config->fileName, oflags | O_BINARY, 0644); diff --git a/mbone/udpcast/pkg-descr b/mbone/udpcast/pkg-descr deleted file mode 100644 index 834bd3b3e5e3..000000000000 --- a/mbone/udpcast/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -[ excerpt taken from developer's www site ] - -UDPcast is a file transfer tool that can send data simultaneously -to many destinations on a LAN. This can for instance be used to -install entire classrooms of PC's at once. The advantage of UDPcast -over using other methods (nfs, ftp, whatever) is that UDPcast uses -Ethernet's multicast abilities: it won't take longer to install 15 -machines than it would to install just 2. - -WWW: http://udpcast.linux.lu/ diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile deleted file mode 100644 index d0200638bdca..000000000000 --- a/mbone/vat/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# New ports collection makefile for: vat -# Date created: 2 November 1996 -# Whom: fenner -# -# $FreeBSD$ -# - -PORTNAME= vat -PORTVERSION= 4.0b2 -PORTREVISION= 3 -CATEGORIES= mbone tk -MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/ -DISTFILES= vatsrc-4.0b2.tar.gz - -MAINTAINER= ports@FreeBSD.org -COMMENT= The Visual Audio Tool - multicast audioconferencing - -GSM_DIR= ${.CURDIR}/../../audio/gsm -GSM_WORK= ${WRKDIRPREFIX}${GSM_DIR}/work/gsm-1.0-pl13 - -# If configure is changed to look for libgsm.a in ${PREFIX}/lib, then -# we can use this first BUILD_DEPENDS and save some work. -#BUILD_DEPENDS= ${GSM_WORK}/inc/private.h:${GSM_DIR}:patch -BUILD_DEPENDS= ${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build -LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 \ - gsm.1:${GSM_DIR} - -USE_XORG= x11 -USE_AUTOTOOLS= autoconf213 -CONFIGURE_ARGS= --with-gsm=${GSM_WORK} -INSTALL_TARGET= install install-man -MAN1= vat.1 -PLIST_FILES= bin/vat - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "sparc64" -BROKEN= Does not build on sparc64 -.endif - -post-install: - ${STRIP_CMD} ${PREFIX}/bin/vat - -.include <bsd.port.post.mk> diff --git a/mbone/vat/distinfo b/mbone/vat/distinfo deleted file mode 100644 index f5d24f56e817..000000000000 --- a/mbone/vat/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (vatsrc-4.0b2.tar.gz) = ad6bfa8e986be1706e60251dd9c2f204 -SHA256 (vatsrc-4.0b2.tar.gz) = 47ee08fc7ce2c0e39c00fa4eabeadd4eb1aba6de6c14dacc24949849c73015af -SIZE (vatsrc-4.0b2.tar.gz) = 263799 diff --git a/mbone/vat/files/patch-aa b/mbone/vat/files/patch-aa deleted file mode 100644 index 574759971107..000000000000 --- a/mbone/vat/files/patch-aa +++ /dev/null @@ -1,249 +0,0 @@ ---- configure.in.tk.orig Thu May 16 01:06:05 1996 -+++ configure.in.tk Tue Sep 9 11:35:45 1997 -@@ -2,6 +2,7 @@ - dnl $Header: /home/ncvs/ports/mbone/vat/patches/patch-aa,v 1.3 1998/06/26 19:05:34 fenner Exp $ (LBL) - - AC_ARG_WITH(tcl, --with-tcl=path specify a pathname for tcl, d=$withval, d="") -+tclposs="tcl8.3 tcl83 tcl" - if test "$d" != "" ; then - if test ! -d $d ; then - echo "'$d' is not a directory" -@@ -12,22 +13,22 @@ - echo "can't find tcl.h in $d/include" - exit 1 - fi -- places="$d/lib/libtcl7.5.so \ -- $d/lib/libtcl7.5.a \ -- $d/lib/libtcl.so \ -- $d/lib/libtcl.a" - V_LIB_TCL=FAIL -- for dir in $places; do -- if test -r $dir ; then -- V_LIB_TCL=$dir -+ for p in $tclposs; do -+ if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then -+ V_LIB_TCL="-L$d/lib -l$p" -+ break -+ fi -+ if test -r $d/lib/lib$p.a ; then -+ V_LIB_TCL="-L$d/lib -l$p" - break - fi - done -- if test $V_LIB_TCL = FAIL ; then -+ if test "$V_LIB_TCL" = FAIL ; then - echo "can't find libtcl.a in $d/lib" - exit 1 - fi -- places="$d/lib/tcl7.5 \ -+ places="$d/lib/tcl8.3 \ - $d/lib/tcl" - V_LIBRARY_TCL=FAIL - for dir in $places; do -@@ -44,13 +45,14 @@ - AC_TEST_CPP([#include <tcl.h>], V_INCLUDE_TCL="", V_INCLUDE_TCL=FAIL) - if test "$V_INCLUDE_TCL" = FAIL; then - echo "checking for tcl.h" -- places="$PWD/../tcl7.5 \ -- /usr/src/local/tcl7.5 \ -- /import/tcl/include/tcl7.5 \ -+ places="$PWD/../tcl8.3 \ -+ /usr/src/local/tcl8.3 \ -+ /import/tcl/include/tcl8.3 \ - $prefix/include \ - $x_includes/tk \ - $x_includes \ - /usr/local/include \ -+ /usr/local/include/tcl8.3 \ - /usr/contrib/include \ - /usr/include" - for dir in $places; do -@@ -64,7 +66,7 @@ - exit 1 - fi - fi -- AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL") -+ AC_CHECK_LIB(tcl8.3, main, V_LIB_TCL="-ltcl8.3", V_LIB_TCL="FAIL") - if test "$V_LIB_TCL" = FAIL; then - echo "checking for libtcl.a" - places="\ -@@ -73,17 +75,22 @@ - /usr/contrib/lib \ - /usr/local/lib \ - /usr/lib \ -- $PWD/../tcl7.5 \ -- /usr/src/local/tcl7.5 \ -- /import/tcl/lib/tcl7.5 \ -+ $PWD/../tcl8.3 \ -+ /usr/src/local/tcl8.3 \ -+ /import/tcl/lib/tcl8.3 \ - " - for dir in $places; do -- if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then -- V_LIB_TCL="-L$dir -ltcl7.5" -- break -- fi -- if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then -- V_LIB_TCL="-L$dir -ltcl" -+ for p in $tclposs; do -+ if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then -+ V_LIB_TCL="-L$dir -l$p" -+ break -+ fi -+ if test -r $dir/lib$p.a ; then -+ V_LIB_TCL="-L$dir -l$p" -+ break -+ fi -+ done -+ if test "$V_LIB_TCL" != FAIL; then - break - fi - done -@@ -98,15 +105,16 @@ - fi - echo "checking for tcl/init.tcl" - V_LIBRARY_TCL=FAIL -- places="/usr/local/lib/tcl7.5 \ -- /usr/contrib/lib/tcl7.5 \ -- /usr/lib/tcl7.5 \ -- /usr/lib/tk/tcl7.5 \ -- /import/tcl/lib/tcl7.5 \ -- $prefix/lib/tcl7.5 \ -- $x_libraries/tcl7.5 \ -+ places="/usr/local/lib/tcl8.3 \ -+ /usr/contrib/lib/tcl8.3 \ -+ /usr/lib/tcl8.3 \ -+ /usr/lib/tk/tcl8.3 \ -+ /import/tcl/lib/tcl8.3 \ -+ $prefix/lib/tcl8.3 \ -+ $x_libraries/tcl8.3 \ - /usr/local/lib/tcl \ - /usr/lib/tcl \ -+ /usr/libdata/tcl \ - /usr/lib/tk/tcl \ - /import/tcl/lib/tcl \ - $prefix/lib/tcl \ -@@ -128,6 +136,7 @@ - AC_SUBST(V_LIBRARY_TCL) - - AC_ARG_WITH(tk, --with-tk=path specify a pathname for tk, d=$withval, d="") -+tkposs="tk8.3 tk83 tk" - if test "$d" != "" ; then - if test ! -d $d ; then - echo "'$d' is not a directory" -@@ -138,22 +147,22 @@ - echo "can't find tk.h in $d/include" - exit 1 - fi -- places="$d/lib/libtk4.1.so \ -- $d/lib/libtk4.1.a \ -- $d/lib/libtk.so \ -- $d/lib/libtk.a" - V_LIB_TK=FAIL -- for dir in $places; do -- if test -r $dir ; then -- V_LIB_TK=$dir -+ for p in $tkposs; do -+ if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then -+ V_LIB_TK="-L$d/lib -l$p" -+ break -+ fi -+ if test -r $d/lib/lib$p.a ; then -+ V_LIB_TK="-L$d/lib -l$p" - break - fi - done -- if test $V_LIB_TK = FAIL ; then -+ if test "$V_LIB_TK" = FAIL ; then - echo "can't find libtk.a in $d/lib" - exit 1 - fi -- places="$d/lib/tk4.1 \ -+ places="$d/lib/tk8.3 \ - $d/lib/tk" - V_LIBRARY_TK=FAIL - for dir in $places; do -@@ -174,14 +183,15 @@ - places="\ - $prefix/include \ - /usr/local/include \ -+ /usr/local/include/tk8.3 \ - /usr/contrib/include \ - /usr/include/tcl \ - /usr/include\ - $x_includes/tk \ - $x_includes \ -- $PWD/../tk4.1 \ -- /usr/src/local/tk4.1 \ -- /import/tcl/include/tk4.1 \ -+ $PWD/../tk8.3 \ -+ /usr/src/local/tk8.3 \ -+ /import/tcl/include/tk8.3 \ - " - for dir in $places; do - if test -r $dir/tk.h ; then -@@ -194,7 +204,7 @@ - exit 1 - fi - fi -- AC_CHECK_LIB(tk4.1, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL") -+ AC_CHECK_LIB(tk8.3, main, V_LIB_TK="-ltk8.3", V_LIB_TK="FAIL") - if test "$V_LIB_TK" = FAIL; then - echo "checking for libtk.a" - places="/usr/local/lib \ -@@ -202,17 +212,22 @@ - /usr/lib \ - /usr/lib/tk \ - /import/tcl/lib \ -- $PWD/../tk4.1 \ -- /usr/src/local/tk4.1 \ -+ $PWD/../tk8.3 \ -+ /usr/src/local/tk8.3 \ - $prefix/lib \ - $x_libraries" - for dir in $places; do -- if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then -- V_LIB_TK="-L$dir -ltk4.1" -- break -- fi -- if test -r $dir/libtk.so -o -r $dir/libtk.a; then -- V_LIB_TK="-L$dir -ltk" -+ for p in $tkposs; do -+ if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then -+ V_LIB_TK="-L$dir -l$p" -+ break -+ fi -+ if test -r $dir/lib$p.a ; then -+ V_LIB_TK="-L$dir -l$p" -+ break -+ fi -+ done -+ if test "$V_LIB_TK" != FAIL; then - break - fi - done -@@ -227,15 +242,15 @@ - fi - echo "checking for tk/tk.tcl" - V_LIBRARY_TK=FAIL -- places="/usr/local/lib/tk4.1 \ -- /usr/contrib/lib/tk4.1 \ -- /usr/lib/tk4.1 \ -- /usr/lib/tk/tk4.1 \ -- /import/tcl/lib/tk4.1 \ -- $prefix/lib/tk4.1 \ -- $x_libraries/tk4.1 \ -- $PWD/../tk4.1/library \ -- /usr/src/local/tk4.1/library \ -+ places="/usr/local/lib/tk8.3 \ -+ /usr/contrib/lib/tk8.3 \ -+ /usr/lib/tk8.3 \ -+ /usr/lib/tk/tk8.3 \ -+ /import/tcl/lib/tk8.3 \ -+ $prefix/lib/tk8.3 \ -+ $x_libraries/tk8.3 \ -+ $PWD/../tk8.3/library \ -+ /usr/src/local/tk8.3/library \ - /usr/local/lib/tk \ - /usr/lib/tk \ - /usr/lib/tk/tk \ diff --git a/mbone/vat/files/patch-ab b/mbone/vat/files/patch-ab deleted file mode 100644 index 8424b66fc784..000000000000 --- a/mbone/vat/files/patch-ab +++ /dev/null @@ -1,136 +0,0 @@ ---- tkStripchart.c.orig Tue Sep 9 11:00:42 1997 -+++ tkStripchart.c Tue Sep 9 10:52:30 1997 -@@ -148,7 +148,7 @@ - int scrollrequired; - int guarantee_draw; - int grow_up; -- XFontStruct *fontPtr; /* Information about text font, or NULL. */ -+ Tk_Font tkfont; /* Information about text font, or NULL. */ - XColor *textColorPtr; /* Color for drawing text. */ - GC textGC; /* GC for drawing text. */ - XColor *tickColorPtr; /* Color for drawing ticks. */ -@@ -257,7 +257,7 @@ - {TK_CONFIG_SYNONYM, "-fg", "stripcolor", 0, - 0, 0, 0}, - {TK_CONFIG_FONT, "-font", "font", "Font", -- DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, fontPtr), -+ DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, tkfont), - 0}, - {TK_CONFIG_BOOLEAN, "-guaranteedrawing", "guaranteedrawing", - "Guaranteedrawing", DEF_GUARANTEE_DRAW, -@@ -570,8 +570,8 @@ - if (StripchartPtr->value != NULL) - free(StripchartPtr->value); - -- if (StripchartPtr->fontPtr != NULL) -- Tk_FreeFontStruct(StripchartPtr->fontPtr); -+ if (StripchartPtr->tkfont != NULL) -+ Tk_FreeFont(StripchartPtr->tkfont); - - if (StripchartPtr->textColorPtr != NULL) - Tk_FreeColor(StripchartPtr->textColorPtr); -@@ -631,7 +631,7 @@ - - Tk_SetBackgroundFromBorder(StripchartPtr->tkwin, StripchartPtr->border); - -- gcValues.font = StripchartPtr->fontPtr->fid; -+ gcValues.font = Tk_FontId(StripchartPtr->tkfont); - gcValues.foreground = StripchartPtr->textColorPtr->pixel; - newGC = Tk_GetGC(StripchartPtr->tkwin, GCForeground|GCFont, &gcValues); - if (StripchartPtr->textGC != None && StripchartPtr->tkwin) { -@@ -692,8 +692,11 @@ - { - int tt = hasatitle(StripchartPtr); - int bd = StripchartPtr->borderWidth; -- int lineHeight = StripchartPtr->fontPtr->ascent + -- StripchartPtr->fontPtr->descent; -+ Tk_FontMetrics fm; -+ int lineHeight; -+ -+ Tk_GetFontMetrics(StripchartPtr->tkfont, &fm); -+ lineHeight = fm.ascent + fm.descent; - - Tk_GeometryRequest(StripchartPtr->tkwin, - 2 * (bd + PADDING) + StripchartPtr->num_strips * -@@ -726,11 +729,13 @@ - /* - * Variable declarations used in the title drawing routines - */ -- XFontStruct *fp = StripchartPtr->fontPtr; -- XCharStruct bbox; -- int x, dummy; -- int lineHeight = StripchartPtr->fontPtr->ascent + -- StripchartPtr->fontPtr->descent; -+ Tk_Font tkf = StripchartPtr->tkfont; -+ int x; -+ Tk_FontMetrics fm; -+ int lineHeight; -+ -+ Tk_GetFontMetrics(tkf, &fm); -+ lineHeight = fm.ascent + fm.descent; - - StripchartPtr->displaybits &= ~REDRAW_PENDING; - if ((StripchartPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) -@@ -747,18 +752,17 @@ - * space. Otherwise left justified and clipped on the right. - */ - if (tt && StripchartPtr->displaybits & DISPLAY_TITLE) { -- XTextExtents(fp, StripchartPtr->title, -- strlen(StripchartPtr->title), -- &dummy, &dummy, &dummy, &bbox); -- if (bbox.lbearing + bbox.rbearing < Tk_Width(tkwin) - 2 * bd) -- x = (Tk_Width(tkwin) - bbox.lbearing - bbox.rbearing)/2; -+ int width = Tk_TextWidth(tkf, StripchartPtr->title, -+ strlen(StripchartPtr->title)); -+ if (width < Tk_Width(tkwin) - 2 * bd) -+ x = (Tk_Width(tkwin) - width)/2; - else - x = bd + PADDING; - - XClearArea(Tk_Display(tkwin), Tk_WindowId(tkwin), bd, bd, - Tk_Width(tkwin) - 2 * bd, lineHeight + PADDING, False); - XDrawString(Tk_Display(tkwin), Tk_WindowId(tkwin), -- StripchartPtr->textGC, x, fp->max_bounds.ascent + bd, -+ StripchartPtr->textGC, x, fm.ascent + bd, /*XXX no max_bounds */ - StripchartPtr->title, strlen(StripchartPtr->title)); - } - /* -@@ -1057,7 +1061,8 @@ - DrawStripi(Stripchart* SPtr, int i) - { - Tk_Window tkwin = SPtr->tkwin; -- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent; -+ Tk_FontMetrics fm; -+ int lineHeight; - int x = SPtr->borderWidth + PADDING + (i - 1) * SPtr->strip_width; - int y = SPtr->borderWidth + PADDING + - hasatitle(SPtr) * (lineHeight + PADDING); -@@ -1066,6 +1071,9 @@ - double maxv = SPtr->max_value; - double minv = SPtr->min_value; - -+ Tk_GetFontMetrics(SPtr->tkfont, &fm); -+ lineHeight = fm.ascent + fm.descent; -+ - if (i < 1 || i > SPtr->num_strips) - return; - -@@ -1136,7 +1144,8 @@ - ScrollStrips(Stripchart* SPtr) - { - Tk_Window tkwin = SPtr->tkwin; -- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent; -+ Tk_FontMetrics fm; -+ int lineHeight; - int src_x = SPtr->borderWidth + PADDING + SPtr->strip_width; - int src_y = SPtr->borderWidth + PADDING + - hasatitle(SPtr) * (lineHeight + PADDING); -@@ -1144,6 +1153,8 @@ - int dest_y = src_y; - int w = (SPtr->num_strips - 1) * SPtr->strip_width; - int h = SPtr->max_height; -+ -+ Tk_GetFontMetrics(SPtr->tkfont, &fm); - - XCopyArea(Tk_Display(tkwin), Tk_WindowId(tkwin), Tk_WindowId(tkwin), - Tk_GetGC(tkwin, 0, NULL), src_x, src_y, w, h, dest_x, dest_y); diff --git a/mbone/vat/files/patch-ac b/mbone/vat/files/patch-ac deleted file mode 100644 index 42144397d299..000000000000 --- a/mbone/vat/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- main.cc.orig Tue Sep 9 11:17:10 1997 -+++ main.cc Tue Sep 9 11:17:31 1997 -@@ -162,7 +162,7 @@ - else { - Tk_Window tk = t.tkmain(); - Tk_Uid uid = Tk_GetUid((char*)argv[1]); -- XFontStruct* p = Tk_GetFontStruct(t.interp(), tk, uid); -+ Tk_Font p = Tk_GetFont(t.interp(), tk, uid); - t.result(p != 0 ? "1" : "0"); - } - return (TCL_OK); diff --git a/mbone/vat/files/patch-ad b/mbone/vat/files/patch-ad deleted file mode 100644 index 8577e53a9883..000000000000 --- a/mbone/vat/files/patch-ad +++ /dev/null @@ -1,70 +0,0 @@ ---- sitebox.cc.orig Tue Sep 9 11:24:41 1997 -+++ sitebox.cc Tue Sep 9 11:24:43 1997 -@@ -112,7 +112,7 @@ - static Drawable pixmap_; - static int pixw_; - static int pixh_; -- static XFontStruct* fs_; /* font metrics */ -+ static Tk_Font fs_; /* font metrics */ - }; - - class SiteBox : public TkWidget, public IdleCallback { -@@ -160,7 +160,7 @@ - GC Site::copy_gc_; - GC Site::fg_[4]; - GC Site::bg_[4]; --XFontStruct* Site::fs_; -+Tk_Font Site::fs_; - XColor* Site::fc_; - XColor* Site::bc_; - XColor* Site::ac_; -@@ -190,15 +190,16 @@ - sitebox_(sb) - { - Tcl& tcl = Tcl::instance(); -+ Tk_FontMetrics fm; - if (fs_ == 0) { - const char* font = tcl.attr("siteFont"); -- fs_ = Tk_GetFontStruct(tcl.interp(), tk_, (char*)font); -+ fs_ = Tk_GetFont(tcl.interp(), tk_, (char*)font); - if (fs_ == 0) { - fprintf(stderr, - "vat: couldn't find font: %s\n", font); -- fs_ = Tk_GetFontStruct(tcl.interp(), tk_, "screen"); -+ fs_ = Tk_GetFont(tcl.interp(), tk_, "screen"); - if (fs_ == 0) -- fs_ = Tk_GetFontStruct(tcl.interp(), tk_, -+ fs_ = Tk_GetFont(tcl.interp(), tk_, - "fixed"); - if (fs_ == 0) { - fprintf(stderr, -@@ -220,8 +221,9 @@ - - copy_gc_ = sitebox_.lookup_gc(0, 0, 0); - } -- descent_ = fs_->descent; -- ascent_ = fs_->ascent; -+ Tk_GetFontMetrics(fs_, &fm); -+ descent_ = fm.descent; -+ ascent_ = fm.ascent; - major_ = ascent_; - minor_ = major_ / 2; - } -@@ -292,7 +294,7 @@ - */ - inline int Site::textwidth(const char* s) - { -- return (XTextWidth(fs_, s, strlen(s))); -+ return (Tk_TextWidth(fs_, s, strlen(s))); - } - - inline void Site::square(Display* dpy, Drawable window, GC gc, -@@ -450,7 +452,7 @@ - free_gc(bg_[0]); - free_gc(bg_[1]); - } -- Font fid = fs_->fid; -+ Font fid = Tk_FontId(fs_); - fg_[0] = raw_gc(fid, fc_, bc_, pixmap_); - fg_[2] = raw_gc(fid, dc_, bc_, pixmap_); - bg_[0] = raw_gc(fid, bc_, bc_, pixmap_); diff --git a/mbone/vat/files/patch-ae b/mbone/vat/files/patch-ae deleted file mode 100644 index 6ac2e51801f1..000000000000 --- a/mbone/vat/files/patch-ae +++ /dev/null @@ -1,79 +0,0 @@ ---- Tcl.h.orig Sat Mar 16 13:14:34 1996 -+++ Tcl.h Tue Dec 17 14:39:45 1996 -@@ -53,7 +53,8 @@ - inline int dark() const { return (tcl_ == 0); } - inline Tcl_Interp* interp() const { return (tcl_); } - inline char* result() const { return (tcl_->result); } -- inline void result(const char* p) { tcl_->result = (char*)p; } -+ inline void result(const char* p, Tcl_FreeProc* freeProc = TCL_STATIC) -+ { Tcl_SetResult(tcl_, (char *)p, freeProc); } - void resultf(const char* fmt, ...); - inline void CreateCommand(const char* cmd, Tcl_CmdProc* cproc, - ClientData cd = 0, ---- source.cc.orig Thu Apr 4 07:05:45 1996 -+++ source.cc Tue Dec 17 14:38:44 1996 -@@ -251,8 +251,7 @@ - return (TCL_OK); - } - if (strcmp(argv[1], "addr") == 0) { -- strcpy(wrk, InetNtoa(addr_)); -- tcl.result(wrk); -+ tcl.result(InetNtoa(addr_), TCL_DYNAMIC); - return (TCL_OK); - } - if (strcmp(argv[1], "srcid") == 0) { ---- Tcl.cc.orig Tue Apr 2 20:53:27 1996 -+++ Tcl.cc Tue Dec 17 15:45:30 1996 -@@ -65,6 +65,7 @@ - { - instance_.tcl_ = tcl; - instance_.application_ = application; -+ Tcl_Init(tcl); - } - - void Tcl::evalc(const char* s) -@@ -162,6 +163,8 @@ - Tcl& tcl = Tcl::instance(); - if (!tcl.dark()) - tcl.DeleteCommand(name_); -+ if (name_ != 0) -+ delete name_; - TclObject** p; - for (p = &all_; *p != this; p = &(*p)->next_) - ; -@@ -197,8 +200,9 @@ - void TclObject::setproc(const char* s) - { - Tcl& tcl = Tcl::instance(); -- if (name_ != 0 && !tcl.dark()) { -- tcl.DeleteCommand(name_); -+ if (name_ != 0) { -+ if (!tcl.dark()) -+ tcl.DeleteCommand(name_); - delete name_; - } - int n = strlen(s); ---- sitebox.cc.orig 1997/01/07 22:48:27 -+++ sitebox.cc 1997/01/07 23:27:35 -@@ -230,6 +230,10 @@ - - Site::~Site() - { -+ if (text_) -+ delete text_; -+ if (tag_) -+ delete tag_; - } - - int Site::command(int argc, const char*const* argv) -@@ -638,8 +642,8 @@ - need_sort_ = 0; - - Tcl& tcl = Tcl::instance(); -- Tk_Uid fg = mono()? "black" : (char*)tcl.attr("foreground"); -- Tk_Uid bg = mono()? "white" : (char*)tcl.attr("background"); -+ Tk_Uid fg = mono()? (char*)"black" : (char*)tcl.attr("foreground"); -+ Tk_Uid bg = mono()? (char*)"white" : (char*)tcl.attr("background"); - fg_ = lookup_gc(0, fg, bg); - bg_ = lookup_gc(0, bg, bg); - } diff --git a/mbone/vat/files/patch-af b/mbone/vat/files/patch-af deleted file mode 100644 index 85e74ea80447..000000000000 --- a/mbone/vat/files/patch-af +++ /dev/null @@ -1,128 +0,0 @@ ---- net.cc.orig Thu Mar 21 03:49:18 1996 -+++ net.cc Sun Dec 3 19:04:01 2006 -@@ -163,46 +163,49 @@ - { - int cc = ::send(fd, (char*)buf, len, 0); - if (cc < 0) { -- switch (errno) { -+ /* -+ * Due to a bug in kern/uipc_socket.c, on several -+ * systems, datagram sockets incorrectly persist -+ * in an error state on receipt of any ICMP -+ * error. This causes unicast connection -+ * rendezvous problems, and worse, multicast -+ * transmission problems because several systems -+ * incorrectly send port unreachables for -+ * multicast destinations. Our work around -+ * is to call getsockopt(..., SO_ERROR, ...) -+ * which resets so->so_error. -+ * -+ * This bug originated at CSRG in Berkeley -+ * and was present in the BSD Reno networking -+ * code release. It has since been fixed -+ * in OSF-3.x. It is know to remain -+ * in 4.4BSD and AIX-4.1.3. -+ * -+ * A fix is to change the following lines from -+ * kern/uipc_socket.c: -+ * -+ * if (so_serror) -+ * snderr(so->so_error); -+ * -+ * to: -+ * -+ * if (so->so_error) { -+ * error = so->so_error; -+ * so->so_error = 0; -+ * splx(s); -+ * goto release; -+ * } -+ * -+ */ -+ int err, savederrno; -+ socklen_t errlen = sizeof(err); -+ -+ savederrno = errno; -+ getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, -+ &errlen); -+ switch (savederrno) { - case ECONNREFUSED: - /* no one listening at some site - ignore */ --#if defined(__osf__) || defined(_AIX) -- /* -- * Due to a bug in kern/uipc_socket.c, on several -- * systems, datagram sockets incorrectly persist -- * in an error state on receipt of an ICMP -- * port-unreachable. This causes unicast connection -- * rendezvous problems, and worse, multicast -- * transmission problems because several systems -- * incorrectly send port unreachables for -- * multicast destinations. Our work around -- * is to simply close and reopen the socket -- * (by calling reset() below). -- * -- * This bug originated at CSRG in Berkeley -- * and was present in the BSD Reno networking -- * code release. It has since been fixed -- * in 4.4BSD and OSF-3.x. It is know to remain -- * in AIX-4.1.3. -- * -- * A fix is to change the following lines from -- * kern/uipc_socket.c: -- * -- * if (so_serror) -- * snderr(so->so_error); -- * -- * to: -- * -- * if (so->so_error) { -- * error = so->so_error; -- * so->so_error = 0; -- * splx(s); -- * goto release; -- * } -- * -- */ -- reset(); --#endif - break; - - case ENETUNREACH: -@@ -217,7 +220,7 @@ - * icmp unreachable, so we should be able to - * send now. - */ -- (void)::send(ssock_, (char*)buf, len, 0); -+ (void)::send(fd, (char*)buf, len, 0); - break; - - default: -@@ -264,12 +267,15 @@ - } - int cc = ::sendmsg(ssock_, (msghdr*)&mh, 0); - if (cc < 0) { -- switch (errno) { -+ int err, savederrno; -+ socklen_t errlen = sizeof(err); -+ -+ savederrno = errno; -+ getsockopt(ssock_, SOL_SOCKET, SO_ERROR, &err, -+ &errlen); -+ switch (savederrno) { - case ECONNREFUSED: - /* no one listening at some site - ignore */ --#if defined(__osf__) || defined(_AIX) -- reset(); --#endif - break; - - case ENETUNREACH: -@@ -297,7 +303,7 @@ - int Network::dorecv(u_char* buf, int len, u_int32_t& from, int fd) - { - sockaddr_in sfrom; -- int fromlen = sizeof(sfrom); -+ socklen_t fromlen = sizeof(sfrom); - int cc = ::recvfrom(fd, (char*)buf, len, 0, - (sockaddr*)&sfrom, &fromlen); - if (cc < 0) { diff --git a/mbone/vat/files/patch-ag b/mbone/vat/files/patch-ag deleted file mode 100644 index c4735e351557..000000000000 --- a/mbone/vat/files/patch-ag +++ /dev/null @@ -1,45 +0,0 @@ ---- ui-resource.tcl.orig Tue Mar 12 07:32:56 1996 -+++ ui-resource.tcl Thu Feb 19 10:48:04 1998 -@@ -111,32 +111,24 @@ - # - option add *tearOff 0 - -- # -- # Make the color scheme a little darker than the default gray. -- # Go through all the palette resources and raise the option data -- # base priority from widgetDefault to 61 so that user's X resources -- # won't override these. -- # -- tk_setPalette gray80 -- foreach option [array names tkPalette] { -- option add *$option $tkPalette($option) 61 -- } -- - option add *highlightThickness 0 - - option add *Radiobutton.relief flat startupFile - option add *Checkbutton.anchor w startupFile - option add *Radiobutton.anchor w startupFile - option add *Radiobutton.relief flat startupFile -- option add *Scale.sliderForeground gray66 startupFile -- option add *Scale.activeForeground gray80 startupFile -- option add *Scale.background gray70 startupFile - -- # vat widgets -- option add Vat.disabledColor gray50 startupFile -- option add Vat.highlightColor gray95 startupFile -+ # add color defaults for vat widgets - where possible, use -+ # the platform specific values compiled into tk widgets -+ scale .junk -+ option add *foreground [.junk cget -foreground] widgetDefault -+ option add *background [.junk cget -background] widgetDefault -+ option add *activeBackground [.junk cget -activebackground] widgetDefault -+ destroy .junk -+ -+ option add *highlightColor white widgetDefault - option add Vat.infoHighlightColor LightYellow2 startupFile -- option add *VatVU.foreground black startupFile -+ option add Vat.disabledColor gray50 startupFile - option add *VatVU.peak gray50 startupFile - option add *VatVU.hot firebrick1 startupFile - option add *VatVU.hotLevel 90 startupFile diff --git a/mbone/vat/files/patch-ah b/mbone/vat/files/patch-ah deleted file mode 100644 index 596513307334..000000000000 --- a/mbone/vat/files/patch-ah +++ /dev/null @@ -1,577 +0,0 @@ ---- audio-voxware.cc.orig Fri Apr 26 05:22:37 1996 -+++ audio-voxware.cc Sat May 10 00:15:51 2003 -@@ -1,4 +1,6 @@ - /* -+ * Modifications (C) 1997-1998 by Luigi Rizzo and others. -+ * - * Copyright (c) 1991-1993 Regents of the University of California. - * All rights reserved. - * -@@ -33,31 +35,43 @@ - static const char rcsid[] = - "@(#) $Header: audio-voxware.cc,v 1.10 96/04/26 05:22:05 van Exp $ (LBL)"; - --#include <string.h> --#include <sys/fcntl.h> --#include <errno.h> --#if defined(sco) || defined(__bsdi__) --#include <sys/socket.h> --#endif --#if defined(__FreeBSD__) --#include <sys/types.h> --#include <sys/uio.h> --#include <unistd.h> --#include <machine/soundcard.h> -+ -+/* -+ * Full Duplex audio module for the new sound driver and full duplex -+ * cards. Luigi Rizzo, from original sources supplied by Amancio Hasty. -+ * -+ * This includes some enhancements: -+ * - the audio device to use can be in the AUDIODEV env. variable. -+ * It can be either a unit number or a full pathname; -+ * - use whatever format is available from the card (included split -+ * format e.g. for the sb16); -+ * - limit the maximum size of the playout queue to approx 4 frames; -+ * this is necessary if the write channel is slower than expected; -+ * the fix is based on two new ioctls, AIOGCAP and AIONWRITE, -+ * but the code should compile with the old driver as well. -+ */ -+ -+#if !defined(__FreeBSD__) || (__FreeBSD__ < 4) -+#include <osfcn.h> - #else --#include <sys/soundcard.h> -+#include <fcntl.h> - #endif -+#include <sys/soundcard.h> - #include "audio.h" -+#include "mulaw.h" - #include "Tcl.h" - - #define ULAW_ZERO 0x7f -+ -+/* for use in the Voxware driver */ - #define ABUFLOG2 8 --#define ABUFLEN (1 << ABUFLOG2) - #define NFRAG 5 - --class VoxWareAudio : public Audio { -+extern const u_char lintomulawX[]; -+ -+class VoxWare : public Audio { - public: -- VoxWareAudio(); -+ VoxWare(); - virtual int FrameReady(); - virtual u_char* Read(); - virtual void Write(u_char *); -@@ -66,163 +80,415 @@ - virtual void OutputPort(int); - virtual void InputPort(int); - virtual void Obtain(); -+ virtual void Release(); - virtual void RMute(); - virtual void RUnmute(); - virtual int HalfDuplex() const; - protected: -+ int ext_fd; /* source for external file */ - -- u_char* readptr; -- u_char* readbufend; - u_char* readbuf; -+ u_short *s16_buf; -+ -+ int play_fmt ; -+ int is_half_duplex ; -+ -+ // new sound driver -+ int rec_fmt ; /* the sb16 has split format... */ -+ snd_capabilities soundcaps; - -- u_char* ubufptr; -- u_char* ubufend; -- u_char* ubuf; -- -- u_char* writeptr; -- u_char* writebufend; -- u_char* writebuf; - }; - --static class VoxWareAudioMatcher : public Matcher { -+static class VoxWareMatcher : public Matcher { - public: -- VoxWareAudioMatcher() : Matcher("audio") {} -+ VoxWareMatcher() : Matcher("audio") {} - TclObject* match(const char* fmt) { - if (strcmp(fmt, "voxware") == 0) -- return (new VoxWareAudio); -- else -+ return (new VoxWare); - return (0); - } --} voxware_audio_matcher; -+} linux_audio_matcher; - --VoxWareAudio::VoxWareAudio() -+VoxWare::VoxWare() - { -- readbuf = new u_char[ABUFLEN]; -- readptr = readbufend = readbuf + ABUFLEN; -+ readbuf = new u_char[blksize]; -+ s16_buf = new u_short[blksize]; - -- writeptr = writebuf = new u_char[ABUFLEN]; -- writebufend = writebuf + ABUFLEN; -+ memset(readbuf, ULAW_ZERO, blksize); - -- ubufptr = ubuf = new u_char[blksize]; -- ubufend = ubuf + blksize; -- memset(ubuf, ULAW_ZERO, blksize); -+ ext_fd = -1 ; /* no external audio */ -+ iports = 4; /* number of input ports */ - } - --int VoxWareAudio::HalfDuplex() const -+void -+VoxWare::Obtain() - { -- /*XXX change this if full duplex audio device available*/ -- return 1; --} -+ char *thedev; -+ char buf[64]; -+ int d = -1; - --void VoxWareAudio::Obtain() --{ - if (HaveAudio()) - abort(); -- -- fd = open("/dev/audio", O_RDWR|O_NDELAY); -+ is_half_duplex = 0 ; -+ /* -+ * variable AUDIODEV has the name of the audio device. -+ * With the new audio driver, the main device can also control -+ * the mixer, so there is no need to carry two descriptors around. -+ */ -+ thedev=getenv("AUDIODEV"); -+ if (thedev==NULL) -+ thedev="/dev/audio"; -+ else if ( thedev[0] >= '0' && thedev[0] <= '9' ) { -+ d = atoi(thedev); -+ sprintf(buf,"/dev/audio%d", d); -+ thedev = buf ; -+ } -+ fd = open(thedev, O_RDWR ); - if (fd >= 0) { -- int on = 1; -- ioctl(fd, FIONBIO, &on); -+ int i = -1 ; -+ u_long fmt = 0 ; -+ int rate = 8000 ; -+ -+ snd_chan_param pa; -+ struct snd_size sz; -+ i = ioctl(fd, AIOGCAP, &soundcaps); -+ fmt = soundcaps.formats ; /* can be invalid, check later */ -+ -+ play_fmt = AFMT_MU_LAW ; -+ rec_fmt = AFMT_MU_LAW ; -+ -+ if (i == -1 ) { /* setup code for old voxware driver */ -+ i = ioctl(fd, SNDCTL_DSP_GETFMTS, &fmt); -+ fmt &= AFMT_MU_LAW ; /* only use mu-law */ -+ fmt |= AFMT_FULLDUPLEX ; -+ if ( i < 0 ) { /* even voxware driver failed, try with pcaudio */ -+ fmt = AFMT_MU_LAW | AFMT_WEIRD ; -+ } -+ } -+ switch (soundcaps.formats & (AFMT_FULLDUPLEX | AFMT_WEIRD)) { -+ case AFMT_FULLDUPLEX : -+ /* -+ * this entry for cards with decent full duplex. Use s16 -+ * preferably (some are broken in ulaw) or ulaw or u8 otherwise. -+ */ -+ if (fmt & AFMT_S16_LE) -+ play_fmt = rec_fmt = AFMT_S16_LE ; -+ else if (soundcaps.formats & AFMT_MU_LAW) -+ play_fmt = rec_fmt = AFMT_MU_LAW ; -+ else if (soundcaps.formats & AFMT_U8) -+ play_fmt = rec_fmt = AFMT_U8 ; -+ else { -+ printf("sorry, no supported formats\n"); -+ close(fd); -+ fd = -1 ; -+ return; -+ } -+ break ; -+ case AFMT_FULLDUPLEX | AFMT_WEIRD : -+ /* this is the sb16... */ -+ if (fmt & AFMT_S16_LE) { -+ play_fmt = AFMT_U8 ; -+ rec_fmt = AFMT_S16_LE; -+ } else { -+ printf("sorry, no supported formats\n"); -+ close(fd); -+ fd = -1 ; -+ return; -+ } -+ break ; -+ default : -+ printf("sorry don't know how to deal with this card\n"); -+ close (fd); -+ fd = -1; -+ return; -+ } - -- int frag = (NFRAG << 16) | ABUFLOG2; -- ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag); --#ifdef fullduplex -+ pa.play_format = play_fmt ; -+ pa.rec_format = rec_fmt ; -+ pa.play_rate = pa.rec_rate = rate ; -+ ioctl(fd, AIOSFMT, &pa); /* if this fails, also AIOSSIZE will.. */ -+ sz.play_size = (play_fmt == AFMT_S16_LE) ? 2*blksize : blksize; -+ sz.rec_size = (rec_fmt == AFMT_S16_LE) ? 2*blksize : blksize; -+ i = ioctl(fd, AIOSSIZE, &sz); -+ -+ /* -+ * Set the line input level to 0 to avoid loopback if the mic -+ * is connected to the line-in port (e.g. through an echo -+ * canceller). -+ */ -+ int v = 0; -+ (void)ioctl(fd, MIXER_WRITE(SOUND_MIXER_LINE), &v); -+ // restore hardware settings in case some other vat changed them -+ InputPort(iport); -+ SetRGain(rgain); -+ SetPGain(pgain); -+ -+ if ( i < 0 ) { // if AIOSSIZE fails, maybe this is a Voxware driver -+ ioctl(fd, SNDCTL_DSP_SPEED, &rate); -+ ioctl(fd, SNDCTL_DSP_SETFMT, &play_fmt); // same for play/rec -+ d = (play_fmt == AFMT_S16_LE) ? 2*blksize : blksize; -+ ioctl(fd, SNDCTL_DSP_SETBLKSIZE, &d); -+ read(fd, &i, 1); /* dummy read to start read engine */ -+ } - Audio::Obtain(); --#else -- notify(); --#endif -+ } else { -+ fprintf(stderr, "failed to open rw...\n"); -+ fd = open(thedev, O_WRONLY ); -+ fprintf(stderr, "open wronly returns %d\n", fd); -+ is_half_duplex = 1 ; -+ play_fmt = rec_fmt = AFMT_MU_LAW ; -+ notify(); /* XXX */ - } - } - --void VoxWareAudio::Write(u_char *cp) -+/* -+ * note: HalfDuplex() uses a modified function of the new driver, -+ * which will return AFMT_FULLDUPLEX set in SNDCTL_DSP_GETFMTS -+ * for full-duplex devices. In the old driver this was 0 so -+ * the default is to use half-duplex for them. Note also that I have -+ * not tested half-duplex operation. -+ */ -+int -+VoxWare::HalfDuplex() const - { -- if (HaveAudio() && (rmute & 1) != 0) { -- register u_char *cpend = cp + blksize; -- register u_char *wbuf = writeptr; -- register u_char *wend = writebufend; -- for ( ; cp < cpend; cp += 4) { -- wbuf[0] = cp[0]; -- wbuf[1] = cp[1]; -- wbuf[2] = cp[2]; -- wbuf[3] = cp[3]; -- wbuf += 4; -- if (wbuf >= wend) { -- wbuf = writebuf; -- if (write(fd, (char*)wbuf, ABUFLEN) != ABUFLEN) -- perror("aud write"); -- } -- } -- writeptr = wbuf; -+ int i, probed_duplex = 0; -+ -+ /* newpcm style */ -+#ifdef SNDCTL_DSP_GETCAPS -+ ioctl(fd, SNDCTL_DSP_GETCAPS, &i); -+ probed_duplex |= (i & DSP_CAP_DUPLEX); -+#endif /* SNDCTL_DSP_GETCAPS */ -+ -+ /* pcm style */ -+#ifdef SNDCTL_DSP_GETFMTS -+ ioctl(fd, SNDCTL_DSP_GETFMTS, &i); -+ probed_duplex |= (i & AFMT_FULLDUPLEX); -+#endif /* SNDCTL_DSP_GETFMTS */ -+ -+ if (is_half_duplex || (probed_duplex == 0)) { -+ fprintf(stderr, "HalfDuplex returns 1\n"); -+ return 1 ; - } -+ -+ return 0; - } - --int VoxWareAudio::FrameReady() -+void VoxWare::Release() - { -- if ((rmute & 1) == 0) { -- register u_char* cp = ubufptr; -- register u_char* cpend = ubufend; -- register u_char* rbuf = readptr; -- register u_char* rend = readbufend; -- -- for ( ; cp < cpend; cp += 4) { -- if (rbuf >= rend) { -- rbuf = readbuf; -- int cc = read(fd, (char*)rbuf, ABUFLEN); -- if (cc <= 0) { -- ubufptr = cp; -- readbufend = rbuf; -- if (cc == -1 && errno != EAGAIN) { -- Release(); -- Obtain(); -- } -- return (0); -+ if (HaveAudio()) { -+ Audio::Release(); - } -- readbufend = rend = rbuf + cc; - } -- cp[0] = rbuf[0]; -- cp[1] = rbuf[1]; -- cp[2] = rbuf[2]; -- cp[3] = rbuf[3]; -- rbuf += 4; -+ -+void VoxWare::Write(u_char *cp) -+{ -+ int i = blksize, l; -+ if (play_fmt == AFMT_S16_LE) { -+ for (i=0; i< blksize; i++) -+ s16_buf[i] = mulawtolin[cp[i]] ; -+ cp = (u_char *)s16_buf; -+ i = 2 *blksize ; -+ } else if (play_fmt == AFMT_S8) { -+ for (i=0; i< blksize; i++) { -+ int x = mulawtolin[cp[i]] ; -+ x = (x >> 8 ) & 0xff; -+ cp[i] = (u_char)x ; -+ } -+ i = blksize ; -+ } else if (play_fmt == AFMT_U8) { -+ for (i=0; i< blksize; i++) { -+ int x = mulawtolin[cp[i]] ; -+ /* -+ * when translating to 8-bit formats, it would be useful to -+ * implement AGC to avoid loss of resolution in the conversion. -+ * This code is still incomplete... -+ */ -+#if 0 /* AGC -- still not complete... */ -+ static int peak = 0; -+ if (x < 0) x = -x ; -+ if (x > peak) peak = ( peak*16 + x - peak ) / 16 ; -+ else peak = ( peak*8192 + x - peak ) / 8192 ; -+ if (peak < 128) peak = 128 ; -+ /* at this point peak is in the range 128..32k -+ * samples can be scaled and clipped consequently. -+ */ -+ x = x * 32768/peak ; -+ if (x > 32767) x = 32767; -+ else if (x < -32768) x = -32768; -+#endif -+ x = (x >> 8 ) & 0xff; -+ x = (x ^ 0x80) & 0xff ; -+ cp[i] = (u_char)x ; -+ } -+ i = blksize ; -+ } -+#if 0 -+ // this code is meant to keep the queue short. -+ int r, queued; -+ r = ioctl(fd, AIONWRITE, &queued); -+ queued = soundcaps.bufsize - queued ; -+ if (play_fmt == AFMT_S16_LE) { -+ if (queued > 8*blksize) -+ i -= 8 ; -+ } else { -+ if (queued > 4*blksize) -+ i -= 4 ; - } -- readptr = rbuf; -+#endif -+ for ( ; i > 0 ; i -= l) { -+ l = write(fd, cp, i); -+ cp += l; - } -- return (1); - } - --u_char* VoxWareAudio::Read() -+u_char* VoxWare::Read() - { -- u_char* cp = ubuf; -- ubufptr = cp; -- return (cp); -+ u_char* cp; -+ int l=0, l0 = blksize, i = blksize; -+ -+ cp = readbuf; -+ -+ if (rec_fmt == AFMT_S16_LE) { -+ cp = (u_char *)s16_buf; -+ l0 = i = 2 *blksize ; -+ } -+ for ( ; i > 0 ; i -= l ) { -+ l = read(fd, cp, i); -+ if (l<0) break; -+ cp += l ; -+ } -+ if (rec_fmt == AFMT_S16_LE) { -+ for (i=0; i< blksize; i++) { -+#if 1 /* remove DC component... */ -+ static int smean = 0 ; /* smoothed mean to remove DC */ -+ int dif = ((short) s16_buf[i]) - (smean >> 13) ; -+ smean += dif ; -+ readbuf[i] = lintomulawX[ dif & 0x1ffff ] ; -+#else -+ readbuf[i] = lintomulaw[ s16_buf[i] ] ; -+#endif -+ } -+ } -+ else if (rec_fmt == AFMT_S8) { -+ for (i=0; i< blksize; i++) -+ readbuf[i] = lintomulaw[ readbuf[i]<<8 ] ; -+ } -+ else if (rec_fmt == AFMT_U8) { -+ for (i=0; i< blksize; i++) -+ readbuf[i] = lintomulaw[ (readbuf[i]<<8) ^ 0x8000 ] ; -+ } -+ if (iport == 3) { -+ l = read(ext_fd, readbuf, blksize); -+ if (l < blksize) { -+ lseek(ext_fd, (off_t) 0, 0); -+ read(ext_fd, readbuf+l, blksize - l); -+ } -+ } -+ return readbuf; - } - --void VoxWareAudio::SetRGain(int level) -+/* -+ * should check that I HaveAudio() before trying to set gain. -+ * -+ * In most mixer devices, there is only a master volume control on -+ * the capture channel, so the following code does not really work -+ * as expected. The only (partial) exception is the MIC line, where -+ * there is generally a 20dB boost which can be enabled or not -+ * depending on the type of device. -+ */ -+void VoxWare::SetRGain(int level) - { -+ double x = level; -+ level = (int) (x/2.56); -+ int foo = (level<<8) | level; -+ if (!HaveAudio()) -+ Obtain(); -+ switch (iport) { -+ case 2: -+ case 1: -+ break; -+ case 0: -+ if (ioctl(fd, MIXER_WRITE(SOUND_MIXER_MIC), &foo) == -1) -+ printf("failed to set mic volume \n"); -+ break; -+ } -+ /* IGAIN tends to be found on SB-like mixers, RECLEV on AC97 */ -+ if ((ioctl(fd, MIXER_WRITE(SOUND_MIXER_IGAIN), &foo) == -1) && -+ (ioctl(fd, MIXER_WRITE(SOUND_MIXER_RECLEV), &foo) == -1)) -+ printf("failed set input line volume \n"); - rgain = level; - } - --void VoxWareAudio::SetPGain(int level) -+void VoxWare::SetPGain(int level) - { -+ float x = level; -+ level = (int) (x/2.56); -+ int foo = (level<<8) | level; -+ if (ioctl(fd, MIXER_WRITE(SOUND_MIXER_PCM), &foo) == -1) { -+ printf("failed to output level %d \n", level); -+ } - pgain = level; - } - --void VoxWareAudio::OutputPort(int p) -+void VoxWare::OutputPort(int p) - { - oport = p; - } - --void VoxWareAudio::InputPort(int p) -+void VoxWare::InputPort(int p) - { -+ int src = 0; -+ -+ if (ext_fd >= 0 && p != 3) { -+ close(ext_fd); -+ ext_fd = -1 ; -+ } -+ -+ switch(p) { -+ case 3: -+ if (ext_fd == -1) -+ ext_fd = open(ext_fname, 0); -+ if (ext_fd != -1) -+ lseek(ext_fd, (off_t) 0, 0); -+ break; -+ case 2: -+ src = 1 << SOUND_MIXER_LINE; -+ break; -+ case 1: /* cd ... */ -+ src = 1 << SOUND_MIXER_CD; -+ break; -+ case 0 : -+ src = 1 << SOUND_MIXER_MIC; -+ break; -+ } -+ if ( ioctl(fd, SOUND_MIXER_WRITE_RECSRC, &src) == -1 ) { -+ printf("failed to select input \n"); -+ p = 0; -+ } - iport = p; - } - --void VoxWareAudio::RMute() -+void VoxWare::RMute() - { - rmute |= 1; - } - --void VoxWareAudio::RUnmute() -+void VoxWare::RUnmute() - { - rmute &=~ 1; - } -+ -+/* -+ * FrameReady must return 0 every so often, or the system will keep -+ * processing mike data and not other events. -+ */ -+int VoxWare::FrameReady() -+{ -+ int i, l = 0; -+ int lim = blksize; -+ -+ i = ioctl(fd, FIONREAD, &l ); -+ if (rec_fmt == AFMT_S16_LE) lim = 2*blksize; -+ return (l >= lim) ? 1 : 0 ; -+} -+/*** end of file ***/ diff --git a/mbone/vat/files/patch-ai b/mbone/vat/files/patch-ai deleted file mode 100644 index 15a8677d87c7..000000000000 --- a/mbone/vat/files/patch-ai +++ /dev/null @@ -1,20 +0,0 @@ ---- iohandler.cc.orig Sun Nov 28 18:49:59 1999 -+++ iohandler.cc Sun Nov 28 18:50:46 1999 -@@ -132,7 +132,7 @@ - - } - #else -- Tk_CreateFileHandler((ClientData)fd, mask, callback, (ClientData)this); -+ Tk_CreateFileHandler(fd, mask, callback, (ClientData)this); - #endif - } - -@@ -151,7 +151,7 @@ - } - #else - if (fd_ >= 0) { -- Tk_DeleteFileHandler((ClientData)fd_); -+ Tk_DeleteFileHandler(fd_); - fd_ = -1; - } - #endif diff --git a/mbone/vat/files/patch-aj b/mbone/vat/files/patch-aj deleted file mode 100644 index 5ee097c986d3..000000000000 --- a/mbone/vat/files/patch-aj +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Thu Jan 27 18:55:52 2000 -+++ Makefile.in Thu Jan 27 18:56:07 2000 -@@ -39,7 +39,7 @@ - all: $(ALL) - - .cc.o: -- rm -f $@; $(C++) -c $(CFLAGS) $*.cc -+ rm -f $@; $(C++) -pedantic -c $(CFLAGS) $*.cc - - .c.o: - rm -f $@; $(CC) -o $@ -c $(CFLAGS) $*.c diff --git a/mbone/vat/files/patch-ak b/mbone/vat/files/patch-ak deleted file mode 100644 index d45528e48bc6..000000000000 --- a/mbone/vat/files/patch-ak +++ /dev/null @@ -1,21 +0,0 @@ ---- old/audio.cc Fri May 3 13:27:20 1996 -+++ audio.cc Thu Apr 16 21:36:33 1998 -@@ -70,6 +70,7 @@ - filter(new Filter(this)), - handler_(0) - { -+ ext_fname[0]='\0'; - for (u_int i = 0; i < sizeof(omode)/sizeof(omode[0]); ++i) - omode[i] = mode_mikemutesnet; - } -@@ -479,6 +480,10 @@ - *cp++ = '\0'; - return (TCL_OK); - } -+ } else if (strcmp(argv[1], "filename") == 0) { -+ strncpy(ext_fname, argv[2], sizeof(ext_fname)); -+ InputPort(input_line3); -+ return (TCL_OK); - } - } else if (argc == 4) { - if (strcmp(argv[1], "input") == 0) { diff --git a/mbone/vat/files/patch-al b/mbone/vat/files/patch-al deleted file mode 100644 index 1ce8088f62c8..000000000000 --- a/mbone/vat/files/patch-al +++ /dev/null @@ -1,10 +0,0 @@ ---- old/audio.h Fri Apr 26 12:00:44 1996 -+++ audio.h Fri Feb 20 13:44:01 1998 -@@ -158,6 +158,7 @@ - int rgain, pgain; - Filter *filter; - AudioHandler* handler_; -+ char ext_fname[256]; - }; - - #endif diff --git a/mbone/vat/files/patch-am b/mbone/vat/files/patch-am deleted file mode 100644 index b3d22bbf4ed4..000000000000 --- a/mbone/vat/files/patch-am +++ /dev/null @@ -1,22 +0,0 @@ ---- old/bitmaps/linein3.xbm Fri May 3 12:18:11 1996 -+++ bitmaps/linein3.xbm Wed Oct 29 11:07:34 1997 -@@ -1,11 +1,11 @@ - #define linein3_width 30 - #define linein3_height 24 - static char linein3_bits[] = { -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, -- 0x00, 0x80, 0xff, 0x00, 0x00, 0xe0, 0xc1, 0x03, 0x00, 0x70, 0x04, 0x07, -- 0x00, 0x30, 0x0c, 0x06, 0x00, 0x18, 0x18, 0x0c, 0x00, 0x18, 0x30, 0x0c, -- 0x00, 0x0c, 0x60, 0x18, 0xe0, 0xff, 0xff, 0x18, 0xe0, 0xff, 0xff, 0x19, -- 0xe0, 0xff, 0xff, 0x18, 0x00, 0x0c, 0x60, 0x18, 0x00, 0x18, 0x30, 0x0c, -- 0x18, 0x18, 0x18, 0x0c, 0x24, 0x30, 0x0c, 0x06, 0x20, 0x70, 0x04, 0x07, -- 0x18, 0xe0, 0xc1, 0x03, 0x10, 0x80, 0xff, 0x00, 0x20, 0x00, 0x3e, 0x00, -- 0x24, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -+ 0x00, 0x00, 0x00, 0x00, 0x7c, 0x1b, 0x3e, 0x00, 0x0c, 0x1b, 0x06, 0x00, -+ 0x0c, 0x1b, 0x06, 0x00, 0x3c, 0x1b, 0x1e, 0x00, 0x0c, 0x1b, 0x06, 0x00, -+ 0x0c, 0x1b, 0x06, 0x00, 0x0c, 0xfb, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x70, 0x00, 0x80, 0x0f, 0xf8, 0x00, -+ 0xc0, 0x18, 0x8c, 0x01, 0x60, 0x30, 0x06, 0x03, 0x60, 0x30, 0x06, 0x03, -+ 0x60, 0x30, 0x06, 0x03, 0xc0, 0x18, 0x8c, 0x01, 0x80, 0xff, 0xff, 0x00, -+ 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; diff --git a/mbone/vat/files/patch-an b/mbone/vat/files/patch-an deleted file mode 100644 index 108d0e8ac475..000000000000 --- a/mbone/vat/files/patch-an +++ /dev/null @@ -1,45 +0,0 @@ ---- old/ui-main.tcl Fri May 3 13:27:22 1996 -+++ ui-main.tcl Sat Feb 21 06:02:59 1998 -@@ -373,9 +373,9 @@ - } - mk.obuttons $w.frame.buttons - frame $w.frame.ssthresh -- # mk.ssthresh $w.frame.ssthresh -- #pack $w.frame.radios $w.frame.buttons $w.frame.ssthresh \ -- # -anchor c -pady 4 -+ mk.ssthresh $w.frame.ssthresh -+ pack $w.frame.radios $w.frame.buttons $w.frame.ssthresh \ -+ -anchor c -pady 4 - pack $w.frame.radios $w.frame.buttons \ - -anchor c -pady 4 - pack $w.label $w.frame -expand 1 -fill x -@@ -515,6 +515,12 @@ - return 0 - } - -+proc update_filename { w s } { -+ set s [string trim $s] -+ audio filename $s -+ return 0 -+} -+ - proc mk.entries { w } { - global sessionKey confName - set sessionKey [option get . sessionKey Vat] -@@ -913,6 +919,16 @@ - set a .m.right - frame $a.ab - mk.ab $a.ab -+ -+### XXX -+ set f [ctrlfont] -+ frame .m.file -+ label .m.file.label -text "AU File: " -font $f -+ mk.entry .m.file update_filename "" -+ .m.file.entry configure -width 30 -+ pack .m.file.label -side left -+ pack .m.file.entry -side left -expand 1 -fill x -pady 2 -+ pack .m.file -fill x - - bind . c purge_sources - bind . C purge_sources diff --git a/mbone/vat/files/patch-ao b/mbone/vat/files/patch-ao deleted file mode 100644 index d249ce21269c..000000000000 --- a/mbone/vat/files/patch-ao +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.in.orig Thu Jan 23 18:20:46 2003 -+++ configure.in Thu Jan 23 18:21:05 2003 -@@ -153,6 +153,7 @@ - ;; - *-*-freebsd*) - V_OBJ_AUDIO="$V_OBJ_AUDIO audio-voxware.o" -+ V_DEFINE="$V_DEFINE -DSIGARGS=int" - ;; - *-*-sco*) - V_DEFINE="$V_DEFINE -DSIGARGS=int -Dsco" diff --git a/mbone/vat/files/patch-ap b/mbone/vat/files/patch-ap deleted file mode 100644 index 178e46540170..000000000000 --- a/mbone/vat/files/patch-ap +++ /dev/null @@ -1,11 +0,0 @@ ---- net-ip.cc.orig Thu May 16 05:28:06 1996 -+++ net-ip.cc Sun Dec 3 19:04:50 2006 -@@ -203,7 +203,7 @@ - { - memset((char *)p, 0, sizeof(*p)); - p->sin_family = AF_INET; -- int len = sizeof(*p); -+ socklen_t len = sizeof(*p); - if (getsockname(ssock_, (struct sockaddr *)p, &len) < 0) { - perror("getsockname"); - p->sin_addr.s_addr = 0; diff --git a/mbone/vat/pkg-descr b/mbone/vat/pkg-descr deleted file mode 100644 index 4c043e7dca5e..000000000000 --- a/mbone/vat/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Vat allows users to conduct host-to-host or multihost audio -teleconferences over an internet. - -WWW: http://www-nrg.ee.lbl.gov/vat/ diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile deleted file mode 100644 index 549c0661d49e..000000000000 --- a/mbone/vic/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# New ports collection makefile for: vic -# Date created: 14 December 1994 -# Whom: wollman -# -# $FreeBSD$ -# - -PORTNAME= vic -PORTVERSION= 2.8.1.1.6 -PORTREVISION= 2 -CATEGORIES= mbone tk ipv6 -MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl1.1.6/ -DISTNAME= ${PORTNAME}-2.8ucl1.1.6 - -MAINTAINER= mi@aldan.algebra.com -COMMENT= MBONE video tool - -BUILD_DEPENDS+= v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= uclmmbase:${PORTSDIR}/devel/uclmmbase - -USE_TK= 84 -USE_TK_BUILD= 84 - -USE_AUTOTOOLS= autoconf213 -USE_XORG= xext -CONFIGURE_ARGS= -x-libraries=${LOCALBASE}/lib \ - -x-includes=${LOCALBASE}/include \ - -without-ucltcl \ - -with-tcl=${LOCALBASE} \ - -without-ucltk \ - -with-tk=${LOCALBASE} -.ifndef (NO_INET6) -CONFIGURE_ARGS+=-enable-ipv6 -.endif -MAN1= vic.1 - -post-patch: - ${RM} ${WRKSRC}/md5* - -post-install: - ${STRIP_CMD} ${PREFIX}/bin/vic - ${STRIP_CMD} ${PREFIX}/bin/histtolut - -.include <bsd.port.mk> diff --git a/mbone/vic/distinfo b/mbone/vic/distinfo deleted file mode 100644 index 50562e1c912d..000000000000 --- a/mbone/vic/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (vic-2.8ucl1.1.6.tar.gz) = f2330ad98655ad43d489a023847645c0 -SHA256 (vic-2.8ucl1.1.6.tar.gz) = 8cb8293c56757e4e1b87dcfdc17988be30a05cbfaae13173d309ae4a98cdb60b -SIZE (vic-2.8ucl1.1.6.tar.gz) = 1119176 diff --git a/mbone/vic/files/patch-Makefile.in b/mbone/vic/files/patch-Makefile.in deleted file mode 100644 index a1dd00423658..000000000000 --- a/mbone/vic/files/patch-Makefile.in +++ /dev/null @@ -1,64 +0,0 @@ ---- Makefile.in.orig Wed Apr 30 13:50:17 2003 -+++ Makefile.in Fri Feb 9 16:08:03 2007 -@@ -58,7 +58,7 @@ - INCLUDE_TK = @V_INCLUDE_TK@ - INCLUDE_TCL = @V_INCLUDE_TCL@ - INCLUDE_X11 = @V_INCLUDE_X11@ --INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I../common/src -+INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I${LOCALBASE}/include/uclmmbase -I${LOCALBASE}/include - - STATIC = @V_STATIC@ - MKDEP = ./mkdep -@@ -89,12 +89,12 @@ - OBJ_XIL = @V_OBJ_XIL@ - OBJ_CRYPT = @V_OBJ_CRYPT@ - LIB = $(LIB_GRABBER) @V_LIB_TK@ @V_LIB_TCL@ @V_LIB_X11@ @V_LIB@ \ -- codec/tmndec/libh263.a codec/tmn-x/libh263coder.a ../common/src/libuclmmbase.a -lm -+ codec/tmndec/libh263.a codec/tmn-x/libh263coder.a -L${LOCALBASE}/lib -luclmmbase -lm - INCLUDE = $(INCLUDE_MISC) $(INCLUDE_GRABBER) $(INCLUDE_TK) $(INCLUDE_TCL) \ - $(INCLUDE_X11) $(MD_INC) -Icodec/jpeg -Icodec/p64 -I. - DEFINE = @V_DEFINE@ -DED_YBITS=$(ED_YBITS) -DSIGRET=@V_SIGRET@ -DNLAYER=8 - BFLAGS = $(DEFINE) $(INCLUDE) --CFLAGS = $(CCOPT) $(BFLAGS) -+CFLAGS += $(BFLAGS) - - # - # Remember to add a dependency if you add any tcl sources here. -@@ -122,7 +122,7 @@ - codec/h263/idctenc.o codec/h263/sac.o - - # .c objects --OBJ1 = net/inet.o net/inet6.o codec/cellb_tables.o tkStripchart.o md5c.o random.o \ -+OBJ1 = net/inet.o net/inet6.o codec/cellb_tables.o tkStripchart.o \ - $(H263_OBJS) - # session-rtpv1.o session-nv.o session-ivs.o # Not supported anymore - # .cpp objects -@@ -329,15 +329,9 @@ - $(CC) -o $@ $(CFLAGS) render/ppmtolut/ppmtolut.c -lm $(STATIC) - - install: force -- cp vic @prefix@/bin/vic -- chown bin @prefix@/bin/vic -- chgrp bin @prefix@/bin/vic -- chmod 555 @prefix@/bin/vic -- cp vic.1 @prefix@/man/vic.1 -- cp histtolut @prefix@/bin/histtolut -- chown bin @prefix@/bin/histtolut -- chgrp bin @prefix@/bin/histtolut -- chmod 555 @prefix@/bin/histtolut -+ ${BSD_INSTALL_PROGRAM} vic @prefix@/bin/vic -+ ${BSD_INSTALL_MAN} vic.1 @prefix@/man/man1/vic.1 -+ ${BSD_INSTALL_PROGRAM} histtolut @prefix@/bin/histtolut - - clean: - rm -f *.o codec/jpeg/*.o codec/p64/*.o codec/h263/*.o \ -@@ -410,7 +404,7 @@ - - - codec/tmn-x/libh263coder.a: -- (cd codec/tmn-x; $(MAKE) CC=$(CC) CCOPT="$(CCOPT)" ) -+ (cd codec/tmn-x; $(MAKE) CC=$(CC) CCOPT="$(CFLAGS)" ) - - codec/tmndec/libh263.a: -- (cd codec/tmndec; $(MAKE) CC=$(CC) CCOPT="$(CCOPT)" -f Makefile.lib) -+ (cd codec/tmndec; $(MAKE) CC=$(CC) CCOPT="$(CFLAGS)" -f Makefile.lib) diff --git a/mbone/vic/files/patch-Tcl.cpp b/mbone/vic/files/patch-Tcl.cpp deleted file mode 100644 index cf26626a5499..000000000000 --- a/mbone/vic/files/patch-Tcl.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- Tcl.cpp Thu Sep 9 08:21:53 1999 -+++ Tcl.cpp Thu Sep 23 18:59:59 2004 -@@ -66,6 +66,7 @@ - { - instance_.tcl_ = tcl; - instance_.application_ = application; -+ Tcl_Init(tcl); - } - - void Tcl::evalc(const char* s) -@@ -214,7 +215,7 @@ - } - } - --int TclObject::callback(ClientData cd, Tcl_Interp*, int ac, char** av) -+int TclObject::callback(ClientData cd, Tcl_Interp*, int ac, const char** av) - { - TclObject* tc = (TclObject*)cd; - return (tc->command(ac, (const char*const*)av)); diff --git a/mbone/vic/files/patch-config b/mbone/vic/files/patch-config deleted file mode 100644 index dd572f7a85c8..000000000000 --- a/mbone/vic/files/patch-config +++ /dev/null @@ -1,25 +0,0 @@ ---- config.h Thu Apr 10 13:57:28 2003 -+++ config.h Thu Sep 23 18:37:11 2004 -@@ -38,11 +38,6 @@ - - #if defined(sgi) || defined(__bsdi__) || defined(__FreeBSD__) - #include <sys/types.h> --#ifndef uint16_t --typedef unsigned char uint8_t; --typedef unsigned short uint16_t; --typedef unsigned int uint32_t; --#endif - #elif defined(sun) - - #include <sys/types.h> -@@ -91,10 +86,6 @@ - #include "debug.h" - #include <stdlib.h> - #include <time.h> /* For clock_t */ -- --#ifdef HAVE_MALLOC_H --#include <malloc.h> --#endif /* HAVE_MALLOC_H */ - - #if defined(NEED_SUNOS_PROTOS) - #if defined(__cplusplus) diff --git a/mbone/vic/files/patch-configure.in b/mbone/vic/files/patch-configure.in deleted file mode 100644 index aac7387cf554..000000000000 --- a/mbone/vic/files/patch-configure.in +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.in.orig Thu Jul 10 16:55:43 2003 -+++ configure.in Mon Feb 12 17:58:29 2007 -@@ -69,18 +69,11 @@ - if test -r /usr/include/machine/ioctl_meteor.h ; then - V_OBJ_GRABBER="video/grabber-meteor.o $V_OBJ_GRABBER" - fi --if test -r /usr/include/linux/videodev.h ; then -- if grep V4L2 /usr/include/linux/videodev.h >/dev/null 2>&1 ; then -- V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-v4l2.o" -- else -- V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-video4linux.o" -- fi --fi --#if test -r /usr/local/lib/libspigot.a -a ${PORTOBJFORMAT} != elf; then --if test -r /usr/local/lib/libspigot.a ; then -- V_OBJ_GRABBER="video/grabber-spigot.o $V_OBJ_GRABBER" -- V_LIB_GRABBER="$V_LIB_GRABBER -lspigot" -+if test -r /usr/local/include/linux/videodev.h ; then - V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I/usr/local/include" -+ V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-video4linux.o" -+ # no V4L2 support yet. -+ # V_OBJ_GRABBER="$V_OBJ_GRABBER video/grabber-v4l2.o" - fi - if test "$qcamdir" != "" ; then - V_OBJ_GRABBER="video/grabber-qcam.o $V_OBJ_GRABBER" -@@ -254,6 +247,7 @@ - else - V_DEFINE="$V_DEFINE -DFreeBSD" - fi -+ V_DEFINE="$V_DEFINE -DSIGARGS=int" - OPSYS=freebsd - ;; - *-*-hpux*) diff --git a/mbone/vic/files/patch-configure.in.tail b/mbone/vic/files/patch-configure.in.tail deleted file mode 100644 index 44ab63487ae9..000000000000 --- a/mbone/vic/files/patch-configure.in.tail +++ /dev/null @@ -1,15 +0,0 @@ ---- configure.in.tail.orig Fri Jan 31 09:09:33 2003 -+++ configure.in.tail Fri Jan 31 09:09:47 2003 -@@ -35,9 +35,9 @@ - - AC_SUBST(V_STATIC) - --if test "$host_cpu" = alpha ; then -- V_DEFINE="$V_DEFINE -DINT_64=u_long" --fi -+#if test "$host_cpu" = alpha ; then -+# V_DEFINE="$V_DEFINE -DINT_64=u_long" -+#fi - - # various include hacks - dirs="/usr/src/local/include-fixes \ diff --git a/mbone/vic/files/patch-configure.in.tk b/mbone/vic/files/patch-configure.in.tk deleted file mode 100644 index d4fdc8a8a3da..000000000000 --- a/mbone/vic/files/patch-configure.in.tk +++ /dev/null @@ -1,56 +0,0 @@ ---- configure.in.tk.org Tue May 8 08:42:54 2001 -+++ configure.in.tk Tue May 8 08:56:43 2001 -@@ -32,13 +32,13 @@ - echo "'$d' is not a directory" - exit 1 - fi -- V_INCLUDE_TCL=-I$d/include -- if test ! -r $d/include/tcl.h ; then -+ V_INCLUDE_TCL=-I$d/include/tcl8.4/ -+ if test ! -r $d/include/tcl8.4/tcl.h ; then - echo "can't find tcl.h in $d/include" - exit 1 - fi -- places="$d/lib/libtcl8.0.so \ -- $d/lib/libtcl8.0.a \ -+ places="$d/lib/libtcl84.so \ -+ $d/lib/libtcl84.a \ - $d/lib/libtcl.so \ - $d/lib/libtcl.a" - V_LIB_TCL=FAIL -@@ -52,7 +52,7 @@ - echo "can't find libtcl.a in $d/lib" - exit 1 - fi -- places="$d/lib/tcl-8.0 \ -+ places="$d/lib/tcl8.4 \ - $d/lib/tcl8.0 \ - $d/lib/tcl" - V_LIBRARY_TCL=FAIL -@@ -190,13 +190,13 @@ - echo "'$d' is not a directory" - exit 1 - fi -- V_INCLUDE_TK=-I$d/include -- if test ! -r $d/include/tk.h ; then -+ V_INCLUDE_TK=-I$d/include/tk8.4 -+ if test ! -r $d/include/tk8.4/tk.h ; then - echo "can't find tk.h in $d/include" - exit 1 - fi -- places="$d/lib/libtk8.0.so \ -- $d/lib/libtk8.0.a \ -+ places="$d/lib/libtk84.so \ -+ $d/lib/libtk84.a \ - $d/lib/libtk.so \ - $d/lib/libtk.a" - V_LIB_TK=FAIL -@@ -210,7 +210,7 @@ - echo "can't find libtk.a in $d/lib" - exit 1 - fi -- places="$d/lib/tk8.0 \ -+ places="$d/lib/tk8.4 \ - $d/lib/tk" - V_LIBRARY_TK=FAIL - for dir in $places; do diff --git a/mbone/vic/files/patch-const b/mbone/vic/files/patch-const deleted file mode 100644 index de01fd3898ca..000000000000 --- a/mbone/vic/files/patch-const +++ /dev/null @@ -1,101 +0,0 @@ ---- tkStripchart.c.orig Mon Jun 29 15:17:00 1998 -+++ tkStripchart.c Tue Mar 22 13:02:03 2005 -@@ -329,7 +329,7 @@ - */ - static void Callback(Stripchart* StripchartPtr); --static void ComputeStripchartGeometry(Stripchart* StripchartPtr); -+static void ComputeStripchartGeometry(const Stripchart* StripchartPtr); - static int ConfigureStripchart(Tcl_Interp* interp, Stripchart* StripchartPtr, -- int argc, char** argv, int flags); -+ int argc, const char** argv, int flags); - static void DestroyStripchart(char* clientData); - static void DisplayStripchart(ClientData clientData); -@@ -337,9 +337,9 @@ - static void EventuallyRedrawStripchart(Stripchart* StripchartPtr, - int displaybits); --static void ReplaceColours(Stripchart* StripchartPtr, int argc, char** argv); -+static void ReplaceColours(Stripchart* StripchartPtr, int argc, const char** argv); - static void ScrollStrips(Stripchart* StripchartPtr); - static void StripchartEventProc(ClientData clientData, XEvent* eventPtr); - static int StripchartWidgetCmd(ClientData clientData, Tcl_Interp* interp, -- int argc, char** argv); -+ int argc, const char** argv); - static void SetStripchartValue(Stripchart* StripchartPtr, double value); - static void SwapColours(Stripchart* StripchartPtr); -@@ -364,5 +364,5 @@ - int - Tk_StripchartCmd(ClientData clientData, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - Tk_Window tkwin = (Tk_Window) clientData; -@@ -419,5 +419,5 @@ - static int - StripchartWidgetCmd(ClientData clientData, Tcl_Interp *interp, -- int argc, char **argv) -+ int argc, const char **argv) - { - register Stripchart *StripchartPtr = (Stripchart*)clientData; -@@ -629,5 +629,5 @@ - static int - ConfigureStripchart(Tcl_Interp *interp, Stripchart *StripchartPtr, -- int argc, char** argv, int flags) -+ int argc, const char** argv, int flags) - { - XGCValues gcValues; -@@ -699,5 +699,5 @@ - */ - static void --ComputeStripchartGeometry(Stripchart* StripchartPtr) -+ComputeStripchartGeometry(const Stripchart* StripchartPtr) - { - int tt = hasatitle(StripchartPtr); -@@ -1040,5 +1040,5 @@ - */ - static void --ReplaceColours(Stripchart* StripchartPtr, int argc, char** argv) -+ReplaceColours(Stripchart* StripchartPtr, int argc, const char** argv) - { - StripchartPtr->altborder = ---- vic_tcl.h Thu Sep 9 08:05:49 1999 -+++ vic_tcl.h Thu Sep 23 19:00:33 2004 -@@ -74,6 +77,6 @@ - error(file); - } -- inline char* var(const char* varname, int flags = TCL_GLOBAL_ONLY) { -- return (Tcl_GetVar(tcl_, (char*)varname, flags)); -+ inline CONST char* var(const char* varname, int flags = TCL_GLOBAL_ONLY) { -+ return (Tcl_GetVar(tcl_, varname, flags)); - } - /* -@@ -125,5 +128,5 @@ - void class_name(const char*); - /* make this public for Sun's compiler */ -- static int callback(ClientData, Tcl_Interp*, int ac, char** av); -+ static int callback(ClientData, Tcl_Interp*, int ac, CONST char** av); - static void reset_all(); - protected: ---- rate-variable.cpp Thu Sep 9 08:21:55 1999 -+++ rate-variable.cpp Thu Sep 23 18:55:10 2004 -@@ -62,11 +62,11 @@ - RateVariable(const char* name) : TclObject(name) { } - protected: -- static char* update_rate_var(ClientData, Tcl_Interp*, char* name1, -- char* name2, int flags); -+ static char* update_rate_var(ClientData, Tcl_Interp*, const char* name1, -+ const char* name2, int flags); - int command(int argc, const char*const* argv); - } rate_variable_cmd("rate_variable"); - - char* RateVariable::update_rate_var(ClientData clientData, Tcl_Interp* tcl, -- char* name1, char* name2, int flags) -+ const char* name1, const char* name2, int flags) - { - rv_data* rv = (rv_data*)clientData; -@@ -81,5 +81,5 @@ - char res[128]; - flags &= TCL_GLOBAL_ONLY; -- char* cv = Tcl_GetVar2(tcl, name1, name2, flags); -+ const char* cv = Tcl_GetVar2(tcl, name1, name2, flags); - if (cv == NULL) - return (tcl->result); diff --git a/mbone/vic/files/patch-defs b/mbone/vic/files/patch-defs deleted file mode 100644 index 2215cae8a4f1..000000000000 --- a/mbone/vic/files/patch-defs +++ /dev/null @@ -1,16 +0,0 @@ ---- codec/h263/Motion.h Thu Sep 9 08:45:55 1999 -+++ codec/h263/Motion.h Tue Mar 22 14:04:18 2005 -@@ -42,4 +42,5 @@ - } MVector; - /***********************************************************CommentEnd********/ -+MVector *AllocMVector(void); - - #endif /* _MOTION_STRUCTS_H_ */ ---- codec/h263/code.h Thu Sep 9 08:45:58 1999 -+++ codec/h263/code.h Tue Mar 22 14:06:24 2005 -@@ -167,4 +167,4 @@ - /***********************************************************CommentEnd********/ - -- -+Code *InitCode(char *title, int size, int eventDim, int *event, char *cw[]); - #endif /* _CODE_H */ diff --git a/mbone/vic/files/patch-histtolut.cpp b/mbone/vic/files/patch-histtolut.cpp deleted file mode 100644 index c47168d31e64..000000000000 --- a/mbone/vic/files/patch-histtolut.cpp +++ /dev/null @@ -1,73 +0,0 @@ ---- render/histtolut/histtolut.cpp.orig Thu Jan 23 18:13:08 2003 -+++ render/histtolut/histtolut.cpp Thu Jan 23 18:15:11 2003 -@@ -62,6 +62,7 @@ - #endif - #include <sys/stat.h> - #include <fcntl.h> -+#include <cstring> - - #ifdef WIN32 - extern "C" { -@@ -142,7 +143,7 @@ - * For further details see "Introduction to Algorithms" by Carmen, - * Lieserson and Rivest. - */ --//extern void *memset(void *, int, size_t); -+//extern void *std::memset(void *, int, size_t); - - /* XXX should pass backup array in as argument, that way can create it - only once. */ -@@ -154,7 +155,7 @@ - \ - register histItem** hist = &h[idx]; \ - int j; \ -- memset((void *)aux, 0, 256 * sizeof(int)); \ -+ std::memset((void *)aux, 0, 256 * sizeof(int)); \ - for (j = 0; j < n; j++) \ - aux[hist[j]->c.fld]++; \ - \ -@@ -199,7 +200,7 @@ - box* bv = new box[sizeof(box) * newcolors]; - - register u_char* colormap = cmap; -- memset(colormap, 0, 3 * newcolors); -+ std::memset(colormap, 0, 3 * newcolors); - - /* Set up the initial box. */ - bv[0].ind = 0; -@@ -450,7 +451,7 @@ - box* bv = new box[sizeof(box) * newcolors]; - - register u_char* colormap = cmap; -- memset(colormap, 0, 3 * newcolors); -+ std::memset(colormap, 0, 3 * newcolors); - - /* Set up the initial box. */ - bv[0].ind = 0; -@@ -639,7 +640,7 @@ - abort(); - - int ncol[MAX_YLEVELS]; -- memset(ncol, 0, sizeof(ncol)); -+ std::memset(ncol, 0, sizeof(ncol)); - /* - * We do this in two passes so that the size of the table can be - * calculated. Otherwise it would be have to be too big: -@@ -657,7 +658,7 @@ - table[i] = new histItem[ncol[i]]; - - i = 0; -- memset(ncol, 0, sizeof(ncol)); -+ std::memset(ncol, 0, sizeof(ncol)); - for (v = 0; v < 1 << 5; ++v) { - for (int u = 0; u < 1 << 5; ++u) { - for (int y = 0; y < 1 << 4; ++y) { -@@ -688,7 +689,7 @@ - } - - histItem** histogram[MAX_YLEVELS]; -- memset(histogram, 0, sizeof(histogram)); -+ std::memset(histogram, 0, sizeof(histogram)); - int totcol = 0; - for (i = 0; i < ny; ++i) { - if (ncol[i] != 0) { diff --git a/mbone/vic/files/patch-inet6.h b/mbone/vic/files/patch-inet6.h deleted file mode 100644 index ed330bfa8b04..000000000000 --- a/mbone/vic/files/patch-inet6.h +++ /dev/null @@ -1,34 +0,0 @@ ---- net/inet6.h.org Mon Feb 4 17:51:39 2002 -+++ net/inet6.h Mon Feb 4 17:52:02 2002 -@@ -44,7 +44,6 @@ - #define vic_inet6_h - - #ifdef HAVE_IPV6 -- - #include <sys/types.h> - #ifdef WIN32 - //#include <winsock.h> -@@ -62,10 +61,23 @@ - } - #else - #include <netinet/in.h> -+#include <netinet6/in6.h> - #endif - #endif - #ifndef WIN32 - #include <arpa/inet.h> -+#ifdef _NETINET6_IN6_H_ -+#ifndef IPV6_ADD_MEMBERSHIP -+#ifdef IPV6_JOIN_GROUP -+#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP -+#endif /* IPV6_JOIN_GROUP */ -+#endif /* IPV6_ADD_MEMBERSHIP */ -+#ifndef IPV6_DROP_MEMBERSHIP -+#ifdef IPV6_LEAVE_GROUP -+#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP -+#endif /* IPV6_LEAVE_GROUP */ -+#endif /* IPV6_DROP_MEMBERSHIP */ -+#endif /* _NETINET6_IN6_H_ */ - #endif - - #include "config.h" diff --git a/mbone/vic/files/patch-main b/mbone/vic/files/patch-main deleted file mode 100644 index 7a217d731fd3..000000000000 --- a/mbone/vic/files/patch-main +++ /dev/null @@ -1,53 +0,0 @@ ---- main.cpp Tue Feb 25 12:55:08 2003 -+++ main.cpp Tue Mar 22 12:37:51 2005 -@@ -363,36 +363,4 @@ - #endif - --/* -- * From the RTP spec. -- */ --u_int32_t --heuristic_random() --{ -- struct { -- struct timeval tv; -- clock_t cpu; -- pid_t pid; -- u_long hid; -- uid_t uid; -- gid_t gid; -- struct utsname name; -- } s; -- -- gettimeofday(&s.tv, 0); -- uname(&s.name); -- s.cpu = clock(); -- s.pid = getpid(); -- s.hid = gethostid(); -- s.uid = getuid(); -- s.gid = getgid(); -- -- MD5_CTX context; -- MD5Init(&context); -- MD5Update(&context, (u_char*)&s, sizeof(s)); -- u_int32_t out[4]; -- MD5Final((u_char *)out, &context); -- return (out[0] ^ out[1] ^ out[2] ^ out[3]); --} -- - void loadbitmaps(Tcl_Interp* tcl) - { -@@ -407,5 +375,5 @@ - } - --extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, char** av); -+extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, const char** av); - #ifdef WIN32 - extern "C" int WinPutsCmd(ClientData, Tcl_Interp*, int ac, char** av); -@@ -433,5 +401,5 @@ - main(int argc, const char** argv) - { -- srandom(heuristic_random()); -+ srandomdev(); - - #ifdef SIGHUP diff --git a/mbone/vic/files/patch-mbus_handler b/mbone/vic/files/patch-mbus_handler deleted file mode 100644 index 8237fee3b279..000000000000 --- a/mbone/vic/files/patch-mbus_handler +++ /dev/null @@ -1,9 +0,0 @@ ---- net/mbus_handler.h Thu Mar 16 08:21:37 2000 -+++ net/mbus_handler.h Thu Sep 23 21:31:33 2004 -@@ -50,6 +50,4 @@ - #include "memory.h" - #include "mbus.h" --#include "mbus_config.h" -- - - #ifdef WIN32 diff --git a/mbone/vic/files/patch-md5 b/mbone/vic/files/patch-md5 deleted file mode 100644 index ba52895aa139..000000000000 --- a/mbone/vic/files/patch-md5 +++ /dev/null @@ -1,21 +0,0 @@ ---- net/crypt.cpp Thu Sep 9 08:48:51 1999 -+++ net/crypt.cpp Tue Mar 22 13:08:25 2005 -@@ -42,5 +42,5 @@ - #define PROTOTYPES 1 - #include "global.h" --#include "md5.h" -+#include <openssl/md5.h> - - Crypt::Crypt() : badpktlen_(0), badpbit_(0) -@@ -70,8 +70,8 @@ - { - MD5_CTX context; -- MD5Init(&context); -- MD5Update(&context, (u_char*)key, strlen(key)); -+ MD5_Init(&context); -+ MD5_Update(&context, (u_char*)key, strlen(key)); - u_char hash[16]; -- MD5Final((u_char *)hash, &context); -+ MD5_Final((u_char *)hash, &context); - return (install_key(hash)); - } diff --git a/mbone/vic/files/patch-net-ipv6.cpp b/mbone/vic/files/patch-net-ipv6.cpp deleted file mode 100644 index 4e8812eff9ff..000000000000 --- a/mbone/vic/files/patch-net-ipv6.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- net/net-ipv6.cpp Thu Apr 24 10:53:26 2003 -+++ net/net-ipv6.cpp Thu Sep 23 19:08:53 2004 -@@ -59,7 +59,6 @@ - #include "config.h" - #include "net.h" - #include "vic_tcl.h" --#include "inet_ntop.h" - - #include "inet6.h" - #include "net-addr.h" diff --git a/mbone/vic/files/patch-nomalloc_h b/mbone/vic/files/patch-nomalloc_h deleted file mode 100644 index 0d7613d84587..000000000000 --- a/mbone/vic/files/patch-nomalloc_h +++ /dev/null @@ -1,8 +0,0 @@ ---- codec/h263/Util.h Thu Sep 9 08:45:56 1999 -+++ codec/h263/Util.h Thu Sep 23 18:31:34 2004 -@@ -7,5 +7,4 @@ - #define _UTIL_ - --#include <malloc.h> - #include "error.h" - #include <stdlib.h> diff --git a/mbone/vic/files/patch-renderer-window b/mbone/vic/files/patch-renderer-window deleted file mode 100644 index 8e940d34f0b4..000000000000 --- a/mbone/vic/files/patch-renderer-window +++ /dev/null @@ -1,14 +0,0 @@ ---- render/renderer-window.h Thu Sep 9 08:38:16 1999 -+++ render/renderer-window.h Thu Sep 23 21:43:13 2004 -@@ -54,10 +54,10 @@ - int minx, int maxx) const; - void sync() const; - void resize(int w, int h); -- protected: - /*XXX*/ - void dither_null(const u_char* frm, u_int off, u_int x, - u_int width, u_int height) const; -+ protected: - virtual void setcolor(int c); - void compute_scale(int w, int h); - virtual void alloc_image() = 0; diff --git a/mbone/vic/files/patch-ui-ctrlmenu.tcl b/mbone/vic/files/patch-ui-ctrlmenu.tcl deleted file mode 100644 index d8a3514fe595..000000000000 --- a/mbone/vic/files/patch-ui-ctrlmenu.tcl +++ /dev/null @@ -1,25 +0,0 @@ ---- tcl/ui-ctrlmenu.tcl.org Thu May 10 08:44:51 2001 -+++ tcl/ui-ctrlmenu.tcl Thu May 10 08:48:19 2001 -@@ -408,16 +408,16 @@ - -relief raised -command transmit \ - -anchor w -variable transmitButtonState -font $f \ - -state disabled -highlightthickness 0 --# checkbutton $w.freeze -text "Freeze" \ --# -relief raised -command "grabber freeze \$freeze" \ --# -anchor w -variable freeze -font $f \ --# -highlightthickness 0 -+ checkbutton $w.freeze -text "Freeze" \ -+ -relief raised -command "grabber freeze \$freeze" \ -+ -anchor w -variable freeze -font $f \ -+ -highlightthickness 0 - button $w.release -text "Release" \ - -relief raised -command release_device \ - -font $f -highlightthickness 0 - --# pack $w.send $w.release $w.freeze -fill both -- pack $w.send $w.release -fill both -+ pack $w.send $w.release $w.freeze -fill both -+# pack $w.send $w.release -fill both - } - - proc doNothing { args } { diff --git a/mbone/vic/files/patch-ui-resource.tcl b/mbone/vic/files/patch-ui-resource.tcl deleted file mode 100644 index b1134d6f5e76..000000000000 --- a/mbone/vic/files/patch-ui-resource.tcl +++ /dev/null @@ -1,11 +0,0 @@ ---- tcl/ui-resource.tcl.org Mon May 7 16:17:03 2001 -+++ tcl/ui-resource.tcl Mon May 7 16:17:29 2001 -@@ -153,7 +153,7 @@ - option add Vic.infoHighlightColor LightYellow2 startupFile - option add Vic.useJPEGforH261 false startupFile - option add Vic.useHardwareComp false startupFile -- option add Vic.stillGrabber false startupFile -+ option add Vic.stillGrabber true startupFile ; # XXX was false - option add Vic.siteDropTime "300" startupFile - option add Vic.quality "0" startupFile - diff --git a/mbone/vic/files/patch-video-grabber-video4linux.cpp b/mbone/vic/files/patch-video-grabber-video4linux.cpp deleted file mode 100644 index 8aa3f98be10e..000000000000 --- a/mbone/vic/files/patch-video-grabber-video4linux.cpp +++ /dev/null @@ -1,60 +0,0 @@ -diff -ubwr video/grabber-video4linux.cpp ../../test/vic-2.8ucl1.1.6/video/grabber-video4linux.cpp ---- video/grabber-video4linux.cpp Fri Sep 12 19:36:19 2003 -+++ ../../test/vic-2.8ucl1.1.6/video/grabber-video4linux.cpp Fri Feb 9 16:15:12 2007 -@@ -36,7 +36,7 @@ - - - extern "C" { --#include <asm/types.h> -+//#include <asm/types.h> - #include <linux/videodev.h> - } - -@@ -312,9 +314,20 @@ - } - - if( !( have_422P || have_422 || have_420P)) { -- debug_msg("No suituable palette found\n"); -+ debug_msg("No suituable palette found, try normal\n"); -+ /* this needs to cleaned up heavily */ -+ have_420P = 1; /* assume no mmap and try 420 is default */ -+ struct video_picture vp; -+ if(ioctl(fd_,VIDIOCGPICT,&vp) == -1) { -+ debug_msg("Failed to get current picture info"); - exit(1); - } -+ vp.palette = VIDEO_PALETTE_YUV420P; -+ if(ioctl(fd_,VIDIOCSPICT,&vp) == -1) { -+ debug_msg("Failed to set current picture info"); -+ exit(1); -+ } -+ } - - /* Release device */ - close(fd_); -@@ -551,10 +564,15 @@ - Grabber::stop(); - } - -+/* -+ * quick hack - support only a single device of this kind, -+ * with a static max-sized buffer for reads. -+ */ -+static char buf1[1024*768*3/2]; -+ - int V4lGrabber::grab() - { - char *fr=NULL; -- - debug_msg((sync_count % 2) ? "o" : "e"); - - if (have_mmap) { -@@ -566,6 +584,8 @@ - else - sync_count++; - } else { -+ read(fd_, buf1, (size_t)height_*width_*3/2); -+ fr = buf1; - /* FIXME: read() */ - } - diff --git a/mbone/vic/files/patch-warns b/mbone/vic/files/patch-warns deleted file mode 100644 index 8db7f714fc0a..000000000000 --- a/mbone/vic/files/patch-warns +++ /dev/null @@ -1,9 +0,0 @@ ---- codec/p64/p64.cpp Thu Sep 9 08:46:10 1999 -+++ codec/p64/p64.cpp Mon Mar 26 01:44:44 2007 -@@ -1069,5 +1069,5 @@ - * with 8 bits; otherwise, prime it with a 16. - */ -- if ((int)bp & 1) { -+ if ((intptr_t)bp & 1) { - bs_ = (u_short*)(bp + 1); - bb_ = *bp; diff --git a/mbone/vic/pkg-descr b/mbone/vic/pkg-descr deleted file mode 100644 index 720c00f6188e..000000000000 --- a/mbone/vic/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This package contains the binary release of LBL's `vic' network video -conferencing tool. - -WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/ diff --git a/mbone/vic/pkg-plist b/mbone/vic/pkg-plist deleted file mode 100644 index 3ae0decf49cb..000000000000 --- a/mbone/vic/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/vic -bin/histtolut diff --git a/mbone/wb/Makefile b/mbone/wb/Makefile deleted file mode 100644 index ce6020a014c1..000000000000 --- a/mbone/wb/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# New ports collection makefile for: wb -# Date created: 2 Novermber 1996 -# Whom: fenner -# -# $FreeBSD$ -# - -PORTNAME= wb -PORTVERSION= 1.59 -PORTREVISION= 4 -CATEGORIES= mbone -MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/wb/ -DISTFILES= i386-wb-1.59.tar.Z - -MAINTAINER= ports@FreeBSD.org -COMMENT= A shared drawing (whiteboard) tool using multicast - -NO_WRKSUBDIR= yes -NO_BUILD= yes -STRIP= - -# ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do. -USE_GHOSTSCRIPT_RUN= yes - -PLIST_FILES= bin/wb -PORTDOCS= README CHANGES NOTES lblwb.ps - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wb ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/NOTES ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/lblwb.ps ${DOCSDIR}/ -.endif - -.include <bsd.port.mk> diff --git a/mbone/wb/distinfo b/mbone/wb/distinfo deleted file mode 100644 index 83c5d40e0f98..000000000000 --- a/mbone/wb/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (i386-wb-1.59.tar.Z) = 7601eb1192ee2774940d805500c0a9ce -SHA256 (i386-wb-1.59.tar.Z) = 0bae5c24f4c65031e99ac5c5df08e91eab92e5542c5a9f9a278f838c84bb035e -SIZE (i386-wb-1.59.tar.Z) = 2049555 diff --git a/mbone/wb/pkg-descr b/mbone/wb/pkg-descr deleted file mode 100644 index 9c196397ccc9..000000000000 --- a/mbone/wb/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -This is a beta-release of the LBL 'whiteboard'. - -Before using wb, read the file NOTES from the distribution (note -especially the .sd.tcl change needed if you are running sd v1.14 -or earlier) and print and read the postscript file lblwb.ps. - -If you simply want a shared "whiteboard" drawing surface, you -don't need to do anything but install wb. But wb can also be -used to export, view and annotate arbitrary PostScript files. -If you want to include PostScript images in your wb conference, -either your X server has to support Display PostScript (the DEC -& SGI X servers do) or wb has to be able to exec the public -domain postscript renderer `GhostScript'. If you want to -render postscript with Ghostscript, it has to be installed on -your machine and has to be in your shell search path with the -name "gs". diff --git a/mbone/xspeakfree/Makefile b/mbone/xspeakfree/Makefile deleted file mode 100644 index b885d245147f..000000000000 --- a/mbone/xspeakfree/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# New ports collection makefile for: xspeakfree -# Date created: 08 Nov 2003 -# Whom: Travis Poppe <tlp@liquidx.org> -# -# $FreeBSD$ -# - -PORTNAME= xspeakfree -PORTVERSION= 0.8.2 -PORTREVISION= 3 -CATEGORIES= mbone net audio -MASTER_SITES= http://www.liquidx.org/distfiles/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Tcl/Tk (wish) frontend to Speak Freely - -RUN_DEPENDS= ${LOCALBASE}/bin/wish8.4:${PORTSDIR}/x11-toolkits/tk84 \ - ${LOCALBASE}/bin/sfmike:${PORTSDIR}/mbone/speak_freely - -NO_BUILD= yes - -.ifndef NOPORTDOCS -PORTDOCS= BUGS HISTORY INSTALL LICENSE README TODO -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|wish|wish8.4|' ${WRKSRC}/bin/xspeakfree - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/bin/xspeakfree ${PREFIX}/bin/xspeakfree - ${MKDIR} ${PREFIX}/lib/xspeakfree - ${INSTALL_DATA} ${WRKSRC}/lib/xspeakfree/* ${PREFIX}/lib/xspeakfree -.ifndef NOPORTDOCS - ${MKDIR} ${DOCSDIR} -.for FILE in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor -.endif - -.include <bsd.port.mk> diff --git a/mbone/xspeakfree/distinfo b/mbone/xspeakfree/distinfo deleted file mode 100644 index 24b01e7513e8..000000000000 --- a/mbone/xspeakfree/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (xspeakfree-0.8.2.tar.gz) = d2bf1a47a56acea1ef64ddf66cd28220 -SHA256 (xspeakfree-0.8.2.tar.gz) = eb3cfb7b7a5bbbe9d7a1d098b2bccfb0ff6bb9f937c1a5046ee74cd8122f7ae2 -SIZE (xspeakfree-0.8.2.tar.gz) = 47853 diff --git a/mbone/xspeakfree/pkg-descr b/mbone/xspeakfree/pkg-descr deleted file mode 100644 index 66dc727b93d2..000000000000 --- a/mbone/xspeakfree/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -xspeakfree is a Tcl/Tk (wish) frontend to Speak Freely. - -WWW: http://www.spearce.org/projects/xspeakfree/ diff --git a/mbone/xspeakfree/pkg-plist b/mbone/xspeakfree/pkg-plist deleted file mode 100644 index cb03efb870e0..000000000000 --- a/mbone/xspeakfree/pkg-plist +++ /dev/null @@ -1,11 +0,0 @@ -bin/xspeakfree -lib/xspeakfree/busy.au -lib/xspeakfree/cmd.tcl -lib/xspeakfree/gui.tcl -lib/xspeakfree/newdialog.tcl -lib/xspeakfree/open3.tcl -lib/xspeakfree/ring.au -lib/xspeakfree/siteconf.tcl -lib/xspeakfree/xspeakfree-version.tcl -lib/xspeakfree/xspeakfree.tcl -@dirrm lib/xspeakfree |