From d151742e361d4f5d5f0352d5e1bfd24c4dc2196b Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 6 Oct 2003 07:53:04 +0000
Subject: Sniff needs to depend on the libpcap package on non-NetBSD systems,
 so convert to use buildlink2 and include libpcap/buildlink2.mk to handle this
 correctly.  Also fix network library problems on Solaris.  From pkg/22915 by
 Jonathan Perkin.

---
 security/sniff/Makefile         | 12 +++++++++++-
 security/sniff/distinfo         |  4 ++--
 security/sniff/patches/patch-aa | 14 +++++++++-----
 3 files changed, 22 insertions(+), 8 deletions(-)

(limited to 'security/sniff')

diff --git a/security/sniff/Makefile b/security/sniff/Makefile
index 3366a8e5f75..70c0ee65c8c 100644
--- a/security/sniff/Makefile
+++ b/security/sniff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:53:16 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/10/06 07:53:04 jlam Exp $
 #
 
 DISTNAME=	sniff-2.0
@@ -8,4 +8,14 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MAINTAINER=	zuntum@NetBSD.org
 COMMENT=	Program to sniff logins and passwords
 
+USE_BUILDLINK2=	yes
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+LIBS+=		-lsocket -lnsl
+MAKE_ENV+=	LIBS="${LIBS}"
+.endif
+
+.include "../../net/libpcap/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/sniff/distinfo b/security/sniff/distinfo
index 874e6b9c925..6a39491436c 100644
--- a/security/sniff/distinfo
+++ b/security/sniff/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:39 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/10/06 07:53:04 jlam Exp $
 
 SHA1 (sniff-2.0.tar.gz) = 9e9ef76eaccaa6cbb3c23054a29a08dd9faed328
 Size (sniff-2.0.tar.gz) = 10720 bytes
-SHA1 (patch-aa) = e9b9dd7ade75d67a4d202b3deddd04d4593afe46
+SHA1 (patch-aa) = 8e5d7967940c60f3bb6c53ab053e7c95c7371605
diff --git a/security/sniff/patches/patch-aa b/security/sniff/patches/patch-aa
index ecee8da9458..40aa34f9aec 100644
--- a/security/sniff/patches/patch-aa
+++ b/security/sniff/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/03/13 14:14:41 zuntum Exp $
+$NetBSD: patch-aa,v 1.3 2003/10/06 07:53:04 jlam Exp $
 
---- Makefile.orig	Thu Feb 15 13:47:36 2001
+--- Makefile.orig	Thu Feb 15 04:47:36 2001
 +++ Makefile
-@@ -1,13 +1,10 @@
+@@ -1,24 +1,21 @@
  # Makefile for NetBSD
  
 -CC=gcc
@@ -16,8 +16,11 @@ $NetBSD: patch-aa,v 1.2 2001/03/13 14:14:41 zuntum Exp $
  OBJS  =  sniff2.o clear.o ifOpen.o lookupDNShost.o printData.o printHeader.o readTCP.o sniffData.o
  
  
-@@ -17,8 +14,8 @@
- 	$(CC) $(CFLAGS) -o sniff2 $(OBJS) -lpcap
+ all: sniff2
+ 
+ sniff2: $(OBJS)
+-	$(CC) $(CFLAGS) -o sniff2 $(OBJS) -lpcap
++	$(CC) $(CFLAGS) $(LDFLAGS) -o sniff2 $(OBJS) -lpcap $(LIBS)
  
  install:
 -	$(CP) sniff2 $(INSTALL_DIR)
@@ -26,3 +29,4 @@ $NetBSD: patch-aa,v 1.2 2001/03/13 14:14:41 zuntum Exp $
 +	$(BSD_INSTALL_MAN) sniff2.1 $(INSTALL_MAN)/man1
  clean: 
  	$(RM)  $(OBJS) sniff2
+ 
-- 
cgit v1.2.3