Fix botched updated so that this package can actually be installed.

2 files changed, 41 insertions, 32 deletions

diff --git a/net/libpcap/distinfo b/net/libpcap/distinfo
index 0625f13e6cf..afe909c46d3 100644
--- a/net/libpcap/distinfo
+++ b/net/libpcap/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2008/10/30 08:12:34 adam Exp $
+$NetBSD: distinfo,v 1.22 2008/10/30 16:35:08 tron Exp $
 
 SHA1 (libpcap-1.0.0.tar.gz) = 9893654027ae11033d785045ff35583da43fe8fa
 RMD160 (libpcap-1.0.0.tar.gz) = 20857fe6af5dc70fffb19da46e0fee908f55b3ea
 Size (libpcap-1.0.0.tar.gz) = 524273 bytes
 SHA1 (patch-aa) = 2bf7bef9e114db7ee9e7d6e5facc8f314969f703
-SHA1 (patch-ac) = 436b9401274bab4ee295ea2d185d57605d9ce8ca
+SHA1 (patch-ac) = 6066b492fc82ee149608b8ab3c28c6cef4752976
diff --git a/net/libpcap/patches/patch-ac b/net/libpcap/patches/patch-ac
index c0d5cba2f97..ec30183cf3f 100644
--- a/net/libpcap/patches/patch-ac
+++ b/net/libpcap/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2008/10/30 08:12:34 adam Exp $
+$NetBSD: patch-ac,v 1.5 2008/10/30 16:35:08 tron Exp $
 
---- Makefile.in.orig	2008-10-28 02:26:13.000000000 +0100
-+++ Makefile.in
-@@ -44,7 +44,7 @@ VPATH = @srcdir@
+--- Makefile.in.orig	2008-10-28 01:26:13.000000000 +0000
++++ Makefile.in	2008-10-30 16:30:21.000000000 +0000
+@@ -44,7 +44,7 @@
  # You shouldn't need to edit anything below.
  #
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.4 2008/10/30 08:12:34 adam Exp $
  CCOPT = @V_CCOPT@
  INCLS = -I. @V_INCLS@
  DEFS = @DEFS@ @V_DEFS@
-@@ -73,7 +73,8 @@ YACC = @V_YACC@
+@@ -73,7 +73,8 @@
  # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
  # Also, gcc does not remove the .o before forking 'as', which can be a
  # problem if you don't own the file but can write to the directory.
@@ -21,7 +21,7 @@ $NetBSD: patch-ac,v 1.4 2008/10/30 08:12:34 adam Exp $
  	@rm -f $@
  	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
  
-@@ -83,13 +84,13 @@ SSRC =  @SSRC@
+@@ -83,13 +84,13 @@
  CSRC =	pcap.c inet.c gencode.c optimize.c nametoaddr.c \
  	etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c
  GENSRC = scanner.c grammar.c version.c
@@ -37,7 +37,7 @@ $NetBSD: patch-ac,v 1.4 2008/10/30 08:12:34 adam Exp $
  HDR = \
  	acconfig.h \
  	arcnet.h \
-@@ -311,12 +312,10 @@ EXTRA_DIST = \
+@@ -311,12 +312,10 @@
  	Win32/Src/inet_net.c \
  	Win32/Src/inet_pton.c
  
@@ -53,7 +53,7 @@ $NetBSD: patch-ac,v 1.4 2008/10/30 08:12:34 adam Exp $
  
  shared: libpcap.$(DYEXT)
  
-@@ -348,10 +347,10 @@ scanner.c: $(srcdir)/scanner.l
+@@ -348,10 +347,10 @@
  	@rm -f $@
  	./runlex.sh $(LEX) -o$@ $<
  
@@ -66,7 +66,7 @@ $NetBSD: patch-ac,v 1.4 2008/10/30 08:12:34 adam Exp $
  
  tokdefs.h: grammar.c
  grammar.c: $(srcdir)/grammar.y
-@@ -360,17 +359,17 @@ grammar.c: $(srcdir)/grammar.y
+@@ -360,17 +359,17 @@
  	mv y.tab.c grammar.c
  	mv y.tab.h tokdefs.h
  
