5 files changed, 160 insertions, 114 deletions

diff --git a/net/cnet/Makefile b/net/cnet/Makefile
index 301a3801abd8..fcefdc67c72a 100644
--- a/net/cnet/Makefile
+++ b/net/cnet/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	cnet
-PORTVERSION=	1.7.7
-PORTREVISION=	2
+PORTVERSION=	2.0.9
 CATEGORIES=	net tcl84 tk84
-MASTER_SITES=	http://www.cs.uwa.edu.au/cnet/
+MASTER_SITES=	http://www.csse.uwa.edu.au/cnet/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,18 +16,15 @@ COMMENT=	A networking simulator
 
 LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
-IGNORE=		does not run (core dumps: Arithmetic exception)
-
 USE_REINPLACE=	yes
-USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	# empty
 MAN1=		cnet.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|8.2|8.4|g ; \
-		 s|82|84|g' ${WRKSRC}/src/Makefile.freebsd
+	@${REINPLACE_CMD} -e 's|8.3|8.4|g ; \
+		 s|83|84|g' ${WRKSRC}/src/Makefile.freebsd
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
 		 s|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/config.h
 
diff --git a/net/cnet/distinfo b/net/cnet/distinfo
index 6621bb1d6036..8d9f986992ac 100644
--- a/net/cnet/distinfo
+++ b/net/cnet/distinfo
@@ -1,2 +1,2 @@
-MD5 (cnet-1.7.7.tgz) = a76fd6bec9b919dc20a8e559f09b06c2
-SIZE (cnet-1.7.7.tgz) = 1019105
+MD5 (cnet-2.0.9.tgz) = 593b63c809773a284bc3d655dc609298
+SIZE (cnet-2.0.9.tgz) = 1165028
diff --git a/net/cnet/files/patch-src_compile_freebsd.c b/net/cnet/files/patch-src_compile_freebsd.c
new file mode 100644
index 000000000000..efe1a472f22e
--- /dev/null
+++ b/net/cnet/files/patch-src_compile_freebsd.c
@@ -0,0 +1,11 @@
+--- src/compile/freebsd.c.orig	Wed May 12 18:13:45 2004
++++ src/compile/freebsd.c	Sun Jun 12 20:05:45 2005
+@@ -84,7 +84,7 @@
+     cp			= (CACHE *)malloc(sizeof(CACHE));

+     cp->so_filenm	= strdup(so_filenm);

+     cp->length_data	= (nls[1].n_value - nls[0].n_value);

+-    cp->incore_data	= (char *)((long)dlsym(handle,"end") - cp->length_data);

++    cp->incore_data	= (char *)((long)dlsym(handle,"_end") - cp->length_data);

+     cp->original_data	= (char *)malloc(cp->length_data);

+     memcpy(cp->original_data, cp->incore_data, cp->length_data);

+     cp->next		= chd;

