4 files changed, 40 insertions, 17 deletions

diff --git a/net/tcpview/Makefile b/net/tcpview/Makefile
index 34438b6a31e8..816443d4194b 100644
--- a/net/tcpview/Makefile
+++ b/net/tcpview/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pub/noc-tools/tcpview/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A Motif-based TCP/IP protocol analyzer
 
 USE_BISON=	build
@@ -22,10 +22,6 @@ MAN1=		tcpview.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 800100
-BROKEN=		does not compile
-.endif
-
 post-patch:
 .for f in nametoaddr.c addrtoname.c print-nfs.c detail-tcp.c tv_addrtoname.c
 	@${REINPLACE_CMD} -e 's/NTOHL/ntohl/ ; s/NTOHS/ntohs/' ${WRKSRC}/${f}
diff --git a/net/tcpview/files/patch-detail_udp.c b/net/tcpview/files/patch-detail_udp.c
index 6bd44e377d9f..324c1110be04 100644
--- a/net/tcpview/files/patch-detail_udp.c
+++ b/net/tcpview/files/patch-detail_udp.c
@@ -1,5 +1,5 @@
---- detail-udp.c.orig	Thu Apr 22 22:39:55 1993
-+++ detail-udp.c	Thu Feb 13 18:57:17 2003
+--- detail-udp.c.orig	1993-04-22 13:39:55.000000000 -0700
++++ detail-udp.c	2010-06-13 08:09:33.000000000 -0700
 @@ -37,6 +37,7 @@
  #endif
  
@@ -8,7 +8,7 @@
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <netinet/in_systm.h>
-@@ -50,12 +51,15 @@
+@@ -50,12 +51,21 @@
  #include <errno.h>
  #include <sys/time.h>
  #include <rpc/types.h>
@@ -21,8 +21,14 @@
 -#include <nfs/nfs.h>
 +#include <sys/ucred.h> 
 +#include <sys/mount.h>
++#if defined(__FreeBSD_version) && __FreeBSD_version >= 800100
++#include <fs/nfs/nfsport.h>
++#include <fs/nfs/rpcv2.h>
++#include <fs/nfs/nfsproto.h>
++#else
 +#include <nfs/rpcv2.h>
 +#include <nfs/nfsproto.h>
++#endif
  
  #include "interface.h"
  #include "addrtoname.h"
diff --git a/net/tcpview/files/patch-print_nfs.c b/net/tcpview/files/patch-print_nfs.c
index 2bee0e9ef466..045edcf9adf1 100644
--- a/net/tcpview/files/patch-print_nfs.c
+++ b/net/tcpview/files/patch-print_nfs.c
@@ -1,5 +1,5 @@
---- print-nfs.c.orig	Thu Apr 22 22:40:18 1993
-+++ print-nfs.c	Thu Feb 13 18:53:20 2003
+--- print-nfs.c.orig	1993-04-22 13:40:18.000000000 -0700
++++ print-nfs.c	2010-06-13 08:09:51.000000000 -0700
 @@ -38,10 +38,10 @@
  #include <sys/time.h>
  #include <errno.h>
@@ -12,7 +12,7 @@
  #include <rpc/rpc_msg.h>
  
  #include <ctype.h>
-@@ -54,9 +54,15 @@
+@@ -54,9 +54,21 @@
  /* These must come after interface.h for BSD. */
  #if BSD >= 199006
  #include <sys/ucred.h>
@@ -23,14 +23,29 @@
 +#define	NFSPROC_ROOT ((unsigned long)(3))
 +#define	NFSPROC_STATFS ((unsigned long)(17))
 +
++#if defined(__FreeBSD_version) && __FreeBSD_version >= 800100
++#include <fs/nfs/nfsport.h>
++#include <fs/nfs/rpcv2.h>
++#include <fs/nfs/nfsproto.h>
++#else
 +#include <nfs/rpcv2.h>
 +#include <nfs/nfsproto.h>
++#endif
  #endif
 -#include <nfs/nfs.h>
  
  #include "addrtoname.h"
  #include "extract.h"
-@@ -250,11 +256,13 @@
+@@ -170,7 +182,7 @@
+ 
+ 	/* Fetch string length; convert to host order */
+ 	len = *dp++;
+-	NTOHL(len);
++	ntohl(len);
+ 
+ 	cp = (u_char *)dp;
+ 	/* Update long pointer (NFS filenames are padded to long) */
+@@ -250,11 +262,13 @@
  			return;
  		break;
  
@@ -44,7 +59,7 @@
  	case RFS_LOOKUP:
  		printf(" lookup");
  		if ((dp = parsereq(rp, length)) != 0 && parsefhn(dp) != 0)
-@@ -277,7 +285,7 @@
+@@ -277,7 +291,7 @@
  			return;
  		}
  		break;
@@ -53,7 +68,7 @@
  #if RFS_WRITECACHE != NFSPROC_NOOP
  	case RFS_WRITECACHE:
  		printf(" writecache");
-@@ -291,6 +299,7 @@
+@@ -291,6 +305,7 @@
  		}
  		break;
  #endif
diff --git a/net/tcpview/files/patch-print_udp.c b/net/tcpview/files/patch-print_udp.c
index 42c7aabd1007..f2ee79bb6c35 100644
--- a/net/tcpview/files/patch-print_udp.c
+++ b/net/tcpview/files/patch-print_udp.c
@@ -1,5 +1,5 @@
---- print-udp.c.orig	Thu Apr 22 22:40:29 1993
-+++ print-udp.c	Thu Feb 13 18:54:06 2003
+--- print-udp.c.orig	1993-04-22 13:40:29.000000000 -0700
++++ print-udp.c	2010-06-13 08:09:39.000000000 -0700
 @@ -39,10 +39,10 @@
  #include <errno.h>
  #include <sys/time.h>
@@ -12,14 +12,20 @@
  #include <rpc/rpc_msg.h>
  
  #ifdef TCPVIEW
-@@ -53,9 +53,10 @@
+@@ -53,9 +53,16 @@
  /* These must come after interface.h for BSD. */
  #if BSD >= 199006
  #include <sys/ucred.h>
 -#include <nfs/nfsv2.h>
 +#include <sys/mount.h>
++#if defined(__FreeBSD_version) && __FreeBSD_version >= 800100
++#include <fs/nfs/nfsport.h>
++#include <fs/nfs/rpcv2.h>
++#include <fs/nfs/nfsproto.h>
++#else
 +#include <nfs/rpcv2.h>
 +#include <nfs/nfsproto.h>
++#endif
  #endif
 -#include <nfs/nfs.h>