Update to 1.0.0.

5 files changed, 158 insertions, 59 deletions

diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index bb1c0b39beca..a9117242b1b4 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	libpcap
-PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTVERSION=	1.0.0
 CATEGORIES=	net ipv6
-MASTER_SITES=	http://www.tcpdump.org/release/ \
-		http://www.icrew.org/mirror/tcp_dump/tcpdump_3_9/
+MASTER_SITES=	http://www.tcpdump.org/release/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	bms@FreeBSD.org
@@ -18,9 +16,8 @@ COMMENT=	Ubiquitous network traffic capture library
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-MAN3=		pcap.3
-
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 USE_BISON=	build
 USE_LDCONFIG=	yes
 
@@ -28,15 +25,88 @@ USE_LDCONFIG=	yes
 PREFIX=		/usr
 PKGNAMESUFFIX=	-overwrite-base
 MANPREFIX=	${PREFIX}/share
-PLIST_SUB+=	NOTBASE="@comment "
-PLIST_SUB+=	BASE=""
-EXTRA_PATCHES+=	${FILESDIR}/patchbase-Makefile.in
 PKGMESSAGE=	${FILESDIR}/pkg-message-base
-.else
-PLIST_SUB+=	BASE="@comment "
-PLIST_SUB+=	NOTBASE=""
 .endif
 
+MAN1=		pcap-config.1
+MAN3=		pcap.3 \
+		pcap_activate.3 \
+		pcap_breakloop.3 \
+		pcap_can_set_rfmon.3 \
+		pcap_close.3 \
+		pcap_compile.3 \
+		pcap_create.3 \
+		pcap_datalink.3 \
+		pcap_datalink_name_to_val.3 \
+		pcap_datalink_val_to_name.3 \
+		pcap_dump.3 \
+		pcap_dump_close.3 \
+		pcap_dump_file.3 \
+		pcap_dump_flush.3 \
+		pcap_dump_ftell.3 \
+		pcap_dump_open.3 \
+		pcap_file.3 \
+		pcap_fileno.3 \
+		pcap_findalldevs.3 \
+		pcap_free_datalinks.3 \
+		pcap_freealldevs.3 \
+		pcap_freecode.3 \
+		pcap_get_selectable_fd.3 \
+		pcap_geterr.3 \
+		pcap_inject.3 \
+		pcap_is_swapped.3 \
+		pcap_lib_version.3 \
+		pcap_list_datalinks.3 \
+		pcap_lookupdev.3 \
+		pcap_lookupnet.3 \
+		pcap_loop.3 \
+		pcap_major_version.3 \
+		pcap_next_ex.3 \
+		pcap_offline_filter.3 \
+		pcap_open_dead.3 \
+		pcap_open_live.3 \
+		pcap_open_offline.3 \
+		pcap_set_buffer_size.3 \
+		pcap_set_datalink.3 \
+		pcap_set_promisc.3 \
+		pcap_set_rfmon.3 \
+		pcap_set_snaplen.3 \
+		pcap_set_timeout.3 \
+		pcap_setdirection.3 \
+		pcap_setfilter.3 \
+		pcap_setnonblock.3 \
+		pcap_snapshot.3 \
+		pcap_stats.3 \
+		pcap_statustostr.3 \
+		pcap_strerror.3
+MAN5=		pcap-savefile.5
+MAN7=		pcap-filter.7 pcap-linktype.7
+
+MLINKS=		pcap_datalink_val_to_name.3 \
+		    pcap_datalink_val_to_description.3 \
+		pcap_dump_open.3 pcap_dump_fopen.3 \
+		pcap_geterr.3 pcap_perror.3 \
+		pcap_inject.3 pcap_sendpacket.3 \
+		pcap_loop.3 pcap_dispatch.3 \
+		pcap_major_version.3 pcap_minor_version.3 \
+		pcap_next_ex.3 pcap_next.3 \
+		pcap_open_offline.3 pcap_fopen_offline.3 \
+		pcap_setnonblock.3 pcap_getnonblock.3
+
+PLIST_FILES+=	bin/pcap-config \
+		include/pcap/bpf.h \
+		include/pcap/namedb.h \
+		include/pcap/pcap.h \
+		include/pcap/sll.h \
+		include/pcap/usb.h \
+		include/pcap.h \
+		include/pcap-namedb.h \
+		include/pcap-bpf.h \
+		lib/libpcap.a \
+		lib/libpcap.so.3 \
+		lib/libpcap.so
+PLIST_DIRS+=	include/pcap
+
 .if !defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
