aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ngrep/Makefile12
-rw-r--r--net/ngrep/distinfo2
-rw-r--r--net/ngrep/files/patch-Makefile.in5
-rw-r--r--net/ngrep/files/patch-ngrep.c25
-rw-r--r--net/ngrep/pkg-descr9
-rw-r--r--net/ngrep/pkg-plist8
6 files changed, 29 insertions, 32 deletions
diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index facc419788cc..bb8cea783ebf 100644
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@@ -7,21 +7,25 @@
#
PORTNAME= ngrep
-PORTVERSION= 1.38
+PORTVERSION= 1.40
CATEGORIES= net security
-MASTER_SITES= http://www.packetfactory.net/Projects/ngrep/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= obrien@FreeBSD.org
WRKSRC= ${WRKDIR}/ngrep
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-pcre --with-restart
ALL_TARGET= ngrep
MAN8= ngrep.8
post-install:
.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/ngrep
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ngrep
+ @${MKDIR} ${DOCSDIR}
+.for file in BUGS CHANGES README README.pcre USAGE
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
.endif
.include <bsd.port.mk>
diff --git a/net/ngrep/distinfo b/net/ngrep/distinfo
index 79f326c89e9d..bb9988832452 100644
--- a/net/ngrep/distinfo
+++ b/net/ngrep/distinfo
@@ -1 +1 @@
-MD5 (ngrep-1.38.tar.gz) = adff63845df54eb40ef48f16664e4344
+MD5 (ngrep-1.40.tar.gz) = 4837f3d3b30e12ee067cb3fd2b874798
diff --git a/net/ngrep/files/patch-Makefile.in b/net/ngrep/files/patch-Makefile.in
deleted file mode 100644
index dcb046bc6721..000000000000
--- a/net/ngrep/files/patch-Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
---- Makefile.in.orig Wed Jun 21 12:13:46 2000
-+++ Makefile.in Sun Aug 13 09:31:51 2000
-@@ -56 +56 @@
---include .depends
-+### -include .depends
diff --git a/net/ngrep/files/patch-ngrep.c b/net/ngrep/files/patch-ngrep.c
index a544f4d278cc..48dc19264ead 100644
--- a/net/ngrep/files/patch-ngrep.c
+++ b/net/ngrep/files/patch-ngrep.c
@@ -1,28 +1,19 @@
---- ngrep.c.orig Mon Jun 26 12:52:50 2000
-+++ ngrep.c Sat Aug 26 17:34:40 2000
-@@ -48,6 +48,7 @@
- #include "regex.h"
+--- ngrep.c.orig Wed Aug 8 23:36:09 2001
++++ ngrep.c Wed Aug 8 23:36:31 2001
+@@ -62,6 +62,7 @@
+
#include "ngrep.h"
+extern FILE *yyin;
- static char rcsver[] = "$Revision: 1.38 $";
+ static char rcsver[] = "$Revision: 1.18 $";
-@@ -196,7 +197,7 @@
- free(filter);
+@@ -232,7 +233,7 @@
filter = get_filter(&argv[optind-1]);
+ #ifdef NEED_RESTART
- PCAP_RESTART();
+ PCAP_RESTART(yyin);
+ #endif
if (pcap_compile(pd, &pcapfilter, filter, 0, mask.s_addr)) {
pcap_perror(pd, "pcap compile");
- clean_exit(-1);
-@@ -653,7 +654,7 @@
- struct tm *t = localtime(&h->ts.tv_sec);
-
- printf("%02d/%02d/%02d %02d:%02d:%02d.%06d ",
-- t->tm_year+1900, t->tm_mon, t->tm_mday, t->tm_hour,
-+ t->tm_year+1900, t->tm_mon+1, t->tm_mday, t->tm_hour,
- t->tm_min, t->tm_sec, h->ts.tv_usec);
- }
-
diff --git a/net/ngrep/pkg-descr b/net/ngrep/pkg-descr
index 292b07b5d7f8..6c7a7c560e28 100644
--- a/net/ngrep/pkg-descr
+++ b/net/ngrep/pkg-descr
@@ -3,6 +3,9 @@ them to the network layer.
ngrep a pcap-aware tool that will allow you to specify extended
regular expressions to match against data payloads of packets. It
-currently recognizes TCP and UDP across Ethernet, PPP and SLIP
-interfaces, and understands BPF filter logic in the same fashion
-as more common packet sniffing tools, like tcpdump and snoop.
+currently recognizes TCP, UDP, and ICMP across Ethernet, PPP, SLIP,
+FDDI, Token Ring and null interfaces, and understands BPF filter
+logic in the same fashion as more common packet sniffing tools,
+like tcpdump and snoop.
+
+WWW: http://ngrep.sourceforge.net/
diff --git a/net/ngrep/pkg-plist b/net/ngrep/pkg-plist
index 0aaba217ba80..c5ea818110e3 100644
--- a/net/ngrep/pkg-plist
+++ b/net/ngrep/pkg-plist
@@ -1,4 +1,8 @@
@comment $FreeBSD$
bin/ngrep
-share/doc/ngrep/README
-@dirrm share/doc/ngrep
+%%PORTDOCS%%share/doc/ngrep/BUGS
+%%PORTDOCS%%share/doc/ngrep/CHANGES
+%%PORTDOCS%%share/doc/ngrep/README
+%%PORTDOCS%%share/doc/ngrep/README.pcre
+%%PORTDOCS%%share/doc/ngrep/USAGE
+%%PORTDOCS%%@dirrm share/doc/ngrep