14 files changed, 240 insertions, 30 deletions

diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index 88488dc14876..39c2ffee6dc7 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -1,19 +1,36 @@
 # New ports collection makefile for:	imm
-# Version required:	3.3
+# Version required:	3.5a1
 # Date created:		13 October 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.8 1996/11/11 07:05:28 asami Exp $
+# $Id: Makefile,v 1.9 1996/11/18 11:32:56 asami Exp $
 #
 
-DISTNAME=	imm-3.3
+DISTNAME=	imm-3.5a1
 CATEGORIES=	mbone
-MASTER_SITES=	ftp://ftp.ucs.ed.ac.uk/pub/videoconference/imm/
-DISTFILES=	imm.src.tar.Z
+MASTER_SITES=	ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
+DISTFILES=	imm.source.tar.Z
+WRKSRC=		${WRKDIR}/mnm
 
-LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk
+MAINTAINER=	fenner@freebsd.org
 
-BROKEN=		yes	# depends on tk-3.6
-WRKSRC=		${WRKDIR}/src
+LIB_DEPENDS=	tk41\\.1:${PORTSDIR}/x11/tk41
+
+USE_X11=	yes
+
+# 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
 
 .include <bsd.port.mk>
diff --git a/mbone/imm/distinfo b/mbone/imm/distinfo
index c09f995b5f45..672f0d0c6e34 100644
--- a/mbone/imm/distinfo
+++ b/mbone/imm/distinfo
@@ -1 +1 @@
-MD5 (imm.src.tar.Z) = b260d70441f94029b4072c9a92b735ec
+MD5 (imm.source.tar.Z) = bf2713e5dca81daaecbc0bbcaf7af667
diff --git a/mbone/imm/files/Makefile.freebsd b/mbone/imm/files/Makefile.freebsd
new file mode 100644
index 000000000000..afcf4cb6b93f
--- /dev/null
+++ b/mbone/imm/files/Makefile.freebsd
@@ -0,0 +1,77 @@
+# 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
+# Libraries to use when linking: 
+LIBS = -lm
+
+TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk41 -ltcl -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
new file mode 100644
index 000000000000..cb876d343f9e
--- /dev/null
+++ b/mbone/imm/files/Makefile.work
@@ -0,0 +1,2 @@
+all install:
+	cd src; ${MAKE} -f Makefile.freebsd $@
diff --git a/mbone/imm/pkg-comment b/mbone/imm/pkg-comment
index ec006bc36ace..f43810ebef09 100644
--- a/mbone/imm/pkg-comment
+++ b/mbone/imm/pkg-comment
@@ -1 +1 @@
-Internet Image Multicaster (and receiver).
+Internet Image(or other data) Multicaster (and receiver).
diff --git a/mbone/imm/pkg-descr b/mbone/imm/pkg-descr
index 2da8c557a389..339f05932750 100644
--- a/mbone/imm/pkg-descr
+++ b/mbone/imm/pkg-descr
@@ -1,5 +1,10 @@
-This is IMM, a program to send and receive images using IP multicast.
-This program is currently in use on the MBONE to transmit semi-real-time
-weather satellite images, as well as a number of other miscellaneous
-pictures.  IMM requires X11R6 and either `xli' or `xv' to perform the
-actual image display.
+IMM has been designed to efficiently replicate files/file directories
+using a reliable dissemination protocol framework and provide archiving
+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.
diff --git a/mbone/imm/pkg-plist b/mbone/imm/pkg-plist
index e768e9db8d54..617852e192ef 100644
--- a/mbone/imm/pkg-plist
+++ b/mbone/imm/pkg-plist
@@ -1,2 +1,6 @@
 bin/imm
 bin/immserv
+bin/lscomp
+share/doc/imm/README
+share/doc/imm/imm_readme.txt
+share/doc/imm/sdr2.plugin.S53.image.imm
diff --git a/net/imm/Makefile b/net/imm/Makefile
index 88488dc14876..39c2ffee6dc7 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -1,19 +1,36 @@
 # New ports collection makefile for:	imm
