Upgrade to imm-3.6a1

10 files changed, 43 insertions, 156 deletions

diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index 3e71cedc9f6..68917e3290e 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -1,45 +1,20 @@
-# $NetBSD: Makefile,v 1.2 1997/11/24 12:06:23 is Exp $
+# $NetBSD: Makefile,v 1.3 1997/11/24 15:04:25 is Exp $
 #
-# NetBSD "imm" package, based on:
-#
-# New ports collection makefile for:	imm
-# Version required:	3.5a1
-# Date created:		13 October 1994
-# Whom:			wollman
-#
-# Id: Makefile,v 1.15 1997/09/13 16:58:21 fenner Exp 
+# NetBSD "imm" package
+# The original was based on the imm-3.5a1 FreeBSD port maintained
+# by Bill Fenner, but the new one had to be redone completely.
 #
 
-DISTNAME=	imm-3.5a1
+DISTNAME=	imm-3.6a1
 CATEGORIES=	mbone tk80
-MASTER_SITES=	ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
-DISTFILES=	imm.source.tar.Z
-WRKSRC=		${WRKDIR}/mnm
+MASTER_SITES=	ftp://ftp.hawaii.edu/paccom/imm/
+DISTFILES=	imm36a1.tar.Z
+WRKSRC=		${WRKDIR}/imm36a1.src
 
 MAINTAINER=	is@netbsd.org
 
 LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
 
-USE_X11=	yes
-
-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
-	${MKDIR} ${PREFIX}/share/doc/imm
-.if !defined(NOPORTDOCS)
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/imm
-	${INSTALL_DATA} ${WRKSRC}/imm_readme.txt ${PREFIX}/share/doc/imm
-.endif
-# The sdr plugin is pretty much required.
-	${INSTALL_DATA} ${WRKSRC}/sdr2.plugin.S53.image.imm ${PREFIX}/share/doc/imm
+ALL_TARGET=	netbsd
 
 .include <bsd.port.mk>
diff --git a/mbone/imm/files/Makefile.freebsd b/mbone/imm/files/Makefile.freebsd
deleted file mode 100644
index 51724b551d0..00000000000
--- 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${PREFIX}/include -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0
-# Libraries to use when linking: 
-LIBS = -lm
-
-TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk80 -ltcl80 -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 cb876d343f9..00000000000
--- 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/md5 b/mbone/imm/files/md5
index 672f0d0c6e3..34270b4c8a1 100644
--- a/mbone/imm/files/md5
+++ b/mbone/imm/files/md5
@@ -1 +1 @@
-MD5 (imm.source.tar.Z) = bf2713e5dca81daaecbc0bbcaf7af667
+MD5 (imm36a1.tar.Z) = c097b646184fd1ddf965fab0d429b896
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:
diff --git a/mbone/imm/pkg/DESCR b/mbone/imm/pkg/DESCR
index 339f0593275..15c4d5abf98 100644
--- a/mbone/imm/pkg/DESCR
+++ b/mbone/imm/pkg/DESCR
@@ -4,7 +4,5 @@ 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.
+The sdr plugin file from the earlier imm release has been integrated into
+the NetBSD sdr package.
diff --git a/mbone/imm/pkg/PLIST b/mbone/imm/pkg/PLIST
index 5ddf84157be..884ada178e2 100644
--- a/mbone/imm/pkg/PLIST
+++ b/mbone/imm/pkg/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 1997/11/24 12:06:28 is Exp $
+@comment $NetBSD: PLIST,v 1.3 1997/11/24 15:04:31 is Exp $
 bin/imm
 bin/immserv
-bin/lscomp
-share/doc/imm/README
-share/doc/imm/imm_readme.txt
-share/doc/imm/sdr2.plugin.S53.image.imm
+bin/mnm
+bin/mdpsniff