Split parts of Makefile into Makefile.common for use by dsniff-nox11.

Only build webspy in this package, and depend on dsniff to get the
other tools. Bump PKGREVISION.

4 files changed, 36 insertions, 45 deletions

diff --git a/security/dsniff/DESCR b/security/dsniff/DESCR
index bcf3a0836c2..96327d9031f 100644
--- a/security/dsniff/DESCR
+++ b/security/dsniff/DESCR
@@ -1 +1,3 @@
-password sniffer, plus sniffing tools for penetration testing
+Password sniffer, plus sniffing tools for penetration testing.
+
+This package contains the X11 tool webspy.
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index 6dc2920be53..36f845f1112 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -1,22 +1,17 @@
-# $NetBSD: Makefile,v 1.23 2005/02/05 16:11:48 adrianp Exp $
-# $OpenBSD: Makefile,v 1.13 2000/06/19 18:38:55 dugsong Exp $
+# $NetBSD: Makefile,v 1.24 2005/03/22 01:07:07 wiz Exp $
 
-DISTNAME=	dsniff-2.3
-PKGREVISION=	3
-CATEGORIES=	security
-MASTER_SITES+=	http://monkey.org/~dugsong/dsniff/
+.include "Makefile.common"
 
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://monkey.org/~dugsong/dsniff/
-COMMENT=	Password sniffer
+PKGREVISION=	4
+COMMENT=	Password sniffer (webspy)
+
+DEPENDS+=	dsniff-nox11-[0-9]*:../../security/dsniff-nox11
 
-USE_BUILDLINK3=	yes
-GNU_CONFIGURE=	yes
 USE_X11=	yes
+BUILD_TARGET=	libmissing.a webspy
 
-BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/webspy ${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/webspy.8 ${PREFIX}/man/man8
 
-.include "../../net/libpcap/buildlink3.mk"
-.include "../../devel/libnet/buildlink3.mk"
-.include "../../net/libnids/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/dsniff/Makefile.common b/security/dsniff/Makefile.common
new file mode 100644
index 00000000000..608ce0e50eb
--- /dev/null
+++ b/security/dsniff/Makefile.common
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile.common,v 1.1 2005/03/22 01:07:07 wiz Exp $
+
+DISTNAME=	dsniff-${VERS}
+VERS=		2.3
+CATEGORIES=	security
+MASTER_SITES+=	http://monkey.org/~dugsong/dsniff/
+
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://monkey.org/~dugsong/dsniff/
+
+USE_BUILDLINK3=	yes
+GNU_CONFIGURE=	yes
+
+BUILDLINK_DEPENDS.libnet+=	libnet-1.0.*
+
+PATCHDIR=	${.CURDIR}/../dsniff/patches
+DISTINFO_FILE=	${.CURDIR}/../dsniff/distinfo
+
+.include "../../net/libpcap/buildlink3.mk"
+.include "../../devel/libnet/buildlink3.mk"
+.include "../../net/libnids/buildlink3.mk"
diff --git a/security/dsniff/PLIST b/security/dsniff/PLIST
index 103b33764f9..c170d9058ae 100644
--- a/security/dsniff/PLIST
+++ b/security/dsniff/PLIST
@@ -1,30 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:16:37 zuntum Exp $
-sbin/arpspoof
-sbin/dnsspoof
-sbin/dsniff
-sbin/filesnarf
-sbin/macof
-sbin/mailsnarf
-sbin/msgsnarf
-sbin/sshmitm
-sbin/tcpkill
-sbin/tcpnice
-sbin/urlsnarf
-sbin/webmitm
-sbin/webspy
-lib/dnsspoof.hosts
-lib/dsniff.magic
-lib/dsniff.services
-man/man8/arpspoof.8
-man/man8/dnsspoof.8
-man/man8/dsniff.8
-man/man8/filesnarf.8
-man/man8/macof.8
-man/man8/mailsnarf.8
-man/man8/msgsnarf.8
-man/man8/sshmitm.8
-man/man8/tcpkill.8
-man/man8/tcpnice.8
-man/man8/urlsnarf.8
-man/man8/webmitm.8
+@comment $NetBSD: PLIST,v 1.2 2005/03/22 01:07:07 wiz Exp $
 man/man8/webspy.8
+sbin/webspy