2 files changed, 19 insertions, 33 deletions

diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index 33f2ae76e11b..eb37b65ed5d2 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -1,28 +1,31 @@
-# New ports collection makefile for:	dsniff
-# Date created:		08 Jan 2000
-# Whom:			kris@FreeBSD.org
-#
+# Created by: kris@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	dsniff
 PORTVERSION=	2.3
 PORTREVISION=	4
 CATEGORIES=	security
-MASTER_SITES=	http://naughty.monkey.org/~dugsong/dsniff/
+MASTER_SITES=	http://www.monkey.org/~dugsong/${PORTNAME}/ \
+		LOCAL/sbz
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Various sniffing utilities for penetration testing
 
+LICENSE=	BSD
+
 BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10 \
 		${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids
 
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
 
-OPTIONS=	X11 "Enable X11 support" on
+OPTIONS_DEFINE=	X11
+
+OPTIONS_DEFAULT=	X11
+
+.include <bsd.port.options.mk>
 
-MAN8=		arpspoof.8 dsniff.8 macof.8 mailsnarf.8 tcpkill.8 \
+MAN8=		arpspoof.8 ${PORTNAME}.8 macof.8 mailsnarf.8 tcpkill.8 \
 		tcpnice.8 urlsnarf.8 filesnarf.8 dnsspoof.8 msgsnarf.8 \
 		sshmitm.8 webmitm.8
 
@@ -41,7 +44,7 @@ LIBNIDS_GLIB2!=	nm -u ${LOCALBASE}/lib/libnids.a | ${GREP} g_thread_init || ${TR
 USE_GNOME+=	glib20
 .endif
 
-.if !defined(WITHOUT_X11)
+.if empty(PORT_OPTIONS:MX11)
 USE_XORG=	x11 xmu
 PLIST_SUB+=	X11=''
 MAN8+=		webspy.8
diff --git a/security/dsniff/pkg-descr b/security/dsniff/pkg-descr
index 523892876945..84ed1ac5a82e 100644
--- a/security/dsniff/pkg-descr
+++ b/security/dsniff/pkg-descr
@@ -1,26 +1,9 @@
-Various tools for network penetration testing. Please do not abuse them.
-
-arpspoof     redirect packets from a target host (or all hosts) on the LAN
-             intended for another host on the LAN by forging ARP replies.
-dnsspoof     forge replies to arbitrary DNS address / pointer queries on
-             the LAN.
-dsniff       simple password sniffer.
-filesnarf    saves selected files sniffed from NFS traffic in the current
-             working directory.
-macof        flood the local network with random MAC addresses.
-mailsnarf    a fast and easy way to violate the Electronic Communications
-             Privacy Act of 1986 (18 USC 2701-2711), be careful.
-msgsnarf     record selected messages from sniffed AOL Instant Messenger,
-             ICQ 2000, IRC, and Yahoo! Messenger chat sessions.
-sshmitm      SSH monkey-in-the-middle.
-tcpkill      kills specified in-progress TCP connections.
-tcpnice      slow down specified TCP connections via "active" traffic
-             shaping.
-urlsnarf     output all requested URLs sniffed from HTTP traffic in CLF
-             (Common Log Format, used by almost all web servers), suitable
-             for offline post-processing
-webmitm      HTTP / HTTPS monkey-in-the-middle.
-webspy       sends URLs sniffed from a client to your local Netscape
-             browser for display, a fun party trick
+dsniff is a collection of tools for network auditing and penetration testing.
+dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor
+a network for interesting data (passwords, e-mail, files, etc.). arpspoof,
+dnsspoof, and macof facilitate the interception of network traffic normally
+unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm
+implement active monkey-in-the-middle attacks against redirected SSH and HTTPS
+sessions by exploiting weak bindings in ad-hoc PKI.
 
 WWW: http://www.monkey.org/~dugsong/dsniff/