author: Pietro Cerutti <gahr@FreeBSD.org> 2014-01-31 09:12:58 +0000
committer: Pietro Cerutti <gahr@FreeBSD.org> 2014-01-31 09:12:58 +0000
commit: 30fb1088d302933bcf6db87b2b1dd22a66e7e9fe (patch)
tree: 276e7d09a0f7aa28a07c30d9f2d13be03551429e /cad
parent: 2ca459630d94fad3a2978b7d39d787458aefbea5 (diff)
download: ports-30fb1088d302933bcf6db87b2b1dd22a66e7e9fe.tar.gz
ports-30fb1088d302933bcf6db87b2b1dd22a66e7e9fe.zip
39 files changed, 0 insertions, 2142 deletions
diff --git a/cad/Makefile b/cad/Makefile
index 98ff48c21cc7..fa9322565254 100644
--- a/cad/Makefile
+++ b/cad/Makefile
@@ -58,7 +58,6 @@
     SUBDIR += linux-eagle5
     SUBDIR += logisim
     SUBDIR += magic
-    SUBDIR += mars
     SUBDIR += meshdev
     SUBDIR += meshlab
     SUBDIR += netgen
diff --git a/cad/mars/Makefile b/cad/mars/Makefile
deleted file mode 100644
index 4e80208e95f9..000000000000
--- a/cad/mars/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Created by: David O'Brien <obrien@cs.ucdavis.edu>
-# $FreeBSD$
-
-PORTNAME=	mars
-PORTVERSION=	2.1
-PORTREVISION=	3
-CATEGORIES=	cad
-MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/sdag/MaRS/
-DISTNAME=	MaRS-${PORTVERSION}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-MAINTAINER=	gahr@FreeBSD.org
-COMMENT=	Maryland Routing Simulator
-
-OPTIONS_DEFINE=	X11
-OPTIONS_DEFAULT=X11
-
-DOCS_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} MaRS-2-doc${EXTRACT_SUFX}
-
-MAKE_JOBS_UNSAFE=	yes
-NO_WRKSUBDIR=	yes
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-USES+=		motif
-MAKEFILE=	Makefile.XMotif
-.else
-MAKEFILE=	Makefile.NoX
-.endif
-ALL_TARGET=	depend mars
-MAN1=		mars.1
-
-post-configure:
-	@${REINPLACE_CMD} -e 's/INFINITY/MARS_INFINITY/g' \
-		${WRKSRC}/include/route.h \
-		${WRKSRC}/comps/exBF.c \
-		${WRKSRC}/comps/exBF_ack.c \
-		${WRKSRC}/comps/route.c \
-		${WRKSRC}/comps/segal.c \
-		${WRKSRC}/comps/spf.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mars ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/man1/mars.1 ${PREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${PREFIX}/share/doc/mars
-	@${CHMOD} a+rx ${PREFIX}/share/doc/mars
-	@(cd ${PREFIX}/share/doc ; \
-		${TAR} xfpz /${DISTDIR}/MaRS-2-doc${EXTRACT_SUFX} ; \
-		[ -d mars ] && ${RM} -rf mars; \
-		${MV} doc mars )
-.endif
-
-.include <bsd.port.mk>
diff --git a/cad/mars/distinfo b/cad/mars/distinfo
deleted file mode 100644
index 95baa48b8d3b..000000000000
--- a/cad/mars/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (MaRS-2.1.tar.gz) = 8d0d468a1f70deca4bbd295101dab28405c7e32c5f65eb3d1338e34c43266fef
-SIZE (MaRS-2.1.tar.gz) = 246527
-SHA256 (MaRS-2-doc.tar.gz) = feb99316bd8c8f3562f640e754f0bf0de6df8a01290c11eba75c10ae3eb31e69
-SIZE (MaRS-2-doc.tar.gz) = 240864
diff --git a/cad/mars/files/patch-01 b/cad/mars/files/patch-01
deleted file mode 100644
index 899605d47dee..000000000000
--- a/cad/mars/files/patch-01
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.SimpleX.orig	Tue Mar 15 16:47:43 1994
-+++ Makefile.SimpleX	Mon Nov 18 21:06:58 1996
-@@ -5,8 +5,8 @@
- 
- # You need to supply directories for libraries and include files
- #   only if they are not in a standard directory.
--LIBDIRS = 
--INCDIRS = 
-+LIBDIRS = -L${LOCALBASE}/lib
-+INCDIRS = -I${LOCALBASE}/include
- #LIBDIRS = -L/usr/imports/lib/X11R5
- #INCDIRS = -I/usr/imports/include
-   
diff --git a/cad/mars/files/patch-02 b/cad/mars/files/patch-02
deleted file mode 100644
index cd7e4c607a6e..000000000000
--- a/cad/mars/files/patch-02
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.NoX.orig	Tue Mar 15 16:33:55 1994
-+++ Makefile.NoX	Thu Nov 21 23:05:55 1996
-@@ -48,7 +48,7 @@
- 
- 
- install: depend mars
--	cp $(MARSDIR)/mars $(MARSDIR)/bin
-+	cp $(MARSDIR)/mars $(PREFIX)/bin
- 
- libs:
- 	@ cd $(MARSDIR)/sim;   make lib $(EXPORT)
diff --git a/cad/mars/files/patch-03 b/cad/mars/files/patch-03
deleted file mode 100644
index a517b622560d..000000000000
--- a/cad/mars/files/patch-03
+++ /dev/null
@@ -1,128 +0,0 @@
---- sim/Makefile.orig	Wed Mar 16 09:37:49 1994
-+++ sim/Makefile	Sat Apr 26 06:21:50 1997
-@@ -19,7 +19,7 @@
- 	ranlib $(MARSDIR)/lib/libMaRSSim.a
- 
- stat: 
--	make_stat_headers $(CC) $(CC) $(CFLAGS) > ../include/stat.h
-+	./make_stat_headers $(CC) $(CC) $(CFLAGS) > ../include/stat.h
- 	$(CC) $(CFLAGS) -c stat.c
- 
- lint:
-@@ -40,114 +40,5 @@
- 
- # make dependencies
- depend:	${SRCS}
--	for i in ${SRCS}; do \
--	    cc -M ${CFLAGS} $$i | sort | uniq |\
--	    awk ' { if ($$1 != prev) \
--		{ if (rec != "") print rec; rec = $$0; prev = $$1; } \
--		else { if (length(rec $$2) > 78) { print rec; rec = $$0; } \
--		else rec = rec " " $$2 } } \
--		END { print rec } ' >> makedep; done
--	echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
--	echo '$$r makedep' >>eddep
--	echo 'w' >>eddep
--	cp Makefile Makefile.bak
--	ed - Makefile < eddep
--	rm eddep makedep
--	echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
--	echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
--	echo '# see make depend above' >> Makefile
--
--# DO NOT DELETE THIS LINE
--main.o: ./include/component.h ./include/comptypes.h ./include/event.h
--main.o: ./include/eventdefs.h ./include/heap.h ./include/list.h ./include/log.h
--main.o: ./include/mempool.h ./include/packet.h ./include/q.h ./include/sim.h
--main.o: ./include/simx.h ./include/simx1.h /usr/include/floatingpoint.h
--main.o: /usr/include/math.h /usr/include/stdio.h /usr/include/strings.h
--main.o: /usr/include/sys/ieeefp.h /usr/include/sys/stdtypes.h
--main.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h main.c
--log.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--log.o: ./include/hash.h ./include/heap.h ./include/list.h ./include/log.h
--log.o: ./include/mempool.h ./include/packet.h ./include/q.h ./include/sim.h
--log.o: ./include/simx.h ./include/simx1.h /usr/include/ctype.h
--log.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stdio.h
--log.o: /usr/include/strings.h /usr/include/sys/fcntl.h
--log.o: /usr/include/sys/fcntlcom.h /usr/include/sys/file.h
--log.o: /usr/include/sys/ieeefp.h /usr/include/sys/stat.h
--log.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--log.o: /usr/include/sys/types.h /usr/include/varargs.h log.c
--subr.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--subr.o: ./include/heap.h ./include/list.h ./include/log.h ./include/mempool.h
--subr.o: ./include/packet.h ./include/peer.h ./include/q.h ./include/sim.h
--subr.o: ./include/simx1.h /usr/include/ctype.h /usr/include/floatingpoint.h
--subr.o: /usr/include/math.h /usr/include/stdio.h /usr/include/strings.h
--subr.o: /usr/include/sys/ieeefp.h /usr/include/sys/stdtypes.h
--subr.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h
--subr.o: /usr/include/varargs.h subr.c
--list.o: ./include/list.h /usr/include/sys/stdtypes.h
--list.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h list.c
--q.o: ./include/q.h ./include/sim.h /usr/include/floatingpoint.h
--q.o: /usr/include/math.h /usr/include/stdio.h /usr/include/strings.h
--q.o: /usr/include/sys/ieeefp.h /usr/include/sys/stdtypes.h
--q.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h q.c
--mempool.o: ./include/mempool.h ./include/q.h ./include/sim.h
--mempool.o: /usr/include/floatingpoint.h /usr/include/math.h
--mempool.o: /usr/include/stdio.h /usr/include/strings.h
--mempool.o: /usr/include/sys/ieeefp.h /usr/include/sys/stdtypes.h
--mempool.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h mempool.c
--hash.o: ./include/hash.h ./include/q.h ./include/sim.h
--hash.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stdio.h
--hash.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--hash.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--hash.o: /usr/include/sys/types.h hash.c
--event.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--event.o: ./include/heap.h ./include/list.h ./include/log.h ./include/mempool.h
--event.o: ./include/packet.h ./include/q.h ./include/sim.h ./include/simx1.h
--event.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stdio.h
--event.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--event.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--event.o: /usr/include/sys/types.h event.c
--file.o: ./include/component.h ./include/comptypes.h ./include/event.h
--file.o: ./include/eventdefs.h ./include/heap.h ./include/list.h ./include/log.h
--file.o: ./include/mempool.h ./include/packet.h ./include/peer.h ./include/q.h
--file.o: ./include/sim.h ./include/simx.h ./include/simx1.h /usr/include/ctype.h
--file.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stdio.h
--file.o: /usr/include/strings.h /usr/include/sys/fcntl.h
--file.o: /usr/include/sys/fcntlcom.h /usr/include/sys/file.h
--file.o: /usr/include/sys/ieeefp.h /usr/include/sys/stat.h
--file.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--file.o: /usr/include/sys/types.h file.c
--packet.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--packet.o: ./include/heap.h ./include/list.h ./include/log.h ./include/mempool.h
--packet.o: ./include/packet.h ./include/q.h ./include/sim.h ./include/simx.h
--packet.o: ./include/simx1.h /usr/include/floatingpoint.h /usr/include/math.h
--packet.o: /usr/include/stdio.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--packet.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--packet.o: /usr/include/sys/types.h packet.c
--heap.o: ./include/heap.h ./include/sim.h /usr/include/floatingpoint.h
--heap.o: /usr/include/math.h /usr/include/stdio.h /usr/include/strings.h
--heap.o: /usr/include/sys/ieeefp.h /usr/include/sys/stdtypes.h
--heap.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h heap.c
--peer.o: ./include/component.h ./include/comptypes.h ./include/event.h
--peer.o: ./include/eventdefs.h ./include/heap.h ./include/list.h ./include/log.h
--peer.o: ./include/mempool.h ./include/meters.h ./include/packet.h
--peer.o: ./include/peer.h ./include/q.h ./include/sim.h ./include/simx.h
--peer.o: ./include/simx1.h ./include/xtables.h /usr/include/floatingpoint.h
--peer.o: /usr/include/math.h /usr/include/stdio.h /usr/include/strings.h
--peer.o: /usr/include/sys/ieeefp.h /usr/include/sys/stdtypes.h
--peer.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h peer.c
--random.o: /usr/include/stdio.h random.c
--comptypes.o: ./include/comptypes.h ./include/sim.h /usr/include/floatingpoint.h
--comptypes.o: /usr/include/math.h /usr/include/stdio.h /usr/include/strings.h
--comptypes.o: /usr/include/sys/ieeefp.h /usr/include/sys/stdtypes.h
--comptypes.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h comptypes.c
--usleep.o: /usr/include/sys/signal.h /usr/include/sys/stdtypes.h
--usleep.o: /usr/include/sys/sysmacros.h /usr/include/sys/time.h
--usleep.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/unistd.h
--usleep.o: /usr/include/vm/faultcode.h usleep.c
--stat.o: ./include/stat.h /usr/include/stdio.h /usr/include/sys/resource.h
--stat.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--stat.o: /usr/include/sys/time.h /usr/include/sys/types.h /usr/include/time.h
--stat.o: stat.c
--# DEPENDENCIES MUST END AT END OF FILE
--# IF YOU PUT STUFF HERE IT WILL GO AWAY
--# see make depend above
-+	mkdep $(CFLAGS) ${SRCS}
-+
diff --git a/cad/mars/files/patch-04 b/cad/mars/files/patch-04
deleted file mode 100644
index 26eea790d3f7..000000000000
--- a/cad/mars/files/patch-04
+++ /dev/null
@@ -1,139 +0,0 @@
---- comps/Makefile.orig	Tue Mar 15 16:38:05 1994
-+++ comps/Makefile	Mon Nov 18 21:12:26 1996
-@@ -37,135 +37,5 @@
- 
- # make dependencies
- depend:	${SRCS}
--	for i in ${SRCS}; do \
--	    cc -M ${CFLAGS} $$i | sort | uniq |\
--	    awk ' { if ($$1 != prev) \
--		{ if (rec != "") print rec; rec = $$0; prev = $$1; } \
--		else { if (length(rec $$2) > 78) { print rec; rec = $$0; } \
--		else rec = rec " " $$2 } } \
--		END { print rec } ' >> makedep; done
--	echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
--	echo '$$r makedep' >>eddep
--	echo 'w' >>eddep
--	cp Makefile Makefile.bak
--	ed - Makefile < eddep
--	rm eddep makedep
--	echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
--	echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
--	echo '# see make depend above' >> Makefile
-+	mkdep $(CFLAGS) ${SRCS}
- 
--# DO NOT DELETE THIS LINE
--stopper.o: ./include/component.h ./include/comptypes.h ./include/event.h
--stopper.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--stopper.o: ./include/log.h ./include/mempool.h ./include/packet.h
--stopper.o: ./include/perf.h ./include/q.h ./include/sim.h ./include/simx.h
--stopper.o: ./include/simx1.h ./include/stopper.h /usr/include/floatingpoint.h
--stopper.o: /usr/include/math.h /usr/include/stdio.h /usr/include/strings.h
--stopper.o: /usr/include/sys/ieeefp.h /usr/include/sys/stdtypes.h
--stopper.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h stopper.c
--perf.o: ./include/component.h ./include/comptypes.h ./include/event.h
--perf.o: ./include/eventdefs.h ./include/heap.h ./include/lcostfcn.h
--perf.o: ./include/link.h ./include/list.h ./include/log.h ./include/mempool.h
--perf.o: ./include/node.h ./include/packet.h ./include/perf.h ./include/q.h
--perf.o: ./include/route.h ./include/sim.h ./include/simx.h ./include/simx1.h
--perf.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stdio.h
--perf.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--perf.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--perf.o: /usr/include/sys/types.h perf.c
--segal.o: ./include/component.h ./include/comptypes.h ./include/event.h
--segal.o: ./include/eventdefs.h ./include/heap.h ./include/lcostfcn.h
--segal.o: ./include/link.h ./include/list.h ./include/log.h ./include/mempool.h
--segal.o: ./include/node.h ./include/packet.h ./include/perf.h ./include/q.h
--segal.o: ./include/route.h ./include/segal.h ./include/sim.h ./include/simx1.h
--segal.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stdio.h
--segal.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--segal.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--segal.o: /usr/include/sys/types.h segal.c
--spf.o: ./include/component.h ./include/comptypes.h ./include/event.h
--spf.o: ./include/eventdefs.h ./include/heap.h ./include/lcostfcn.h
--spf.o: ./include/list.h ./include/log.h ./include/mempool.h ./include/node.h
--spf.o: ./include/packet.h ./include/perf.h ./include/q.h ./include/route.h
--spf.o: ./include/sim.h ./include/simx1.h ./include/spf.h
--spf.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stdio.h
--spf.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--spf.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--spf.o: /usr/include/sys/types.h spf.c
--exBF.o: ./include/component.h ./include/comptypes.h ./include/event.h
--exBF.o: ./include/eventdefs.h ./include/exBF.h ./include/heap.h
--exBF.o: ./include/lcostfcn.h ./include/link.h ./include/list.h ./include/log.h
--exBF.o: ./include/mempool.h ./include/node.h ./include/packet.h
--exBF.o: ./include/perf.h ./include/q.h ./include/route.h ./include/sim.h
--exBF.o: ./include/simx1.h /usr/include/floatingpoint.h /usr/include/math.h
--exBF.o: /usr/include/stdio.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--exBF.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--exBF.o: /usr/include/sys/types.h exBF.c
--exBF_ack.o: ./include/component.h ./include/comptypes.h ./include/event.h
--exBF_ack.o: ./include/eventdefs.h ./include/exBF_ack.h ./include/heap.h
--exBF_ack.o: ./include/lcostfcn.h ./include/link.h ./include/list.h
--exBF_ack.o: ./include/log.h ./include/mempool.h ./include/node.h
--exBF_ack.o: ./include/packet.h ./include/perf.h ./include/q.h ./include/route.h
--exBF_ack.o: ./include/sim.h ./include/simx1.h /usr/include/floatingpoint.h
--exBF_ack.o: /usr/include/math.h /usr/include/stdio.h /usr/include/strings.h
--exBF_ack.o: /usr/include/sys/ieeefp.h /usr/include/sys/stdtypes.h
--exBF_ack.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h exBF_ack.c
--link.o: ./include/component.h ./include/comptypes.h ./include/event.h
--link.o: ./include/eventdefs.h ./include/heap.h ./include/link.h
--link.o: ./include/list.h ./include/log.h ./include/mempool.h ./include/packet.h
--link.o: ./include/perf.h ./include/q.h ./include/sim.h ./include/simx1.h
--link.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stdio.h
--link.o: /usr/include/string.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--link.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--link.o: /usr/include/sys/types.h link.c
--node.o: ./include/component.h ./include/comptypes.h ./include/event.h
--node.o: ./include/eventdefs.h ./include/heap.h ./include/lcostfcn.h
--node.o: ./include/link.h ./include/list.h ./include/log.h ./include/mempool.h
--node.o: ./include/node.h ./include/packet.h ./include/q.h ./include/route.h
--node.o: ./include/sim.h ./include/simx1.h /usr/include/floatingpoint.h
--node.o: /usr/include/math.h /usr/include/stdio.h /usr/include/strings.h
--node.o: /usr/include/sys/ieeefp.h /usr/include/sys/stdtypes.h
--node.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h node.c
--ftp.o: ./include/component.h ./include/comptypes.h ./include/event.h
--ftp.o: ./include/eventdefs.h ./include/ftp.h ./include/heap.h ./include/list.h
--ftp.o: ./include/log.h ./include/mempool.h ./include/packet.h ./include/perf.h
--ftp.o: ./include/q.h ./include/sim.h ./include/simx1.h
--ftp.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stdio.h
--ftp.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--ftp.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--ftp.o: /usr/include/sys/types.h ftp.c
--telnet.o: ./include/component.h ./include/comptypes.h ./include/event.h
--telnet.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--telnet.o: ./include/log.h ./include/mempool.h ./include/packet.h
--telnet.o: ./include/perf.h ./include/q.h ./include/sim.h ./include/simx1.h
--telnet.o: ./include/telnet.h /usr/include/floatingpoint.h /usr/include/math.h
--telnet.o: /usr/include/stdio.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--telnet.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--telnet.o: /usr/include/sys/types.h telnet.c
--simple_traffic.o: ./include/component.h ./include/comptypes.h ./include/event.h
--simple_traffic.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--simple_traffic.o: ./include/log.h ./include/mempool.h ./include/packet.h
--simple_traffic.o: ./include/perf.h ./include/q.h ./include/sim.h
--simple_traffic.o: ./include/simple_traffic.h ./include/simx1.h
--simple_traffic.o: /usr/include/floatingpoint.h /usr/include/math.h
--simple_traffic.o: /usr/include/stdio.h /usr/include/strings.h
--simple_traffic.o: /usr/include/sys/ieeefp.h /usr/include/sys/stdtypes.h
--simple_traffic.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h
--simple_traffic.o: simple_traffic.c
--route.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--route.o: ./include/heap.h ./include/lcostfcn.h ./include/list.h ./include/log.h
--route.o: ./include/mempool.h ./include/node.h ./include/packet.h ./include/q.h
--route.o: ./include/route.h ./include/sim.h ./include/simx1.h
--route.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stdio.h
--route.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--route.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--route.o: /usr/include/sys/types.h route.c
--lcostfcn.o: ./include/component.h ./include/comptypes.h ./include/event.h
--lcostfcn.o: ./include/eventdefs.h ./include/heap.h ./include/lcostfcn.h
--lcostfcn.o: ./include/list.h ./include/log.h ./include/mempool.h
--lcostfcn.o: ./include/packet.h ./include/q.h ./include/sim.h ./include/simx.h
--lcostfcn.o: ./include/simx1.h /usr/include/floatingpoint.h /usr/include/math.h
--lcostfcn.o: /usr/include/stdio.h /usr/include/strings.h
--lcostfcn.o: /usr/include/sys/ieeefp.h /usr/include/sys/stdtypes.h
--lcostfcn.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h lcostfcn.c
--# DEPENDENCIES MUST END AT END OF FILE
--# IF YOU PUT STUFF HERE IT WILL GO AWAY
--# see make depend above
diff --git a/cad/mars/files/patch-05 b/cad/mars/files/patch-05
deleted file mode 100644
index b14db973e9a8..000000000000
--- a/cad/mars/files/patch-05
+++ /dev/null
@@ -1,40 +0,0 @@
---- sim/log.c.orig	Wed Oct  7 04:52:51 1992
-+++ sim/log.c	Tue Dec  9 19:59:48 2003
-@@ -23,7 +23,7 @@
- #include "packet.h"
- #include "event.h"
- #include "log.h"
--#include <varargs.h>
-+#include <stdarg.h>
- 
- #ifdef DEBUG
- extern Log debug_log;
-@@ -59,13 +59,7 @@
- /* Debugging log-- writes name of component along with message */
- /*VARARGS4*/
- /*dbg_write(l, level, c, format, args)*/
--dbg_write(l, level, c, format, va_alist)
--     Log l;
--     int level;
--     Component *c;
--     char *format;
--     va_dcl
--
-+dbg_write(Log l, int level, Component *c, char *format, ... )
- {
-   va_list p;
- 
-@@ -79,8 +73,12 @@
-   }
-   /* Add the time */
-   fprintf(l, "%d ", ev_now());
--  va_start(p);
-+  va_start(p, format);
-+#ifdef __FreeBSD__
-+  vfprintf(l, format, p);
-+#else
-   _doprnt(format, p, l);
-+#endif
-   va_end(p);
-   fputs("\n\0", l);
-   fflush(l);
diff --git a/cad/mars/files/patch-06 b/cad/mars/files/patch-06
deleted file mode 100644
index 4dac3113ed2f..000000000000
--- a/cad/mars/files/patch-06
+++ /dev/null
@@ -1,207 +0,0 @@
---- X/Makefile.orig	Tue Mar 15 16:30:27 1994
-+++ X/Makefile	Sun Nov 24 01:03:10 1996
-@@ -35,203 +35,5 @@
- 
- # make dependencies
- depend:	${SRCS}
--	for i in ${SRCS}; do \
--	    cc -M ${CFLAGS} $$i | sort | uniq |\
--	    awk ' { if ($$1 != prev) \
--		{ if (rec != "") print rec; rec = $$0; prev = $$1; } \
--		else { if (length(rec $$2) > 78) { print rec; rec = $$0; } \
--		else rec = rec " " $$2 } } \
--		END { print rec } ' >> makedep; done
--	echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
--	echo '$$r makedep' >>eddep
--	echo 'w' >>eddep
--	cp Makefile Makefile.bak
--	ed - Makefile < eddep
--	rm eddep makedep
--	echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
--	echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
--	echo '# see make depend above' >> Makefile
-+	mkdep $(CFLAGS) ${SRCS}
- 
--# DO NOT DELETE THIS LINE
--IO.o: ./include/component.h ./include/controls.h ./include/event.h
--IO.o: ./include/eventdefs.h ./include/heap.h ./include/list.h ./include/log.h
--IO.o: ./include/mempool.h ./include/meters.h ./include/packet.h
--IO.o: ./include/peer.h ./include/q.h ./include/sim.h ./include/simx.h
--IO.o: ./include/simx1.h ./include/xtables.h /usr/include/floatingpoint.h
--IO.o: /usr/include/math.h /usr/include/stdio.h /usr/include/strings.h
--IO.o: /usr/include/sys/fcntl.h /usr/include/sys/fcntlcom.h
--IO.o: /usr/include/sys/file.h /usr/include/sys/ieeefp.h /usr/include/sys/stat.h
--IO.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--IO.o: /usr/include/sys/types.h IO.c
--clock.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--clock.o: ./include/heap.h ./include/list.h ./include/log.h ./include/mempool.h
--clock.o: ./include/packet.h ./include/q.h ./include/sim.h ./include/simx.h
--clock.o: ./include/simx1.h /usr/include/floatingpoint.h /usr/include/math.h
--clock.o: /usr/include/stdio.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--clock.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--clock.o: /usr/include/sys/types.h clock.c
--components.o: ./include/component.h ./include/comptypes.h ./include/event.h
--components.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--components.o: ./include/log.h ./include/mempool.h ./include/packet.h
--components.o: ./include/q.h ./include/sim.h ./include/simx.h ./include/simx1.h
--components.o: ./include/xtables.h /usr/include/floatingpoint.h
--components.o: /usr/include/math.h /usr/include/stdio.h /usr/include/strings.h
--components.o: /usr/include/sys/ieeefp.h /usr/include/sys/stdtypes.h
--components.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h
--components.o: components.c
--controls.o: ./include/component.h ./include/controls.h ./include/event.h
--controls.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--controls.o: ./include/log.h ./include/mempool.h ./include/packet.h
--controls.o: ./include/q.h ./include/sim.h ./include/simx.h ./include/simx1.h
--controls.o: ./include/xtables.h /usr/include/floatingpoint.h
--controls.o: /usr/include/math.h /usr/include/stdio.h /usr/include/strings.h
--controls.o: /usr/include/sys/fcntl.h /usr/include/sys/fcntlcom.h
--controls.o: /usr/include/sys/file.h /usr/include/sys/ieeefp.h
--controls.o: /usr/include/sys/stat.h /usr/include/sys/stdtypes.h
--controls.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h controls.c
--IO.o: ./include/component.h ./include/controls.h ./include/event.h
--IO.o: ./include/eventdefs.h ./include/heap.h ./include/list.h ./include/log.h
--IO.o: ./include/mempool.h ./include/meters.h ./include/packet.h
--IO.o: ./include/peer.h ./include/q.h ./include/sim.h ./include/simx.h
--IO.o: ./include/simx1.h ./include/xtables.h /usr/include/floatingpoint.h
--IO.o: /usr/include/math.h /usr/include/stdio.h /usr/include/strings.h
--IO.o: /usr/include/sys/fcntl.h /usr/include/sys/fcntlcom.h
--IO.o: /usr/include/sys/file.h /usr/include/sys/ieeefp.h /usr/include/sys/stat.h
--IO.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--IO.o: /usr/include/sys/types.h IO.c
--clock.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--clock.o: ./include/heap.h ./include/list.h ./include/log.h ./include/mempool.h
--clock.o: ./include/packet.h ./include/q.h ./include/sim.h ./include/simx.h
--clock.o: ./include/simx1.h /usr/include/floatingpoint.h /usr/include/math.h
--clock.o: /usr/include/stdio.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--clock.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--clock.o: /usr/include/sys/types.h clock.c
--IO.o: ./include/component.h ./include/controls.h ./include/event.h
--IO.o: ./include/eventdefs.h ./include/heap.h ./include/list.h ./include/log.h
--IO.o: ./include/mempool.h ./include/meters.h ./include/packet.h
--IO.o: ./include/peer.h ./include/q.h ./include/sim.h ./include/simx.h
--IO.o: ./include/simx1.h ./include/xtables.h /usr/imports/include/X11/X.h
--IO.o: /usr/imports/include/X11/Xfuncproto.h /usr/imports/include/X11/Xlib.h
--IO.o: /usr/imports/include/X11/Xosdefs.h /usr/imports/include/X11/Xutil.h
--IO.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stddef.h
--IO.o: /usr/include/stdio.h /usr/include/strings.h /usr/include/sys/fcntl.h
--IO.o: /usr/include/sys/fcntlcom.h /usr/include/sys/file.h
--IO.o: /usr/include/sys/ieeefp.h /usr/include/sys/stat.h
--IO.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--IO.o: /usr/include/sys/types.h IO.c
--clock.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--clock.o: ./include/heap.h ./include/list.h ./include/log.h ./include/mempool.h
--clock.o: ./include/packet.h ./include/q.h ./include/sim.h ./include/simx.h
--clock.o: ./include/simx1.h /usr/imports/include/X11/X.h
--clock.o: /usr/imports/include/X11/Xfuncproto.h /usr/imports/include/X11/Xlib.h
--clock.o: /usr/imports/include/X11/Xosdefs.h /usr/imports/include/X11/Xutil.h
--clock.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stddef.h
--clock.o: /usr/include/stdio.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--clock.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--clock.o: /usr/include/sys/types.h clock.c
--components.o: ./include/component.h ./include/comptypes.h ./include/event.h
--components.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--components.o: ./include/log.h ./include/mempool.h ./include/packet.h
--components.o: ./include/q.h ./include/sim.h ./include/simx.h ./include/simx1.h
--components.o: ./include/xtables.h /usr/imports/include/X11/X.h
--components.o: /usr/imports/include/X11/Xfuncproto.h
--components.o: /usr/imports/include/X11/Xlib.h
--components.o: /usr/imports/include/X11/Xosdefs.h
--components.o: /usr/imports/include/X11/Xutil.h /usr/include/floatingpoint.h
--components.o: /usr/include/math.h /usr/include/stddef.h /usr/include/stdio.h
--components.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--components.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--components.o: /usr/include/sys/types.h components.c
--controls.o: ./include/component.h ./include/controls.h ./include/event.h
--controls.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--controls.o: ./include/log.h ./include/mempool.h ./include/packet.h
--controls.o: ./include/q.h ./include/sim.h ./include/simx.h ./include/simx1.h
--controls.o: ./include/xtables.h /usr/imports/include/X11/X.h
--controls.o: /usr/imports/include/X11/Xfuncproto.h
--controls.o: /usr/imports/include/X11/Xlib.h /usr/imports/include/X11/Xosdefs.h
--controls.o: /usr/imports/include/X11/Xutil.h /usr/include/floatingpoint.h
--controls.o: /usr/include/math.h /usr/include/stddef.h /usr/include/stdio.h
--controls.o: /usr/include/strings.h /usr/include/sys/fcntl.h
--controls.o: /usr/include/sys/fcntlcom.h /usr/include/sys/file.h
--controls.o: /usr/include/sys/ieeefp.h /usr/include/sys/stat.h
--controls.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--controls.o: /usr/include/sys/types.h controls.c
--infowindows.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--infowindows.o: ./include/heap.h ./include/list.h ./include/log.h
--infowindows.o: ./include/mempool.h ./include/packet.h ./include/q.h
--infowindows.o: ./include/sim.h ./include/simx.h ./include/simx1.h
--infowindows.o: ./include/xtables.h /usr/imports/include/X11/X.h
--infowindows.o: /usr/imports/include/X11/Xfuncproto.h
--infowindows.o: /usr/imports/include/X11/Xlib.h
--infowindows.o: /usr/imports/include/X11/Xosdefs.h
--infowindows.o: /usr/imports/include/X11/Xutil.h /usr/include/floatingpoint.h
--infowindows.o: /usr/include/math.h /usr/include/stddef.h /usr/include/stdio.h
--infowindows.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--infowindows.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--infowindows.o: /usr/include/sys/types.h infowindows.c
--lines.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--lines.o: ./include/hash.h ./include/heap.h ./include/list.h ./include/log.h
--lines.o: ./include/mempool.h ./include/packet.h ./include/q.h ./include/sim.h
--lines.o: ./include/simx.h ./include/simx1.h /usr/imports/include/X11/X.h
--lines.o: /usr/imports/include/X11/Xfuncproto.h /usr/imports/include/X11/Xlib.h
--lines.o: /usr/imports/include/X11/Xosdefs.h /usr/imports/include/X11/Xutil.h
--lines.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stddef.h
--lines.o: /usr/include/stdio.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--lines.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--lines.o: /usr/include/sys/types.h lines.c
--meters.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--meters.o: ./include/heap.h ./include/list.h ./include/log.h ./include/mempool.h
--meters.o: ./include/meters.h ./include/packet.h ./include/q.h ./include/sim.h
--meters.o: ./include/simx.h ./include/simx1.h ./include/xtables.h
--meters.o: /usr/imports/include/X11/X.h /usr/imports/include/X11/Xfuncproto.h
--meters.o: /usr/imports/include/X11/Xlib.h /usr/imports/include/X11/Xosdefs.h
--meters.o: /usr/imports/include/X11/Xutil.h /usr/include/floatingpoint.h
--meters.o: /usr/include/math.h /usr/include/stddef.h /usr/include/stdio.h
--meters.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--meters.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--meters.o: /usr/include/sys/types.h meters.c
--update.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--update.o: ./include/heap.h ./include/list.h ./include/log.h ./include/mempool.h
--update.o: ./include/packet.h ./include/q.h ./include/sim.h ./include/simx.h
--update.o: ./include/simx1.h ./include/xtables.h /usr/imports/include/X11/X.h
--update.o: /usr/imports/include/X11/Xfuncproto.h /usr/imports/include/X11/Xlib.h
--update.o: /usr/imports/include/X11/Xosdefs.h /usr/imports/include/X11/Xutil.h
--update.o: /usr/include/floatingpoint.h /usr/include/math.h
--update.o: /usr/include/stddef.h /usr/include/stdio.h /usr/include/strings.h
--update.o: /usr/include/sys/ieeefp.h /usr/include/sys/stdtypes.h
--update.o: /usr/include/sys/sysmacros.h /usr/include/sys/types.h update.c
--xinit.o: ./include/component.h ./include/comptypes.h ./include/event.h
--xinit.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--xinit.o: ./include/log.h ./include/mempool.h ./include/packet.h ./include/q.h
--xinit.o: ./include/sim.h ./include/simx.h ./include/simx1.h ./include/xtables.h
--xinit.o: /usr/imports/include/X11/X.h /usr/imports/include/X11/Xfuncproto.h
--xinit.o: /usr/imports/include/X11/Xlib.h /usr/imports/include/X11/Xosdefs.h
--xinit.o: /usr/imports/include/X11/Xutil.h /usr/imports/include/X11/cursorfont.h
--xinit.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stddef.h
--xinit.o: /usr/include/stdio.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--xinit.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--xinit.o: /usr/include/sys/types.h xinit.c
--edit.o: ./include/component.h ./include/comptypes.h ./include/event.h
--edit.o: ./include/eventdefs.h ./include/heap.h ./include/list.h ./include/log.h
--edit.o: ./include/mempool.h ./include/meters.h ./include/packet.h ./include/q.h
--edit.o: ./include/sim.h ./include/simx.h ./include/simx1.h ./include/xtables.h
--edit.o: /usr/imports/include/X11/X.h /usr/imports/include/X11/Xfuncproto.h
--edit.o: /usr/imports/include/X11/Xlib.h /usr/imports/include/X11/Xosdefs.h
--edit.o: /usr/imports/include/X11/Xutil.h /usr/include/floatingpoint.h
--edit.o: /usr/include/math.h /usr/include/stddef.h /usr/include/stdio.h
--edit.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--edit.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--edit.o: /usr/include/sys/types.h edit.c
--text.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--text.o: ./include/heap.h ./include/list.h ./include/log.h ./include/mempool.h
--text.o: ./include/packet.h ./include/q.h ./include/sim.h ./include/simx.h
--text.o: ./include/simx1.h /usr/imports/include/X11/X.h
--text.o: /usr/imports/include/X11/Xfuncproto.h /usr/imports/include/X11/Xlib.h
--text.o: /usr/imports/include/X11/Xosdefs.h /usr/imports/include/X11/Xutil.h
--text.o: /usr/include/floatingpoint.h /usr/include/math.h /usr/include/stddef.h
--text.o: /usr/include/stdio.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--text.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--text.o: /usr/include/sys/types.h text.c
--# DEPENDENCIES MUST END AT END OF FILE
--# IF YOU PUT STUFF HERE IT WILL GO AWAY
--# see make depend above
diff --git a/cad/mars/files/patch-07 b/cad/mars/files/patch-07
deleted file mode 100644
index 76326c1033f5..000000000000
--- a/cad/mars/files/patch-07
+++ /dev/null
@@ -1,577 +0,0 @@
---- XMotif/Makefile.orig	Tue Mar 15 16:18:24 1994
-+++ XMotif/Makefile	Sun Nov 24 03:12:03 1996
-@@ -33,573 +33,5 @@
- 
- # make dependencies
- depend:	${SRCS}
--	for i in ${SRCS}; do \
--	    cc -M ${CFLAGS} $$i | sort | uniq |\
--	    awk ' { if ($$1 != prev) \
--		{ if (rec != "") print rec; rec = $$0; prev = $$1; } \
--		else { if (length(rec $$2) > 78) { print rec; rec = $$0; } \
--		else rec = rec " " $$2 } } \
--		END { print rec } ' >> makedep; done
--	echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
--	echo '$$r makedep' >>eddep
--	echo 'w' >>eddep
--	cp Makefile Makefile.bak
--	ed - Makefile < eddep
--	rm eddep makedep
--	echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
--	echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
--	echo '# see make depend above' >> Makefile
-+	mkdep $(CFLAGS) ${SRCS}
- 
--# DO NOT DELETE THIS LINE
--xinit.o: ./include/component.h ./include/comptypes.h ./include/event.h
--xinit.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--xinit.o: ./include/log.h ./include/mempool.h ./include/packet.h ./include/q.h
--xinit.o: ./include/sim.h ./include/simx.h ./include/simx1.h
--xinit.o: ./include/xm-comp_trans.h ./include/xm-edit.h ./include/xm-info_w.h
--xinit.o: ./include/xm-lines.h ./include/xm-main_w.h ./include/xm-meters.h
--xinit.o: ./include/xm-mfile.h ./include/xm-network.h ./include/xm-param_w.h
--xinit.o: ./include/xm-util.h /usr/imports/include/X11R5/X11/Composite.h
--xinit.o: /usr/imports/include/X11R5/X11/Constraint.h
--xinit.o: /usr/imports/include/X11R5/X11/Core.h
--xinit.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--xinit.o: /usr/imports/include/X11R5/X11/Object.h
--xinit.o: /usr/imports/include/X11R5/X11/RectObj.h
--xinit.o: /usr/imports/include/X11R5/X11/Shell.h
--xinit.o: /usr/imports/include/X11R5/X11/StringDefs.h
--xinit.o: /usr/imports/include/X11R5/X11/X.h
--xinit.o: /usr/imports/include/X11R5/X11/Xatom.h
--xinit.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--xinit.o: /usr/imports/include/X11R5/X11/Xlib.h
--xinit.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--xinit.o: /usr/imports/include/X11R5/X11/Xresource.h
--xinit.o: /usr/imports/include/X11R5/X11/Xutil.h
--xinit.o: /usr/imports/include/X11R5/Xm/PushB.h
--xinit.o: /usr/imports/include/X11R5/Xm/Text.h
--xinit.o: /usr/imports/include/X11R5/Xm/VendorS.h
--xinit.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--xinit.o: /usr/imports/include/X11R5/Xm/Xm.h
--xinit.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h /usr/include/floatingpoint.h
--xinit.o: /usr/include/math.h /usr/include/stddef.h /usr/include/stdio.h
--xinit.o: /usr/include/string.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--xinit.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--xinit.o: /usr/include/sys/types.h xinit.c
--io.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--io.o: ./include/heap.h ./include/list.h ./include/log.h ./include/mempool.h
--io.o: ./include/packet.h ./include/q.h ./include/sim.h ./include/simx.h
--io.o: ./include/simx1.h ./include/xm-info_w.h ./include/xm-io.h
--io.o: ./include/xm-main_w.h ./include/xm-meters.h ./include/xm-network.h
--io.o: ./include/xm-param_w.h ./include/xm-util.h
--io.o: /usr/imports/include/X11R5/X11/Composite.h
--io.o: /usr/imports/include/X11R5/X11/Constraint.h
--io.o: /usr/imports/include/X11R5/X11/Core.h
--io.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--io.o: /usr/imports/include/X11R5/X11/Object.h
--io.o: /usr/imports/include/X11R5/X11/RectObj.h
--io.o: /usr/imports/include/X11R5/X11/Shell.h
--io.o: /usr/imports/include/X11R5/X11/StringDefs.h
--io.o: /usr/imports/include/X11R5/X11/X.h /usr/imports/include/X11R5/X11/Xatom.h
--io.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--io.o: /usr/imports/include/X11R5/X11/Xlib.h
--io.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--io.o: /usr/imports/include/X11R5/X11/Xresource.h
--io.o: /usr/imports/include/X11R5/X11/Xutil.h
--io.o: /usr/imports/include/X11R5/Xm/PushB.h
--io.o: /usr/imports/include/X11R5/Xm/Text.h
--io.o: /usr/imports/include/X11R5/Xm/VendorS.h
--io.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--io.o: /usr/imports/include/X11R5/Xm/Xm.h
--io.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h /usr/include/floatingpoint.h
--io.o: /usr/include/math.h /usr/include/stddef.h /usr/include/stdio.h
--io.o: /usr/include/string.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--io.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--io.o: /usr/include/sys/types.h io.c
--main_w.o: ./include/component.h ./include/comptypes.h ./include/event.h
--main_w.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--main_w.o: ./include/log.h ./include/mempool.h ./include/packet.h ./include/q.h
--main_w.o: ./include/sim.h ./include/simx.h ./include/simx1.h
--main_w.o: ./include/xm-comp_trans.h ./include/xm-edit.h ./include/xm-info_w.h
--main_w.o: ./include/xm-lines.h ./include/xm-main_w.h ./include/xm-meters.h
--main_w.o: ./include/xm-mfile.h ./include/xm-network.h ./include/xm-options.h
--main_w.o: ./include/xm-util.h ./include/xm-view.h
--main_w.o: /usr/imports/include/X11R5/X11/Composite.h
--main_w.o: /usr/imports/include/X11R5/X11/Constraint.h
--main_w.o: /usr/imports/include/X11R5/X11/Core.h
--main_w.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--main_w.o: /usr/imports/include/X11R5/X11/Object.h
--main_w.o: /usr/imports/include/X11R5/X11/RectObj.h
--main_w.o: /usr/imports/include/X11R5/X11/Shell.h
--main_w.o: /usr/imports/include/X11R5/X11/StringDefs.h
--main_w.o: /usr/imports/include/X11R5/X11/X.h
--main_w.o: /usr/imports/include/X11R5/X11/Xatom.h
--main_w.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--main_w.o: /usr/imports/include/X11R5/X11/Xlib.h
--main_w.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--main_w.o: /usr/imports/include/X11R5/X11/Xresource.h
--main_w.o: /usr/imports/include/X11R5/X11/Xutil.h
--main_w.o: /usr/imports/include/X11R5/Xm/BulletinB.h
--main_w.o: /usr/imports/include/X11R5/Xm/DrawingA.h
--main_w.o: /usr/imports/include/X11R5/Xm/Form.h
--main_w.o: /usr/imports/include/X11R5/Xm/Label.h
--main_w.o: /usr/imports/include/X11R5/Xm/MessageB.h
--main_w.o: /usr/imports/include/X11R5/Xm/PushB.h
--main_w.o: /usr/imports/include/X11R5/Xm/RowColumn.h
--main_w.o: /usr/imports/include/X11R5/Xm/ScrolledW.h
--main_w.o: /usr/imports/include/X11R5/Xm/SeparatoG.h
--main_w.o: /usr/imports/include/X11R5/Xm/Text.h
--main_w.o: /usr/imports/include/X11R5/Xm/TextF.h
--main_w.o: /usr/imports/include/X11R5/Xm/VendorS.h
--main_w.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--main_w.o: /usr/imports/include/X11R5/Xm/Xm.h
--main_w.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h
--main_w.o: /usr/include/floatingpoint.h /usr/include/math.h
--main_w.o: /usr/include/stddef.h /usr/include/stdio.h /usr/include/string.h
--main_w.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--main_w.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--main_w.o: /usr/include/sys/types.h main_w.c
--util.o: ./include/component.h ./include/comptypes.h ./include/event.h
--util.o: ./include/eventdefs.h ./include/heap.h ./include/list.h ./include/log.h
--util.o: ./include/mempool.h ./include/packet.h ./include/q.h ./include/sim.h
--util.o: ./include/simx.h ./include/simx1.h ./include/xm-util.h
--util.o: /usr/imports/include/X11R5/X11/Composite.h
--util.o: /usr/imports/include/X11R5/X11/Constraint.h
--util.o: /usr/imports/include/X11R5/X11/Core.h
--util.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--util.o: /usr/imports/include/X11R5/X11/Object.h
--util.o: /usr/imports/include/X11R5/X11/RectObj.h
--util.o: /usr/imports/include/X11R5/X11/Shell.h
--util.o: /usr/imports/include/X11R5/X11/StringDefs.h
--util.o: /usr/imports/include/X11R5/X11/X.h
--util.o: /usr/imports/include/X11R5/X11/Xatom.h
--util.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--util.o: /usr/imports/include/X11R5/X11/Xlib.h
--util.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--util.o: /usr/imports/include/X11R5/X11/Xresource.h
--util.o: /usr/imports/include/X11R5/X11/Xutil.h
--util.o: /usr/imports/include/X11R5/Xm/BulletinB.h
--util.o: /usr/imports/include/X11R5/Xm/CascadeBG.h
--util.o: /usr/imports/include/X11R5/Xm/Form.h
--util.o: /usr/imports/include/X11R5/Xm/Label.h
--util.o: /usr/imports/include/X11R5/Xm/PushB.h
--util.o: /usr/imports/include/X11R5/Xm/PushBG.h
--util.o: /usr/imports/include/X11R5/Xm/RowColumn.h
--util.o: /usr/imports/include/X11R5/Xm/TextF.h
--util.o: /usr/imports/include/X11R5/Xm/ToggleBG.h
--util.o: /usr/imports/include/X11R5/Xm/VendorS.h
--util.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--util.o: /usr/imports/include/X11R5/Xm/Xm.h
--util.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h /usr/include/floatingpoint.h
--util.o: /usr/include/math.h /usr/include/stddef.h /usr/include/stdio.h
--util.o: /usr/include/string.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--util.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--util.o: /usr/include/sys/types.h util.c
--edit.o: ./include/component.h ./include/comptypes.h ./include/event.h
--edit.o: ./include/eventdefs.h ./include/heap.h ./include/list.h ./include/log.h
--edit.o: ./include/mempool.h ./include/packet.h ./include/q.h ./include/sim.h
--edit.o: ./include/simx.h ./include/simx1.h ./include/xm-comp_trans.h
--edit.o: ./include/xm-edit.h ./include/xm-icon.h ./include/xm-info_w.h
--edit.o: ./include/xm-main_w.h ./include/xm-meters.h ./include/xm-network.h
--edit.o: ./include/xm-util.h /usr/imports/include/X11R5/X11/Composite.h
--edit.o: /usr/imports/include/X11R5/X11/Constraint.h
--edit.o: /usr/imports/include/X11R5/X11/Core.h
--edit.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--edit.o: /usr/imports/include/X11R5/X11/Object.h
--edit.o: /usr/imports/include/X11R5/X11/RectObj.h
--edit.o: /usr/imports/include/X11R5/X11/Shell.h
--edit.o: /usr/imports/include/X11R5/X11/StringDefs.h
--edit.o: /usr/imports/include/X11R5/X11/X.h
--edit.o: /usr/imports/include/X11R5/X11/Xatom.h
--edit.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--edit.o: /usr/imports/include/X11R5/X11/Xlib.h
--edit.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--edit.o: /usr/imports/include/X11R5/X11/Xresource.h
--edit.o: /usr/imports/include/X11R5/X11/Xutil.h
--edit.o: /usr/imports/include/X11R5/Xm/BulletinB.h
--edit.o: /usr/imports/include/X11R5/Xm/DrawingA.h
--edit.o: /usr/imports/include/X11R5/Xm/Form.h
--edit.o: /usr/imports/include/X11R5/Xm/Label.h
--edit.o: /usr/imports/include/X11R5/Xm/MessageB.h
--edit.o: /usr/imports/include/X11R5/Xm/PushB.h
--edit.o: /usr/imports/include/X11R5/Xm/PushBG.h
--edit.o: /usr/imports/include/X11R5/Xm/RowColumn.h
--edit.o: /usr/imports/include/X11R5/Xm/SeparatoG.h
--edit.o: /usr/imports/include/X11R5/Xm/Text.h
--edit.o: /usr/imports/include/X11R5/Xm/VendorS.h
--edit.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--edit.o: /usr/imports/include/X11R5/Xm/Xm.h
--edit.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h /usr/include/floatingpoint.h
--edit.o: /usr/include/math.h /usr/include/stddef.h /usr/include/stdio.h
--edit.o: /usr/include/string.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--edit.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--edit.o: /usr/include/sys/types.h edit.c
--mfile.o: ./include/component.h ./include/comptypes.h ./include/event.h
--mfile.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--mfile.o: ./include/log.h ./include/mempool.h ./include/packet.h ./include/q.h
--mfile.o: ./include/sim.h ./include/simx.h ./include/simx1.h
--mfile.o: ./include/xm-info_w.h ./include/xm-main_w.h ./include/xm-meters.h
--mfile.o: ./include/xm-mfile.h ./include/xm-network.h ./include/xm-util.h
--mfile.o: /usr/imports/include/X11R5/X11/Composite.h
--mfile.o: /usr/imports/include/X11R5/X11/Constraint.h
--mfile.o: /usr/imports/include/X11R5/X11/Core.h
--mfile.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--mfile.o: /usr/imports/include/X11R5/X11/Object.h
--mfile.o: /usr/imports/include/X11R5/X11/RectObj.h
--mfile.o: /usr/imports/include/X11R5/X11/Shell.h
--mfile.o: /usr/imports/include/X11R5/X11/StringDefs.h
--mfile.o: /usr/imports/include/X11R5/X11/X.h
--mfile.o: /usr/imports/include/X11R5/X11/Xatom.h
--mfile.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--mfile.o: /usr/imports/include/X11R5/X11/Xlib.h
--mfile.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--mfile.o: /usr/imports/include/X11R5/X11/Xresource.h
--mfile.o: /usr/imports/include/X11R5/X11/Xutil.h
--mfile.o: /usr/imports/include/X11R5/Xm/BulletinB.h
--mfile.o: /usr/imports/include/X11R5/Xm/FileSB.h
--mfile.o: /usr/imports/include/X11R5/Xm/Form.h
--mfile.o: /usr/imports/include/X11R5/Xm/Label.h
--mfile.o: /usr/imports/include/X11R5/Xm/MessageB.h
--mfile.o: /usr/imports/include/X11R5/Xm/PushB.h
--mfile.o: /usr/imports/include/X11R5/Xm/PushBG.h
--mfile.o: /usr/imports/include/X11R5/Xm/SeparatoG.h
--mfile.o: /usr/imports/include/X11R5/Xm/Separator.h
--mfile.o: /usr/imports/include/X11R5/Xm/Text.h
--mfile.o: /usr/imports/include/X11R5/Xm/VendorS.h
--mfile.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--mfile.o: /usr/imports/include/X11R5/Xm/Xm.h
--mfile.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h /usr/include/floatingpoint.h
--mfile.o: /usr/include/math.h /usr/include/stddef.h /usr/include/stdio.h
--mfile.o: /usr/include/string.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--mfile.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--mfile.o: /usr/include/sys/types.h /usr/include/unistd.h mfile.c
--view.o: ./include/component.h ./include/comptypes.h ./include/event.h
--view.o: ./include/eventdefs.h ./include/heap.h ./include/list.h ./include/log.h
--view.o: ./include/mempool.h ./include/packet.h ./include/q.h ./include/sim.h
--view.o: ./include/simx.h ./include/simx1.h ./include/xm-comp_trans.h
--view.o: ./include/xm-info_w.h ./include/xm-main_w.h ./include/xm-meters.h
--view.o: ./include/xm-network.h ./include/xm-param_w.h ./include/xm-util.h
--view.o: ./include/xm-view.h /usr/imports/include/X11R5/X11/Composite.h
--view.o: /usr/imports/include/X11R5/X11/Constraint.h
--view.o: /usr/imports/include/X11R5/X11/Core.h
--view.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--view.o: /usr/imports/include/X11R5/X11/Object.h
--view.o: /usr/imports/include/X11R5/X11/RectObj.h
--view.o: /usr/imports/include/X11R5/X11/Shell.h
--view.o: /usr/imports/include/X11R5/X11/StringDefs.h
--view.o: /usr/imports/include/X11R5/X11/X.h
--view.o: /usr/imports/include/X11R5/X11/Xatom.h
--view.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--view.o: /usr/imports/include/X11R5/X11/Xlib.h
--view.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--view.o: /usr/imports/include/X11R5/X11/Xresource.h
--view.o: /usr/imports/include/X11R5/X11/Xutil.h
--view.o: /usr/imports/include/X11R5/Xm/BulletinB.h
--view.o: /usr/imports/include/X11R5/Xm/Form.h
--view.o: /usr/imports/include/X11R5/Xm/Label.h
--view.o: /usr/imports/include/X11R5/Xm/PushB.h
--view.o: /usr/imports/include/X11R5/Xm/PushBG.h
--view.o: /usr/imports/include/X11R5/Xm/RowColumn.h
--view.o: /usr/imports/include/X11R5/Xm/SeparatoG.h
--view.o: /usr/imports/include/X11R5/Xm/Separator.h
--view.o: /usr/imports/include/X11R5/Xm/Text.h
--view.o: /usr/imports/include/X11R5/Xm/ToggleB.h
--view.o: /usr/imports/include/X11R5/Xm/ToggleBG.h
--view.o: /usr/imports/include/X11R5/Xm/VendorS.h
--view.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--view.o: /usr/imports/include/X11R5/Xm/Xm.h
--view.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h /usr/include/floatingpoint.h
--view.o: /usr/include/math.h /usr/include/stddef.h /usr/include/stdio.h
--view.o: /usr/include/string.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--view.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--view.o: /usr/include/sys/types.h view.c
--options.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--options.o: ./include/heap.h ./include/list.h ./include/log.h
--options.o: ./include/mempool.h ./include/packet.h ./include/q.h ./include/sim.h
--options.o: ./include/simx.h ./include/simx1.h ./include/xm-main_w.h
--options.o: ./include/xm-network.h ./include/xm-options.h ./include/xm-util.h
--options.o: /usr/imports/include/X11R5/X11/Composite.h
--options.o: /usr/imports/include/X11R5/X11/Constraint.h
--options.o: /usr/imports/include/X11R5/X11/Core.h
--options.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--options.o: /usr/imports/include/X11R5/X11/Object.h
--options.o: /usr/imports/include/X11R5/X11/RectObj.h
--options.o: /usr/imports/include/X11R5/X11/Shell.h
--options.o: /usr/imports/include/X11R5/X11/StringDefs.h
--options.o: /usr/imports/include/X11R5/X11/X.h
--options.o: /usr/imports/include/X11R5/X11/Xatom.h
--options.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--options.o: /usr/imports/include/X11R5/X11/Xlib.h
--options.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--options.o: /usr/imports/include/X11R5/X11/Xresource.h
--options.o: /usr/imports/include/X11R5/X11/Xutil.h
--options.o: /usr/imports/include/X11R5/Xm/BulletinB.h
--options.o: /usr/imports/include/X11R5/Xm/CascadeBG.h
--options.o: /usr/imports/include/X11R5/Xm/Form.h
--options.o: /usr/imports/include/X11R5/Xm/Frame.h
--options.o: /usr/imports/include/X11R5/Xm/Label.h
--options.o: /usr/imports/include/X11R5/Xm/PushB.h
--options.o: /usr/imports/include/X11R5/Xm/PushBG.h
--options.o: /usr/imports/include/X11R5/Xm/RowColumn.h
--options.o: /usr/imports/include/X11R5/Xm/SeparatoG.h
--options.o: /usr/imports/include/X11R5/Xm/Text.h
--options.o: /usr/imports/include/X11R5/Xm/TextF.h
--options.o: /usr/imports/include/X11R5/Xm/ToggleBG.h
--options.o: /usr/imports/include/X11R5/Xm/VendorS.h
--options.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--options.o: /usr/imports/include/X11R5/Xm/Xm.h
--options.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h
--options.o: /usr/include/floatingpoint.h /usr/include/math.h
--options.o: /usr/include/stddef.h /usr/include/stdio.h /usr/include/string.h
--options.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--options.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--options.o: /usr/include/sys/types.h options.c
--info_w.o: ./include/component.h ./include/comptypes.h ./include/event.h
--info_w.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--info_w.o: ./include/log.h ./include/mempool.h ./include/packet.h ./include/q.h
--info_w.o: ./include/sim.h ./include/simx.h ./include/simx1.h
--info_w.o: ./include/xm-comp_trans.h ./include/xm-info_w.h ./include/xm-main_w.h
--info_w.o: ./include/xm-network.h ./include/xm-param_w.h ./include/xm-util.h
--info_w.o: /usr/imports/include/X11R5/X11/Composite.h
--info_w.o: /usr/imports/include/X11R5/X11/Constraint.h
--info_w.o: /usr/imports/include/X11R5/X11/Core.h
--info_w.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--info_w.o: /usr/imports/include/X11R5/X11/Object.h
--info_w.o: /usr/imports/include/X11R5/X11/RectObj.h
--info_w.o: /usr/imports/include/X11R5/X11/Shell.h
--info_w.o: /usr/imports/include/X11R5/X11/StringDefs.h
--info_w.o: /usr/imports/include/X11R5/X11/X.h
--info_w.o: /usr/imports/include/X11R5/X11/Xatom.h
--info_w.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--info_w.o: /usr/imports/include/X11R5/X11/Xlib.h
--info_w.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--info_w.o: /usr/imports/include/X11R5/X11/Xresource.h
--info_w.o: /usr/imports/include/X11R5/X11/Xutil.h
--info_w.o: /usr/imports/include/X11R5/Xm/BulletinB.h
--info_w.o: /usr/imports/include/X11R5/Xm/Form.h
--info_w.o: /usr/imports/include/X11R5/Xm/Frame.h
--info_w.o: /usr/imports/include/X11R5/Xm/Label.h
--info_w.o: /usr/imports/include/X11R5/Xm/LabelG.h
--info_w.o: /usr/imports/include/X11R5/Xm/MessageB.h
--info_w.o: /usr/imports/include/X11R5/Xm/PushB.h
--info_w.o: /usr/imports/include/X11R5/Xm/RowColumn.h
--info_w.o: /usr/imports/include/X11R5/Xm/SeparatoG.h
--info_w.o: /usr/imports/include/X11R5/Xm/Text.h
--info_w.o: /usr/imports/include/X11R5/Xm/TextF.h
--info_w.o: /usr/imports/include/X11R5/Xm/ToggleB.h
--info_w.o: /usr/imports/include/X11R5/Xm/VendorS.h
--info_w.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--info_w.o: /usr/imports/include/X11R5/Xm/Xm.h
--info_w.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h
--info_w.o: /usr/include/floatingpoint.h /usr/include/math.h
--info_w.o: /usr/include/stddef.h /usr/include/stdio.h /usr/include/string.h
--info_w.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--info_w.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--info_w.o: /usr/include/sys/types.h info_w.c
--param_w.o: ./include/component.h ./include/comptypes.h ./include/event.h
--param_w.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--param_w.o: ./include/log.h ./include/mempool.h ./include/packet.h ./include/q.h
--param_w.o: ./include/sim.h ./include/simx.h ./include/simx1.h
--param_w.o: ./include/xm-comp_trans.h ./include/xm-info_w.h
--param_w.o: ./include/xm-main_w.h ./include/xm-meters.h ./include/xm-network.h
--param_w.o: ./include/xm-param_w.h ./include/xm-util.h
--param_w.o: /usr/imports/include/X11R5/X11/Composite.h
--param_w.o: /usr/imports/include/X11R5/X11/Constraint.h
--param_w.o: /usr/imports/include/X11R5/X11/Core.h
--param_w.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--param_w.o: /usr/imports/include/X11R5/X11/Object.h
--param_w.o: /usr/imports/include/X11R5/X11/RectObj.h
--param_w.o: /usr/imports/include/X11R5/X11/Shell.h
--param_w.o: /usr/imports/include/X11R5/X11/StringDefs.h
--param_w.o: /usr/imports/include/X11R5/X11/X.h
--param_w.o: /usr/imports/include/X11R5/X11/Xatom.h
--param_w.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--param_w.o: /usr/imports/include/X11R5/X11/Xlib.h
--param_w.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--param_w.o: /usr/imports/include/X11R5/X11/Xresource.h
--param_w.o: /usr/imports/include/X11R5/X11/Xutil.h
--param_w.o: /usr/imports/include/X11R5/Xm/BulletinB.h
--param_w.o: /usr/imports/include/X11R5/Xm/Form.h
--param_w.o: /usr/imports/include/X11R5/Xm/Frame.h
--param_w.o: /usr/imports/include/X11R5/Xm/Label.h
--param_w.o: /usr/imports/include/X11R5/Xm/PushB.h
--param_w.o: /usr/imports/include/X11R5/Xm/RowColumn.h
--param_w.o: /usr/imports/include/X11R5/Xm/SeparatoG.h
--param_w.o: /usr/imports/include/X11R5/Xm/Text.h
--param_w.o: /usr/imports/include/X11R5/Xm/TextF.h
--param_w.o: /usr/imports/include/X11R5/Xm/ToggleB.h
--param_w.o: /usr/imports/include/X11R5/Xm/VendorS.h
--param_w.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--param_w.o: /usr/imports/include/X11R5/Xm/Xm.h
--param_w.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h
--param_w.o: /usr/include/floatingpoint.h /usr/include/math.h
--param_w.o: /usr/include/stddef.h /usr/include/stdio.h /usr/include/string.h
--param_w.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--param_w.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--param_w.o: /usr/include/sys/types.h param_w.c
--comp_trans.o: ./include/component.h ./include/comptypes.h ./include/event.h
--comp_trans.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--comp_trans.o: ./include/log.h ./include/mempool.h ./include/packet.h
--comp_trans.o: ./include/q.h ./include/sim.h ./include/simx.h ./include/simx1.h
--comp_trans.o: ./include/xm-comp_trans.h ./include/xm-icon.h
--comp_trans.o: ./include/xm-info_w.h ./include/xm-lines.h ./include/xm-main_w.h
--comp_trans.o: ./include/xm-network.h ./include/xm-param_w.h ./include/xm-util.h
--comp_trans.o: /usr/imports/include/X11R5/X11/Composite.h
--comp_trans.o: /usr/imports/include/X11R5/X11/Constraint.h
--comp_trans.o: /usr/imports/include/X11R5/X11/Core.h
--comp_trans.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--comp_trans.o: /usr/imports/include/X11R5/X11/Object.h
--comp_trans.o: /usr/imports/include/X11R5/X11/RectObj.h
--comp_trans.o: /usr/imports/include/X11R5/X11/Shell.h
--comp_trans.o: /usr/imports/include/X11R5/X11/StringDefs.h
--comp_trans.o: /usr/imports/include/X11R5/X11/X.h
--comp_trans.o: /usr/imports/include/X11R5/X11/Xatom.h
--comp_trans.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--comp_trans.o: /usr/imports/include/X11R5/X11/Xlib.h
--comp_trans.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--comp_trans.o: /usr/imports/include/X11R5/X11/Xresource.h
--comp_trans.o: /usr/imports/include/X11R5/X11/Xutil.h
--comp_trans.o: /usr/imports/include/X11R5/Xm/PushB.h
--comp_trans.o: /usr/imports/include/X11R5/Xm/Text.h
--comp_trans.o: /usr/imports/include/X11R5/Xm/VendorS.h
--comp_trans.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--comp_trans.o: /usr/imports/include/X11R5/Xm/Xm.h
--comp_trans.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h
--comp_trans.o: /usr/include/floatingpoint.h /usr/include/math.h
--comp_trans.o: /usr/include/stddef.h /usr/include/stdio.h /usr/include/string.h
--comp_trans.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--comp_trans.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--comp_trans.o: /usr/include/sys/types.h comp_trans.c
--network.o: ./include/component.h ./include/comptypes.h ./include/event.h
--network.o: ./include/eventdefs.h ./include/heap.h ./include/list.h
--network.o: ./include/log.h ./include/mempool.h ./include/packet.h ./include/q.h
--network.o: ./include/sim.h ./include/simx.h ./include/simx1.h
--network.o: ./include/xm-comp_trans.h ./include/xm-icon.h ./include/xm-info_w.h
--network.o: ./include/xm-lines.h ./include/xm-main_w.h ./include/xm-meters.h
--network.o: ./include/xm-network.h ./include/xm-param_w.h ./include/xm-util.h
--network.o: /usr/imports/include/X11R5/X11/Composite.h
--network.o: /usr/imports/include/X11R5/X11/Constraint.h
--network.o: /usr/imports/include/X11R5/X11/Core.h
--network.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--network.o: /usr/imports/include/X11R5/X11/Object.h
--network.o: /usr/imports/include/X11R5/X11/RectObj.h
--network.o: /usr/imports/include/X11R5/X11/Shell.h
--network.o: /usr/imports/include/X11R5/X11/StringDefs.h
--network.o: /usr/imports/include/X11R5/X11/X.h
--network.o: /usr/imports/include/X11R5/X11/Xatom.h
--network.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--network.o: /usr/imports/include/X11R5/X11/Xlib.h
--network.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--network.o: /usr/imports/include/X11R5/X11/Xresource.h
--network.o: /usr/imports/include/X11R5/X11/Xutil.h
--network.o: /usr/imports/include/X11R5/Xm/DrawingA.h
--network.o: /usr/imports/include/X11R5/Xm/PushB.h
--network.o: /usr/imports/include/X11R5/Xm/Text.h
--network.o: /usr/imports/include/X11R5/Xm/VendorS.h
--network.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--network.o: /usr/imports/include/X11R5/Xm/Xm.h
--network.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h
--network.o: /usr/include/floatingpoint.h /usr/include/math.h
--network.o: /usr/include/stddef.h /usr/include/stdio.h /usr/include/string.h
--network.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--network.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--network.o: /usr/include/sys/types.h network.c
--icon.o: ./include/component.h ./include/comptypes.h ./include/event.h
--icon.o: ./include/eventdefs.h ./include/heap.h ./include/list.h ./include/log.h
--icon.o: ./include/mempool.h ./include/packet.h ./include/q.h ./include/sim.h
--icon.o: ./include/simx.h ./include/simx1.h ./include/xm-icon.h
--icon.o: ./include/xm-network.h ./include/xm-util.h
--icon.o: /usr/imports/include/X11R5/X11/Composite.h
--icon.o: /usr/imports/include/X11R5/X11/Constraint.h
--icon.o: /usr/imports/include/X11R5/X11/Core.h
--icon.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--icon.o: /usr/imports/include/X11R5/X11/Object.h
--icon.o: /usr/imports/include/X11R5/X11/RectObj.h
--icon.o: /usr/imports/include/X11R5/X11/Shell.h
--icon.o: /usr/imports/include/X11R5/X11/StringDefs.h
--icon.o: /usr/imports/include/X11R5/X11/X.h
--icon.o: /usr/imports/include/X11R5/X11/Xatom.h
--icon.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--icon.o: /usr/imports/include/X11R5/X11/Xlib.h
--icon.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--icon.o: /usr/imports/include/X11R5/X11/Xresource.h
--icon.o: /usr/imports/include/X11R5/X11/Xutil.h
--icon.o: /usr/imports/include/X11R5/Xm/Label.h
--icon.o: /usr/imports/include/X11R5/Xm/VendorS.h
--icon.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--icon.o: /usr/imports/include/X11R5/Xm/Xm.h
--icon.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h /usr/include/floatingpoint.h
--icon.o: /usr/include/math.h /usr/include/stddef.h /usr/include/stdio.h
--icon.o: /usr/include/string.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--icon.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--icon.o: /usr/include/sys/types.h icon.c
--meters.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--meters.o: ./include/heap.h ./include/list.h ./include/log.h ./include/mempool.h
--meters.o: ./include/packet.h ./include/q.h ./include/sim.h ./include/simx.h
--meters.o: ./include/simx1.h ./include/xm-comp_trans.h ./include/xm-info_w.h
--meters.o: ./include/xm-main_w.h ./include/xm-meters.h ./include/xm-network.h
--meters.o: ./include/xm-util.h ./include/xm-view.h ./include/xtables.h
--meters.o: /usr/imports/include/X11R5/X11/Composite.h
--meters.o: /usr/imports/include/X11R5/X11/Constraint.h
--meters.o: /usr/imports/include/X11R5/X11/Core.h
--meters.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--meters.o: /usr/imports/include/X11R5/X11/Object.h
--meters.o: /usr/imports/include/X11R5/X11/RectObj.h
--meters.o: /usr/imports/include/X11R5/X11/Shell.h
--meters.o: /usr/imports/include/X11R5/X11/StringDefs.h
--meters.o: /usr/imports/include/X11R5/X11/X.h
--meters.o: /usr/imports/include/X11R5/X11/Xatom.h
--meters.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--meters.o: /usr/imports/include/X11R5/X11/Xlib.h
--meters.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--meters.o: /usr/imports/include/X11R5/X11/Xresource.h
--meters.o: /usr/imports/include/X11R5/X11/Xutil.h
--meters.o: /usr/imports/include/X11R5/Xm/BulletinB.h
--meters.o: /usr/imports/include/X11R5/Xm/CascadeB.h
--meters.o: /usr/imports/include/X11R5/Xm/DrawingA.h
--meters.o: /usr/imports/include/X11R5/Xm/Form.h
--meters.o: /usr/imports/include/X11R5/Xm/Label.h
--meters.o: /usr/imports/include/X11R5/Xm/LabelG.h
--meters.o: /usr/imports/include/X11R5/Xm/PushB.h
--meters.o: /usr/imports/include/X11R5/Xm/PushBG.h
--meters.o: /usr/imports/include/X11R5/Xm/RowColumn.h
--meters.o: /usr/imports/include/X11R5/Xm/SeparatoG.h
--meters.o: /usr/imports/include/X11R5/Xm/Text.h
--meters.o: /usr/imports/include/X11R5/Xm/TextF.h
--meters.o: /usr/imports/include/X11R5/Xm/ToggleBG.h
--meters.o: /usr/imports/include/X11R5/Xm/VendorS.h
--meters.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--meters.o: /usr/imports/include/X11R5/Xm/Xm.h
--meters.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h
--meters.o: /usr/include/floatingpoint.h /usr/include/math.h
--meters.o: /usr/include/stddef.h /usr/include/stdio.h /usr/include/string.h
--meters.o: /usr/include/strings.h /usr/include/sys/ieeefp.h
--meters.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--meters.o: /usr/include/sys/types.h meters.c
--lines.o: ./include/component.h ./include/event.h ./include/eventdefs.h
--lines.o: ./include/heap.h ./include/list.h ./include/log.h ./include/mempool.h
--lines.o: ./include/packet.h ./include/q.h ./include/sim.h ./include/simx.h
--lines.o: ./include/simx1.h ./include/xm-lines.h ./include/xm-network.h
--lines.o: /usr/imports/include/X11R5/X11/Composite.h
--lines.o: /usr/imports/include/X11R5/X11/Constraint.h
--lines.o: /usr/imports/include/X11R5/X11/Core.h
--lines.o: /usr/imports/include/X11R5/X11/Intrinsic.h
--lines.o: /usr/imports/include/X11R5/X11/Object.h
--lines.o: /usr/imports/include/X11R5/X11/RectObj.h
--lines.o: /usr/imports/include/X11R5/X11/Shell.h
--lines.o: /usr/imports/include/X11R5/X11/StringDefs.h
--lines.o: /usr/imports/include/X11R5/X11/X.h
--lines.o: /usr/imports/include/X11R5/X11/Xatom.h
--lines.o: /usr/imports/include/X11R5/X11/Xfuncproto.h
--lines.o: /usr/imports/include/X11R5/X11/Xlib.h
--lines.o: /usr/imports/include/X11R5/X11/Xosdefs.h
--lines.o: /usr/imports/include/X11R5/X11/Xresource.h
--lines.o: /usr/imports/include/X11R5/X11/Xutil.h
--lines.o: /usr/imports/include/X11R5/Xm/VendorS.h
--lines.o: /usr/imports/include/X11R5/Xm/VirtKeys.h
--lines.o: /usr/imports/include/X11R5/Xm/Xm.h
--lines.o: /usr/imports/include/X11R5/Xm/XmStrDefs.h /usr/include/floatingpoint.h
--lines.o: /usr/include/math.h /usr/include/stddef.h /usr/include/stdio.h
--lines.o: /usr/include/string.h /usr/include/strings.h /usr/include/sys/ieeefp.h
--lines.o: /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h
--lines.o: /usr/include/sys/types.h lines.c
--# DEPENDENCIES MUST END AT END OF FILE
--# IF YOU PUT STUFF HERE IT WILL GO AWAY
--# see make depend above
diff --git a/cad/mars/files/patch-08 b/cad/mars/files/patch-08
deleted file mode 100644
index ffb4e6cc53ad..000000000000
--- a/cad/mars/files/patch-08
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.XMotif.orig	Tue Mar 15 16:47:48 1994
-+++ Makefile.XMotif	Sun Sep 13 13:46:54 1998
-@@ -5,8 +5,8 @@
- 
- # You need to supply directories for libraries and include files
- #   only if they are not in a standard directory.
--LIBDIRS = 
--INCDIRS = 
-+LIBDIRS = -L$(LOCALBASE)/lib
-+INCDIRS = -I$(LOCALBASE)/include
- #LIBDIRS = -L/usr/imports/lib/X11R5
- #INCDIRS = -I/usr/imports/include/X11R5 -I/usr/imports/include
- 
-@@ -45,7 +45,7 @@
- 
- mars: $(OBJS) libs
- 	@ cd sim; make stat $(EXPORT)
--	$(CC) $(GFLAG) -o mars $(OBJS) sim/stat.o $(MARSLIBS) -lm -lXm -lXt -lX11 
-+	$(CC) $(GFLAG) -o mars $(OBJS) sim/stat.o $(MARSLIBS) -lm $(MOTIFLIB) -lXt -lX11 
- 
- 
- install: depend mars
diff --git a/cad/mars/files/patch-09 b/cad/mars/files/patch-09
deleted file mode 100644
index a6276e0d0773..000000000000
--- a/cad/mars/files/patch-09
+++ /dev/null
@@ -1,34 +0,0 @@
---- sim/subr.c.orig	Tue Dec  9 20:00:42 2003
-+++ sim/subr.c	Tue Dec  9 20:01:31 2003
-@@ -6,7 +6,7 @@
- #include <ctype.h>
- #include <sys/types.h>
- #include <stdio.h>
--#include <varargs.h>
-+#include <stdarg.h>
- #include <math.h>
- #include "sim.h"
- #include "q.h"
-@@ -610,12 +610,7 @@
- 
- /*VARARGS4*/
- Neighbor *
--add_neighbor(c, neighc, max_num_neighbors, num_classes, va_alist)
--     register Component *c;	/* Comp to add neighbor to */
--     register Component *neighc; /* New neighbor */
--     int max_num_neighbors;	/* Max number neighbors allowed (0=infinite)*/
--     int num_classes;		/* How many classes follow  */
--     va_dcl
-+add_neighbor(register Component *c, register Component *neighc, int max_num_neighbors, int num_classes, ... )
- {
-   va_list vp;
-   register Neighbor *n;
-@@ -644,7 +639,7 @@
-   if (num_classes > 0)  {
-     /* Final check--may sure the new neighbor is one of the
-        legal classes */
--    va_start(vp);
-+    va_start(vp, num_classes);
-     notlegal = TRUE;
-     while (num_classes--)
-       if (neighc->co_class == va_arg(vp, int))  {
diff --git a/cad/mars/files/patch-10 b/cad/mars/files/patch-10
deleted file mode 100644
index d409bf9d0005..000000000000
--- a/cad/mars/files/patch-10
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/component.h.orig	Tue Dec  9 20:04:47 2003
-+++ include/component.h	Tue Dec  9 20:05:04 2003
-@@ -153,6 +153,6 @@
- } Neighbor;
- 
- Neighbor *find_neighbor();
--Neighbor *add_neighbor();
-+Neighbor *add_neighbor(register Component *c, register Component *neighc, int max_num_neighbors, int num_classes, ... );
- Param *param_init();
- #endif   /* COMPONENT_H   */
diff --git a/cad/mars/files/patch-XMotif_edit.c b/cad/mars/files/patch-XMotif_edit.c
deleted file mode 100644
index 501f3eb9e703..000000000000
--- a/cad/mars/files/patch-XMotif_edit.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- XMotif/edit.c.orig	2007-11-23 21:36:17.000000000 +0100
-+++ XMotif/edit.c	2007-11-23 21:40:19.000000000 +0100
-@@ -73,11 +73,11 @@
- void selection_confirm_kill_cb(Widget widget);
- 
- MenuItem edit_items[] = {
--  {"Create Component",&xmPushButtonGadgetClass,NULL,NULL,NULL,XmNactivateCallback,edit_create_cb,(XtPointer)E_CREATE_COMPONENT,(MenuItem *)NULL,NULL},
--  {"",&xmSeparatorGadgetClass,NULL,NULL,NULL,NULL,NULL,NULL,(MenuItem *)NULL,NULL},
--  {"Kill Selection",&xmPushButtonGadgetClass,NULL,NULL,NULL,XmNactivateCallback,selection_confirm_kill_cb,(XtPointer)E_REMOVE_SELECTION,(MenuItem *)NULL,NULL},
--  {"Group Selection",&xmPushButtonGadgetClass,NULL,NULL,NULL,XmNactivateCallback,edit_group_cb,(XtPointer)E_GROUP_SELECTION,(MenuItem *)NULL,NULL},
--  {"Unselect All",&xmPushButtonGadgetClass,NULL,NULL,NULL,XmNactivateCallback,edit_unsel_cb,(XtPointer)E_UNSELECT_ALL,(MenuItem *)NULL,NULL},
-+  {"Create Component",&xmPushButtonGadgetClass,'\0',NULL,NULL,XmNactivateCallback,edit_create_cb,(XtPointer)E_CREATE_COMPONENT,(MenuItem *)NULL,NULL},
-+  {"",&xmSeparatorGadgetClass,'\0',NULL,NULL,NULL,NULL,NULL,(MenuItem *)NULL,NULL},
-+  {"Kill Selection",&xmPushButtonGadgetClass,'\0',NULL,NULL,XmNactivateCallback,selection_confirm_kill_cb,(XtPointer)E_REMOVE_SELECTION,(MenuItem *)NULL,NULL},
-+  {"Group Selection",&xmPushButtonGadgetClass,'\0',NULL,NULL,XmNactivateCallback,edit_group_cb,(XtPointer)E_GROUP_SELECTION,(MenuItem *)NULL,NULL},
-+  {"Unselect All",&xmPushButtonGadgetClass,'\0',NULL,NULL,XmNactivateCallback,edit_unsel_cb,(XtPointer)E_UNSELECT_ALL,(MenuItem *)NULL,NULL},
-   NULL
- };
- 
-@@ -167,9 +167,9 @@
-   if (l_empty(selected)) return;
-   if (!question_dialog) {
-     question_dialog=XmCreateQuestionDialog(main_w,"confirm_kill_selection_dialog",NULL,0);
--    XtAddCallback(question_dialog,XmNokCallback,edit_remove_cb,NULL);
--    XtAddCallback(question_dialog,XmNokCallback,XtUnmanageChild,NULL);
--    XtAddCallback(question_dialog,XmNcancelCallback,XtUnmanageChild,NULL);
-+    XtAddCallback(question_dialog,XmNokCallback,(XtCallbackProc)edit_remove_cb,NULL);
-+    XtAddCallback(question_dialog,XmNokCallback,(XtCallbackProc)XtUnmanageChild,NULL);
-+    XtAddCallback(question_dialog,XmNcancelCallback,(XtCallbackProc)XtUnmanageChild,NULL);
-   }
-   else {
-     XRaiseWindow(XtDisplay(question_dialog),XtWindow(XtParent(question_dialog)));
-@@ -233,7 +233,7 @@
-    box_w=0;
-    box_h=0;
-   
--   for(i=0;component_types[i].class!=NULL;i++) {
-+   for(i=0;component_types[i].class!=0;i++) {
-       Widget icon;     
- 	
-       x=X_OFFSET+col*COL_SPACING;
-@@ -265,7 +265,7 @@
- 				       XmNtopWidget, icon_box,
- 				       NULL);
- 
--   XtAddCallback(done_button,XmNactivateCallback,create_comp_done_cb,form);
-+   XtAddCallback(done_button,XmNactivateCallback,(XtCallbackProc)create_comp_done_cb,form);
-    return(form);
- }
- 
diff --git a/cad/mars/files/patch-XMotif_info_w.c b/cad/mars/files/patch-XMotif_info_w.c
deleted file mode 100644
index 6f0f9607b435..000000000000
--- a/cad/mars/files/patch-XMotif_info_w.c
+++ /dev/null
@@ -1,94 +0,0 @@
---- XMotif/info_w.c.orig	2007-11-23 22:04:53.000000000 +0100
-+++ XMotif/info_w.c	2007-11-23 22:06:58.000000000 +0100
-@@ -374,7 +374,7 @@
- 		  NULL);
- 
-     if (parameter->p_flags & (InputMask | ModifyMask))
--       XtAddCallback(textfield, XmNactivateCallback, change_parameter_cb, window_data);
-+       XtAddCallback(textfield, XmNactivateCallback, (XtCallbackProc)change_parameter_cb, window_data);
-     else
-        XtVaSetValues(textfield, XmNeditable,False,NULL);
- 
-@@ -413,7 +413,7 @@
- 				 XmNbackground, bg,
- 				 XmNset, (window_data->initial_hide_settings & HIDE_CHILDREN)? True : False,
- 				 NULL);
--  XtAddCallback(toggle, XmNvalueChangedCallback, comp_info_children_toggle_cb, window_data); 
-+  XtAddCallback(toggle, XmNvalueChangedCallback, (XtCallbackProc)comp_info_children_toggle_cb, window_data); 
- 
- 
- /* METER TOGGLE */
-@@ -421,7 +421,7 @@
- 				 XmNbackground, bg,
- 				 XmNset, (window_data->initial_hide_settings & HIDE_METERS)? True : False,
- 				 NULL);
--  XtAddCallback(toggle, XmNvalueChangedCallback, comp_info_meter_toggle_cb, window_data); 
-+  XtAddCallback(toggle, XmNvalueChangedCallback, (XtCallbackProc)comp_info_meter_toggle_cb, window_data); 
- 
-   XtManageChild(row_col);
-   XtManageChild(form);
-@@ -461,7 +461,7 @@
-      Widget w;
-      CompInfoWinData *window_data;
- {
--  XtRemoveCallback(w,XmNokCallback, comp_info_kill_action, window_data);
-+  XtRemoveCallback(w,XmNokCallback, (XtCallbackProc)comp_info_kill_action, window_data);
-   XtRemoveCallback(w,XmNokCallback, close_confirm_kill_comp_dialog, window_data);
-   XtRemoveCallback(w,XmNcancelCallback, close_confirm_kill_comp_dialog, window_data);    
-   XtUnmanageChild(w);
-@@ -481,15 +481,15 @@
-     question_dialog=XmCreateQuestionDialog(main_w,"confirm_kill_component_dialog",NULL,0);
-   }
-   
--  XtAddCallback(question_dialog,XmNokCallback, comp_info_kill_action, window_data);
-+  XtAddCallback(question_dialog,XmNokCallback, (XtCallbackProc)comp_info_kill_action, window_data);
-   XtAddCallback(question_dialog,XmNokCallback, close_confirm_kill_comp_dialog, window_data);
-   XtAddCallback(question_dialog,XmNcancelCallback, close_confirm_kill_comp_dialog, window_data);    
- 
-   pos.x=((XButtonEvent *)cbs->event)->x_root;
-   pos.y=((XButtonEvent *)cbs->event)->y_root;
--  XtAddCallback(XtParent(question_dialog), XmNpopupCallback, SetShellPosition, &pos);
-+  XtAddCallback(XtParent(question_dialog), XmNpopupCallback, (XtCallbackProc)SetShellPosition, &pos);
-   XtManageChild(question_dialog);
--  XtRemoveCallback(XtParent(question_dialog), XmNpopupCallback, SetShellPosition, &pos);
-+  XtRemoveCallback(XtParent(question_dialog), XmNpopupCallback, (XtCallbackProc)SetShellPosition, &pos);
- }
- 
- /**********************************************************************************************************************************************/
-@@ -803,7 +803,7 @@
- 		  XmNleftAttachment, XmATTACH_FORM,
- 		  NULL);
-     
--    XtAddCallback(textfield,XmNactivateCallback, change_group_name_cb, window_data);
-+    XtAddCallback(textfield,XmNactivateCallback, (XtCallbackProc)change_group_name_cb, window_data);
-   }
- 
-   sep=CreateSeparator(group_info_w,XmSINGLE_LINE,name_input);
-@@ -864,7 +864,7 @@
-      Widget w;
-      CompInfoWinData *window_data;
- {
--  XtRemoveCallback(w,XmNokCallback, group_info_kill_action, window_data);
-+  XtRemoveCallback(w,XmNokCallback, (XtCallbackProc)group_info_kill_action, window_data);
-   XtRemoveCallback(w,XmNokCallback, close_confirm_kill_group_dialog, window_data);
-   XtRemoveCallback(w,XmNcancelCallback, close_confirm_kill_group_dialog, window_data);    
-   XtUnmanageChild(w);
-@@ -882,15 +882,15 @@
-   if (!question_dialog) {
-     question_dialog=XmCreateQuestionDialog(main_w,"confirm_kill_group_dialog",NULL,0);
-   }
--  XtAddCallback(question_dialog, XmNokCallback, group_info_kill_action, window_data);
-+  XtAddCallback(question_dialog, XmNokCallback, (XtCallbackProc)group_info_kill_action, window_data);
-   XtAddCallback(question_dialog, XmNokCallback, close_confirm_kill_group_dialog, window_data);
-   XtAddCallback(question_dialog, XmNcancelCallback, close_confirm_kill_group_dialog, window_data);
- 
-   pos.x=((XButtonEvent *)cbs->event)->x_root;
-   pos.y=((XButtonEvent *)cbs->event)->y_root;
--  XtAddCallback(XtParent(question_dialog), XmNpopupCallback, SetShellPosition, &pos);
-+  XtAddCallback(XtParent(question_dialog), XmNpopupCallback, (XtCallbackProc)SetShellPosition, &pos);
-   XtManageChild(question_dialog);
--  XtRemoveCallback(XtParent(question_dialog), XmNpopupCallback, SetShellPosition, &pos);
-+  XtRemoveCallback(XtParent(question_dialog), XmNpopupCallback, (XtCallbackProc)SetShellPosition, &pos);
- }
- 
- /**********************************************************************************************************************************************/
diff --git a/cad/mars/files/patch-XMotif_io.c b/cad/mars/files/patch-XMotif_io.c
deleted file mode 100644
index f15fc4e50275..000000000000
--- a/cad/mars/files/patch-XMotif_io.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- XMotif/io.c.orig	2007-11-23 21:31:17.000000000 +0100
-+++ XMotif/io.c	2007-11-23 21:33:26.000000000 +0100
-@@ -77,7 +77,7 @@
- void update_screen()
- {
-    update_clock();
--   if (screen_update != NULL) {
-+   if (screen_update != OFF) {
-       update_meters_and_info_windows();
-    }
-    XFlush(the_environment.the_display);
-@@ -240,9 +240,9 @@
-   base_position=XmTextGetLastPosition(message_w);
-   XmTextSetInsertionPosition(message_w,base_position);
- 
--  XtAddCallback(message_w,XmNactivateCallback, input_text, NULL);
--  XtAddCallback(message_w,XmNmotionVerifyCallback, input_text, NULL);
--  XtAddCallback(message_w,XmNmodifyVerifyCallback, input_text, NULL);
-+  XtAddCallback(message_w,XmNactivateCallback, (XtCallbackProc)input_text, NULL);
-+  XtAddCallback(message_w,XmNmotionVerifyCallback, (XtCallbackProc)input_text, NULL);
-+  XtAddCallback(message_w,XmNmodifyVerifyCallback, (XtCallbackProc)input_text, NULL);
- 
-   input=0;
-   XmTextSetEditable(message_w,True);
-@@ -251,9 +251,9 @@
-   }
-   XmTextSetEditable(message_w,False);
- 
--  XtRemoveCallback(message_w,XmNactivateCallback, input_text, NULL);
--  XtRemoveCallback(message_w,XmNmotionVerifyCallback, input_text, NULL);
--  XtRemoveCallback(message_w,XmNmodifyVerifyCallback, input_text, NULL);
-+  XtRemoveCallback(message_w,XmNactivateCallback, (XtCallbackProc)input_text, NULL);
-+  XtRemoveCallback(message_w,XmNmotionVerifyCallback, (XtCallbackProc)input_text, NULL);
-+  XtRemoveCallback(message_w,XmNmodifyVerifyCallback, (XtCallbackProc)input_text, NULL);
- 
-   str=XmTextGetString(message_w);
- 
diff --git a/cad/mars/files/patch-XMotif_lines.c b/cad/mars/files/patch-XMotif_lines.c
deleted file mode 100644
index 30f2839c3c59..000000000000
--- a/cad/mars/files/patch-XMotif_lines.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- XMotif/lines.c.orig	1992-10-07 04:16:16.000000000 +0100
-+++ XMotif/lines.c	2007-11-23 22:16:24.000000000 +0100
-@@ -154,10 +154,13 @@
-    int number_of_lines=sl->num_lines;
-    ComponentPair *comp_pairs=sl->comp_pairs;
-    register int i;
-+   MComponent *tmp;
- 
--   if (comp2<comp1) 
--      swap((caddr_t)comp1,(caddr_t)comp2);
--
-+   if (comp2<comp1) {
-+      tmp = comp2;
-+      comp2 = comp1;
-+      comp1 = tmp;
-+   }
- 
-    for (i = 0; i < number_of_lines; ++i) {
-       if ((comp_pairs[i].comp1 == comp1) &&
diff --git a/cad/mars/files/patch-XMotif_main_w.c b/cad/mars/files/patch-XMotif_main_w.c
deleted file mode 100644
index 6eccfae959a0..000000000000
--- a/cad/mars/files/patch-XMotif_main_w.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- XMotif/main_w.c.orig	2007-11-23 21:34:10.000000000 +0100
-+++ XMotif/main_w.c	2007-11-23 21:35:22.000000000 +0100
-@@ -217,7 +217,7 @@
- 					XmNbottomAttachment, XmATTACH_FORM,
- 					NULL);
- 
--   XtAddCallback(pause_button,XmNactivateCallback,pause_button_cb,NULL);
-+   XtAddCallback(pause_button,XmNactivateCallback,(XtCallbackProc)pause_button_cb,NULL);
- 
-    start_button=XtVaCreateManagedWidget("start_button",xmPushButtonWidgetClass, header,
- 					XmNleftAttachment, XmATTACH_WIDGET,
-@@ -226,7 +226,7 @@
- 					XmNbottomAttachment, XmATTACH_FORM,
- 					NULL);
- 
--   XtAddCallback(start_button,XmNactivateCallback,start_button_cb,NULL);
-+   XtAddCallback(start_button,XmNactivateCallback,(XtCallbackProc)start_button_cb,NULL);
- 
-    XtManageChild(header);
- 
-@@ -270,8 +270,8 @@
- 				       XmNbackground, the_environment.back_color,
- 				       NULL);
- 
--   XtAddEventHandler(network_w, StructureNotifyMask, False, resize_network_w_event_handler, NULL);
--   XtAddEventHandler(network_w, ExposureMask, False, redraw_lines_event_handler, NULL);
-+   XtAddEventHandler(network_w, StructureNotifyMask, False, (XtEventHandler)resize_network_w_event_handler, NULL);
-+   XtAddEventHandler(network_w, ExposureMask, False, (XtEventHandler)redraw_lines_event_handler, NULL);
- 
-    XtVaSetValues(scroll_w,
- 		 XmNworkWindow, network_w,
diff --git a/cad/mars/files/patch-XMotif_meters.c b/cad/mars/files/patch-XMotif_meters.c
deleted file mode 100644
index c8c208332dd8..000000000000
--- a/cad/mars/files/patch-XMotif_meters.c
+++ /dev/null
@@ -1,106 +0,0 @@
---- XMotif/meters.c.orig	2007-11-23 21:40:49.000000000 +0100
-+++ XMotif/meters.c	2007-11-23 21:45:10.000000000 +0100
-@@ -570,7 +570,7 @@
- 	    buttons[n]=XmStringCreateSimple(meter_types[i].meter_name);
- 	 }
- 
--	 popup=XmVaCreateSimplePopupMenu(parent,"meter_type_popup_menu",change_meter_type,
-+	 popup=XmVaCreateSimplePopupMenu(parent,"meter_type_popup_menu",(XtCallbackProc)change_meter_type,
- 					 XmVaPUSHBUTTON, buttons[0], 0, NULL, NULL,
- 					 XmVaPUSHBUTTON, buttons[1], 0, NULL, NULL,
- 					 XmVaPUSHBUTTON, buttons[2], 0, NULL, NULL,
-@@ -594,7 +594,7 @@
- 				      XmNbackground, bg,
- 				      NULL);
- 	 XmStringFree(str);
--	 XtAddCallback(item, XmNactivateCallback, popup_change_meter_type_menu, popup);
-+	 XtAddCallback(item, XmNactivateCallback, (XtCallbackProc)popup_change_meter_type_menu, popup);
-       }
-       *textfield_return=NULL;
-       break;
-@@ -744,10 +744,10 @@
-       data->previous_value=new_string(value);
-       data->new_value=NULL;
-       if (edit_flags & EDIT_ON_ACTIVATE) {
--	 XtAddCallback(textfield, XmNactivateCallback, preview_textfield, NULL);
-+	 XtAddCallback(textfield, XmNactivateCallback, (XtCallbackProc)preview_textfield, NULL);
- 	 XtAddCallback(textfield, XmNactivateCallback, edit_callback, edit_calldata);    
--	 XtAddCallback(textfield, XmNactivateCallback, update_textfield, NULL);
--	 XtAddCallback(textfield, XmNdestroyCallback, free_TextFieldData, NULL);
-+	 XtAddCallback(textfield, XmNactivateCallback, (XtCallbackProc)update_textfield, NULL);
-+	 XtAddCallback(textfield, XmNdestroyCallback, (XtCallbackProc)free_TextFieldData, NULL);
-       }
-    }
-    else {
-@@ -898,7 +898,7 @@
-    
-    data=GetTextFieldData(w);
-    if (data->value_changed) {
--      if (sscanf(data->new_value, "%lf", &scale) == NULL) {
-+      if (!sscanf(data->new_value, "%lf", &scale)) {
- 	 data->action=RESTORE_PREVIOUS_VALUE;
- 	 return;
-       }	
-@@ -925,7 +925,7 @@
- 
-    data=GetTextFieldData(w);
-    if (data->value_changed) {
--      if (sscanf(data->new_value, "%lf", &increment) == NULL) {
-+      if (!sscanf(data->new_value, "%lf", &increment)) {
- 	 data->action=RESTORE_PREVIOUS_VALUE;
- 	 return;
-       }
-@@ -967,7 +967,7 @@
-    
-    data=GetTextFieldData(w);
-    if (data->value_changed) {
--      if (sscanf(data->new_value, "%f", &increment) == NULL) {
-+      if (!sscanf(data->new_value, "%f", &increment)) {
- 	 data->action=RESTORE_PREVIOUS_VALUE;
- 	 return;
-       }	
-@@ -1004,7 +1004,7 @@
-             
-    data=GetTextFieldData(w);
-    if (data->value_changed) {
--      if (sscanf(data->new_value, "%f", &increment) == NULL) {
-+      if (!sscanf(data->new_value, "%f", &increment)) {
- 	 data->action=RESTORE_PREVIOUS_VALUE;
- 	 return;
-       }	
-@@ -1041,7 +1041,7 @@
-    
-    data=GetTextFieldData(w);
-    if (data->value_changed) {
--      if (sscanf(data->new_value, "%f", &increment) == NULL) {
-+      if (!sscanf(data->new_value, "%f", &increment)) {
- 	 data->action=RESTORE_PREVIOUS_VALUE;
- 	 return;
-       }	
-@@ -1078,7 +1078,7 @@
-    
-    data=GetTextFieldData(w);
-    if (data->value_changed) {
--      if (sscanf(data->new_value, "%f", &increment) == NULL) {
-+      if (!sscanf(data->new_value, "%f", &increment)) {
- 	 data->action=RESTORE_PREVIOUS_VALUE;
- 	 return;
-       }	
-@@ -1439,7 +1439,7 @@
- 				      NULL);
-   
-   XtOverrideTranslations(draw_area, the_environment.meter_window_translations);
--  XtAddEventHandler(draw_area, ExposureMask, False, meter_expose_event_handler, meter);
-+  XtAddEventHandler(draw_area, ExposureMask, False, (XtEventHandler)meter_expose_event_handler, meter);
- 
-   XtVaSetValues(form, XmNwidth, (Dimension)meter->width, NULL);
- 
-@@ -2143,7 +2143,7 @@
-   if (xinput(answer_string, 20) == 0)
-     {
-       xprintclear();  /* user just typed return */
--      return (NULL); 
-+      return (0); 
-     }
-   xprintclear();
- 
diff --git a/cad/mars/files/patch-XMotif_mfile.c b/cad/mars/files/patch-XMotif_mfile.c
deleted file mode 100644
index 8d6d53e2648c..000000000000
--- a/cad/mars/files/patch-XMotif_mfile.c
+++ /dev/null
@@ -1,95 +0,0 @@
---- XMotif/mfile.c.orig	1994-03-15 05:43:09.000000000 +0100
-+++ XMotif/mfile.c	2007-11-23 21:59:35.000000000 +0100
-@@ -80,17 +80,17 @@
- #define F_QUIT 8
- 
- MenuItem file_items[] = {
--  {"",&xmSeparatorGadgetClass,NULL,NULL,NULL,NULL,NULL,NULL,(MenuItem *)NULL,NULL},
--  {"New",&xmPushButtonGadgetClass,NULL,NULL,NULL,XmNactivateCallback,confirm_clear_network,(XtPointer)F_NEW,(MenuItem *)NULL,NULL},
--  {"Open",&xmPushButtonGadgetClass,NULL,NULL,NULL,XmNactivateCallback,file_cb,(XtPointer)F_OPEN,(MenuItem *)NULL,NULL},
--  {"Save",&xmPushButtonGadgetClass,NULL,NULL,NULL,XmNactivateCallback,file_cb,(XtPointer)F_SAVE,(MenuItem *)NULL,NULL},
--  {"Snap",&xmPushButtonGadgetClass,NULL,NULL,NULL,XmNactivateCallback,file_cb,(XtPointer)F_SNAP,(MenuItem *)NULL,NULL},
--  {"Print",&xmPushButtonGadgetClass,NULL,NULL,NULL,XmNactivateCallback,file_cb,(XtPointer)F_PRINT,(MenuItem *)NULL,NULL},
--  {"",&xmSeparatorGadgetClass,NULL,NULL,NULL,NULL,NULL,NULL,(MenuItem *)NULL,NULL},
--  {"Stop Record",&xmPushButtonGadgetClass,NULL,NULL,NULL,XmNactivateCallback,record,(XtPointer)F_RECORD,(MenuItem *)NULL,initialize_record_button},
--  {"Play",&xmPushButtonGadgetClass,NULL,NULL,NULL,XmNactivateCallback,file_cb,(XtPointer)F_PLAY,(MenuItem *)NULL,NULL},
--  {"",&xmSeparatorGadgetClass,NULL,NULL,NULL,NULL,NULL,NULL,(MenuItem *)NULL,NULL},
--  {"Quit",&xmPushButtonGadgetClass,NULL,NULL,NULL,XmNactivateCallback,confirm_quit,(XtPointer)F_QUIT,(MenuItem *)NULL,NULL},
-+  {"",&xmSeparatorGadgetClass,'\0',NULL,NULL,NULL,NULL,NULL,(MenuItem *)NULL,NULL},
-+  {"New",&xmPushButtonGadgetClass,'\0',NULL,NULL,XmNactivateCallback,confirm_clear_network,(XtPointer)F_NEW,(MenuItem *)NULL,NULL},
-+  {"Open",&xmPushButtonGadgetClass,'\0',NULL,NULL,XmNactivateCallback,file_cb,(XtPointer)F_OPEN,(MenuItem *)NULL,NULL},
-+  {"Save",&xmPushButtonGadgetClass,'\0',NULL,NULL,XmNactivateCallback,file_cb,(XtPointer)F_SAVE,(MenuItem *)NULL,NULL},
-+  {"Snap",&xmPushButtonGadgetClass,'\0',NULL,NULL,XmNactivateCallback,file_cb,(XtPointer)F_SNAP,(MenuItem *)NULL,NULL},
-+  {"Print",&xmPushButtonGadgetClass,'\0',NULL,NULL,XmNactivateCallback,file_cb,(XtPointer)F_PRINT,(MenuItem *)NULL,NULL},
-+  {"",&xmSeparatorGadgetClass,'\0',NULL,NULL,NULL,NULL,NULL,(MenuItem *)NULL,NULL},
-+  {"Stop Record",&xmPushButtonGadgetClass,'\0',NULL,NULL,XmNactivateCallback,record,(XtPointer)F_RECORD,(MenuItem *)NULL,initialize_record_button},
-+  {"Play",&xmPushButtonGadgetClass,'\0',NULL,NULL,XmNactivateCallback,file_cb,(XtPointer)F_PLAY,(MenuItem *)NULL,NULL},
-+  {"",&xmSeparatorGadgetClass,'\0',NULL,NULL,NULL,NULL,NULL,(MenuItem *)NULL,NULL},
-+  {"Quit",&xmPushButtonGadgetClass,'\0',NULL,NULL,XmNactivateCallback,confirm_quit,(XtPointer)F_QUIT,(MenuItem *)NULL,NULL},
-   NULL
- };
- 
-@@ -858,9 +858,9 @@
- 
-   if (!question_dialog) {
-     question_dialog=XmCreateQuestionDialog(main_w_shell,"confirm_clear_network_dialog",NULL,0);
--    XtAddCallback(question_dialog,XmNokCallback,file_new_cb,NULL);
--    XtAddCallback(question_dialog,XmNokCallback,XtUnmanageChild,NULL);
--    XtAddCallback(question_dialog,XmNcancelCallback,XtUnmanageChild,NULL);
-+    XtAddCallback(question_dialog,XmNokCallback,(XtCallbackProc)file_new_cb,NULL);
-+    XtAddCallback(question_dialog,XmNokCallback,(XtCallbackProc)XtUnmanageChild,NULL);
-+    XtAddCallback(question_dialog,XmNcancelCallback,(XtCallbackProc)XtUnmanageChild,NULL);
-   }
-   XtManageChild(question_dialog);
-   XRaiseWindow(the_environment.the_display, XtWindow(XtParent(question_dialog)));
-@@ -896,9 +896,9 @@
-   }
-   if (!question_dialog) {
-     question_dialog=XmCreateQuestionDialog(main_w_shell,"confirm_quit_dialog",NULL,0);
--    XtAddCallback(question_dialog,XmNokCallback,file_quit_cb,NULL);
--    XtAddCallback(question_dialog,XmNokCallback,XtUnmanageChild,NULL);
--    XtAddCallback(question_dialog,XmNcancelCallback,XtUnmanageChild,NULL);
-+    XtAddCallback(question_dialog,XmNokCallback,(XtCallbackProc)file_quit_cb,NULL);
-+    XtAddCallback(question_dialog,XmNokCallback,(XtCallbackProc)XtUnmanageChild,NULL);
-+    XtAddCallback(question_dialog,XmNcancelCallback,(XtCallbackProc)XtUnmanageChild,NULL);
-   }
-   XtManageChild(question_dialog);
-   XRaiseWindow(the_environment.the_display, XtWindow(XtParent(question_dialog)));
-@@ -936,7 +936,7 @@
- 		   XmNtopAttachment, XmATTACH_WIDGET,
- 		   XmNtopWidget, sep,
- 		   NULL);
--     XtAddCallback(fs_box, XmNcancelCallback, cancel_file_selection, NULL);
-+     XtAddCallback(fs_box, XmNcancelCallback, (XtCallbackProc)cancel_file_selection, NULL);
-      XtManageChild(fs_box);
-   }
-   else {
-@@ -945,23 +945,23 @@
-   
-   switch(item) {
-   case F_OPEN:
--     XtAddCallback(fs_box, XmNokCallback, load_network, NULL);
-+     XtAddCallback(fs_box, XmNokCallback, (XtCallbackProc)load_network, NULL);
-      SetLabelString(label, "Open Network");
-      break;
-   case F_SAVE:     
--     XtAddCallback(fs_box, XmNokCallback, save_network, FALSE);
-+     XtAddCallback(fs_box, XmNokCallback, (XtCallbackProc)save_network, FALSE);
-      SetLabelString(label, "Save Network");
-      break;
-   case F_SNAP:
--     XtAddCallback(fs_box, XmNokCallback, save_network, TRUE);
-+     XtAddCallback(fs_box, XmNokCallback, (XtCallbackProc)save_network, (XtPointer) TRUE);
-      SetLabelString(label, "Save Snapshot");
-      break;
-   case F_PRINT:
--     XtAddCallback(fs_box, XmNokCallback, print, NULL);
-+     XtAddCallback(fs_box, XmNokCallback, (XtCallbackProc)print, NULL);
-      SetLabelString(label, "Print Network");
-      break;
-   case F_PLAY:
--     XtAddCallback(fs_box, XmNokCallback, play, NULL);
-+     XtAddCallback(fs_box, XmNokCallback, (XtCallbackProc)play, NULL);
-      SetLabelString(label, "Playback Events");
-      break;
-   default: WARNING("Unexpected item no. in file_cb.\n"); break;
diff --git a/cad/mars/files/patch-XMotif_options.c b/cad/mars/files/patch-XMotif_options.c
deleted file mode 100644
index ff2b4e952589..000000000000
--- a/cad/mars/files/patch-XMotif_options.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- XMotif/options.c.orig	2007-11-23 22:02:50.000000000 +0100
-+++ XMotif/options.c	2007-11-23 22:04:08.000000000 +0100
-@@ -70,17 +70,17 @@
- Widget delay_button;
- 
- MenuItem opmodes_radiobox[] = {
--  {"Continuous", &xmToggleButtonGadgetClass, NULL, NULL, NULL, XmNvalueChangedCallback, opmodes_cb, (XtPointer)CONTINUOUS_BUTTON, (MenuItem*)NULL, initialize_continuous_button},
--  {"Event Step", &xmToggleButtonGadgetClass, NULL, NULL ,NULL, XmNvalueChangedCallback, opmodes_cb, (XtPointer)EVENT_STEP_BUTTON, (MenuItem*)NULL, initialize_event_step_button},
--  {"Time Step", &xmToggleButtonGadgetClass, NULL, NULL, NULL, XmNvalueChangedCallback, opmodes_cb, (XtPointer)TIME_STEP_BUTTON, (MenuItem*)NULL, initialize_time_step_button},
-+  {"Continuous", &xmToggleButtonGadgetClass, '\0', NULL, NULL, XmNvalueChangedCallback, opmodes_cb, (XtPointer)CONTINUOUS_BUTTON, (MenuItem*)NULL, initialize_continuous_button},
-+  {"Event Step", &xmToggleButtonGadgetClass, '\0', NULL ,NULL, XmNvalueChangedCallback, opmodes_cb, (XtPointer)EVENT_STEP_BUTTON, (MenuItem*)NULL, initialize_event_step_button},
-+  {"Time Step", &xmToggleButtonGadgetClass, '\0', NULL, NULL, XmNvalueChangedCallback, opmodes_cb, (XtPointer)TIME_STEP_BUTTON, (MenuItem*)NULL, initialize_time_step_button},
-   NULL
- };
- 
- MenuItem options_items[] = {
--  {"Delay", &xmPushButtonGadgetClass, NULL, NULL, NULL, XmNactivateCallback, delay_cb, (XtPointer)O_DELAY, (MenuItem *)NULL, initialize_delay_button},
--  {"", &xmSeparatorGadgetClass, NULL, NULL, NULL, NULL, NULL, NULL, (MenuItem *)NULL, NULL},
--  {"Operating Mode", &xmCascadeButtonGadgetClass, NULL, NULL, NULL, XmNactivateCallback, NULL, (XtPointer)O_OPERATING_MODE,opmodes_radiobox, NULL},
--  {"Resize Network", &xmPushButtonGadgetClass, NULL, NULL, NULL, XmNactivateCallback, resize_dialog_cb, (XtPointer)O_RESIZE, (MenuItem *)NULL, NULL},
-+  {"Delay", &xmPushButtonGadgetClass, '\0', NULL, NULL, XmNactivateCallback, delay_cb, (XtPointer)O_DELAY, (MenuItem *)NULL, initialize_delay_button},
-+  {"", &xmSeparatorGadgetClass, '\0', NULL, NULL, NULL, NULL, NULL, (MenuItem *)NULL, NULL},
-+  {"Operating Mode", &xmCascadeButtonGadgetClass, '\0', NULL, NULL, XmNactivateCallback, NULL, (XtPointer)O_OPERATING_MODE,opmodes_radiobox, NULL},
-+  {"Resize Network", &xmPushButtonGadgetClass, '\0', NULL, NULL, XmNactivateCallback, resize_dialog_cb, (XtPointer)O_RESIZE, (MenuItem *)NULL, NULL},
-   NULL
- };
- 
-@@ -241,7 +241,7 @@
-      /* Width Textfield */
-      sprintf(buf,"%d",the_environment.network_width);
-      width_input=CreateTextInput(resize_dialog,"width",buf,&textfields[0]);
--     XtAddCallback(textfields[0],XmNactivateCallback,resize_check_input,&resize_max_w);
-+     XtAddCallback(textfields[0],XmNactivateCallback,(XtCallbackProc)resize_check_input,&resize_max_w);
-      XtVaSetValues(width_input,
- 		   XmNleftAttachment, XmATTACH_FORM,
- 		   XmNrightAttachment, XmATTACH_FORM,
-@@ -252,7 +252,7 @@
-    /* Height Textfield */
-       sprintf(buf,"%d",the_environment.network_height);
-       height_input=CreateTextInput(resize_dialog,"height",buf,&textfields[1]);
--      XtAddCallback(textfields[1],XmNactivateCallback,resize_check_input,&resize_max_h);
-+      XtAddCallback(textfields[1],XmNactivateCallback,(XtCallbackProc)resize_check_input,&resize_max_h);
-       XtVaSetValues(height_input,
- 		    XmNleftAttachment, XmATTACH_FORM,
- 		    XmNrightAttachment, XmATTACH_FORM,
-@@ -262,7 +262,7 @@
- 
-    /* Minimize Button */
-       minimize_button=XtVaCreateManagedWidget("minimize_button", xmPushButtonWidgetClass, resize_dialog, NULL);
--      XtAddCallback(minimize_button, XmNactivateCallback, resize_minimize, textfields);
-+      XtAddCallback(minimize_button, XmNactivateCallback, (XtCallbackProc)resize_minimize, textfields);
-       XtVaSetValues(minimize_button,
- 		    XmNleftAttachment, XmATTACH_FORM,
- 		    XmNrightAttachment, XmATTACH_FORM,
diff --git a/cad/mars/files/patch-XMotif_param_w.c b/cad/mars/files/patch-XMotif_param_w.c
deleted file mode 100644
index 2ce8e84a0f26..000000000000
--- a/cad/mars/files/patch-XMotif_param_w.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- XMotif/param_w.c.orig	1992-10-07 04:16:18.000000000 +0100
-+++ XMotif/param_w.c	2007-11-23 22:12:20.000000000 +0100
-@@ -444,7 +444,7 @@
- 					     XmNrightAttachment, XmATTACH_POSITION,
- 					     XmNset, (parameter->p_flags & LogMask)? True : False,
- 					     NULL);
--	  XtAddCallback(log_toggle, XmNvalueChangedCallback, comp_param_log_toggle, window_data);
-+	  XtAddCallback(log_toggle, XmNvalueChangedCallback, (XtCallbackProc)comp_param_log_toggle, window_data);
- 	  SetWidgetUserData(log_toggle,p_textf);
- 	  p_textf->log_toggle=log_toggle;
- 	}
-@@ -459,7 +459,7 @@
- 					       XmNrightAttachment, XmATTACH_POSITION,					       
- 					       XmNset, (parameter->p_flags & MeterMask)? True : False,
- 					       NULL);
--	  XtAddCallback(meter_toggle, XmNvalueChangedCallback, comp_param_meter_toggle, window_data);
-+	  XtAddCallback(meter_toggle, XmNvalueChangedCallback, (XtCallbackProc)comp_param_meter_toggle, window_data);
- 	  SetWidgetUserData(meter_toggle,p_textf);
- 	  p_textf->meter_toggle=meter_toggle;
-        }
-@@ -479,8 +479,8 @@
- 		      NULL);
- 
- 	if (parameter->p_flags & (InputMask | ModifyMask) && i!=0) { /* The name parameter is not editable from this window. */
--	  XtAddCallback(p_textf->textfield,XmNvalueChangedCallback,set_changed_by_user_flag,window_data);
--	  XtAddCallback(p_textf->textfield,XmNactivateCallback,change_parameter_cb,window_data);
-+	  XtAddCallback(p_textf->textfield,XmNvalueChangedCallback,(XtCallbackProc)set_changed_by_user_flag,window_data);
-+	  XtAddCallback(p_textf->textfield,XmNactivateCallback,(XtCallbackProc)change_parameter_cb,window_data);
- 	  p_textf->initial_value=new_string(value);
- 	  p_textf->current_value=new_string(value);
- 	}
diff --git a/cad/mars/files/patch-XMotif_view.c b/cad/mars/files/patch-XMotif_view.c
deleted file mode 100644
index e0b53d5fd879..000000000000
--- a/cad/mars/files/patch-XMotif_view.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- XMotif/view.c.orig	2007-11-23 22:00:21.000000000 +0100
-+++ XMotif/view.c	2007-11-23 22:02:13.000000000 +0100
-@@ -75,13 +75,13 @@
- void close_all_groups(Widget w);
- 
- MenuItem view_items[] = {
--  {"Update Screen", &xmToggleButtonGadgetClass, NULL, NULL, NULL, XmNvalueChangedCallback, toggle_update_screen, (XtPointer)NULL, (MenuItem *)NULL,initialize_update_screen_toggle},
--  {"",&xmSeparatorGadgetClass, NULL, NULL, NULL, NULL, NULL, NULL, (MenuItem *)NULL,NULL},
--  {"Open Meter Window", &xmPushButtonGadgetClass, NULL, NULL, NULL, XmNactivateCallback, view_meter_cb, (XtPointer)V_METER_WINDOW, (MenuItem *)NULL, NULL}, 
--  {"Close All Information Windows", &xmPushButtonGadgetClass, NULL, NULL, NULL, XmNactivateCallback, close_all_info_w, (XtPointer)V_CLOSE_ALL_INFO_WINDOWS, (MenuItem *)NULL, NULL},
--  {"Close All Groups", &xmPushButtonGadgetClass, NULL, NULL, NULL, XmNactivateCallback, close_all_groups, (XtPointer)V_CLOSE_ALL_GROUPS, (MenuItem *)NULL, NULL},
--  {"",&xmSeparatorGadgetClass, NULL, NULL, NULL, NULL, NULL, NULL, (MenuItem *)NULL,NULL},
--  {"Hide", &xmPushButtonGadgetClass, NULL, NULL, NULL, XmNactivateCallback, view_hide_cb, (XtPointer)V_HIDE, (MenuItem *)NULL,NULL},
-+  {"Update Screen", &xmToggleButtonGadgetClass, '\0', NULL, NULL, XmNvalueChangedCallback, toggle_update_screen, (XtPointer)NULL, (MenuItem *)NULL,initialize_update_screen_toggle},
-+  {"",&xmSeparatorGadgetClass, '\0', NULL, NULL, NULL, NULL, NULL, (MenuItem *)NULL,NULL},
-+  {"Open Meter Window", &xmPushButtonGadgetClass, '\0', NULL, NULL, XmNactivateCallback, view_meter_cb, (XtPointer)V_METER_WINDOW, (MenuItem *)NULL, NULL}, 
-+  {"Close All Information Windows", &xmPushButtonGadgetClass, '\0', NULL, NULL, XmNactivateCallback, close_all_info_w, (XtPointer)V_CLOSE_ALL_INFO_WINDOWS, (MenuItem *)NULL, NULL},
-+  {"Close All Groups", &xmPushButtonGadgetClass, '\0', NULL, NULL, XmNactivateCallback, close_all_groups, (XtPointer)V_CLOSE_ALL_GROUPS, (MenuItem *)NULL, NULL},
-+  {"",&xmSeparatorGadgetClass, '\0', NULL, NULL, NULL, NULL, NULL, (MenuItem *)NULL,NULL},
-+  {"Hide", &xmPushButtonGadgetClass, '\0', NULL, NULL, XmNactivateCallback, view_hide_cb, (XtPointer)V_HIDE, (MenuItem *)NULL,NULL},
-   NULL
- };
- 
-@@ -284,7 +284,7 @@
- 			     XmNrightAttachment, XmATTACH_FORM,
- 			     NULL);
-     
--     for(num_components=0;component_types[num_components].class!=NULL;num_components++);
-+     for(num_components=0;component_types[num_components].class!=0;num_components++);
-      hide_components_toggles=(Widget *)sim_malloc(sizeof(Widget)*num_components);
- 
-      for(i=0;i<num_components;i++) {
-@@ -297,7 +297,7 @@
- 							   XmNset, (the_environment.hide_settings>>i & 0x1L)? True:False,
- 							   NULL);
- 	XmStringFree(str);
--	XtAddCallback(hide_components_toggles[i], XmNvalueChangedCallback, hide_w_component_toggle_cb, (XtPointer)i);
-+	XtAddCallback(hide_components_toggles[i], XmNvalueChangedCallback, (XtCallbackProc)hide_w_component_toggle_cb, (XtPointer)i);
-      }
-      str=XmStringCreateSimple("METERS");
-      hide_meters_toggle=XtVaCreateManagedWidget("toggle_button", xmToggleButtonGadgetClass,row_col,
-@@ -308,7 +308,7 @@
- 						XmNset, (the_environment.hide_meters)? True:False,
- 						NULL);
-      XmStringFree(str);
--     XtAddCallback(hide_meters_toggle, XmNvalueChangedCallback, hide_w_component_toggle_cb, (XtPointer)TYPE_METER);
-+     XtAddCallback(hide_meters_toggle, XmNvalueChangedCallback, (XtCallbackProc)hide_w_component_toggle_cb, (XtPointer)TYPE_METER);
-     
-      XtManageChild(row_col);
-     
diff --git a/cad/mars/files/patch-XMotif_xinit.c b/cad/mars/files/patch-XMotif_xinit.c
deleted file mode 100644
index 1537c918b7bf..000000000000
--- a/cad/mars/files/patch-XMotif_xinit.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- XMotif/xinit.c.orig	2007-11-23 21:08:13.000000000 +0100
-+++ XMotif/xinit.c	2007-11-23 21:29:50.000000000 +0100
-@@ -83,32 +83,32 @@
- 
- 
- XtActionsRec actions[]={
--  {"move_component",move_component},
--  {"lower_component",lower_component},
--  {"raise_component",raise_component},
--  {"join_components",join_components},
--  {"select_component",select_component},
--  {"open_group",open_group},
--  {"close_group",close_group},
--  {"drag_component_icon",create_comp_drag_icon},
--  {"open_parameter_window",open_param_w_tn},
--  {"close_parameter_window",close_param_w_tn},
--  {"open_close_parameter_window",open_close_param_w_tn},
--  {"open_information_window",open_info_w_tn},
--  {"open_close_information_window",open_close_info_w_tn},
--  {"close_information_window",close_info_w_tn},
--  {"move_window",move_window},
--  {"raise_window",raise_window},
--  {"lower_window",lower_window},
--  {"rubberbox",rubberbox},
--  {"make_peers",make_peer},
--  {"open_meter_information_window",open_meter_info_w_tn},
--  {"close_meter_information_window",close_meter_info_w_tn},
--  {"open_close_meter_information_window",open_close_meter_info_w_tn},
--  {"move_meter",move_meter},
--  {"raise_meter",raise_meter},
--  {"lower_meter",lower_meter},
--  {"resize_meter",resize_meter}
-+  {(String)"move_component",(XtActionProc)move_component},
-+  {(String)"lower_component",(XtActionProc)lower_component},
-+  {(String)"raise_component",(XtActionProc)raise_component},
-+  {(String)"join_components",(XtActionProc)join_components},
-+  {(String)"select_component",(XtActionProc)select_component},
-+  {(String)"open_group",(XtActionProc)open_group},
-+  {(String)"close_group",(XtActionProc)close_group},
-+  {(String)"drag_component_icon",(XtActionProc)create_comp_drag_icon},
-+  {(String)"open_parameter_window",(XtActionProc)open_param_w_tn},
-+  {(String)"close_parameter_window",(XtActionProc)close_param_w_tn},
-+  {(String)"open_close_parameter_window",(XtActionProc)open_close_param_w_tn},
-+  {(String)"open_information_window",(XtActionProc)open_info_w_tn},
-+  {(String)"open_close_information_window",(XtActionProc)open_close_info_w_tn},
-+  {(String)"close_information_window",(XtActionProc)close_info_w_tn},
-+  {(String)"move_window",(XtActionProc)move_window},
-+  {(String)"raise_window",(XtActionProc)raise_window},
-+  {(String)"lower_window",(XtActionProc)lower_window},
-+  {(String)"rubberbox",(XtActionProc)rubberbox},
-+  {(String)"make_peers",(XtActionProc)make_peer},
-+  {(String)"open_meter_information_window",(XtActionProc)open_meter_info_w_tn},
-+  {(String)"close_meter_information_window",(XtActionProc)close_meter_info_w_tn},
-+  {(String)"open_close_meter_information_window",(XtActionProc)open_close_meter_info_w_tn},
-+  {(String)"move_meter",(XtActionProc)move_meter},
-+  {(String)"raise_meter",(XtActionProc)raise_meter},
-+  {(String)"lower_meter",(XtActionProc)lower_meter},
-+  {(String)"resize_meter",(XtActionProc)resize_meter}
- };
- 
- int screen_update;
diff --git a/cad/mars/files/patch-aa b/cad/mars/files/patch-aa
deleted file mode 100644
index 9279a299f277..000000000000
--- a/cad/mars/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- sim/usleep.c.orig	Fri Nov 14 08:20:27 1997
-+++ sim/usleep.c	Fri Nov 14 08:22:23 1997
-@@ -47,6 +47,7 @@
- 
- static int ringring;
- 
-+#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
- void
- usleep(useconds)
- 	unsigned int useconds;
-@@ -91,7 +92,7 @@
- 	(void) sigsetmask(omask);
- 	(void) setitimer(ITIMER_REAL, &oitv, (struct itimerval *)0);
- }
--
-+#endif
- static void
- sleephandler()
- {
diff --git a/cad/mars/files/patch-comps_ftp.c b/cad/mars/files/patch-comps_ftp.c
deleted file mode 100644
index 7278763c2e10..000000000000
--- a/cad/mars/files/patch-comps_ftp.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- comps/ftp.c.orig	2007-11-23 23:37:24.000000000 +0100
-+++ comps/ftp.c	2007-11-23 23:41:03.000000000 +0100
-@@ -554,7 +554,7 @@
-  /* Schedule next computation */
-   ev_enqueue(EV_INSTANT_RATE,  (Component *)g, (Component *)g,
- 	    ev_now() + perf_update_dt_usecs / USECS_PER_TICK,
--             g->ftp_action, (caddr_t *)NULL, (caddr_t)NULL);
-+             g->ftp_action, (Packet *)NULL, (caddr_t)NULL);
-   return ((caddr_t)g);
- }
- 
-@@ -584,7 +584,7 @@
-   /* Schedule first computation of instantaneous thruput */
-   ev_enqueue(EV_INSTANT_RATE,  (Component *)g, (Component *)g, 
- 	     ev_now() + perf_update_dt_usecs/USECS_PER_TICK,
--             g->ftp_action, (caddr_t *)NULL, (caddr_t)NULL);
-+             g->ftp_action, (Packet *)NULL, (caddr_t)NULL);
- 
-   /* produce first packet */
-   if (strcmp(g->init_conn_on_off->u.p, "On") == 0)
-@@ -593,7 +593,7 @@
-      time = ticks_btw_conns(g);
- 
-    ev_enqueue(EV_APTR_CONN_ON, (Component *)g, (Component *)g, 
--	      time, g->ftp_action, (caddr_t *)NULL, train_length(g));
-+	      time, g->ftp_action, (Packet *)NULL, (caddr_t)train_length(g));
-  
-   /* send a token packet */
-   pkt = pk_alloc();
-@@ -707,7 +707,7 @@
-      /* schedule an event for the next pkt */
-      ev_enqueue(EV_APTR_PRODUCE, (Component *)g, (Component *)g, 
- 		ev_now() + ticks_btw_packets(g),
--		g->ftp_action, (caddr_t *)NULL, (caddr_t)NULL);
-+		(PFP)g->ftp_action, (Packet *)NULL, (caddr_t)NULL);
-   else {
-      g->produce_scheduled = 0;
-      /* schedule an event for the next connection i.e. train */
-@@ -715,7 +715,7 @@
- 	 g->ftp_tr_how_many->u.i == -1) 
- 	ev_enqueue(EV_APTR_CONN_ON, (Component *)g, (Component *)g, 
- 		   ev_now() + ticks_btw_conns(g),
--		   g->ftp_action, (Packet *)NULL, train_length(g));
-+		   g->ftp_action, (Packet *)NULL, (caddr_t) train_length(g));
-   }
-   
-   return((caddr_t)g);
diff --git a/cad/mars/files/patch-comps_node.c b/cad/mars/files/patch-comps_node.c
deleted file mode 100644
index 8a485691d121..000000000000
--- a/cad/mars/files/patch-comps_node.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- comps/node.c.orig	2007-11-23 23:35:05.000000000 +0100
-+++ comps/node.c	2007-11-23 23:36:22.000000000 +0100
-@@ -644,7 +644,7 @@
-                                  nd->nd_delay->u.i/USECS_PER_TICK + ticks;
- 	 ev_enqueue(EV_NODE_SEND, (Component *)nd, (Component *)nd,
- 		   pkt->pk_time , nd->nd_action, (Packet *)NULL,
--		   (Neighbor *)n);
-+		   (caddr_t)n);
-       }
- 
- 
-@@ -759,7 +759,7 @@
-      pkt->pk_time = ev_now() + process_delay + ticks;
-      ev_enqueue(EV_NODE_SEND, (Component *)nd, (Component *)nd,
- 		pkt->pk_time , nd->nd_action, (Packet *)NULL,
--		(Neighbor *)n);
-+		(caddr_t)n);
-      q_addt(n->n_pq, (caddr_t)pkt);
-      log_param((Component *)nd, n->n_p);
-   }
-@@ -804,7 +804,7 @@
-   if (n->n_pq->q_len > 0) {
-      time_value = ((Packet *)(n->n_pq->q_head->qe_data))->pk_time;
-      ev_enqueue(EV_NODE_SEND, (Component *)nd, (Component *)nd,
--                time_value, nd->nd_action, (Packet *)NULL, (Neighbor *)n);
-+                time_value, nd->nd_action, (Packet *)NULL, (caddr_t)n);
-   }
-   return((caddr_t)nd);
- }
diff --git a/cad/mars/files/patch-comps_telnet.c b/cad/mars/files/patch-comps_telnet.c
deleted file mode 100644
index 7b753f7927bf..000000000000
--- a/cad/mars/files/patch-comps_telnet.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- comps/telnet.c.orig	2007-11-23 23:41:45.000000000 +0100
-+++ comps/telnet.c	2007-11-23 23:42:14.000000000 +0100
-@@ -619,7 +619,7 @@
-      time = ticks_btw_conns(g);
- 
-    ev_enqueue(EV_APTR_CONN_ON, (Component *)g, (Component *)g, 
--	      time, g->telnet_action, (Packet *)NULL, train_length(g));
-+	      time, g->telnet_action, (Packet *)NULL, (caddr_t)train_length(g));
- 
-   /* send a token packet */
-   pkt = pk_alloc();
-@@ -760,7 +760,7 @@
-          g->telnet_tr_how_many->u.i == -1)
- 	ev_enqueue(EV_APTR_CONN_ON, (Component *)g, (Component *)g, 
- 		   ev_now() + ticks_btw_conns(g),
--		   g->telnet_action, (Packet *)NULL, train_length(g));
-+		   g->telnet_action, (Packet *)NULL, (caddr_t)train_length(g));
-   }
- 
-   return((caddr_t)g);
diff --git a/cad/mars/files/patch-include_lcostfcn.h b/cad/mars/files/patch-include_lcostfcn.h
deleted file mode 100644
index f261c9b6b1dd..000000000000
--- a/cad/mars/files/patch-include_lcostfcn.h
+++ /dev/null
@@ -1,9 +0,0 @@
---- include/lcostfcn.h.orig	2007-11-23 23:19:41.000000000 +0100
-+++ include/lcostfcn.h	2007-11-23 23:19:51.000000000 +0100
-@@ -64,5 +64,5 @@
- 
- extern Lcostfcn *lcostfcn_adr;
- 
--#endif LCOSTFCN_H
-+#endif /* !LCOSTFCN_H */
- 
diff --git a/cad/mars/files/patch-include_perf.h b/cad/mars/files/patch-include_perf.h
deleted file mode 100644
index 555f77ecd503..000000000000
--- a/cad/mars/files/patch-include_perf.h
+++ /dev/null
@@ -1,9 +0,0 @@
---- include/perf.h.orig	2007-11-23 23:18:53.000000000 +0100
-+++ include/perf.h	2007-11-23 23:19:18.000000000 +0100
-@@ -181,5 +181,5 @@
- 
- } Pmt;
- 
--#endif PERF_MON_H
-+#endif /* !PERF_MON_H */
- 
diff --git a/cad/mars/files/patch-include_sim.h b/cad/mars/files/patch-include_sim.h
deleted file mode 100644
index a71b92b15616..000000000000
--- a/cad/mars/files/patch-include_sim.h
+++ /dev/null
@@ -1,27 +0,0 @@
---- include/sim.h.orig	1992-10-07 04:51:27.000000000 +0100
-+++ include/sim.h	2007-11-23 23:51:50.000000000 +0100
-@@ -4,7 +4,9 @@
- 
- #include <sys/types.h>
- #include <strings.h>
-+#include <string.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <math.h>
- 
- /* Things for all simulator routines */
-@@ -83,14 +85,11 @@
- #define CONST
- #endif  /* __STDC__ */
- 
--extern char *strncpy(), *strcpy(), *strcat(), *strncat();
--extern char *calloc(), *malloc(), *realloc();
- char *sim_calloc(), *sim_malloc(), *sim_realloc();
- void panic();
- 
- /** Largest number returned by random(). (2**31)-1   From RANDOM(3) */
- #define MAX_RANDOM_NUMBER 2147483647
--extern long random();
- double random_range();
- 
- #define min(a, b)  ((a) < (b) ? (a) : (b))
diff --git a/cad/mars/files/patch-include_stopper.h b/cad/mars/files/patch-include_stopper.h
deleted file mode 100644
index 616ff8b5c34f..000000000000
--- a/cad/mars/files/patch-include_stopper.h
+++ /dev/null
@@ -1,9 +0,0 @@
---- include/stopper.h.orig	2007-11-23 23:20:44.000000000 +0100
-+++ include/stopper.h	2007-11-23 23:20:55.000000000 +0100
-@@ -69,5 +69,5 @@
- 
- } Stopper;
- 
--#endif STOPPER_H
-+#endif /* !STOPPER_H */
- 
diff --git a/cad/mars/files/patch-sim_compfiles.c b/cad/mars/files/patch-sim_compfiles.c
deleted file mode 100644
index e1aecd796bb8..000000000000
--- a/cad/mars/files/patch-sim_compfiles.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- sim/comptypes.c.orig	2007-11-23 23:17:42.000000000 +0100
-+++ sim/comptypes.c	2007-11-23 23:18:07.000000000 +0100
-@@ -96,5 +96,5 @@
- 	    stopper_p},
- 	{"LINK_COST_FUNC",	AUXILIARY_CLASS,lcostfcn_action,	
- 	    link_cost_func_p},
--	{"", NULL} /* This line indicates the end of the list.  */
-+	{"", 0} /* This line indicates the end of the list.  */
- };
diff --git a/cad/mars/files/patch-sim_event.c b/cad/mars/files/patch-sim_event.c
deleted file mode 100644
index 7b74f752b8c5..000000000000
--- a/cad/mars/files/patch-sim_event.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- sim/event.c.orig	2007-11-23 21:54:37.000000000 +0100
-+++ sim/event.c	2007-11-23 21:55:23.000000000 +0100
-@@ -433,14 +433,13 @@
-    I'm just using the stack to store a list of events that must be
-    deleted, rather than creating my own list/array/whatever.
- */
--
-+static void ev_dequeue_by_comp_and_type1();
- void
- ev_dequeue_by_comp_and_type(src, dest, type)
- 
- Component	*src, *dest;
- Evtype		type;
- {
--    static void ev_dequeue_by_comp_and_type1();
-     ev_dequeue_by_comp_and_type1(src, dest, type,
- 				 (Event *)heap_iter_init(event_queue));
- }
-@@ -476,13 +475,11 @@
-    I'm just using the stack to store a list of events that must be
-    deleted, rather than creating my own list/array/whatever.
- */
--
-+static void ev_dequeue_by_time1();
- void
- ev_dequeue_by_time(t)
-      tick_t t;
- {
--    static void ev_dequeue_by_time1();
--
-     ev_dequeue_by_time1(t, (Event *)heap_iter_init(event_queue));
- }
- 
diff --git a/cad/mars/files/patch-sim_file.c b/cad/mars/files/patch-sim_file.c
deleted file mode 100644
index 1c01066cca5c..000000000000
--- a/cad/mars/files/patch-sim_file.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- sim/file.c.orig	2007-11-23 23:15:16.000000000 +0100
-+++ sim/file.c	2007-11-23 23:16:18.000000000 +0100
-@@ -252,7 +252,7 @@
- 
- #ifndef NoX
- 	    if (doXstuff)  {
--	       if (((COMP_OBJECT) c1->co_picture = (COMP_OBJECT)pop_comp_window((COMPONENT *)c1,xpos, ypos)) == (COMP_OBJECT) NULL) {
-+	       if (( c1->co_picture = (COMP_OBJECT)pop_comp_window((COMPONENT *)c1,xpos, ypos)) == NULL) {
- 	  
- #ifdef DEBUG
- 		  dbg_write(debug_log, DBG_ERR, (Component *)NULL,
diff --git a/cad/mars/files/patch-sim_mempool.c b/cad/mars/files/patch-sim_mempool.c
deleted file mode 100644
index c330e7191bfe..000000000000
--- a/cad/mars/files/patch-sim_mempool.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- sim/mempool.c.orig	2007-11-23 22:23:58.000000000 +0100
-+++ sim/mempool.c	2007-11-23 22:24:10.000000000 +0100
-@@ -23,7 +23,6 @@
- #include "mempool.h"
- 
- extern char *sim_calloc(), *sim_malloc();
--#define NULL 0
- #define TRUE 1
- #define FALSE 0
- 
diff --git a/cad/mars/files/patch-sim_q.c b/cad/mars/files/patch-sim_q.c
deleted file mode 100644
index 21440e05f0a3..000000000000
--- a/cad/mars/files/patch-sim_q.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- sim/q.c.orig	1992-10-07 04:52:52.000000000 +0100
-+++ sim/q.c	2007-11-23 22:23:21.000000000 +0100
-@@ -23,8 +23,6 @@
- 
- extern char *sim_calloc(), *sim_malloc();
- 
--#define NULL 0
--
- /* If using GCC, this function is declared inline in q.h. */
- #ifndef INLINE
- q_elt *
-@@ -95,7 +93,7 @@
- 	    return TRUE;
- 	  }
- 
--	return NULL;		/* not in queue, fail */
-+	return 0;		/* not in queue, fail */
- }
- 
- q_del(q, elt)
-@@ -120,7 +118,7 @@
- 	    return TRUE;
- 	  }
- 
--	return NULL;		/* not in queue, fail */
-+	return 0;		/* not in queue, fail */
- }
- 
-   
diff --git a/cad/mars/pkg-descr b/cad/mars/pkg-descr
deleted file mode 100644
index eff3b7988147..000000000000
--- a/cad/mars/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-The Maryland Routing Simulator (MaRS) is a discrete-event simulator
-providing a flexible platform for the evaluation and comparison of
-network routing algorithms.
diff --git a/cad/mars/pkg-plist b/cad/mars/pkg-plist
deleted file mode 100644
index e70dd8905bbf..000000000000
--- a/cad/mars/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/mars
-%%PORTDOCS%%%%DOCSDIR%%/proman/prog.ps
-%%PORTDOCS%%%%DOCSDIR%%/usrman/user.ps
-%%PORTDOCS%%%%DOCSDIR%%/motifman/Xmotif.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/proman
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/usrman
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/motifman
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
author	Pietro Cerutti <gahr@FreeBSD.org>	2014-01-31 09:12:58 +0000
committer	Pietro Cerutti <gahr@FreeBSD.org>	2014-01-31 09:12:58 +0000
commit	30fb1088d302933bcf6db87b2b1dd22a66e7e9fe (patch)
tree	276e7d09a0f7aa28a07c30d9f2d13be03551429e /cad
parent	2ca459630d94fad3a2978b7d39d787458aefbea5 (diff)
download	ports-30fb1088d302933bcf6db87b2b1dd22a66e7e9fe.tar.gz ports-30fb1088d302933bcf6db87b2b1dd22a66e7e9fe.zip