2.5.8

13 files changed, 75 insertions, 217 deletions

diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 646c55c1659..d22e4078e6b 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,19 +1,20 @@
-# $NetBSD: Makefile,v 1.11 1998/10/02 06:47:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 1998/11/05 05:32:18 mycroft Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/10/15 20:35:20 fenner Exp 
 #
 
-DISTNAME=	sdr.V2.4a7n
-PKGNAME=	sdr-2.4a7mmrz
+DISTNAME=	sdr-2.5.8
 CATEGORIES=	mbone tk80
-MASTER_SITES=	http://north.east.isi.edu/sdr/
+MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.5.8/
 
 MAINTAINER=	is@netbsd.org
 HOMEPAGE=	http://north.east.isi.edu/sdr/
 
 DEPENDS+=	tk-8.0p2:../../x11/tk80
 
+CONFLICTS=	sdr-2.4a7mmrz
+
 MIRROR_DISTFILE=	no
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/sdr
 USE_GMAKE=	yes
 USE_X11=	yes
 
diff --git a/mbone/sdr/files/Makefile.freebsd b/mbone/sdr/files/Makefile.freebsd
deleted file mode 100644
index c94d75cf7a8..00000000000
--- a/mbone/sdr/files/Makefile.freebsd
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# $NetBSD: Makefile.freebsd,v 1.2 1998/08/07 11:09:58 agc Exp $
-#
-CC=cc
-INCLUDES=-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tcl8.0 -I${X11BASE}/include
-LIB_DIR=${LOCALBASE}/lib
-LIBS=-L${LIB_DIR} -ltk80 -ltcl80 -lm -L${X11BASE}/lib -lX11
-CFLAGS+=-ggdb $(INCLUDES) -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST
-LIBRARY_TCL = ${LIB_DIR}/tcl8.0
-LIBRARY_TK = ${LIB_DIR}/tk8.0
-
-all:	sdr
-
-install:	sdr
-	install -c -s -m 555 -o bin -g bin sdr ${PREFIX}/bin
-
-clean:
-	rm *.o *.tcl *.ehtml tcl2c
diff --git a/mbone/sdr/files/Makefile.netbsd b/mbone/sdr/files/Makefile.netbsd
index ff4285df414..4c6d1cf79af 100644
--- a/mbone/sdr/files/Makefile.netbsd
+++ b/mbone/sdr/files/Makefile.netbsd
@@ -1,18 +1,12 @@
-#
-# $NetBSD: Makefile.netbsd,v 1.3 1998/09/13 18:02:10 garbled Exp $
-#
-CC=cc
-INCLUDES=-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tcl8.0 -I${X11BASE}/include
-LIB_DIR=${LOCALBASE}/lib
-LIBS= ${LDFLAGS} -L${LIB_DIR} -ltk80 -ltcl80 -lm -L${X11BASE}/lib -lX11
-CFLAGS+=-ggdb $(INCLUDES) -DNORANDPROTO -DUSE_PERROR -Werror
-LIBRARY_TCL = ${LIB_DIR}/tcl8.0
-LIBRARY_TK = ${LIB_DIR}/tk8.0
+#	$NetBSD: Makefile.netbsd,v 1.4 1998/11/05 05:32:19 mycroft Exp $
 
-all:	sdr
+CC	    = gcc -g -O
+INCLUDES    = -I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tcl8.0 -I${X11BASE}/include
+LIBS	    = -L${LOCALBASE}/lib -ltk80 -ltcl80 -lm -L${X11BASE}/lib -lX11
+CFLAGS	    = ${INCLUDES} -DNORANDPROTO -DUSE_PERROR -DAUTH -Werror
 
-install:	sdr
-	install -c -s -m 555 -o bin -g bin sdr ${PREFIX}/bin
+all::	sdr
+
+install:
+	${BSD_INSTALL_PROGRAM} sdr ${PREFIX}/bin
 
