update to ngrep 1.42

from thuglife at bsd.hu (Robert Nagy)

net/ngrep/Makefile

@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2003/09/25 06:25:13 jolan Exp $
+# $OpenBSD: Makefile,v 1.20 2004/04/09 10:11:36 sturm Exp $
 
 COMMENT=	"network grep"
 
-DISTNAME=	ngrep-1.40.1
+DISTNAME=	ngrep-1.42
 CATEGORIES=     net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ngrep/}
+EXTRACT_SUFX=	.tar.bz2
 
 HOMEPAGE=	http://ngrep.sourceforge.net/
 
@@ -16,9 +17,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 NO_REGRESS=	Yes
 
-WRKDIST=	${WRKDIR}/ngrep
-
-CONFIGURE_STYLE=gnu dest
+CONFIGURE_STYLE=autoconf
+AUTOCONF_VERSION=2.57
 
 ALL_TARGET=	ngrep
 

net/ngrep/distinfo

@@ -1,3 +1,3 @@
-MD5 (ngrep-1.40.1.tar.gz) = 6bda40605febf490623a625202f2a605
-RMD160 (ngrep-1.40.1.tar.gz) = c1387dcde779f8515c49524f775c95a34c4ba95e
-SHA1 (ngrep-1.40.1.tar.gz) = 4cf30c02d315e98671eb437db81298c3bdd2e715
+MD5 (ngrep-1.42.tar.bz2) = 35e821cfd888e9523a90fb7e5074a072
+RMD160 (ngrep-1.42.tar.bz2) = 54ad8e4794d57adb26e209dd381d47d1ed5e468e
+SHA1 (ngrep-1.42.tar.bz2) = 03987bc4f6344ecd0d56313f42f2c254f37ac271

net/ngrep/patches/patch-Makefile_in

@@ -1,12 +1,11 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2003/04/17 18:59:49 wilfried Exp $
---- Makefile.in.orig	Mon Dec 31 16:05:21 2001
-+++ Makefile.in	Wed Apr  2 02:35:44 2003
-@@ -20,7 +20,7 @@ TARGET=ngrep
- MANPAGE=ngrep.8
+--- Makefile.in.orig	Fri Apr  9 08:24:50 2004
++++ Makefile.in	Fri Apr  9 08:24:32 2004
+@@ -22,7 +22,7 @@
  
- INSTALL=./install-sh
--BINDEST=@prefix@/bin
-+BINDEST=@prefix@/sbin
- MANDEST=@prefix@/man/man8
+ prefix      = @prefix@
+ exec_prefix = @exec_prefix@
+-BINDIR      = @bindir@
++BINDIR      = @sbindir@
+ MANDIR      = @mandir@/man8
  
- REGEX_TARGET=@REGEX_TARGET@
+ INSTALL = ./install-sh

net/ngrep/patches/patch-configure_in

@@ -0,0 +1,19 @@
+--- configure.in.orig	Fri Apr  9 08:33:58 2004
++++ configure.in	Fri Apr  9 08:34:16 2004
+@@ -250,16 +250,6 @@
+ 
+ *bsd*)
+ 	AC_SUBST(OS, BSD)
+-
+-	echo 
+-        AC_MSG_WARN(
+-Your OS ($target_os) may have an old libpcap installation.
+-If the resulting ngrep binary segfaults when a BPF filter is specified 
+-without an ngrep match string then you should reconfigure ngrep with 
+-the option ``--disable-pcap-restart''.
+-)
+-	sleep 3
+-
+         ;;
+ 
+ *solaris*)

net/ngrep/patches/patch-ngrep_8

@@ -0,0 +1,11 @@
+$OpenBSD: patch-ngrep_8,v 1.1 2004/04/09 10:11:36 sturm Exp $
+--- ngrep.8.orig	Fri Apr  9 11:23:42 2004
++++ ngrep.8	Fri Apr  9 11:23:45 2004
+@@ -5,7 +5,6 @@
+ .\" Copyright (c) 2004  Jordan Ritter <jpr5@darkridge.com>
+ .\"
+ .\" Please refer to the LICENSE file for more information.
+-
+ .TH NGREP 8 "March 2004" *nux "User Manuals"
+ 
+ .SH NAME

net/ngrep/patches/patch-ngrep_c

@@ -1,14 +0,0 @@
-$OpenBSD: patch-ngrep_c,v 1.1 2003/04/17 18:59:49 wilfried Exp $
---- ngrep.c.orig	Mon Dec 31 16:11:00 2001
-+++ ngrep.c	Wed Apr  2 02:26:17 2003
-@@ -385,10 +385,6 @@ int main(int argc, char **argv) {
-     link_offset = LOOPHDR_SIZE;
-     break;
- 
--  case DLT_LINUX_SLL:
--    link_offset = ISDNHDR_SIZE;
--    break;
--
-   default:
-     fprintf(stderr, "fatal: unsupported interface type %d\n", pcap_datalink(pd));
-     clean_exit(-1);

net/ngrep/patches/patch-regex-0_12_Makefile_in

@@ -1,7 +1,6 @@
-$OpenBSD: patch-regex-0_12_Makefile_in,v 1.1 2003/04/17 18:59:49 wilfried Exp $
---- regex-0.12/Makefile.in.orig	Tue Jun 26 12:55:13 2001
-+++ regex-0.12/Makefile.in	Wed Apr  2 02:31:04 2003
-@@ -29,7 +29,7 @@ version = 0.12
+--- regex-0.12/Makefile.in.orig	Fri Apr  9 08:15:44 2004
++++ regex-0.12/Makefile.in	Fri Apr  9 08:15:49 2004
+@@ -29,7 +29,7 @@
  CPPFLAGS = 
  
  # Likewise, you can override CFLAGS to optimize, use -Wall, etc.