- add upstream patches (missing ntohl, adjust lsof parsing)

- add missing prototype
- unbreak lsof command line
- mark BROKEN on lp64

considering between these problems this port was totally useless, so
presumably nobody actually uses this and is a good candidate for removal.

sysutils/tcplist/Makefile

@@ -1,26 +1,31 @@
-# $OpenBSD: Makefile,v 1.23 2010/11/20 17:22:42 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2012/01/17 17:08:16 sthen Exp $
 
 COMMENT=	list tcp connections to/from the local machine
 
+.include <bsd.port.arch.mk>
+.if ${PROPERTIES:Mlp64}
+BROKEN=		not lp64 compatible
+.endif
+
 DISTNAME=	tcplist-2.2
-REVISION =	1
+REVISION=	2
 CATEGORIES=	sysutils net
 
 MASTER_SITES=	ftp://ftp.cdf.toronto.edu/pub/jdd/tcplist/
 EXTRACT_SUFX=	.shar
 
-# License: BSD
+# BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c 
+
+WANTLIB += c
 
 RUN_DEPENDS=	sysutils/lsof
 
 WRKDIST=	${WRKDIR}
 
-USE_GROFF =	Yes
 NO_REGRESS=	Yes
 
 do-install:

sysutils/tcplist/patches/patch-Makefile

@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.1 2012/01/17 17:05:14 sthen Exp $
---- Makefile.orig	Tue Jan 17 17:04:32 2012
-+++ Makefile	Tue Jan 17 17:04:33 2012
+$OpenBSD: patch-Makefile,v 1.2 2012/01/17 17:08:16 sthen Exp $
+--- Makefile.orig	Tue Jan 17 16:38:38 2012
++++ Makefile	Tue Jan 17 16:38:39 2012
 @@ -1,14 +1,16 @@
  # Compiler: eg. cc or gcc
 -CC = cc                      

sysutils/tcplist/patches/patch-lsof_c

@@ -1,12 +1,12 @@
-$OpenBSD: patch-lsof_c,v 1.1 2012/01/17 17:05:14 sthen Exp $
---- lsof.c.orig	Tue Jan 17 17:04:32 2012
-+++ lsof.c	Tue Jan 17 17:04:33 2012
+$OpenBSD: patch-lsof_c,v 1.2 2012/01/17 17:08:16 sthen Exp $
+--- lsof.c.orig	Tue Jan 17 16:44:32 2012
++++ lsof.c	Tue Jan 17 16:52:37 2012
 @@ -27,7 +27,7 @@
  #define LSOFCMD  "lsof -HPsli TCP | awk '{print $3,$NF}' | sort | uniq"
  #else /* !OLDLSOF */
  /* These use the current (as of 3.62W, at least) parameters for lsof */
 -#define LSOFCMD  "lsof -nPsli TCP | awk '{print $3,$NF}' | sort | uniq"
-+#define LSOFCMD  "lsof -nPsli TCP | awk '{print $3,$(NF - 1)}' | sort | uniq"
++#define LSOFCMD  "lsof -nPli TCP | awk '{print $3,$(NF - 1)}' | sort | uniq"
  #endif /* !OLDLSOF */
  #endif /* LSOFCMD */
  

sysutils/tcplist/patches/patch-tcplist_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-tcplist_c,v 1.1 2012/01/17 17:08:16 sthen Exp $
+--- tcplist.c.orig	Tue Jan 17 16:53:51 2012
++++ tcplist.c	Tue Jan 17 16:54:02 2012
+@@ -24,6 +24,7 @@ static char rcsid[] = "$Id: tcplist.c,v 1.17 1997/04/2
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <errno.h>
+ #include <ctype.h>

sysutils/tcplist/patches/patch-utils_c

@@ -1,6 +1,6 @@
-$OpenBSD: patch-utils_c,v 1.2 2012/01/17 17:05:14 sthen Exp $
---- utils.c.orig	Tue Jan 17 17:04:32 2012
-+++ utils.c	Tue Jan 17 17:04:33 2012
+$OpenBSD: patch-utils_c,v 1.3 2012/01/17 17:08:16 sthen Exp $
+--- utils.c.orig	Tue Jan 17 16:44:32 2012
++++ utils.c	Tue Jan 17 16:44:32 2012
 @@ -17,7 +17,7 @@ static char rcsid[] = "$Id: utils.c,v 1.6 1997/04/24 1
  #else
  #include <strings.h>
@@ -110,3 +110,11 @@ $OpenBSD: patch-utils_c,v 1.2 2012/01/17 17:05:14 sthen Exp $
  	}
   va_end(args);
  #ifdef lint
+@@ -259,6 +235,7 @@ int hostresolv;
+ 				lastfail++;
+ 			}
+ 		}
++		iaddr=ntohl(iaddr);
+ 		sprintf(iaddrbuff, "%u.%u.%u.%u", (iaddr>>24)&0xff,
+ 		(iaddr>>16)&0xff, (iaddr>>8)&0xff,
+ 		iaddr&0xff);

sysutils/tcplist/patches/patch-utils_h

@@ -1,6 +1,6 @@
-$OpenBSD: patch-utils_h,v 1.2 2012/01/17 17:05:14 sthen Exp $
---- utils.h.orig	Tue Jan 17 17:04:32 2012
-+++ utils.h	Tue Jan 17 17:04:33 2012
+$OpenBSD: patch-utils_h,v 1.3 2012/01/17 17:08:16 sthen Exp $
+--- utils.h.orig	Tue Jan 17 16:38:38 2012
++++ utils.h	Tue Jan 17 16:38:39 2012
 @@ -50,19 +50,19 @@
  
  /* Error - print like fprintf(stderr, ...) and die. Progname included at

sysutils/tcplist/pkg/PLIST

@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/09/15 18:39:34 espie Exp $
-bin/tcplist
+@comment $OpenBSD: PLIST,v 1.5 2012/01/17 17:08:16 sthen Exp $
+@bin bin/tcplist
 @man man/man1/tcplist.1