diff --git a/mbone/relate/Makefile b/mbone/relate/Makefile new file mode 100644 index 00000000000..222dc56baa4 --- /dev/null +++ b/mbone/relate/Makefile @@ -0,0 +1,26 @@ +# $OpenBSD: Makefile,v 1.1.1.1 1999/09/03 16:33:49 angelos Exp $ + +DISTNAME= relate +DISTFILES= relate-2.0.tar.gz +CATEGORIES= mbone +MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/relate-ui/2.0/ +MAINTAINER= angelos@openbsd.org + +NEED_VERSION= 1.111 + +LIB_DEPENDS= tcl80:${PORTSDIR}/lang/tcl80 \ + tk80:${PORTSDIR}/x11/tk80 \ + +RUN_DEPENDS= nte:${PORTSDIR}/mbone/nte \ + vic:${PORTSDIR}/mbone/vic \ + wbd:${PORTSDIR}/mbone/wbd + +USE_GMAKE= yes +MAKEFILE= makefile +ALL_TARGET= + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/relate ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/relate.tcl ${PREFIX}/bin + +.include diff --git a/mbone/relate/files/Makefile.work b/mbone/relate/files/Makefile.work new file mode 100644 index 00000000000..fe4aba75135 --- /dev/null +++ b/mbone/relate/files/Makefile.work @@ -0,0 +1,10 @@ +# +# Makefile for ${WRKSRC}. +# +install: + +clean: + cd linux; $(MAKE) $@ + +all: + cd linux; $(MAKE) diff --git a/mbone/relate/files/configure b/mbone/relate/files/configure new file mode 100644 index 00000000000..5322de2ed0d --- /dev/null +++ b/mbone/relate/files/configure @@ -0,0 +1,7 @@ +#!/bin/sh +# +# configure script for ${WRKSRC}. It just decends into the +# linux subdirectory and execs configure. +# +cd linux +exec ./configure $@ diff --git a/mbone/relate/files/md5 b/mbone/relate/files/md5 new file mode 100644 index 00000000000..e28c5eacef2 --- /dev/null +++ b/mbone/relate/files/md5 @@ -0,0 +1,3 @@ +MD5 (relate-2.0.tar.gz) = 9b62e1c39f485aca7546a28e56463659 +RMD160 (relate-2.0.tar.gz) = 410a6af8a006147281b6b2e2b83e82ebad222c64 +SHA1 (relate-2.0.tar.gz) = 1869223ea1b07c0194d41b8ecd80bcf886bbb319 diff --git a/mbone/relate/patches/patch-relate b/mbone/relate/patches/patch-relate new file mode 100644 index 00000000000..a6341fbc3c2 --- /dev/null +++ b/mbone/relate/patches/patch-relate @@ -0,0 +1,197 @@ +*** config.h.orig Thu Oct 15 12:08:03 1998 +--- config.h Fri Sep 3 12:16:06 1999 +*************** +*** 42,50 **** +--- 42,54 ---- + + #include + ++ #if !defined(__OpenBSD__) + #define NEED_INET_ATON + #define NEED_INET_PTON + #define NEED_IN6_IS_ADDR_MULTICAST ++ #else ++ #define EXT_SCRIPT ++ #endif + + #ifdef WIN32 + typedef int ttl_t; +*************** +*** 67,74 **** + #endif + + typedef int fd_t; + typedef unsigned long in_addr_t; +! + #ifndef TRUE + #define FALSE 0 + #define TRUE 1 +--- 71,79 ---- + #endif + + typedef int fd_t; ++ #if !defined(__OpenBSD__) + typedef unsigned long in_addr_t; +! #endif + #ifndef TRUE + #define FALSE 0 + #define TRUE 1 +*** main.c.orig Mon Dec 14 11:07:55 1998 +--- main.c Fri Sep 3 12:29:50 1999 +*************** +*** 20,26 **** +--- 20,30 ---- + + #include + #include ++ ++ #if !defined(__OpenBSD__) + #include ++ #endif ++ + #include + #include + #include +*************** +*** 281,287 **** + if (nteVersion>1.4) Tcl_SetVar(interp, "nte15", "1", TCL_GLOBAL_ONLY); else Tcl_SetVar(interp, "nte15", "0", TCL_GLOBAL_ONLY); + + #ifdef EXT_SCRIPT +! if (Tcl_VarEval(interp, "source ", "relate.tcl", (char *) NULL) != TCL_OK) { + goto error; + exit (-1); + } +--- 285,291 ---- + if (nteVersion>1.4) Tcl_SetVar(interp, "nte15", "1", TCL_GLOBAL_ONLY); else Tcl_SetVar(interp, "nte15", "0", TCL_GLOBAL_ONLY); + + #ifdef EXT_SCRIPT +! if (Tcl_VarEval(interp, "source ", "/usr/local/bin/relate.tcl", (char *) NULL) != TCL_OK) { + goto error; + exit (-1); + } +*** makefile.orig Mon Dec 14 10:40:17 1998 +--- makefile Fri Sep 3 12:16:06 1999 +*************** +*** 1,11 **** + YFLAGS = -dv + CFLAGS = -g $(LIBFLAGS) $(IFLAGS) -DNDEBUG -DRELATE_INT +! LIBDIR = /cs/research/mice/starship/common/solaris/lib +! INCDIR = /cs/research/mice/starship/common/solaris/include + + # The files needed from the tcl/tk library directories... +! LIBRARY_TK = $(LIBDIR)/tk8.0 +! LIBRARY_TCL = $(LIBDIR)/tcl8.0 + + + # Uncomment these lines for SGI (IRIX 5.3). +--- 1,15 ---- + YFLAGS = -dv + CFLAGS = -g $(LIBFLAGS) $(IFLAGS) -DNDEBUG -DRELATE_INT +! LIBDIR = /usr/local/lib +! X11LIBDIR = /usr/X11R6/lib +! INCDIR = /usr/local/include +! TCLINCDIR = /usr/local/include/tcl8.0 +! TKINCDIR = /usr/local/include/tk8.0 +! X11INCDIR = /usr/X11R6/include + + # The files needed from the tcl/tk library directories... +! LIBRARY_TK = $(LIBDIR)/tk80 +! LIBRARY_TCL = $(LIBDIR)/tcl80 + + + # Uncomment these lines for SGI (IRIX 5.3). +*************** +*** 27,42 **** + #LIBS = -ll -ltk8.0 -ltcl8.0 -lm -lX11 + + # Uncomment these lines for Sun (SunOS 5.5.1). +! CC = gcc -DFNDELAY=O_NDELAY -DBYTE_ORDER=4321 -ansi +! LIBFLAGS = -L$(LIBDIR) -L/usr/openwin/lib +! IFLAGS = -I$(INCDIR) -I/usr/openwin/include +! LIBS = -ll -ltk8.0 -ltcl8.0 -lm -lX11 -lsocket -lnsl -ldl + + # Uncomment these lines for NetBSD 1.2. +! #CC = cc -ansi +! #LIBFLAGS = -L$(LIBDIR) +! #IFLAGS = -I$(INCDIR) +! #LIBS = -ll -ltk8.0 -ltcl8.0 -lm -lX11 + + # Tcl initialisation files to be compiled into a C string. + TCL_LIBS = \ +--- 31,46 ---- + #LIBS = -ll -ltk8.0 -ltcl8.0 -lm -lX11 + + # Uncomment these lines for Sun (SunOS 5.5.1). +! #CC = gcc -DFNDELAY=O_NDELAY -DBYTE_ORDER=4321 -ansi +! #LIBFLAGS = -L$(LIBDIR) -L/usr/openwin/lib +! #IFLAGS = -I$(INCDIR) -I/usr/openwin/include +! #LIBS = -ll -ltk8.0 -ltcl8.0 -lm -lX11 -lsocket -lnsl -ldl + + # Uncomment these lines for NetBSD 1.2. +! CC = cc -ansi +! LIBFLAGS = -L$(LIBDIR) -L$(X11LIBDIR) +! IFLAGS = -I$(INCDIR) -I$(X11INCDIR) -I$(TCLINCDIR) -I$(TKINCDIR) +! LIBS = -ll -ltk80 -ltcl80 -lm -lX11 + + # Tcl initialisation files to be compiled into a C string. + TCL_LIBS = \ +*************** +*** 69,84 **** + OBJ = tcllibs.o main.o mbus.o mbus_ui.o util.o lbl_confbus.o tcltk.o net_udp.o + + relate : $(OBJ) $(INC) +! $(CC) $(CFLAGS) $(OBJ) $(LIBS) -o relate + + clean : + rm -f *.o tcl2c relate core + + tcl2c : tcl2c.o +! $(CC) $(CFLAGS) tcl2c.o $(LIBS) -o tcl2c + + # Tcl library files are turned into a single object file. + tcllibs.o: $(TCL_FILES) tcl2c + rm -f $@ tcllibs.c; \ + ./tcl2c 1 $(TCL_FILES) > tcllibs.c ; \ +! $(CC) -c $(CFLAGS) tcllibs.c ; rm -f tcllibs.c +--- 73,88 ---- + OBJ = tcllibs.o main.o mbus.o mbus_ui.o util.o lbl_confbus.o tcltk.o net_udp.o + + relate : $(OBJ) $(INC) +! $(CC) $(CFLAGS) $(OBJ) $(LIBFLAGS) $(LIBS) -o relate + + clean : + rm -f *.o tcl2c relate core + + tcl2c : tcl2c.o +! $(CC) $(CFLAGS) tcl2c.o $(LIBFLAGS) $(LIBS) -o tcl2c + + # Tcl library files are turned into a single object file. + tcllibs.o: $(TCL_FILES) tcl2c + rm -f $@ tcllibs.c; \ + ./tcl2c 1 $(TCL_FILES) > tcllibs.c ; \ +! $(CC) -c $(CFLAGS) tcllibs.c ; rm -f tcllibs.c +*** util.h.orig Wed Oct 14 10:32:22 1998 +--- util.h Fri Sep 3 12:16:06 1999 +*************** +*** 44,50 **** +--- 44,52 ---- + #define _UTIL_H_ + + #define UNUSED(x) (x=x) ++ #if !defined(__OpenBSD__) + #define IN_CLASSD(i) (((long)(i) & 0xf0000000) == 0xe0000000) ++ #endif + #define IN_MULTICAST(i) IN_CLASSD(i) + + #define xmalloc(x) _xmalloc(x,__FILE__,__LINE__) +*************** +*** 74,77 **** + }; + #endif + +! typedef struct _socket_udp socket_udp; +--- 76,79 ---- + }; + #endif + +! typedef struct _socket_udp socket_udp; diff --git a/mbone/relate/pkg/COMMENT b/mbone/relate/pkg/COMMENT new file mode 100644 index 00000000000..b14a362e18e --- /dev/null +++ b/mbone/relate/pkg/COMMENT @@ -0,0 +1 @@ +ReLaTe integrated conferencing tool from UCL, version 2.0. diff --git a/mbone/relate/pkg/DESCR b/mbone/relate/pkg/DESCR new file mode 100644 index 00000000000..5716e66dfa9 --- /dev/null +++ b/mbone/relate/pkg/DESCR @@ -0,0 +1,25 @@ +The integrated interface, which brings together the audio, video and +shared workspace tools, has been designed to be as simple and easy to +use as possible. Particular emphasis has been given to reducing screen +clutter and to minimising the number of things that need to be done to +use the different parts of the software. There is minimal need to +manipulate, move or uncover windows, and all necessary tools and +controls are readily to hand. Although basic keyboard and mouse skills +are required, little else is needed for students and teachers to use +the software. + +Currently, up to eight people can take part in a conference. As the +screen-shot shows,each participant uses a workstation with camera and +headset (headphones and microphones). Video images are displayed of +all participants (including oneself), and any image may be enlarged to +the upper window. Being able to see all members of the conference +simultaneously gives a more relaxed atmosphere than other systems, +which show only the current speaker. + +The system incorporates both a shared whiteboard (wbd, by Julian +Highfield) and a shared text editor (nte, by UCL). The user can switch +between them at any point during the session. With these tools, text +and graphics can be entered, either via the keyboard and mouse or by +importing a file. Everyone can draw or write simultaneously and see +all other contributions; colour allows easy identification of the +contributions. diff --git a/mbone/relate/pkg/PLIST b/mbone/relate/pkg/PLIST new file mode 100644 index 00000000000..a5eecf96c63 --- /dev/null +++ b/mbone/relate/pkg/PLIST @@ -0,0 +1 @@ +bin/relate