use libtool version of LIBOBJS

2 files changed, 18 insertions, 11 deletions

diff --git a/net/libpcap/distinfo b/net/libpcap/distinfo
index 9f594cc9000..bb36958f178 100644
--- a/net/libpcap/distinfo
+++ b/net/libpcap/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2006/02/24 23:39:44 drochner Exp $
+$NetBSD: distinfo,v 1.16 2006/12/06 21:17:28 schwarz Exp $
 
 SHA1 (libpcap-0.9.4.tar.gz) = 046f7624e66da51eba1ed2cb169695d1e7f31c29
 RMD160 (libpcap-0.9.4.tar.gz) = b8adee8f40256b8822e8e8b7da9a9bbd716ff6ab
 Size (libpcap-0.9.4.tar.gz) = 425887 bytes
 SHA1 (patch-ab) = ef8450b6f7ee050fcc40eec8ebdaa3fbb3ebdfe9
-SHA1 (patch-ac) = 26148fe8cfbd0502fc13b0381ca31c4d02204b00
+SHA1 (patch-ac) = b8cf112a9a7cd0114b728e128905a8806a8d1e5a
 SHA1 (patch-ad) = f9d2d6401a62d216b9f0af858fb1adde2098483e
 SHA1 (patch-ae) = 5b00f64d503b44d13814e326c5f171c5a20c7eb3
diff --git a/net/libpcap/patches/patch-ac b/net/libpcap/patches/patch-ac
index e494022384f..0e721246ac6 100644
--- a/net/libpcap/patches/patch-ac
+++ b/net/libpcap/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2005/08/10 13:48:22 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2006/12/06 21:17:28 schwarz Exp $
 
 --- Makefile.in.orig	2003-12-15 02:35:03.000000000 +0100
-+++ Makefile.in
-@@ -41,7 +41,7 @@ VPATH = @srcdir@
++++ Makefile.in	2006-12-06 21:37:05.000000000 +0100
+@@ -41,7 +41,7 @@
  # You shouldn't need to edit anything below.
  #
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1 2005/08/10 13:48:22 drochner Exp $
  CCOPT = @V_CCOPT@
  INCLS = -I. @V_INCLS@
  DEFS = @DEFS@ @V_DEFS@
-@@ -67,7 +67,8 @@ YACC = @V_YACC@
+@@ -67,7 +67,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,14 @@ $NetBSD: patch-ac,v 1.1 2005/08/10 13:48:22 drochner Exp $
  	@rm -f $@
  	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
  
-@@ -83,7 +84,7 @@ SRC =	$(PSRC) $(FSRC) $(CSRC) $(SSRC) $(
+@@ -77,13 +78,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
+-LIBOBJS = @LIBOBJS@
++LIBOBJS = @LTLIBOBJS@
+ 
+ SRC =	$(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC)
  
  # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
  # hack the extra indirection
@@ -30,7 +37,7 @@ $NetBSD: patch-ac,v 1.1 2005/08/10 13:48:22 drochner 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 @@ TAGFILES = \
+@@ -97,12 +98,10 @@
  
  CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
  
@@ -46,7 +53,7 @@ $NetBSD: patch-ac,v 1.1 2005/08/10 13:48:22 drochner Exp $
  
  shared: libpcap.$(DYEXT)
  
-@@ -126,10 +125,10 @@ scanner.c: $(srcdir)/scanner.l
+@@ -126,10 +125,10 @@
  	@rm -f $@
  	$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
  
@@ -59,7 +66,7 @@ $NetBSD: patch-ac,v 1.1 2005/08/10 13:48:22 drochner Exp $
  
  tokdefs.h: grammar.c
  grammar.c: $(srcdir)/grammar.y
-@@ -138,14 +137,14 @@ grammar.c: $(srcdir)/grammar.y
+@@ -138,14 +137,14 @@
  	mv y.tab.c grammar.c
  	mv y.tab.h tokdefs.h
  
@@ -77,7 +84,7 @@ $NetBSD: patch-ac,v 1.1 2005/08/10 13:48:22 drochner Exp $
  	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
  
  version.c: $(srcdir)/VERSION
-@@ -167,14 +166,13 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
+@@ -167,14 +166,13 @@
  	rm -f bpf_filter.c
  	ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c