diff --git a/net/libpcap/distinfo b/net/libpcap/distinfo
index 0b15e0309777..c316b9a642ae 100644
--- a/net/libpcap/distinfo
+++ b/net/libpcap/distinfo
@@ -1,3 +1,3 @@
-MD5 (libpcap-0.9.7.tar.gz) = 77bc1f1de0de8488c7cb28e4753b9603
-SHA256 (libpcap-0.9.7.tar.gz) = b86b12651a2759b8f4ddfcc2380d8567cccbf0ab90303df658042b8ba334e617
-SIZE (libpcap-0.9.7.tar.gz) = 517562
+MD5 (libpcap-1.0.0.tar.gz) = 9ad1358c5dec48456405eac197a46d3d
+SHA256 (libpcap-1.0.0.tar.gz) = a214c4e1d7e22a758f66fe1d08f0ce41c3ba801a4c13dd1188e1e38288ac73c0
+SIZE (libpcap-1.0.0.tar.gz) = 524273
diff --git a/net/libpcap/files/patch-Makefile.in b/net/libpcap/files/patch-Makefile.in
new file mode 100644
index 000000000000..e842b44d4e81
--- /dev/null
+++ b/net/libpcap/files/patch-Makefile.in
@@ -0,0 +1,73 @@
+--- Makefile.in.orig	2008-10-28 01:26:13.000000000 +0000
++++ Makefile.in	2009-04-24 13:38:12.000000000 +0100
+@@ -311,22 +311,20 @@
+ 	Win32/Src/inet_net.c \
+ 	Win32/Src/inet_pton.c
+ 
+-all: libpcap.a pcap-config
++all: libpcap.a libpcap.so.3 pcap-config
+ 
+ libpcap.a: $(OBJ)
+ 	@rm -f $@
+ 	$(AR) rc $@ $(OBJ) $(LIBS)
+ 	$(RANLIB) $@
+ 
+-shared: libpcap.$(DYEXT)
+-
+ #
+ # XXX - this works with GNU ld, but won't necessarily work with native
+ # ld on, for example, various SVR4-flavored platforms, or Digital UNIX.
+ #
+-libpcap.so: $(OBJ)
++libpcap.so.3: $(OBJ)
+ 	@rm -f $@
+-	$(CC) -shared -Wl,-soname,$@.1 -o $@.`cat $(srcdir)/VERSION` $(OBJ) $(DAGLIBS)
++	$(CC) -shared -Wl,-x -o libpcap.so.3 -Wl,-soname,libpcap.so.3 `lorder $(OBJ) | tsort -q` $(DAGLIBS)
+ 
+ #
+ # The following rule succeeds, but the result is untested.
+@@ -416,6 +414,8 @@
+ install: libpcap.a pcap-config
+ 	[ -d $(DESTDIR)$(libdir) ] || \
+ 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
++	$(INSTALL_DATA) libpcap.so.3 $(DESTDIR)$(libdir)/libpcap.so.3
++	ln -fs $(DESTDIR)$(libdir)/libpcap.so.3 $(DESTDIR)$(libdir)/libpcap.so
+ 	$(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
+ 	$(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
+ 	[ -d $(DESTDIR)$(includedir) ] || \
+@@ -445,31 +445,15 @@
+ 	    $(DESTDIR)$(includedir)/pcap-bpf.h
+ 	$(INSTALL_DATA) $(srcdir)/pcap-namedb.h \
+ 	    $(DESTDIR)$(includedir)/pcap-namedb.h
+-	$(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
++	$(INSTALL_DATA) pcap-config $(DESTDIR)$(bindir)/pcap-config
++	chmod 755 $(DESTDIR)$(bindir)/pcap-config
+ 	for i in $(MAN1); do \
+ 		$(INSTALL_DATA) $(srcdir)/$$i \
+ 		    $(DESTDIR)$(mandir)/man1/$$i; done
+ 	for i in $(MAN3PCAP); do \
++		j=$$(echo $$i | sed -e 's/3pcap/3/') ; \
+ 		$(INSTALL_DATA) $(srcdir)/$$i \
+-		    $(DESTDIR)$(mandir)/man3/$$i; done
+-	ln $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_name.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_datalink_val_to_description.3pcap
+-	ln $(DESTDIR)$(mandir)/man3/pcap_dump_open.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_dump_fopen.3pcap
+-	ln $(DESTDIR)$(mandir)/man3/pcap_geterr.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_perror.3pcap
+-	ln $(DESTDIR)$(mandir)/man3/pcap_inject.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_sendpacket.3pcap
+-	ln $(DESTDIR)$(mandir)/man3/pcap_loop.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_dispatch.3pcap
+-	ln $(DESTDIR)$(mandir)/man3/pcap_major_version.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_minor_version.3pcap
+-	ln $(DESTDIR)$(mandir)/man3/pcap_next_ex.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_next.3pcap
+-	ln $(DESTDIR)$(mandir)/man3/pcap_open_offline.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_fopen_offline.3pcap
+-	ln $(DESTDIR)$(mandir)/man3/pcap_setnonblock.3pcap \
+-		 $(DESTDIR)$(mandir)/man3/pcap_getnonblock.3pcap
++		    $(DESTDIR)$(mandir)/man3/$$j; done
+ 	for i in $(MANFILE); do \
+ 		$(INSTALL_DATA) $(srcdir)/`echo $$i | sed 's/.manfile.in/.manfile/'` \
+ 		    $(DESTDIR)$(mandir)/man@MAN_FILE_FORMATS@/`echo $$i | sed 's/.manfile.in/.@MAN_FILE_FORMATS@/'`; done
diff --git a/net/libpcap/files/patchbase-Makefile.in b/net/libpcap/files/patchbase-Makefile.in
deleted file mode 100644
index 093f74508196..000000000000
--- a/net/libpcap/files/patchbase-Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.in.orig	Mon Sep 25 11:06:00 2006
-+++ Makefile.in	Sun Jul  8 18:36:39 2007
-@@ -98,22 +98,18 @@
- 
- CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c
- 
--all: libpcap.a
-+all: libpcap.a libpcap.so.2
- 
- libpcap.a: $(OBJ)
- 	@rm -f $@
- 	ar rc $@ $(OBJ) $(LIBS)
- 	$(RANLIB) $@
- 
--shared: libpcap.$(DYEXT)
-+#shared: libpcap.$(DYEXT)
- 
--#
--# XXX - this works with GNU ld, but won't necessarily work with native
--# ld on, for example, various SVR4-flavored platforms, or Digital UNIX.
--#
--libpcap.so: $(OBJ)
-+libpcap.so.2: $(OBJ)
- 	@rm -f $@
--	$(CC) -shared -o $@.`cat VERSION` $(OBJ) $(DAGLIBS)
-+	$(CC) -shared -Wl,-x  -o libpcap.so.2 -Wl,-soname,libpcap.so.2  `lorder *.o | tsort -q`
- 
- # the following rule succeeds, but the result is untested.
- libpcap.dylib: $(OBJ)
-@@ -174,6 +170,8 @@
- install: libpcap.a 
- 	[ -d $(DESTDIR)$(libdir) ] || \
- 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
-+	$(INSTALL_DATA) libpcap.so.2 $(DESTDIR)$(libdir)/libpcap.so.2
-+	ln -fs $(DESTDIR)$(libdir)/libpcap.so.2 $(DESTDIR)$(libdir)/libpcap.so
- 	$(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
- 	$(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
- 	[ -d $(DESTDIR)$(includedir) ] || \
diff --git a/net/libpcap/pkg-plist b/net/libpcap/pkg-plist
deleted file mode 100644
index a76804c9577a..000000000000
--- a/net/libpcap/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/libpcap.a
-%%BASE%%lib/libpcap.so.2
-%%BASE%%lib/libpcap.so
-include/pcap.h
-include/pcap-namedb.h
-include/pcap-bpf.h