-clean:
-	rm *.o *.tcl *.ehtml tcl2c
diff --git a/mbone/sdr/files/md5 b/mbone/sdr/files/md5
index ee12eba7efc..782674cadfe 100644
--- a/mbone/sdr/files/md5
+++ b/mbone/sdr/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:25:04 agc Exp $
+$NetBSD: md5,v 1.4 1998/11/05 05:32:19 mycroft Exp $
 
-MD5 (sdr.V2.4a7n.tar.gz) = 3131d934134fccaa81662ac951fdb604
+MD5 (sdr-2.5.8.tar.gz) = 6894a0dcf96ee3cc8bb722f7a1c338fb
diff --git a/mbone/sdr/patches/patch-aa b/mbone/sdr/patches/patch-aa
deleted file mode 100644
index 337e24d58aa..00000000000
--- a/mbone/sdr/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1998/08/07 11:09:59 agc Exp $
-
-diff -ru ../original/src/Makefile.template ./src/Makefile.template
---- ../original/src/Makefile.template	Tue Oct  1 16:53:30 1996
-+++ ./src/Makefile.template	Tue Nov 18 15:06:29 1997
-@@ -97,7 +97,7 @@
- $(SDR_UI_FILES): tcl2c
- 
- parsed_plugins.tcl: ../src/plugin2tcl.tcl
--	tclsh7.6 ../src/plugin2tcl.tcl
-+	tclsh8.0 ../src/plugin2tcl.tcl
- 
- libs.tcl: $(TK_LIBRARY_FILES)
- 	cat $(TK_LIBRARY_FILES) | sed '/^[      ]*source[       ]/d' > libs.tcl
diff --git a/mbone/sdr/patches/patch-ab b/mbone/sdr/patches/patch-ab
index e62ebb0bb59..784795cc731 100644
--- a/mbone/sdr/patches/patch-ab
+++ b/mbone/sdr/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 1998/08/07 11:09:59 agc Exp $
+$NetBSD: patch-ab,v 1.5 1998/11/05 05:32:19 mycroft Exp $
 
---- /tmp/newsdr/src/sip_common.c	Tue Apr 29 23:48:25 1997
-+++ src/sip_common.c	Wed Jun 17 16:53:24 1998
-@@ -211,7 +211,7 @@
+--- src/sip_common.c.orig	Thu Oct  1 18:53:01 1998
++++ src/sip_common.c	Wed Nov  4 23:44:12 1998
+@@ -256,7 +256,7 @@
  	  len=res_mkquery(QUERY, hostname, C_IN, T_MX, NULL, NULL, 
  			  NULL, buf, 200);
  	  if (len==-1) perror("res_mkquery");
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.4 1998/08/07 11:09:59 agc Exp $
  	  if (len==-1) perror("res_send");
  	  ans[0]=htonl(ans[0]);
  	  ans[1]=htonl(ans[1]);
-@@ -283,7 +283,8 @@
+@@ -328,7 +328,8 @@
  		    } else {
  		      /*it's compressed*/
  		        if(*tstr==0) tstr+=2;
diff --git a/mbone/sdr/patches/patch-ac b/mbone/sdr/patches/patch-ac
index 32c9b6cb6a5..b1be85987d1 100644
--- a/mbone/sdr/patches/patch-ac
+++ b/mbone/sdr/patches/patch-ac
@@ -1,6 +1,7 @@
-$NetBSD: patch-ac,v 1.5 1998/10/02 09:49:59 kleink Exp $
---- src/iohandler.c.orig	Thu Jan  8 20:40:17 1998
-+++ src/iohandler.c	Fri Oct  2 08:26:48 1998
+$NetBSD: patch-ac,v 1.6 1998/11/05 05:32:19 mycroft Exp $
+
+--- src/iohandler.c.orig	Sun Sep  6 11:41:03 1998
++++ src/iohandler.c	Wed Nov  4 23:42:24 1998
 @@ -43,6 +43,9 @@
  #include <time.h>
  #include <winsock.h>
@@ -11,16 +12,14 @@ $NetBSD: patch-ac,v 1.5 1998/10/02 09:49:59 kleink Exp $
  #include <tk.h>
  #ifdef WIN32
  #define WM_WSOCK_READY 	WM_USER+123
-@@ -134,8 +137,13 @@
+@@ -136,7 +139,11 @@
          }
  	sockproc[fd] = callback;
  #else
 +#ifdef HAVE_SYS_INTTYPES_H
