Upgrade

6 files changed, 16 insertions, 82 deletions

diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index 2a34b3c..54170a4 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -3,11 +3,11 @@
 # Date created:		13 October 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/14 01:37:11 wollman Exp $
+# $Id: Makefile,v 1.2 1995/02/11 13:50:14 asami Exp $
 #
 
 DISTNAME=	imm-3.3
-DISTFILES=	imm-3.3-src.tar.Z
+DISTFILES=	imm.src.tar.Z
 MASTER_SITES=	ftp://ftp.ucs.ed.ac.uk/pub/videoconference/imm/
 WRKSRC=		${WRKDIR}/src
 LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk
diff --git a/mbone/imm/files/patch-aa b/mbone/imm/files/patch-aa
index b88b87b..3e1ea4f 100644
--- a/mbone/imm/files/patch-aa
+++ b/mbone/imm/files/patch-aa
@@ -145,19 +145,6 @@ diff -rc2 orig-immserv.c immserv.c
   #include "protocol.h"
   #if defined(sgi) || defined (ultrix) || defined (__alpha) || defined(hpux) || defined(__NetBSD__)
 ***************
-*** 1098,1102 ****
-  	while (top != NULL) {
-  	    /* extract name and directory */
-! 	    token = strrchr(top->name, '//') + 1;
-  	    entry = liststrdup(token,NULL);
-  	    i = strlen(top->name) - strlen(entry);
---- 1099,1103 ----
-  	while (top != NULL) {
-  	    /* extract name and directory */
-! 	    token = strrchr(top->name, '/') + 1;
-  	    entry = liststrdup(token,NULL);
-  	    i = strlen(top->name) - strlen(entry);
-***************
 *** 1195,1199 ****
   int setackalarm() {}
   /******************************************************************************/
@@ -190,14 +177,6 @@ diff -rc2 orig-mcl.c mcl.c
 + #include <arpa/inet.h>
   
   extern int SendDeclarePacket();    
-***************
-*** 50,54 ****
-  
-  int len_addr_dist;
-- extern struct nodelist;
-  extern int locktransmit;
-  extern char *localhost;
---- 57,60 ----
 diff -rc2 orig-xlopen.c xlopen.c
 *** orig-xlopen.c	Fri Mar  4 19:01:14 1994
 --- xlopen.c	Thu Oct 13 21:18:29 1994
diff --git a/mbone/imm/files/patch-ab b/mbone/imm/files/patch-ab
index c013432..af587eb 100644
--- a/mbone/imm/files/patch-ab
+++ b/mbone/imm/files/patch-ab
@@ -1,31 +1,19 @@
-*** main.c.orig	Fri Mar  4 16:01:13 1994
---- main.c	Sat Oct 29 15:45:04 1994
+*** main.c.orig	Thu Oct 27 16:14:52 1994
+--- main.c	Fri Mar 31 12:34:29 1995
 ***************
-*** 129,135 ****
+*** 132,138 ****
   ClientData clientdata;
   Tcl_Interp *interp;
   int argc;
-! int *argv[];
+! char *argv[];
   {
       int transmitflag = FALSE;
       int ofp;
---- 129,135 ----
+--- 132,138 ----
   ClientData clientdata;
   Tcl_Interp *interp;
   int argc;
-! char *argv[];
+! int *argv[];
   {
       int transmitflag = FALSE;
       int ofp;
-***************
-*** 161,166 ****
---- 161,169 ----
-  			   repeatnum,argv[3], argv[1]);
-  	fclose(stdin);
-  	closeall();
-+ #ifndef SIGCLD
-+ #define SIGCLD SIGCHLD
-+ #endif
-  	signal(SIGCLD,SIG_IGN);
-  	Tcl_DeleteInterp(interp);
-  	if (localhost == NULL)
diff --git a/net/imm/Makefile b/net/imm/Makefile
index 2a34b3c..54170a4 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -3,11 +3,11 @@
 # Date created:		13 October 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/14 01:37:11 wollman Exp $
+# $Id: Makefile,v 1.2 1995/02/11 13:50:14 asami Exp $
 #
 
 DISTNAME=	imm-3.3
-DISTFILES=	imm-3.3-src.tar.Z
+DISTFILES=	imm.src.tar.Z
 MASTER_SITES=	ftp://ftp.ucs.ed.ac.uk/pub/videoconference/imm/
 WRKSRC=		${WRKDIR}/src
 LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk
diff --git a/net/imm/files/patch-aa b/net/imm/files/patch-aa
index b88b87b..3e1ea4f 100644
--- a/net/imm/files/patch-aa
+++ b/net/imm/files/patch-aa
@@ -145,19 +145,6 @@ diff -rc2 orig-immserv.c immserv.c
   #include "protocol.h"
   #if defined(sgi) || defined (ultrix) || defined (__alpha) || defined(hpux) || defined(__NetBSD__)
 ***************
-*** 1098,1102 ****
-  	while (top != NULL) {
-  	    /* extract name and directory */
-! 	    token = strrchr(top->name, '//') + 1;
-  	    entry = liststrdup(token,NULL);
-  	    i = strlen(top->name) - strlen(entry);
---- 1099,1103 ----
-  	while (top != NULL) {
-  	    /* extract name and directory */
-! 	    token = strrchr(top->name, '/') + 1;
-  	    entry = liststrdup(token,NULL);
-  	    i = strlen(top->name) - strlen(entry);
-***************
 *** 1195,1199 ****
   int setackalarm() {}
   /******************************************************************************/
@@ -190,14 +177,6 @@ diff -rc2 orig-mcl.c mcl.c
 + #include <arpa/inet.h>
   
   extern int SendDeclarePacket();    
-***************
-*** 50,54 ****
-  
-  int len_addr_dist;
-- extern struct nodelist;
-  extern int locktransmit;
-  extern char *localhost;
---- 57,60 ----
 diff -rc2 orig-xlopen.c xlopen.c
 *** orig-xlopen.c	Fri Mar  4 19:01:14 1994
 --- xlopen.c	Thu Oct 13 21:18:29 1994
diff --git a/net/imm/files/patch-ab b/net/imm/files/patch-ab
index c013432..af587eb 100644
--- a/net/imm/files/patch-ab
+++ b/net/imm/files/patch-ab
@@ -1,31 +1,19 @@
-*** main.c.orig	Fri Mar  4 16:01:13 1994
---- main.c	Sat Oct 29 15:45:04 1994
+*** main.c.orig	Thu Oct 27 16:14:52 1994
+--- main.c	Fri Mar 31 12:34:29 1995
 ***************
-*** 129,135 ****
+*** 132,138 ****
   ClientData clientdata;
   Tcl_Interp *interp;
   int argc;
-! int *argv[];
+! char *argv[];
   {
       int transmitflag = FALSE;
       int ofp;
---- 129,135 ----
+--- 132,138 ----
   ClientData clientdata;
   Tcl_Interp *interp;
   int argc;
-! char *argv[];
+! int *argv[];
   {
       int transmitflag = FALSE;
       int ofp;
-***************
-*** 161,166 ****
---- 161,169 ----
-  			   repeatnum,argv[3], argv[1]);
-  	fclose(stdin);
-  	closeall();
-+ #ifndef SIGCLD
-+ #define SIGCLD SIGCHLD
-+ #endif
-  	signal(SIGCLD,SIG_IGN);
-  	Tcl_DeleteInterp(interp);
-  	if (localhost == NULL)