diff --git a/net/cnet/files/patch-src_parser.c b/net/cnet/files/patch-src_parser.c
new file mode 100644
index 000000000000..4d9902558111
--- /dev/null
+++ b/net/cnet/files/patch-src_parser.c
@@ -0,0 +1,28 @@
+--- src/parser.c.orig	Wed May 12 18:13:44 2004
++++ src/parser.c	Sun Jun 12 17:04:02 2005
+@@ -26,6 +26,8 @@
+     59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  */
+ 
++extern void	init_reboot_args(NODEATTR *na, int argc, char **argv);
++
+ #define expect(t,msg)	if(token == t) gettoken(); \
+ 			else compile_error("%s expected\n", msg)
+ 
+@@ -224,8 +226,6 @@
+ 	check_string(&(na->outputfile));
+ 	break;
+     case T_ATTR_NODE_REBOOTARGS : {
+-	extern	void init_reboot_args(NODEATTR *na, int argc, char **argv);
+-
+ 	int	argc;
+ 	char	**argv;
+ 	char	*str, *s, *t, ch;
+@@ -420,7 +420,6 @@
+ static int node_defn(CnetNodetype nodetype)
+ {
+     extern int	add_node(CnetNodetype, char *, int, int *);
+-    extern void	init_reboot_args(int n, int argc, char **argv);
+ 
+     int		thisnode, wasnew;
+ 
diff --git a/net/cnet/pkg-plist b/net/cnet/pkg-plist
index 078da1fcc245..0ad532eb7ddc 100644
--- a/net/cnet/pkg-plist
+++ b/net/cnet/pkg-plist
@@ -1,106 +1,117 @@
 bin/cnet
 include/cnet.h
-share/cnet/australia.gif
-share/cnet/australia1.gif
-share/cnet/australia2.gif
-share/cnet/bsd.gif
-share/cnet/cnet.h
-share/cnet/cnet.tcl
-share/cnet/dead.gif
-share/cnet/europe1.gif
-share/cnet/hurd.gif
-share/cnet/linux.gif
-share/cnet/mac.gif
-share/cnet/next.gif
-share/cnet/os2.gif
-share/cnet/palm.gif
-share/cnet/paused.gif
-share/cnet/repair.gif
-share/cnet/router.gif
-share/cnet/sgi.gif
-share/cnet/sun.gif
-share/cnet/usa1.gif
-share/cnet/usa2.gif
-share/cnet/usa3.gif
-share/cnet/windows.gif
-share/cnet/world1.gif
-share/cnet/zap.gif
-%%PORTDOCS%%share/doc/cnet/application.html
-%%PORTDOCS%%share/doc/cnet/attributes.html
-%%PORTDOCS%%share/doc/cnet/drawframes.html
-%%PORTDOCS%%share/doc/cnet/enumerated.html
-%%PORTDOCS%%share/doc/cnet/eventdriven.html
-%%PORTDOCS%%share/doc/cnet/eventfuncs.html
-%%PORTDOCS%%share/doc/cnet/faq.html
-%%PORTDOCS%%share/doc/cnet/functions.html
-%%PORTDOCS%%share/doc/cnet/images/UWAsmall.gif
-%%PORTDOCS%%share/doc/cnet/images/australia.gif
-%%PORTDOCS%%share/doc/cnet/images/australia1.gif
-%%PORTDOCS%%share/doc/cnet/images/australia2.gif
-%%PORTDOCS%%share/doc/cnet/images/costs.gif
-%%PORTDOCS%%share/doc/cnet/images/drawframes.gif
-%%PORTDOCS%%share/doc/cnet/images/europe.gif
-%%PORTDOCS%%share/doc/cnet/images/layers.fig
-%%PORTDOCS%%share/doc/cnet/images/layers.gif
-%%PORTDOCS%%share/doc/cnet/images/mainlink.gif
-%%PORTDOCS%%share/doc/cnet/images/mainstdio.gif
-%%PORTDOCS%%share/doc/cnet/images/mainwindow.gif
-%%PORTDOCS%%share/doc/cnet/images/multinode.gif
-%%PORTDOCS%%share/doc/cnet/images/purple-line.gif
-%%PORTDOCS%%share/doc/cnet/images/purplefade.gif
-%%PORTDOCS%%share/doc/cnet/images/random12.gif
-%%PORTDOCS%%share/doc/cnet/images/skey5.gif
-%%PORTDOCS%%share/doc/cnet/images/stallings6.jpg
-%%PORTDOCS%%share/doc/cnet/images/tracing1.gif
-%%PORTDOCS%%share/doc/cnet/images/tracing2.gif
-%%PORTDOCS%%share/doc/cnet/index.html
-%%PORTDOCS%%share/doc/cnet/install.html
-%%PORTDOCS%%share/doc/cnet/introduction.html
-%%PORTDOCS%%share/doc/cnet/options.html
-%%PORTDOCS%%share/doc/cnet/otherfuncs.html
-%%PORTDOCS%%share/doc/cnet/physical.html
-%%PORTDOCS%%share/doc/cnet/themodel.html
-%%PORTDOCS%%share/doc/cnet/timers.html
-%%PORTDOCS%%share/doc/cnet/topology.html
-%%PORTDOCS%%share/doc/cnet/tracing.html
-%%PORTDOCS%%share/doc/cnet/walkthrough.html
-%%PORTDOCS%%share/examples/cnet/AUSTRALIA.MAP
-%%PORTDOCS%%share/examples/cnet/CLICK
-%%PORTDOCS%%share/examples/cnet/EUROPE.MAP
-%%PORTDOCS%%share/examples/cnet/FLOODING1
-%%PORTDOCS%%share/examples/cnet/FLOODING2
-%%PORTDOCS%%share/examples/cnet/FLOODING3
-%%PORTDOCS%%share/examples/cnet/KEYBOARD
-%%PORTDOCS%%share/examples/cnet/LINKCRASH
-%%PORTDOCS%%share/examples/cnet/LINKSTATE
-%%PORTDOCS%%share/examples/cnet/MAXFLOW
-%%PORTDOCS%%share/examples/cnet/Makefile
-%%PORTDOCS%%share/examples/cnet/README.flooding
-%%PORTDOCS%%share/examples/cnet/STOPANDWAIT
-%%PORTDOCS%%share/examples/cnet/T2
-%%PORTDOCS%%share/examples/cnet/TICKTOCK
-%%PORTDOCS%%share/examples/cnet/TOPOLOGY.2a
-%%PORTDOCS%%share/examples/cnet/TOPOLOGY.2b
-%%PORTDOCS%%share/examples/cnet/TOPOLOGY.2c
-%%PORTDOCS%%share/examples/cnet/WORLD
-%%PORTDOCS%%share/examples/cnet/WORLD.MAP
-%%PORTDOCS%%share/examples/cnet/click.c
-%%PORTDOCS%%share/examples/cnet/flooding.gp
-%%PORTDOCS%%share/examples/cnet/flooding1.c
-%%PORTDOCS%%share/examples/cnet/flooding1.dat
-%%PORTDOCS%%share/examples/cnet/flooding2.c
-%%PORTDOCS%%share/examples/cnet/flooding2.dat
-%%PORTDOCS%%share/examples/cnet/flooding3.c
-%%PORTDOCS%%share/examples/cnet/flooding3.dat
-%%PORTDOCS%%share/examples/cnet/keyboard.c
-%%PORTDOCS%%share/examples/cnet/linkcrash.c
-%%PORTDOCS%%share/examples/cnet/linkstate.c
-%%PORTDOCS%%share/examples/cnet/protocol.c
-%%PORTDOCS%%share/examples/cnet/result.file
-%%PORTDOCS%%share/examples/cnet/stopandwait.c
-%%PORTDOCS%%share/examples/cnet/stopandwait2.c
-%%PORTDOCS%%share/examples/cnet/ticktock.c
-%%PORTDOCS%%@dirrm share/examples/cnet
-%%PORTDOCS%%@dirrm share/doc/cnet/images
-%%PORTDOCS%%@dirrm share/doc/cnet
-@dirrm share/cnet
+%%DATADIR%%/australia.gif
+%%DATADIR%%/australia1.gif
+%%DATADIR%%/australia2.gif
+%%DATADIR%%/bsd.gif
+%%DATADIR%%/cnet.h
+%%DATADIR%%/cnet.tcl
+%%DATADIR%%/cnet64bits.h
+%%DATADIR%%/dead.gif
+%%DATADIR%%/europe1.gif
+%%DATADIR%%/hurd.gif
+%%DATADIR%%/linux.gif
+%%DATADIR%%/mac.gif
+%%DATADIR%%/next.gif
+%%DATADIR%%/os2.gif
+%%DATADIR%%/palm.gif
+%%DATADIR%%/paused.gif
+%%DATADIR%%/repair.gif
+%%DATADIR%%/router.gif
+%%DATADIR%%/sgi.gif
+%%DATADIR%%/sun.gif
+%%DATADIR%%/usa1.gif
+%%DATADIR%%/usa2.gif
+%%DATADIR%%/usa3.gif
+%%DATADIR%%/windows.gif
+%%DATADIR%%/world1.gif
+%%DATADIR%%/zap.gif
+%%PORTDOCS%%%%DOCSDIR%%/application.html
+%%PORTDOCS%%%%DOCSDIR%%/attributes.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog.html
+%%PORTDOCS%%%%DOCSDIR%%/datatypes.html
+%%PORTDOCS%%%%DOCSDIR%%/drawframes.html
+%%PORTDOCS%%%%DOCSDIR%%/ethernets.html
+%%PORTDOCS%%%%DOCSDIR%%/eventdriven.html
+%%PORTDOCS%%%%DOCSDIR%%/eventfuncs.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/images/UWAsmall.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/australia.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/australia1.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/australia2.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/costs.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/drawframes.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/error1.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/ethernet1.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/ethernet2.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/europe.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/layers.fig
+%%PORTDOCS%%%%DOCSDIR%%/images/layers.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/mainlink.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/mainstdio.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/mainwindow.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/multinode.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/new.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/purple-line.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/purplefade.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/random12.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/skey5.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/stallings6.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/stallings7.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/tracing1.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/tracing2.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/updated.gif
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/int64.html
+%%PORTDOCS%%%%DOCSDIR%%/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/options.html
+%%PORTDOCS%%%%DOCSDIR%%/otherfuncs.html
+%%PORTDOCS%%%%DOCSDIR%%/physical.html
+%%PORTDOCS%%%%DOCSDIR%%/themodel.html
+%%PORTDOCS%%%%DOCSDIR%%/timers.html
+%%PORTDOCS%%%%DOCSDIR%%/topology.html
+%%PORTDOCS%%%%DOCSDIR%%/tracing.html
+%%PORTDOCS%%%%DOCSDIR%%/walkthrough.html
+%%PORTDOCS%%%%EXAMPLESDIR%%/AUSTRALIA.MAP
+%%PORTDOCS%%%%EXAMPLESDIR%%/CLICK
+%%PORTDOCS%%%%EXAMPLESDIR%%/ETHERTEST
+%%PORTDOCS%%%%EXAMPLESDIR%%/EUROPE.MAP
+%%PORTDOCS%%%%EXAMPLESDIR%%/FLOODING1
+%%PORTDOCS%%%%EXAMPLESDIR%%/FLOODING2
+%%PORTDOCS%%%%EXAMPLESDIR%%/FLOODING3
+%%PORTDOCS%%%%EXAMPLESDIR%%/KEYBOARD
+%%PORTDOCS%%%%EXAMPLESDIR%%/LINKSTATE
+%%PORTDOCS%%%%EXAMPLESDIR%%/MAXFLOW
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/README.flooding
+%%PORTDOCS%%%%EXAMPLESDIR%%/STOPANDWAIT
+%%PORTDOCS%%%%EXAMPLESDIR%%/T2
+%%PORTDOCS%%%%EXAMPLESDIR%%/TICKTOCK
+%%PORTDOCS%%%%EXAMPLESDIR%%/TOPOLOGY.2a
+%%PORTDOCS%%%%EXAMPLESDIR%%/TOPOLOGY.2b
+%%PORTDOCS%%%%EXAMPLESDIR%%/TOPOLOGY.2c
+%%PORTDOCS%%%%EXAMPLESDIR%%/WORLD
+%%PORTDOCS%%%%EXAMPLESDIR%%/WORLD.MAP
+%%PORTDOCS%%%%EXAMPLESDIR%%/click.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/ethertest.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/flooding.gp
+%%PORTDOCS%%%%EXAMPLESDIR%%/flooding1.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/flooding1.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/flooding2.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/flooding2.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/flooding3.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/flooding3.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/keyboard.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/linkstate.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/nltable.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/nltable.h
+%%PORTDOCS%%%%EXAMPLESDIR%%/protocol.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/result.file
+%%PORTDOCS%%%%EXAMPLESDIR%%/stopandwait.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/ticktock.c
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%