-+	Tcl_CreateFileHandler(fd,
-+			      mask, callback, (ClientData)(intptr_t)fd);
++        Tcl_CreateFileHandler(fd, mask, callback, (ClientData)(intptr_t)fd);
 +#else
- 	Tcl_CreateFileHandler(fd,
- 			      mask, callback, (ClientData)fd);
+         Tcl_CreateFileHandler(fd, mask, callback, (ClientData)fd);
 +#endif
  #endif
  }
diff --git a/mbone/sdr/patches/patch-ad b/mbone/sdr/patches/patch-ad
index 65e4fb1091a..3951f77f203 100644
--- a/mbone/sdr/patches/patch-ad
+++ b/mbone/sdr/patches/patch-ad
@@ -1,35 +1,36 @@
-$NetBSD
---- src/sd_listen.c.orig	Thu Jan  8 20:39:21 1998
-+++ src/sd_listen.c	Fri Oct  2 08:30:50 1998
-@@ -316,11 +316,19 @@
+$NetBSD: patch-ad,v 1.5 1998/11/05 05:32:19 mycroft Exp $
+
+--- src/sd_listen.c.orig	Wed Oct  7 07:18:56 1998
++++ src/sd_listen.c	Wed Nov  4 23:52:04 1998
+@@ -484,10 +484,18 @@
+       }
  
