From owner-svn-ports-all@freebsd.org Mon Nov 23 18:54:01 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 179B3A3630D; Mon, 23 Nov 2015 18:54:01 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C75371BD4; Mon, 23 Nov 2015 18:54:00 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tANIrxpM078951; Mon, 23 Nov 2015 18:53:59 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tANIrx5m078947; Mon, 23 Nov 2015 18:53:59 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201511231853.tANIrx5m078947@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Mon, 23 Nov 2015 18:53:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402314 - in head/net/libpcap: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2015 18:54:01 -0000 Author: garga Date: Mon Nov 23 18:53:59 2015 New Revision: 402314 URL: https://svnweb.freebsd.org/changeset/ports/402314 Log: - Update net/libpcap to 1.7.4 - Move PLIST_FILES to pkg-plist - Remove LIBPCAP_OVERWRITE_BASE - Use OPTION helpers Added: head/net/libpcap/pkg-plist (contents, props changed) Deleted: head/net/libpcap/files/pkg-message-base Modified: head/net/libpcap/Makefile head/net/libpcap/distinfo head/net/libpcap/files/patch-Makefile.in Modified: head/net/libpcap/Makefile ============================================================================== --- head/net/libpcap/Makefile Mon Nov 23 18:46:58 2015 (r402313) +++ head/net/libpcap/Makefile Mon Nov 23 18:53:59 2015 (r402314) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libpcap -PORTVERSION= 1.7.3 +PORTVERSION= 1.7.4 CATEGORIES= net ipv6 MASTER_SITES= http://www.tcpdump.org/release/ @@ -14,91 +14,9 @@ LICENSE= BSD3CLAUSE GNU_CONFIGURE= yes USES= bison gmake USE_LDCONFIG= yes - -.if defined(LIBPCAP_OVERWRITE_BASE) -PREFIX= /usr -PKGNAMESUFFIX= -overwrite-base -MANPREFIX= ${PREFIX}/share -PKGMESSAGE= ${FILESDIR}/pkg-message-base -.endif - -PLIST_FILES+= bin/pcap-config \ - include/pcap/bluetooth.h \ - include/pcap/bpf.h \ - include/pcap/ipnet.h \ - include/pcap/namedb.h \ - include/pcap/nflog.h \ - include/pcap/pcap.h \ - include/pcap/sll.h \ - include/pcap/usb.h \ - include/pcap/vlan.h \ - include/pcap.h \ - include/pcap-namedb.h \ - include/pcap-bpf.h \ - lib/libpcap.a \ - lib/libpcap.so.1 \ - lib/libpcap.so.${PORTVERSION} \ - lib/libpcap.so \ - man/man1/pcap-config.1.gz \ - man/man3/pcap.3.gz \ - man/man3/pcap_activate.3.gz \ - man/man3/pcap_breakloop.3.gz \ - man/man3/pcap_can_set_rfmon.3.gz \ - man/man3/pcap_close.3.gz \ - man/man3/pcap_compile.3.gz \ - man/man3/pcap_create.3.gz \ - man/man3/pcap_datalink.3.gz \ - man/man3/pcap_datalink_name_to_val.3.gz \ - man/man3/pcap_datalink_val_to_name.3.gz \ - man/man3/pcap_dump.3.gz \ - man/man3/pcap_dump_close.3.gz \ - man/man3/pcap_dump_file.3.gz \ - man/man3/pcap_dump_flush.3.gz \ - man/man3/pcap_dump_ftell.3.gz \ - man/man3/pcap_dump_open.3.gz \ - man/man3/pcap_file.3.gz \ - man/man3/pcap_fileno.3.gz \ - man/man3/pcap_findalldevs.3.gz \ - man/man3/pcap_freecode.3.gz \ - man/man3/pcap_get_tstamp_precision.3.gz \ - man/man3/pcap_get_selectable_fd.3.gz \ - man/man3/pcap_geterr.3.gz \ - man/man3/pcap_inject.3.gz \ - man/man3/pcap_is_swapped.3.gz \ - man/man3/pcap_lib_version.3.gz \ - man/man3/pcap_list_datalinks.3.gz \ - man/man3/pcap_list_tstamp_types.3.gz \ - man/man3/pcap_lookupdev.3.gz \ - man/man3/pcap_lookupnet.3.gz \ - man/man3/pcap_loop.3.gz \ - man/man3/pcap_major_version.3.gz \ - man/man3/pcap_next_ex.3.gz \ - man/man3/pcap_offline_filter.3.gz \ - man/man3/pcap_open_dead.3.gz \ - man/man3/pcap_open_live.3.gz \ - man/man3/pcap_open_offline.3.gz \ - man/man3/pcap_set_buffer_size.3.gz \ - man/man3/pcap_set_datalink.3.gz \ - man/man3/pcap_set_immediate_mode.3.gz \ - man/man3/pcap_set_promisc.3.gz \ - man/man3/pcap_set_rfmon.3.gz \ - man/man3/pcap_set_snaplen.3.gz \ - man/man3/pcap_set_timeout.3.gz \ - man/man3/pcap_set_tstamp_precision.3.gz \ - man/man3/pcap_set_tstamp_type.3.gz \ - man/man3/pcap_setdirection.3.gz \ - man/man3/pcap_setfilter.3.gz \ - man/man3/pcap_setnonblock.3.gz \ - man/man3/pcap_snapshot.3.gz \ - man/man3/pcap_stats.3.gz \ - man/man3/pcap_statustostr.3.gz \ - man/man3/pcap_strerror.3.gz \ - man/man3/pcap_tstamp_type_name_to_val.3.gz \ - man/man3/pcap_tstamp_type_val_to_name.3.gz \ - man/man5/pcap-savefile.5.gz \ - man/man7/pcap-filter.7.gz \ - man/man7/pcap-linktype.7.gz \ - man/man7/pcap-tstamp.7.gz +CONFIGURE_ARGS+=--enable-dbus=no \ + --with-pcap=bpf +PLIST_SUB+= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= DAG IPV6 @@ -106,36 +24,14 @@ DAG_DESC= Support for Endace DAG hardwar OPTIONS_DEFAULT= IPV6 -.include - -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.endif - -.if ${PORT_OPTIONS:MDAG} -LDFLAGS+= -L${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --without-dag -.endif - -# Maybe make this into an OPTION? -.if defined(LIBPCAP_OVERWRITE_BASE) -post-install: - ${CAT} ${PKGMESSAGE} -.endif +IPV6_CONFIGURE_ENABLE= ipv6 +DAG_CONFIGURE_WITH= dag +DAG_LDFLAGS= -L${LOCALBASE}/lib .include -# Packages are built on a kernel that has cloning, but the resulting -# package will be run on a system that does not have cloning (7.x). -# Always use bpf device, but specify CFLAGS if we have cloning. -CONFIGURE_ARGS+= --with-pcap=bpf -CFLAGS+= -DHAVE_DEVICE_CLONING=1 - .if ${ARCH} == "amd64" || ${ARCH} == "sparc64" CFLAGS+= -fPIC .endif -CONFIGURE_ARGS+= --enable-dbus=no - .include Modified: head/net/libpcap/distinfo ============================================================================== --- head/net/libpcap/distinfo Mon Nov 23 18:46:58 2015 (r402313) +++ head/net/libpcap/distinfo Mon Nov 23 18:53:59 2015 (r402314) @@ -1,2 +1,2 @@ -SHA256 (libpcap-1.7.3.tar.gz) = dd9f85213dc8e948068405b55dd20f8b32e3083e9e0e186f833bd0372e559e2f -SIZE (libpcap-1.7.3.tar.gz) = 662941 +SHA256 (libpcap-1.7.4.tar.gz) = 7ad3112187e88328b85e46dce7a9b949632af18ee74d97ffc3f2b41fe7f448b0 +SIZE (libpcap-1.7.4.tar.gz) = 663021 Modified: head/net/libpcap/files/patch-Makefile.in ============================================================================== --- head/net/libpcap/files/patch-Makefile.in Mon Nov 23 18:46:58 2015 (r402313) +++ head/net/libpcap/files/patch-Makefile.in Mon Nov 23 18:53:59 2015 (r402314) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2015-01-06 19:12:16.000000000 +0100 -+++ Makefile.in 2015-01-06 19:16:34.000000000 +0100 -@@ -565,51 +565,19 @@ +--- Makefile.in.orig 2015-06-28 01:03:37 UTC ++++ Makefile.in +@@ -569,51 +569,19 @@ install: install-shared install-archive $(DESTDIR)$(includedir)/$$i; done [ -d $(DESTDIR)$(bindir) ] || \ (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir)) Added: head/net/libpcap/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/libpcap/pkg-plist Mon Nov 23 18:53:59 2015 (r402314) @@ -0,0 +1,77 @@ +bin/pcap-config +include/pcap-bpf.h +include/pcap-namedb.h +include/pcap.h +include/pcap/bluetooth.h +include/pcap/bpf.h +include/pcap/ipnet.h +include/pcap/namedb.h +include/pcap/nflog.h +include/pcap/pcap.h +include/pcap/sll.h +include/pcap/usb.h +include/pcap/vlan.h +lib/libpcap.a +lib/libpcap.so +lib/libpcap.so.%%PORTVERSION%% +lib/libpcap.so.1 +man/man1/pcap-config.1.gz +man/man3/pcap.3.gz +man/man3/pcap_activate.3.gz +man/man3/pcap_breakloop.3.gz +man/man3/pcap_can_set_rfmon.3.gz +man/man3/pcap_close.3.gz +man/man3/pcap_compile.3.gz +man/man3/pcap_create.3.gz +man/man3/pcap_datalink.3.gz +man/man3/pcap_datalink_name_to_val.3.gz +man/man3/pcap_datalink_val_to_name.3.gz +man/man3/pcap_dump.3.gz +man/man3/pcap_dump_close.3.gz +man/man3/pcap_dump_file.3.gz +man/man3/pcap_dump_flush.3.gz +man/man3/pcap_dump_ftell.3.gz +man/man3/pcap_dump_open.3.gz +man/man3/pcap_file.3.gz +man/man3/pcap_fileno.3.gz +man/man3/pcap_findalldevs.3.gz +man/man3/pcap_freecode.3.gz +man/man3/pcap_get_selectable_fd.3.gz +man/man3/pcap_get_tstamp_precision.3.gz +man/man3/pcap_geterr.3.gz +man/man3/pcap_inject.3.gz +man/man3/pcap_is_swapped.3.gz +man/man3/pcap_lib_version.3.gz +man/man3/pcap_list_datalinks.3.gz +man/man3/pcap_list_tstamp_types.3.gz +man/man3/pcap_lookupdev.3.gz +man/man3/pcap_lookupnet.3.gz +man/man3/pcap_loop.3.gz +man/man3/pcap_major_version.3.gz +man/man3/pcap_next_ex.3.gz +man/man3/pcap_offline_filter.3.gz +man/man3/pcap_open_dead.3.gz +man/man3/pcap_open_live.3.gz +man/man3/pcap_open_offline.3.gz +man/man3/pcap_set_buffer_size.3.gz +man/man3/pcap_set_datalink.3.gz +man/man3/pcap_set_immediate_mode.3.gz +man/man3/pcap_set_promisc.3.gz +man/man3/pcap_set_rfmon.3.gz +man/man3/pcap_set_snaplen.3.gz +man/man3/pcap_set_timeout.3.gz +man/man3/pcap_set_tstamp_precision.3.gz +man/man3/pcap_set_tstamp_type.3.gz +man/man3/pcap_setdirection.3.gz +man/man3/pcap_setfilter.3.gz +man/man3/pcap_setnonblock.3.gz +man/man3/pcap_snapshot.3.gz +man/man3/pcap_stats.3.gz +man/man3/pcap_statustostr.3.gz +man/man3/pcap_strerror.3.gz +man/man3/pcap_tstamp_type_name_to_val.3.gz +man/man3/pcap_tstamp_type_val_to_name.3.gz +man/man5/pcap-savefile.5.gz +man/man7/pcap-filter.7.gz +man/man7/pcap-linktype.7.gz +man/man7/pcap-tstamp.7.gz