* fixes detection of ncurses.h

* let to exactly use system libpcap (fixes build with newer system libpcap).

Bump PKGREVISION.

4 files changed, 43 insertions, 11 deletions

diff --git a/net/sniffit/patches/patch-ab b/net/sniffit/patches/patch-ab
index 96832403966..976382c1de1 100644
--- a/net/sniffit/patches/patch-ab
+++ b/net/sniffit/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.4 2006/01/25 17:30:55 joerg Exp $
+$NetBSD: patch-ab,v 1.5 2012/04/07 09:23:11 obache Exp $
 
 --- configure.orig	1997-04-18 09:33:57.000000000 +0000
 +++ configure
+@@ -538,7 +538,7 @@ ac_config_guess=$ac_aux_dir/config.guess
+ ac_config_sub=$ac_aux_dir/config.sub
+ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+ 
+-subdirs="libpcap-0.3"
++subdirs=
+ 
+ 
+ # Extract the first word of "gcc", so it can be a program name with args.
 @@ -996,7 +996,7 @@ cat >> confdefs.h <<EOF
  EOF
  
diff --git a/net/sniffit/patches/patch-ad b/net/sniffit/patches/patch-ad
index 704fce4f222..808147d236a 100644
--- a/net/sniffit/patches/patch-ad
+++ b/net/sniffit/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 1999/07/25 00:36:32 hubertf Exp $
+$NetBSD: patch-ad,v 1.4 2012/04/07 09:23:11 obache Exp $
 
---- Makefile.in.BAK	Mon Mar 30 09:38:19 1998
-+++ Makefile.in	Mon Mar 30 09:38:50 1998
-@@ -11,9 +11,9 @@
+--- Makefile.in.orig	1997-04-18 09:33:57.000000000 +0000
++++ Makefile.in
+@@ -11,17 +11,16 @@ LIBS       = @LIBS@
  DEFS	   = @DEFS@
  OS_OPT     = @OS_OPT@
  OBJ_FLAG   = -w -O2 -c
@@ -13,8 +13,9 @@ $NetBSD: patch-ad,v 1.3 1999/07/25 00:36:32 hubertf Exp $
 +EXE_OPT    = -lpcap $(LDFLAGS)
  EXE_OBJ    = sn_packets.o sn_generation.o sn_interface.o sn_cfgfile.o \
               sn_logfile.o
- DEP_FILES  = sn_config.h pcap.h sn_data.h sn_defines.h sn_plugins.h \
-@@ -21,7 +21,6 @@
+-DEP_FILES  = sn_config.h pcap.h sn_data.h sn_defines.h sn_plugins.h \
++DEP_FILES  = sn_config.h sn_data.h sn_defines.h sn_plugins.h \
+              sn_packets.o \
               sn_generation.o sn_interface.o sn_cfgfile.o sn_logfile.o
  
  sniffit: $(SNIFFIT) $(DEP_FILES)
@@ -22,7 +23,7 @@ $NetBSD: patch-ad,v 1.3 1999/07/25 00:36:32 hubertf Exp $
  	$(CC) $(EXE_FLAG) $(SNIFFIT) $(EXE_OBJ) $(EXE_OPT) $(LIBS) $(DEFS) $(OS_OPT) 
  	strip sniffit
  
-@@ -44,11 +43,7 @@
+@@ -44,11 +43,7 @@ sn_generation.o: sn_generation.h sn_gene
  
  #Clean up everthing...
  clean:
diff --git a/net/sniffit/patches/patch-sn__interface.h b/net/sniffit/patches/patch-sn__interface.h
new file mode 100644
index 00000000000..7f4dc3614b8
--- /dev/null
+++ b/net/sniffit/patches/patch-sn__interface.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-sn__interface.h,v 1.1 2012/04/07 09:23:11 obache Exp $
+
+- make const declarations internally consistent
+
+--- sn_interface.h.orig	1997-04-18 09:33:58.000000000 +0000
++++ sn_interface.h
+@@ -29,7 +29,7 @@ void sig_blocking(char, int);
+ void stop_logging (void);
+ int check_mask (const struct packetheader *,const unsigned char *, char *, 
+ 					char *, struct unwrap *);
+-pcap_handler interactive_packethandler( char *, const struct packetheader *,
++pcap_handler interactive_packethandler(unsigned char *, const struct packetheader *,
+                  		        const unsigned char *);
+ void stop_packet_info (void);
+ void packet_info_handler (int);
diff --git a/net/sniffit/patches/patch-sniffit_h b/net/sniffit/patches/patch-sniffit_h
index 6101f034c10..6bb7d096397 100644
--- a/net/sniffit/patches/patch-sniffit_h
+++ b/net/sniffit/patches/patch-sniffit_h
@@ -1,12 +1,19 @@
-$NetBSD: patch-sniffit_h,v 1.1 2012/03/31 08:31:06 dholland Exp $
+$NetBSD: patch-sniffit_h,v 1.2 2012/04/07 09:23:11 obache Exp $
 
 - move strlower to sn_cfgfile.h to make it visible in the right places
 - my_exit should be file-static
 - update const to match changes to sniffit.0.3.5.c
 
---- sniffit.h~	1997-04-18 09:33:58.000000000 +0000
+--- sniffit.h.orig	1997-04-18 09:33:58.000000000 +0000
 +++ sniffit.h
-@@ -15,14 +15,12 @@ void print_iphead (struct IP_header *, c
+@@ -9,20 +9,18 @@ pcap_handler packethandler(unsigned char
+ 							const unsigned char *);
+ int check_mask (const struct packetheader *,const unsigned char *, char *,
+     	                                    char *,struct unwrap *);
+-pcap_handler interactive_packethandler( char *, const struct packetheader *,
++pcap_handler interactive_packethandler( unsigned char *, const struct packetheader *,
+                                         const unsigned char *);     
+ void print_iphead (struct IP_header *, char);
  unsigned long getaddrbyname(char *);
  void quit (char *);
  void reset_all (void);