[pkgsrc/trunk]: pkgsrc/net/libpcap libtoolize, to get a shared library

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/43900e2d9798
branches:  trunk
changeset: 498019:43900e2d9798
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Aug 10 13:48:22 2005 +0000

description:
libtoolize, to get a shared library
bump PKGREVISION

diffstat:

 net/libpcap/Makefile         |   4 +-
 net/libpcap/PLIST            |   4 +-
 net/libpcap/distinfo         |   3 +-
 net/libpcap/patches/patch-ac |  97 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 104 insertions(+), 4 deletions(-)

diffs (145 lines):

diff -r 2351a8e2ba8e -r 43900e2d9798 net/libpcap/Makefile
--- a/net/libpcap/Makefile      Wed Aug 10 13:46:33 2005 +0000
+++ b/net/libpcap/Makefile      Wed Aug 10 13:48:22 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2005/08/05 16:24:50 drochner Exp $
+# $NetBSD: Makefile,v 1.28 2005/08/10 13:48:22 drochner Exp $
 
 DISTNAME=              libpcap-0.9.3
+PKGREVISION=           1
 SVR4_PKGNAME=          lpcap
 CATEGORIES=            net
 MASTER_SITES=          http://www.tcpdump.org/release/
@@ -15,6 +16,7 @@
 
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            bison gm4 lex
+USE_LIBTOOL=           yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r 2351a8e2ba8e -r 43900e2d9798 net/libpcap/PLIST
--- a/net/libpcap/PLIST Wed Aug 10 13:46:33 2005 +0000
+++ b/net/libpcap/PLIST Wed Aug 10 13:48:22 2005 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2005/06/05 18:49:50 salo Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/08/10 13:48:22 drochner Exp $
 include/pcap-bpf.h
 include/pcap-namedb.h
 include/pcap.h
-lib/libpcap.a
+lib/libpcap.la
 man/man3/pcap.3
diff -r 2351a8e2ba8e -r 43900e2d9798 net/libpcap/distinfo
--- a/net/libpcap/distinfo      Wed Aug 10 13:46:33 2005 +0000
+++ b/net/libpcap/distinfo      Wed Aug 10 13:48:22 2005 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2005/08/05 16:24:50 drochner Exp $
+$NetBSD: distinfo,v 1.10 2005/08/10 13:48:22 drochner Exp $
 
 SHA1 (libpcap-0.9.3.tar.gz) = d4008a6122d12720626c00c16355e4122024ea5f
 RMD160 (libpcap-0.9.3.tar.gz) = 40d9598220e1d0df5c302cc43e836b0d264eab95
 Size (libpcap-0.9.3.tar.gz) = 424508 bytes
 SHA1 (patch-ab) = d6769dd3b6467d20618b1dad3b6a817de19854f8
+SHA1 (patch-ac) = 26148fe8cfbd0502fc13b0381ca31c4d02204b00
diff -r 2351a8e2ba8e -r 43900e2d9798 net/libpcap/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/libpcap/patches/patch-ac      Wed Aug 10 13:48:22 2005 +0000
@@ -0,0 +1,97 @@
+$NetBSD: patch-ac,v 1.1 2005/08/10 13:48:22 drochner Exp $
+
+--- Makefile.in.orig   2003-12-15 02:35:03.000000000 +0100
++++ Makefile.in
+@@ -41,7 +41,7 @@ VPATH = @srcdir@
+ # You shouldn't need to edit anything below.
+ #
+ 
+-CC = @CC@
++CC = ${LIBTOOL} --mode=compile @CC@
+ CCOPT = @V_CCOPT@
+ INCLS = -I. @V_INCLS@
+ DEFS = @DEFS@ @V_DEFS@
+@@ -67,7 +67,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.
+-.c.o:
++.SUFFIXES:    .lo
++.c.lo:
+       @rm -f $@
+       $(CC) $(CFLAGS) -c $(srcdir)/$*.c
+ 
+@@ -83,7 +84,7 @@ SRC =        $(PSRC) $(FSRC) $(CSRC) $(SSRC) $(
+ 
+ # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
+ # hack the extra indirection
+-OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
++OBJ = $(PSRC:.c=.lo) $(FSRC:.c=.lo) $(CSRC:.c=.lo) $(SSRC:.c=.lo) $(GENSRC:.c=.lo) $(LIBOBJS)
+ 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 = \
+ 
+ CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
+ 
+-all: libpcap.a
++all: libpcap.la
+ 
+-libpcap.a: $(OBJ)
+-      @rm -f $@
+-      ar rc $@ $(OBJ) $(LIBS)
+-      $(RANLIB) $@
++libpcap.la: $(OBJ)
++      ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib ${LDFLAGS} $(OBJ) -o libpcap.la
+ 
+ shared: libpcap.$(DYEXT)
+ 
+@@ -126,10 +125,10 @@ scanner.c: $(srcdir)/scanner.l
+       @rm -f $@
+       $(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
+ 
+-scanner.o: scanner.c tokdefs.h
++scanner.lo: scanner.c tokdefs.h
+       $(CC) $(CFLAGS) -c scanner.c
+ 
+-pcap.o: version.h
++pcap.lo: version.h
+ 
+ tokdefs.h: grammar.c
+ grammar.c: $(srcdir)/grammar.y
+@@ -138,14 +137,14 @@ grammar.c: $(srcdir)/grammar.y
+       mv y.tab.c grammar.c
+       mv y.tab.h tokdefs.h
+ 
+-grammar.o: grammar.c
++grammar.lo: grammar.c
+       @rm -f $@
+       $(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
+ 
+-version.o: version.c
++version.lo: version.c
+       $(CC) $(CFLAGS) -c version.c
+ 
+-snprintf.o: $(srcdir)/missing/snprintf.c
++snprintf.lo: $(srcdir)/missing/snprintf.c
+       $(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
+ 
+ version.c: $(srcdir)/VERSION
+@@ -167,14 +166,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
+ 
+-bpf_filter.o: bpf_filter.c
++bpf_filter.lo: bpf_filter.c
+       $(CC) $(CFLAGS) -c bpf_filter.c
+ 
+-install: libpcap.a 
++install: libpcap.la 
+       [ -d $(DESTDIR)$(libdir) ] || \
+           (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
+-      $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
+-      $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
++      ${LIBTOOL} --mode=install $(INSTALL_DATA) libpcap.la $(DESTDIR)$(libdir)
+       [ -d $(DESTDIR)$(includedir) ] || \
+           (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
+       $(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h