diff --git a/net/aguri/Makefile b/net/aguri/Makefile
index f05c2159b46..05ab069d2b2 100644
--- a/net/aguri/Makefile
+++ b/net/aguri/Makefile
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/05/04 18:57:29 margarida Exp $
+# $OpenBSD: Makefile,v 1.2 2003/05/05 02:41:50 margarida Exp $
+COMMENT=		"aggregation-based network traffic profiler"
 
-COMMENT=		"aggregation-based Network Traffic Profiler"
-
-DISTNAME=		aguri-0.5
+DISTNAME=		aguri-0.7
 CATEGORIES=		net
 
 HOMEPAGE=		http://www.csl.sony.co.jp/person/kjc/software.html
@@ -17,7 +16,6 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		ftp://ftp.csl.sony.co.jp/pub/kjc/
 
-USE_X11=		Yes
 MAKE_FLAGS=		CC="${CC}" CFLAGS="${CFLAGS}"
 
 post-install:
diff --git a/net/aguri/distinfo b/net/aguri/distinfo
index 353af23843b..6c1b2a7eb85 100644
--- a/net/aguri/distinfo
+++ b/net/aguri/distinfo
@@ -1,3 +1,3 @@
-MD5 (aguri-0.5.tar.gz) = ae25dec143a29e92be3b314dd5af2991
-RMD160 (aguri-0.5.tar.gz) = 0689c5eab30fc578307cb02c430edb02208c0f71
-SHA1 (aguri-0.5.tar.gz) = 3d2e909481f99ed0e4497ab87d3b93758ec31572
+MD5 (aguri-0.7.tar.gz) = b15586e62763a5d5a2295f115c42df29
+RMD160 (aguri-0.7.tar.gz) = c77739e3b1470ed0f7a74721fe048dc5c43d4057
+SHA1 (aguri-0.7.tar.gz) = d7e9ccdb81f7c93f6a2907525e0bfcf26ba358b9
diff --git a/net/aguri/patches/patch-read_pcap_c b/net/aguri/patches/patch-read_pcap_c
deleted file mode 100644
index fcd4592f0e7..00000000000
--- a/net/aguri/patches/patch-read_pcap_c
+++ /dev/null
@@ -1,59 +0,0 @@
-$OpenBSD: patch-read_pcap_c,v 1.1.1.1 2003/05/04 18:57:29 margarida Exp $
---- read_pcap.c.orig	Thu Mar 22 02:19:46 2001
-+++ read_pcap.c	Sat Feb 22 14:37:30 2003
-@@ -36,6 +36,7 @@
- #include <sys/socket.h>
- #include <sys/queue.h>
- #include <net/if.h>
-+#include <net/if_pflog.h>
- #include <netinet/in.h>
- #include <netinet/in_systm.h>
- #include <netinet/if_ether.h>
-@@ -63,6 +64,8 @@
- 
- static void ether_if_read(u_char *user, const struct pcap_pkthdr *h,
- 			  const u_char *p);
-+static void pflog_if_read(u_char *user, const struct pcap_pkthdr *h,
-+			  const u_char *p);
- static void fddi_if_read(u_char *user, const struct pcap_pkthdr *h,
- 			 const u_char *p);
- static void atm_if_read(u_char *user, const struct pcap_pkthdr *h,
-@@ -115,6 +118,7 @@ static struct printer printers[] = {
- #endif
- 	{ ppp_if_read,	DLT_PPP },
- 	{ null_if_read,	DLT_NULL },
-+	{ pflog_if_read,	DLT_PFLOG },
- 	{ NULL,			0 },
- };
- 
-@@ -173,6 +177,30 @@ ether_if_read(u_char *user, const struct
- 	} else if (ether_encap_read(ether_type, p, length, caplen) == 0) {
- 		/* ether_type not known */
- 	}
-+}
-+
-+static void
-+pflog_if_read(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
-+{
-+	int caplen = h->caplen;
-+	int length = h->len;
-+
-+	if (caplen < PFLOG_HDRLEN) {
-+		return;
-+	}
-+
-+	/*
-+	 * Some printers want to get back at the ethernet addresses,
-+	 * and/or check that they're not walking off the end of the packet.
-+	 * Rather than pass them all the way down, we set these globals.
-+	 */
-+	packetp = p;
-+	snapend = p + caplen;
-+
-+	p += PFLOG_HDRLEN;
-+	length -= PFLOG_HDRLEN;
-+	caplen -= PFLOG_HDRLEN;
-+	ip_read(p, length);
- }
- 
- static int