Fix for PR#37066

3 files changed, 34 insertions, 21 deletions

diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index aeaf9fcf67e..ef0971b097d 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.37 2007/08/02 15:15:20 taca Exp $
+# $NetBSD: Makefile,v 1.38 2007/10/08 20:38:17 adam Exp $
 
-DISTNAME=		libpcap-0.9.7
-SVR4_PKGNAME=		lpcap
-CATEGORIES=		net
+DISTNAME=	libpcap-0.9.7
+SVR4_PKGNAME=	lpcap
+CATEGORIES=	net
 MASTER_SITES=	http://www.tcpdump.org/release/
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.tcpdump.org/
-COMMENT=		System-independent interface for user-level packet capture
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.tcpdump.org/
+COMMENT=	System-independent interface for user-level packet capture
 
 NOT_FOR_PLATFORM+=	Interix-*-* # no raw interface access
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-GNU_CONFIGURE=		yes
 USE_TOOLS+=		bison gm4 lex
 USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/libpcap/distinfo b/net/libpcap/distinfo
index 74812128c91..071bece0269 100644
--- a/net/libpcap/distinfo
+++ b/net/libpcap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2007/08/02 15:15:20 taca Exp $
+$NetBSD: distinfo,v 1.19 2007/10/08 20:38:17 adam Exp $
 
 SHA1 (libpcap-0.9.7.tar.gz) = 0e2e494d8a66dd644fff03dcad7887164aef9b0e
 RMD160 (libpcap-0.9.7.tar.gz) = f927552c04aa3ef35f8e62e9286001e8ddb3dcf0
 Size (libpcap-0.9.7.tar.gz) = 517562 bytes
-SHA1 (patch-ac) = b8cf112a9a7cd0114b728e128905a8806a8d1e5a
+SHA1 (patch-ac) = f1d911e4c4136ae332d3e756fe92dbf8f0ea8c9d
diff --git a/net/libpcap/patches/patch-ac b/net/libpcap/patches/patch-ac
index 0e721246ac6..dcfb7f98d89 100644
--- a/net/libpcap/patches/patch-ac
+++ b/net/libpcap/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2006/12/06 21:17:28 schwarz Exp $
+$NetBSD: patch-ac,v 1.3 2007/10/08 20:38:17 adam Exp $
 
---- Makefile.in.orig	2003-12-15 02:35:03.000000000 +0100
-+++ Makefile.in	2006-12-06 21:37:05.000000000 +0100
-@@ -41,7 +41,7 @@
+--- Makefile.in.orig	2007-07-24 04:35:15.000000000 +0200
++++ Makefile.in
+@@ -41,7 +41,7 @@ VPATH = @srcdir@
  # You shouldn't need to edit anything below.
  #
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.2 2006/12/06 21:17:28 schwarz Exp $
  CCOPT = @V_CCOPT@
  INCLS = -I. @V_INCLS@
  DEFS = @DEFS@ @V_DEFS@
-@@ -67,7 +67,8 @@
+@@ -69,7 +69,8 @@ YACC = @V_YACC@
  # 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.2 2006/12/06 21:17:28 schwarz Exp $
  	@rm -f $@
  	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
  
-@@ -77,13 +78,13 @@
+@@ -79,13 +80,13 @@ SSRC =  @SSRC@
  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.2 2006/12/06 21:17:28 schwarz Exp $
  HDR =	pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
  	ethertype.h gencode.h gnuc.h
  GENHDR = \
-@@ -97,12 +98,10 @@
+@@ -99,12 +100,10 @@ TAGFILES = \
  
  CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
  
@@ -53,7 +53,7 @@ $NetBSD: patch-ac,v 1.2 2006/12/06 21:17:28 schwarz Exp $
  
  shared: libpcap.$(DYEXT)
  
-@@ -126,10 +125,10 @@
+@@ -128,10 +127,10 @@ scanner.c: $(srcdir)/scanner.l
  	@rm -f $@
  	$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
  
@@ -66,7 +66,7 @@ $NetBSD: patch-ac,v 1.2 2006/12/06 21:17:28 schwarz Exp $
  
  tokdefs.h: grammar.c
  grammar.c: $(srcdir)/grammar.y
-@@ -138,14 +137,14 @@
+@@ -140,17 +139,17 @@ grammar.c: $(srcdir)/grammar.y
  	mv y.tab.c grammar.c
  	mv y.tab.h tokdefs.h
  
@@ -83,8 +83,21 @@ $NetBSD: patch-ac,v 1.2 2006/12/06 21:17:28 schwarz Exp $
 +snprintf.lo: $(srcdir)/missing/snprintf.c
  	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
  
- version.c: $(srcdir)/VERSION
-@@ -167,14 +166,13 @@
+-version.c: $(srcdir)/VERSION
++version.c: #$(srcdir)/VERSION
+ 	@rm -f $@
+ 	sed -e 's/.*/char pcap_version[] = "&";/' $(srcdir)/VERSION > $@
+ 
+@@ -161,7 +160,7 @@ version.c: $(srcdir)/VERSION
+ # so we make the version string static and return it from
+ # a function, which does work.
+ #
+-version.h: $(srcdir)/VERSION
++version.h: #$(srcdir)/VERSION
+ 	@rm -f $@
+ 	sed -e 's/.*/static const char pcap_version_string[] = "libpcap version &";/' $(srcdir)/VERSION > $@
+ 
+@@ -169,14 +168,13 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
  	rm -f bpf_filter.c
  	ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c