-# Version required:	3.3
+# Version required:	3.5a1
 # Date created:		13 October 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.8 1996/11/11 07:05:28 asami Exp $
+# $Id: Makefile,v 1.9 1996/11/18 11:32:56 asami Exp $
 #
 
-DISTNAME=	imm-3.3
+DISTNAME=	imm-3.5a1
 CATEGORIES=	mbone
-MASTER_SITES=	ftp://ftp.ucs.ed.ac.uk/pub/videoconference/imm/
-DISTFILES=	imm.src.tar.Z
+MASTER_SITES=	ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
+DISTFILES=	imm.source.tar.Z
+WRKSRC=		${WRKDIR}/mnm
 
-LIB_DEPENDS=	tk\\.3\\.:${PORTSDIR}/x11/tk
+MAINTAINER=	fenner@freebsd.org
 
-BROKEN=		yes	# depends on tk-3.6
-WRKSRC=		${WRKDIR}/src
+LIB_DEPENDS=	tk41\\.1:${PORTSDIR}/x11/tk41
+
+USE_X11=	yes
+
+# 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
 
 .include <bsd.port.mk>
diff --git a/net/imm/distinfo b/net/imm/distinfo
index c09f995b5f45..672f0d0c6e34 100644
--- a/net/imm/distinfo
+++ b/net/imm/distinfo
@@ -1 +1 @@
-MD5 (imm.src.tar.Z) = b260d70441f94029b4072c9a92b735ec
+MD5 (imm.source.tar.Z) = bf2713e5dca81daaecbc0bbcaf7af667
diff --git a/net/imm/files/Makefile.freebsd b/net/imm/files/Makefile.freebsd
new file mode 100644
index 000000000000..afcf4cb6b93f
--- /dev/null
+++ b/net/imm/files/Makefile.freebsd
@@ -0,0 +1,77 @@
+# 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
+# Libraries to use when linking: 
+LIBS = -lm
+
+TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk41 -ltcl -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/net/imm/files/Makefile.work b/net/imm/files/Makefile.work
new file mode 100644
index 000000000000..cb876d343f9e
--- /dev/null
+++ b/net/imm/files/Makefile.work
@@ -0,0 +1,2 @@
+all install:
+	cd src; ${MAKE} -f Makefile.freebsd $@
diff --git a/net/imm/pkg-comment b/net/imm/pkg-comment
index ec006bc36ace..f43810ebef09 100644
--- a/net/imm/pkg-comment
+++ b/net/imm/pkg-comment
@@ -1 +1 @@
-Internet Image Multicaster (and receiver).
+Internet Image(or other data) Multicaster (and receiver).
diff --git a/net/imm/pkg-descr b/net/imm/pkg-descr
index 2da8c557a389..339f05932750 100644
--- a/net/imm/pkg-descr
+++ b/net/imm/pkg-descr
@@ -1,5 +1,10 @@
-This is IMM, a program to send and receive images using IP multicast.
-This program is currently in use on the MBONE to transmit semi-real-time
-weather satellite images, as well as a number of other miscellaneous
-pictures.  IMM requires X11R6 and either `xli' or `xv' to perform the
-actual image display.
+IMM has been designed to efficiently replicate files/file directories
+using a reliable dissemination protocol framework and provide archiving
+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.
diff --git a/net/imm/pkg-plist b/net/imm/pkg-plist
index e768e9db8d54..617852e192ef 100644
--- a/net/imm/pkg-plist
+++ b/net/imm/pkg-plist
@@ -1,2 +1,6 @@
 bin/imm
 bin/immserv
+bin/lscomp
+share/doc/imm/README
+share/doc/imm/imm_readme.txt
+share/doc/imm/sdr2.plugin.S53.image.imm