diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile index 83ed876f6b3..ee00514f089 100644 --- a/net/ngrep/Makefile +++ b/net/ngrep/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.22 2004/12/16 00:31:23 alek Exp $ +# $OpenBSD: Makefile,v 1.23 2005/07/23 19:41:21 brad Exp $ COMMENT= "network grep" -DISTNAME= ngrep-1.42 +DISTNAME= ngrep-1.44 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ngrep/} EXTRACT_SUFX= .tar.bz2 @@ -18,9 +18,8 @@ WANTLIB= c pcap NO_REGRESS= Yes -CONFIGURE_STYLE=autoconf no-autoheader -AUTOCONF_VERSION=2.57 - -ALL_TARGET= ngrep +AUTOCONF_VERSION= 2.59 +CONFIGURE_STYLE= autoconf no-autoheader +CONFIGURE_ARGS+= --enable-ipv6 .include diff --git a/net/ngrep/distinfo b/net/ngrep/distinfo index 5297203ae64..9a2fc1374f1 100644 --- a/net/ngrep/distinfo +++ b/net/ngrep/distinfo @@ -1,4 +1,4 @@ -MD5 (ngrep-1.42.tar.bz2) = 35e821cfd888e9523a90fb7e5074a072 -RMD160 (ngrep-1.42.tar.bz2) = 54ad8e4794d57adb26e209dd381d47d1ed5e468e -SHA1 (ngrep-1.42.tar.bz2) = 03987bc4f6344ecd0d56313f42f2c254f37ac271 -SIZE (ngrep-1.42.tar.bz2) = 527699 +MD5 (ngrep-1.44.tar.bz2) = 8a142d74043609b09ed57d3baadb2fd6 +RMD160 (ngrep-1.44.tar.bz2) = 837433d0e3909218b65c8ecef46e2dd45ff99eed +SHA1 (ngrep-1.44.tar.bz2) = ad17011d52abec29aaa876e5112114d00fe4a5e9 +SIZE (ngrep-1.44.tar.bz2) = 793871 diff --git a/net/ngrep/patches/patch-Makefile_in b/net/ngrep/patches/patch-Makefile_in index 589acfca32c..97110507774 100644 --- a/net/ngrep/patches/patch-Makefile_in +++ b/net/ngrep/patches/patch-Makefile_in @@ -1,11 +1,14 @@ ---- Makefile.in.orig Fri Apr 9 08:24:50 2004 -+++ Makefile.in Fri Apr 9 08:24:32 2004 -@@ -22,7 +22,7 @@ +--- Makefile.in.orig Thu Jun 30 13:08:14 2005 ++++ Makefile.in Fri Jul 22 20:20:25 2005 +@@ -25,9 +25,9 @@ exec_prefix = @exec_prefix@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ --BINDIR = @bindir@ -+BINDIR = @sbindir@ - MANDIR = @mandir@/man8 + bindir = $(prefix)/bin + datadir = $(prefix)/share +-mandir = $(datadir)/man ++mandir = $(prefix)/man + +-BINDIR_INSTALL = $(prefix)/bin ++BINDIR_INSTALL = $(prefix)/sbin + MANDIR_INSTALL = $(mandir)/man8 INSTALL = ./install-sh diff --git a/net/ngrep/patches/patch-configure_in b/net/ngrep/patches/patch-configure_in index 4e31f85045a..9d4a047d10a 100644 --- a/net/ngrep/patches/patch-configure_in +++ b/net/ngrep/patches/patch-configure_in @@ -1,11 +1,11 @@ ---- configure.in.orig Fri Apr 9 08:33:58 2004 -+++ configure.in Fri Apr 9 08:34:16 2004 -@@ -250,16 +250,6 @@ - +--- configure.in.orig Thu Jun 30 13:22:15 2005 ++++ configure.in Fri Jul 22 20:01:45 2005 +@@ -196,18 +196,6 @@ unsigned short bar = foo.source; *bsd*) AC_SUBST(OS, BSD) + +- if test "$USE_PCAP_RESTART" = "0"; then - -- 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 @@ -13,6 +13,8 @@ -the option ``--disable-pcap-restart''. -) - sleep 3 +- +- fi - ;; diff --git a/net/ngrep/patches/patch-ngrep_8 b/net/ngrep/patches/patch-ngrep_8 deleted file mode 100644 index 75c2b98228d..00000000000 --- a/net/ngrep/patches/patch-ngrep_8 +++ /dev/null @@ -1,11 +0,0 @@ -$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 - .\" - .\" Please refer to the LICENSE file for more information. -- - .TH NGREP 8 "March 2004" *nux "User Manuals" - - .SH NAME diff --git a/net/ngrep/patches/patch-regex-0_12_Makefile_in b/net/ngrep/patches/patch-regex-0_12_Makefile_in index 7f81a6624df..a5f0684db70 100644 --- a/net/ngrep/patches/patch-regex-0_12_Makefile_in +++ b/net/ngrep/patches/patch-regex-0_12_Makefile_in @@ -1,6 +1,6 @@ ---- 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 @@ +--- regex-0.12/Makefile.in.orig Sat Sep 25 13:04:26 2004 ++++ regex-0.12/Makefile.in Fri Jul 22 17:02:42 2005 +@@ -29,7 +29,7 @@ version = 0.12 CPPFLAGS = # Likewise, you can override CFLAGS to optimize, use -Wall, etc.