@@ -88,7 +88,7 @@ $NetBSD: patch-ac,v 1.4 2008/10/30 08:12:34 adam Exp $
  	@rm -f $@
  	sed -e 's/.*/char pcap_version[] = "&";/' $(srcdir)/VERSION > $@
  
-@@ -381,7 +380,7 @@ version.c: $(srcdir)/VERSION
+@@ -381,7 +380,7 @@
  # so we make the version string static and return it from
  # a function, which does work.
  #
@@ -97,7 +97,7 @@ $NetBSD: patch-ac,v 1.4 2008/10/30 08:12:34 adam Exp $
  	@rm -f $@
  	sed -e 's/.*/static const char pcap_version_string[] = "libpcap version &";/' $(srcdir)/VERSION > $@
  
-@@ -389,7 +388,7 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
+@@ -389,7 +388,7 @@
  	rm -f bpf_filter.c
  	ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c
  
@@ -106,7 +106,7 @@ $NetBSD: patch-ac,v 1.4 2008/10/30 08:12:34 adam Exp $
  	$(CC) $(CFLAGS) -c bpf_filter.c
  
  #
-@@ -413,11 +412,10 @@ filtertest: filtertest.c libpcap.a
+@@ -413,11 +412,10 @@
  findalldevstest: findalldevstest.c libpcap.a
  	$(CC) $(CFLAGS) -I. -L. -o findalldevstest findalldevstest.c libpcap.a
  
@@ -120,7 +120,7 @@ $NetBSD: patch-ac,v 1.4 2008/10/30 08:12:34 adam Exp $
  	[ -d $(DESTDIR)$(includedir) ] || \
  	    (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
  	[ -d $(DESTDIR)$(includedir)/pcap ] || \
-@@ -445,31 +443,31 @@ install: libpcap.a pcap-config
+@@ -445,31 +443,31 @@
  	    $(DESTDIR)$(includedir)/pcap-bpf.h
  	$(INSTALL_DATA) $(srcdir)/pcap-namedb.h \
  	    $(DESTDIR)$(includedir)/pcap-namedb.h
@@ -134,32 +134,41 @@ $NetBSD: patch-ac,v 1.4 2008/10/30 08:12:34 adam Exp $
 +	for i in $(MAN3PCAP:.3pcap=.3); do \
 +		$(INSTALL_DATA) $(srcdir)/$${i}pcap \
  		    $(DESTDIR)$(mandir)/man3/$$i; done
- 	ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \
+-	ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \
 -		 $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
-+		 $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3
- 	ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \
+-	ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \
 -		 $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
-+		 $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3
- 	ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \
+-	ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \
 -		 $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
-+		 $(DESTDIR)$(mandir)/man3/pcap_perror.3
- 	ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \
+-	ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \
 -		 $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
-+		 $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3
- 	ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \
+-	ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \
 -		 $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
-+		 $(DESTDIR)$(mandir)/man3/pcap_dispatch.3
- 	ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \
+-	ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \
 -		 $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
-+		 $(DESTDIR)$(mandir)/man3/pcap_minor_version.3
- 	ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \
+-	ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \
 -		 $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
-+		 $(DESTDIR)$(mandir)/man3/pcap_next.3
- 	ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \
+-	ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \
 -		 $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
-+		 $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
- 	ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \
+-	ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \
 -		 $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
++	ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3 \
++		 $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3
++	ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3 \
++		 $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3
++	ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3 \
++		 $(DESTDIR)$(mandir)/man3/pcap_perror.3
++	ln $(DESTDIR)$(mandir)/man3/pcap_inject.3 \
++		 $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3
++	ln $(DESTDIR)$(mandir)/man3/pcap_loop.3 \
++		 $(DESTDIR)$(mandir)/man3/pcap_dispatch.3
++	ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3 \
++		 $(DESTDIR)$(mandir)/man3/pcap_minor_version.3
++	ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3 \
++		 $(DESTDIR)$(mandir)/man3/pcap_next.3
++	ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3 \
++		 $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3
++	ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3 \
 +		 $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3
  	for i in $(MANFILE); do \
  		$(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manfile.in/.manfile/'` \