- 	if (strncmp(k1, "k=", 2)==0)
- 	  {
+       if (strncmp(k1, "k=", 2)==0) {
 +#ifdef HAVE_SYS_INTTYPES_H
-+	    if ((uintptr_t)k2>=(uintptr_t)k1+2)
-+	      {
-+		memcpy(key, k1+2, (uintptr_t)k2-((uintptr_t)k1+1));
-+		key[(uintptr_t)k2-((uintptr_t)k1+1)]='\0';
-+	      }
++	if ((uintptr_t)k2>=(uintptr_t)k1+2) {
++	  memcpy(key, k1+2, (uintptr_t)k2-((uintptr_t)k1+1));
++	  key[(uintptr_t)k2-((uintptr_t)k1+1)]='\0';
++	}
 +#else
- 	    if ((u_int)k2>=(u_int)k1+2)
- 	      {
- 		memcpy(key, k1+2, (u_int)k2-((u_int)k1+1));
- 		key[(u_int)k2-((u_int)k1+1)]='\0';
- 	      }
+ 	if ((u_int)k2>=(u_int)k1+2) {
+ 	  memcpy(key, k1+2, (u_int)k2-((u_int)k1+1));
+ 	  key[(u_int)k2-((u_int)k1+1)]='\0';
+-	} else {
++	}
 +#endif
- 	    else
- 	      {
- 		key[0]='\0';
-@@ -648,7 +656,11 @@
-     struct timeval tv;
-     unsigned long src, hfrom;
-     char *data;
++	else {
+           key[0]='\0';
+         }
+ 	p=strchr(k1, '\n')+1;
+@@ -1509,7 +1517,11 @@
+     char buf[MAXADSIZE];
+     char debugbuf[MAXADSIZE];
+ 
 +#ifdef HAVE_SYS_INTTYPES_H
 +    intptr_t ix = rfd2sock[PTOI(fd)];
 +#else
      int ix = rfd2sock[PTOI(fd)];
 +#endif
  
-     fromlen=sizeof(struct sockaddr);
-     
+     memset(new_data,       0, MAXADSIZE);
+     memset(aid,            0, AIDLEN);
diff --git a/mbone/sdr/patches/patch-ae b/mbone/sdr/patches/patch-ae
index d6a4422848e..df35addeab2 100644
--- a/mbone/sdr/patches/patch-ae
+++ b/mbone/sdr/patches/patch-ae
@@ -1,6 +1,7 @@
-$NetBSD: patch-ae,v 1.3 1998/09/13 18:02:10 garbled Exp $
---- src/generic_prototypes.h.orig	Sun Sep 13 10:38:28 1998
-+++ src/generic_prototypes.h	Sun Sep 13 10:39:31 1998
+$NetBSD: patch-ae,v 1.4 1998/11/05 05:32:19 mycroft Exp $
+
+--- src/generic_prototypes.h.orig	Tue Jan 27 11:56:28 1998
++++ src/generic_prototypes.h	Wed Nov  4 23:48:53 1998
 @@ -37,7 +37,7 @@
  #endif
  
diff --git a/mbone/sdr/patches/patch-af b/mbone/sdr/patches/patch-af
index d37a1919d8b..1d6738e7419 100644
--- a/mbone/sdr/patches/patch-af
+++ b/mbone/sdr/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:09:59 agc Exp $
+$NetBSD: patch-af,v 1.3 1998/11/05 05:32:19 mycroft Exp $
 
---- /dev/null	Fri Nov 21 14:47:55 1997
-+++ src/plugins/sdr2.plugin.S53.image.imm	Fri Nov 21 14:42:48 1997
+--- /dev/null	Wed Nov  4 23:28:48 1998
++++ src/plugins/sdr2.plugin.S53.image.imm	Wed Nov  4 23:48:53 1998
 @@ -0,0 +1,5 @@
 +media:image
 +proto:MDP
diff --git a/mbone/sdr/patches/patch-ag b/mbone/sdr/patches/patch-ag
deleted file mode 100644
index 0fdda442304..00000000000
--- a/mbone/sdr/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 11:10:01 agc Exp $
-
---- /tmp/newsdr/src/tcl_nocrypt_modules.h	Fri Jun 13 22:01:40 1997
-+++ src/tcl_nocrypt_modules.h	Wed Jun 17 17:05:04 1998
-@@ -12,7 +12,7 @@
- 
- #define MAX_TCL_MODULE 10
- 
--const char *modname[MAX_TCL_MODULE]=
-+char *modname[MAX_TCL_MODULE]=
- {"tcl_generic", "tcl_www", "tcl_new", "tcl_start_tools",
-  "tcl_parsed_plugins", "tcl_plugins", "tcl_sip", "tcl_sdp", "tcl_cache",
-  "tcl_sdr"};
-@@ -24,7 +24,7 @@
- 
- #define MAX_UI_FN 20
- 
--const char *ui_fn_name[MAX_UI_FN]=
-+char *ui_fn_name[MAX_UI_FN]=
- {
-   "ui_generate_port",
-   "generate_id",
diff --git a/mbone/sdr/patches/patch-ah b/mbone/sdr/patches/patch-ah
deleted file mode 100644
index 39696409ed8..00000000000
--- a/mbone/sdr/patches/patch-ah
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 11:10:01 agc Exp $
-
---- /tmp/src/sdr.tcl	Tue Jan 20 22:04:15 1998
-+++ src/sdr.tcl	Wed Jun 17 16:05:59 1998
-@@ -2,6 +2,7 @@
- #Copyright University College London 1995, 1996
- #see ui_fns.c for information on usage and redistribution of this file
- #and for a DISCLAIMER OF ALL WARRANTIES.
-+#changes for record C.Fleck 12/97
- 
- set initWait 400
- set last_widget foo
-@@ -584,9 +585,9 @@
- 	  set interval [parse_rpt_time [lindex $repeat($i,$r) 0]]
- 	  if {$interval>0} {
- 	      set duration [parse_rpt_time [lindex $repeat($i,$r) 1]]
--	      # If the duration is longer than or equal to the interval, then it
-+	      # If the duration is longer than the interval, then it
- 	      # effectively means "the whole time".
--	      if {$duration >= $interval} {
-+	      if {$duration > $interval} {
- 		  # XXX
- 		  # Need to increment the start of the session by the
- 		  # first offset if it's not 0.
-@@ -1155,11 +1156,7 @@
- after 120000 timeout_expired_sessions
- 
- proc popdown {aid} {
--    global ldata
-     set wname .desc$aid
--    global [set wname].f.visible
--    unset [set wname].f.visible
--    set $ldata($aid,is_popped) -1
-     highlight_tag $aid popdown
-     catch "destroy $wname"
-     update
-@@ -1956,10 +1953,10 @@
- 	  start_recorder $aid $file $rname
- 	  destroy .record
- 	} else {
--	  timedmsgpopup [tt "Recording Prepared"] \
--	      "[tt "The recording will start at "$ldata($aid,tfrom)" 6000
-+# C.Fleck
-+          timedmsgpopup [tt "Recording Prepared"] "" 3000
-+# end
- 	  msgpopup [tt "Error"] [tt "feature is not yet implemented - sorry"]
--	  
- 	  destroy .record
- 	}
-     }
-@@ -3130,7 +3127,7 @@
- 	    incr mon -12
- 	    incr year
- 	}
--#	set cal [exec cal $mon $year]
-+	set cal [exec cal $mon $year]
- 	.cal.f0.c addtag mon$i withtag \
- 	    [.cal.f0.c create text [expr $i*$fw*32] 0 -anchor nw\
-              -fill $fg -font $font]
---- /tmp/src/new.tcl	Tue May 13 01:00:32 1997
-+++ src/new.tcl	Wed Jun 17 16:00:59 1998
-@@ -3,6 +3,7 @@
- #new.tcl Copyright (c) 1995 University College London
- #see ui_fns.c for information on usage and redistribution of this file
- #and for a DISCLAIMER OF ALL WARRANTIES.
-+#changes for scopes scrollbar C.Fleck 12/97
- 
- proc new {aid} {
-     global ifstyle ldata
-@@ -380,8 +381,15 @@
-     pack .new.f3.admin.l -side top -anchor w
-     frame .new.f3.admin.f -relief sunken -borderwidth 1
-     pack .new.f3.admin.f -side top -fill both -expand true
--    text .new.f3.admin.f.lb -width 15 -height 6 -relief flat -wrap none
-+# C.Fleck
-+    text .new.f3.admin.f.lb -width 35 -height 5 -relief flat\
-+         -relief sunken -borderwidth 1 -yscroll ".new.f3.admin.f.sb set" \
-+         -highlightthickness 0
-+    scrollbar .new.f3.admin.f.sb -borderwidth 1 -command ".new.f3.admin.f.lb yview" \
-+         -highlightthickness 0
-+    pack .new.f3.admin.f.sb -side right -fill y -expand true
-     pack .new.f3.admin.f.lb -side top -fill both -expand true
-+# end
-     for {set i 0} {$i < $zone(no_of_zones)} {incr i} {
- 	.new.f3.admin.f.lb insert [expr $i+1].0 "$zone(name,$i)"
- 	.new.f3.admin.f.lb tag add line$i [expr $i+1].0 end-1c
-@@ -431,7 +439,9 @@
- 
- Specify the smallest scope that will reach the people you want to communicate with."]
- 
--    label .new.f3.rr.l -text [tt "Scope"]
-+# C.Fleck
-+    label .new.f3.rr.l -text [tt "Scope:"]
-+# end
-     radiobutton .new.f3.rr.r1 -relief flat -text [tt "Site"] -variable ttl\
- 	-highlightthickness 0 \
- 	-value 15 -command {disable_scope_entry 15}
diff --git a/mbone/sdr/patches/patch-ai b/mbone/sdr/patches/patch-ai
new file mode 100644
index 00000000000..bea0941f1a1
--- /dev/null
+++ b/mbone/sdr/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 1998/11/05 05:32:38 mycroft Exp $
+
+--- src/random.c.orig	Wed Aug  5 11:16:03 1998
++++ src/random.c	Thu Nov  5 00:21:35 1998
+@@ -48,7 +48,7 @@
+ static int randseed = 1;
+ 
+ void
+-srandom(unsigned int seed)
++srandom(unsigned long seed)
+ {
+ 	randseed = seed;
+ }