Upgrade to imm-3.6a1

4 files changed, 28 insertions, 33 deletions

diff --git a/mbone/imm/patches/patch-aa b/mbone/imm/patches/patch-aa
deleted file mode 100644
index f7cb9a9cefc..00000000000
--- a/mbone/imm/patches/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/patches/patch-ab b/mbone/imm/patches/patch-ab
deleted file mode 100644
index 4b1f038304d..00000000000
--- a/mbone/imm/patches/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/patches/patch-ac b/mbone/imm/patches/patch-ac
deleted file mode 100644
index 2da9e3a99e1..00000000000
--- a/mbone/imm/patches/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/patches/patch-ad b/mbone/imm/patches/patch-ad
new file mode 100644
index 00000000000..e2a84a7aa87
--- /dev/null
+++ b/mbone/imm/patches/patch-ad
@@ -0,0 +1,28 @@
+--- Makefile.orig	Mon Feb 10 16:56:48 1997
++++ Makefile	Mon Nov 24 15:19:47 1997
+@@ -1,9 +1,9 @@
+ ##################################
+ # Common Area
+ SHELL = /bin/sh
+-PREFIX = /usr/local
++PREFIX = /usr/pkg
+ INCLUDE_DIR = -I$(PREFIX)/include
+-BINDIR= /usr/local/bin
++BINDIR= $(PREFIX)/bin
+ 
+ noentry:
+ 	@echo "type 'make clean' followed by  'make SYSTEM' "
+@@ -44,10 +44,10 @@
+ netbsd:
+ 	$(MAKE) \
+ 	LIBS='-lm' \
+-	TKLIBS='-L$(PREFIX)/lib -L/usr/X11/lib -ltk4.2 -ltcl7.6 -lX11' \
+-	INCLUDES='-I. $(INCLUDE_DIR) -I/usr/X11/include' \
++	TKLIBS='-L$(PREFIX)/lib -L/usr/X11R6/lib -ltk80 -ltcl80 -lX11' \
++	INCLUDES='-I. $(INCLUDE_DIR) -I/usr/X11R6/include -I/usr/pkg/include/tcl8.0 -I/usr/pkg/include/tk8.0' \
+ 	SYSDEFS='-g -DSIG_T=int -DMULTICAST -DERROR_TEST' \
+-	CC=gcc \
++	CC='cc -O2'\
+ 	all
+ 
+ linux: