6 files changed, 79 insertions, 55 deletions

diff --git a/net/cnet/Makefile b/net/cnet/Makefile
index a0864022890c..47094704a89f 100644
--- a/net/cnet/Makefile
+++ b/net/cnet/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	cnet
-PORTVERSION=	1.5.p2
+PORTVERSION=	1.6
 CATEGORIES=	net tk82
 MASTER_SITES=	http://www.cs.uwa.edu.au/cnet/
-DISTNAME=	cnet-1.5-2
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -23,8 +22,7 @@ MAN1=		cnet.1
 
 post-extract:
 	${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/src
-	@${MKDIR} ${WRKSRC}/src/freebsd
-	${CP} ${FILESDIR}/compile.c ${WRKSRC}/src/freebsd
+	${CP} ${FILESDIR}/compile.c ${WRKSRC}/src/compile/freebsd.c
 
 post-patch:
 	@${PERL} -pi.in \
@@ -36,10 +34,15 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/cnet ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/src/cnet.h ${PREFIX}/include
 	${INSTALL_MAN} ${WRKSRC}/DOC/cnet.man ${PREFIX}/man/man1/cnet.1
-	@${MKDIR} ${PREFIX}/libdata/cnet
-	${INSTALL_DATA} ${WRKSRC}/src/tcltk/cnet.tcl ${PREFIX}/libdata/cnet
-	${INSTALL_DATA} ${WRKSRC}/src/tcltk/cnet_icon.bmp ${PREFIX}/libdata/cnet
+	@${MKDIR} ${PREFIX}/share/cnet
+	${INSTALL_DATA} ${WRKSRC}/cnetlib/* ${PREFIX}/share/cnet
 	@${MKDIR} ${PREFIX}/share/examples/cnet
 	${INSTALL_DATA} ${WRKSRC}/EXAMPLES/* ${PREFIX}/share/examples/cnet
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/cnet
+	${INSTALL_DATA} ${WRKSRC}/DOC/*.html ${PREFIX}/share/doc/cnet
+	@${MKDIR} ${PREFIX}/share/doc/cnet/images
+	${INSTALL_DATA} ${WRKSRC}/DOC/images/* ${PREFIX}/share/doc/cnet/images
+.endif
 
 .include <bsd.port.mk>
diff --git a/net/cnet/distinfo b/net/cnet/distinfo
index 926ce45ff66b..cde7a95c3166 100644
--- a/net/cnet/distinfo
+++ b/net/cnet/distinfo
@@ -1 +1 @@
-MD5 (cnet-1.5-2.tar.gz) = 746b317d0a86d0288d478dddc658c4f4
+MD5 (cnet-1.6.tar.gz) = 5e37ca664da8be9f3507734a60d3d89b
diff --git a/net/cnet/files/patch-ad b/net/cnet/files/patch-ad
index 61d6301ed5a2..44e00b2b000f 100644
--- a/net/cnet/files/patch-ad
+++ b/net/cnet/files/patch-ad
@@ -1,31 +1,13 @@
---- src/compile.c.orig	Wed Apr 21 23:26:23 1999
-+++ src/compile.c	Fri Mar  3 07:16:22 2000
-@@ -2,6 +2,7 @@
- 
- #include <fcntl.h>
- #include <sys/stat.h>
-+#include <dlfcn.h>
- 
- #if	!defined(MAXPATHLEN)
- #define	MAXPATHLEN	1024
-@@ -26,6 +27,9 @@
+--- src/compile.c.orig	Sat May 13 03:41:53 2000
++++ src/compile.c	Sat Jul 22 01:44:09 2000
+@@ -25,6 +25,10 @@
  #elif	defined(USE_IRIX5)
- #include "irix5/compile.c"
+ #include "compile/irix5.c"
  
 +#elif	defined(USE_FREEBSD)
-+#include "freebsd/compile.c"
-+
- #endif
- 
- 
-@@ -141,6 +145,10 @@
- {
- 
- #define	RECIEVE		"[Rr][Ee][Cc][IiEe][Ee][Vv]"
++#include <dlfcn.h>
++#include "compile/freebsd.c"
 +
-+#if	defined(USE_FREEBSD)
-+#include	<unistd.h>
-+#endif
- 
- #if	defined(SVR4) || defined(__svr4__)
- #include <regexpr.h>
+ #elif	defined(USE_WIN32)
+ #include <process.h>
+ #include "compile/win32.c"
diff --git a/net/cnet/files/patch-ae b/net/cnet/files/patch-ae
index e95dd0e25902..2ced039b8e5d 100644
--- a/net/cnet/files/patch-ae
+++ b/net/cnet/files/patch-ae
@@ -1,5 +1,5 @@
---- src/config.h.orig	Tue Mar  7 04:05:53 2000
-+++ src/config.h	Tue Mar  7 04:11:33 2000
+--- src/config.h.orig	Thu Jun 22 16:39:34 2000
++++ src/config.h	Sat Jul 22 01:41:04 2000
 @@ -19,6 +19,9 @@
  #elif	defined(sgi) || defined(__sgi) || defined(__sgi__)
  #define	USE_IRIX5
@@ -7,10 +7,10 @@
 +#elif	defined(__FreeBSD__)
 +#define	USE_FREEBSD
 +
- #else
- #error	Could not determine the operating system in config.h
- #endif
-@@ -68,6 +71,13 @@
+ #elif	defined(_WIN32)
+ /* Don't get too excited here . The Windows implementation is still being
+    developed and will first appear in the non-alpha version of 1.6.
+@@ -78,6 +81,13 @@
  #define	CNETGCC		"/usr/local/bin/gcc"
  #define	CNETLD		"/bin/ld"
  
@@ -21,15 +21,15 @@
 +#define	CNETGCC		"%%CC%%"
 +#define	CNETLD		"/usr/bin/ld"
 +
+ #elif	defined(USE_WIN32)
+ #define	OS_DEFINE	"/DWIN32"
  #endif
- 
- 
-@@ -93,7 +103,7 @@
+@@ -102,7 +112,7 @@
      CNETPATH must be defined.
   */
  
--#define	CNETPATH		".:/cslinux/cnetlib:/net/tahoe6/cs78/cnetlib"
-+#define	CNETPATH		".:%%PREFIX%%/libdata/cnet:%%PREFIX%%/include"
+-#define	CNETPATH	".:/cslinux/cnetlib:/home/chris/cnetlib"
++#define	CNETPATH	".:%%PREFIX%%/share/cnet:%%PREFIX%%/include"
+ 
  
- /*  When compiled for Tcl/Tk, the Tcl/Tk script file may be taken from
-     CNETTCLTK or provided with the -F command-line option.
+ /*  A small number of common errors are detected by cnet at run-time.
diff --git a/net/cnet/files/patch-af b/net/cnet/files/patch-af
index e9b72f9ed8e5..b2cd7bedfc12 100644
--- a/net/cnet/files/patch-af
+++ b/net/cnet/files/patch-af
@@ -1,15 +1,15 @@
---- src/Makefile.orig	Thu Apr 22 00:42:28 1999
-+++ src/Makefile	Fri Mar  3 07:06:53 2000
+--- src/Makefile.orig	Mon Feb  7 02:49:35 2000
++++ src/Makefile	Sat Jul 22 01:42:34 2000
 @@ -14,6 +14,8 @@
  		make -f Makefile.osf1 $(NAME) ; fi
  	@if uname -s -r | grep "IRIX" ; then \
  		make -f Makefile.irix5 $(NAME) ; fi
 +	@if uname -s -r | grep "FreeBSD" ; then \
 +		$(MAKE) -f Makefile.freebsd $(NAME) ; fi
+ 	cp cnet ..
  
  install:
- 	@if uname -s -r | grep "Linux" ; then \
-@@ -26,6 +28,8 @@
+@@ -27,6 +29,8 @@
  		make -f Makefile.osf1 install ; fi
  	@if uname -s -r | grep "IRIX" ; then \
  		make -f Makefile.irix5 install ; fi
diff --git a/net/cnet/pkg-plist b/net/cnet/pkg-plist
index 763a53970cac..b91aec1be9e0 100644
--- a/net/cnet/pkg-plist
+++ b/net/cnet/pkg-plist
@@ -1,7 +1,44 @@
 bin/cnet
 include/cnet.h
-libdata/cnet/cnet.tcl
-libdata/cnet/cnet_icon.bmp
+share/cnet/bsd.gif
+share/cnet/cnet.h
+share/cnet/cnet.tcl
+share/cnet/dead.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/palm.xpm
+share/cnet/paused.gif
+share/cnet/repair.gif
+share/cnet/router.gif
+share/cnet/sgi.gif
+share/cnet/sun.gif
+share/cnet/windows.gif
+share/cnet/zap.gif
+share/doc/cnet/application.html
+share/doc/cnet/enumerated.html
+share/doc/cnet/eventdriven.html
+share/doc/cnet/eventfuncs.html
+share/doc/cnet/faq.html
+share/doc/cnet/functions.html
+share/doc/cnet/images/australia.gif
+share/doc/cnet/images/mainlink.gif
+share/doc/cnet/images/mainstdio.gif
+share/doc/cnet/images/mainwindow.gif
+share/doc/cnet/images/purple-line.gif
+share/doc/cnet/images/skey5.gif
+share/doc/cnet/images/stallings6.jpg
+share/doc/cnet/index.html
+share/doc/cnet/install.html
+share/doc/cnet/introduction.html
+share/doc/cnet/options.html
+share/doc/cnet/otherfuncs.html
+share/doc/cnet/physical.html
+share/doc/cnet/timers.html
+share/doc/cnet/topology.html
 share/examples/cnet/AUSTRALIA.MAP
 share/examples/cnet/CLICK
 share/examples/cnet/EUROPE.MAP
@@ -31,4 +68,6 @@ share/examples/cnet/protocol.c
 share/examples/cnet/stopandwait.c
 share/examples/cnet/ticktock.c
 @dirrm share/examples/cnet
-@dirrm libdata/cnet
+@dirrm share/doc/cnet/images
+@dirrm share/doc/cnet
+@dirrm share/cnet