4 files changed, 45 insertions, 41 deletions

diff --git a/net/dpdk/Makefile b/net/dpdk/Makefile
index 088d17e43f2c..9d78b47038dc 100644
--- a/net/dpdk/Makefile
+++ b/net/dpdk/Makefile
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	dpdk
-PORTVERSION=	1.7.1
+PORTVERSION=	1.8.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.dpdk.org/browse/dpdk/snapshot/
 
 MAINTAINER=	bruce.richardson@intel.com
-COMMENT=	Intel(R) DPDK: Software libraries for packet processing
+COMMENT=	DPDK: Software libraries for packet processing
 
 LICENSE=	BSD3CLAUSE
 
@@ -33,7 +33,7 @@ post-patch:
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/${RTE_TARGET}/app \
 	  ${STAGEDIR}${DATADIR}/${RTE_TARGET}/lib \
-	  ${STAGEDIR}${DATADIR}/${RTE_TARGET}/include/arch \
+	  ${STAGEDIR}${DATADIR}/${RTE_TARGET}/include/generic \
 	  ${STAGEDIR}${DATADIR}/${RTE_TARGET}/include/exec-env
 	cd ${WRKSRC} && ${COPYTREE_SHARE} mk ${STAGEDIR}${DATADIR} \
 	   && ${COPYTREE_SHARE} examples ${STAGEDIR}${DATADIR}
@@ -47,8 +47,8 @@ do-install:
 	for f in ${WRKBUILD}/include/*.h ; do \
 		${INSTALL_DATA} $$f ${STAGEDIR}${DATADIR}/${RTE_TARGET}/include ; \
 	done
-	for f in ${WRKBUILD}/include/arch/*.h ; do \
-		${INSTALL_DATA} $$f ${STAGEDIR}${DATADIR}/${RTE_TARGET}/include/arch ; \
+	for f in ${WRKBUILD}/include/generic/*.h ; do \
+		${INSTALL_DATA} $$f ${STAGEDIR}${DATADIR}/${RTE_TARGET}/include/generic ; \
 	done
 	for f in ${WRKBUILD}/include/exec-env/*.h ; do \
 		${INSTALL_DATA} $$f ${STAGEDIR}${DATADIR}/${RTE_TARGET}/include/exec-env ; \
diff --git a/net/dpdk/distinfo b/net/dpdk/distinfo
index 8854de7d1962..324b2da9ced4 100644
--- a/net/dpdk/distinfo
+++ b/net/dpdk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dpdk-1.7.1.tar.gz) = 9deeb7467c404883946735a1fbcf126b98216ae8f8862ea86bc0c15e3807a679
-SIZE (dpdk-1.7.1.tar.gz) = 8281609
+SHA256 (dpdk-1.8.0.tar.gz) = 9f5386830bd999355182e20408f3fc2cfa0802a4497fdded8d43202feede1939
+SIZE (dpdk-1.8.0.tar.gz) = 14706839
diff --git a/net/dpdk/pkg-descr b/net/dpdk/pkg-descr
index ceeae7c14dfc..a4f09217b2a0 100644
--- a/net/dpdk/pkg-descr
+++ b/net/dpdk/pkg-descr
@@ -1,6 +1,6 @@
-The Intel(R) Data Plane Development Kit (DPDK)
+The Data Plane Development Kit (DPDK)
 
-The Intel DPDK is a set of software libraries to enable packet processing. It
+The DPDK is a set of software libraries to enable packet processing. It
 consists of a set of polling mode drivers (PMD) which can be used to pull
 network packets directly from a Network Interface Card (NIC), as well as
 other libraries to assist in the processing of those packets. The additional
@@ -10,6 +10,6 @@ libraries include ones for:
 * software rings or FIFOs to allow packet transfer between cores
 amongst others.
 
-Applications written using the DPDK run in userspace. The devices used by an
-Intel DPDK application are removed from kernel control and are instead managed
+Applications written using the DPDK run in userspace. The devices used by a
+DPDK application are removed from kernel control and are instead managed
 directly by that application.
diff --git a/net/dpdk/pkg-plist b/net/dpdk/pkg-plist
index 7ba4fb3a25d2..55e73f4fc151 100644
--- a/net/dpdk/pkg-plist
+++ b/net/dpdk/pkg-plist
@@ -7,9 +7,10 @@ lib/dpdk
 %%DATADIR%%/examples/cmdline/commands.c
 %%DATADIR%%/examples/cmdline/commands.h
 %%DATADIR%%/examples/cmdline/main.c
-%%DATADIR%%/examples/cmdline/main.h
 %%DATADIR%%/examples/cmdline/parse_obj_list.c
 %%DATADIR%%/examples/cmdline/parse_obj_list.h
+%%DATADIR%%/examples/distributor/Makefile
+%%DATADIR%%/examples/distributor/main.c
 %%DATADIR%%/examples/dpdk_qat/Makefile
 %%DATADIR%%/examples/dpdk_qat/config_files/coleto/dh895xcc_qa_dev0.conf
 %%DATADIR%%/examples/dpdk_qat/config_files/shumway/dh89xxcc_qa_dev0.conf
@@ -18,15 +19,12 @@ lib/dpdk
 %%DATADIR%%/examples/dpdk_qat/crypto.c
 %%DATADIR%%/examples/dpdk_qat/crypto.h
 %%DATADIR%%/examples/dpdk_qat/main.c
-%%DATADIR%%/examples/dpdk_qat/main.h
 %%DATADIR%%/examples/exception_path/Makefile
 %%DATADIR%%/examples/exception_path/main.c
 %%DATADIR%%/examples/helloworld/Makefile
 %%DATADIR%%/examples/helloworld/main.c
-%%DATADIR%%/examples/helloworld/main.h
 %%DATADIR%%/examples/ip_fragmentation/Makefile
 %%DATADIR%%/examples/ip_fragmentation/main.c
-%%DATADIR%%/examples/ip_fragmentation/main.h
 %%DATADIR%%/examples/ip_pipeline/Makefile
 %%DATADIR%%/examples/ip_pipeline/cmdline.c
 %%DATADIR%%/examples/ip_pipeline/config.c
@@ -45,10 +43,8 @@ lib/dpdk
 %%DATADIR%%/examples/ip_pipeline/pipeline_tx.c
 %%DATADIR%%/examples/ip_reassembly/Makefile
 %%DATADIR%%/examples/ip_reassembly/main.c
-%%DATADIR%%/examples/ip_reassembly/main.h
 %%DATADIR%%/examples/ipv4_multicast/Makefile
 %%DATADIR%%/examples/ipv4_multicast/main.c
-%%DATADIR%%/examples/ipv4_multicast/main.h
 %%DATADIR%%/examples/kni/Makefile
 %%DATADIR%%/examples/kni/main.c
 %%DATADIR%%/examples/l2fwd-ivshmem/Makefile
@@ -59,22 +55,16 @@ lib/dpdk
 %%DATADIR%%/examples/l2fwd-ivshmem/include/common.h
 %%DATADIR%%/examples/l2fwd/Makefile
 %%DATADIR%%/examples/l2fwd/main.c
-%%DATADIR%%/examples/l2fwd/main.h
 %%DATADIR%%/examples/l3fwd-acl/Makefile
 %%DATADIR%%/examples/l3fwd-acl/main.c
-%%DATADIR%%/examples/l3fwd-acl/main.h
 %%DATADIR%%/examples/l3fwd-power/Makefile
 %%DATADIR%%/examples/l3fwd-power/main.c
-%%DATADIR%%/examples/l3fwd-power/main.h
 %%DATADIR%%/examples/l3fwd-vf/Makefile
 %%DATADIR%%/examples/l3fwd-vf/main.c
-%%DATADIR%%/examples/l3fwd-vf/main.h
 %%DATADIR%%/examples/l3fwd/Makefile
 %%DATADIR%%/examples/l3fwd/main.c
-%%DATADIR%%/examples/l3fwd/main.h
 %%DATADIR%%/examples/link_status_interrupt/Makefile
 %%DATADIR%%/examples/link_status_interrupt/main.c
-%%DATADIR%%/examples/link_status_interrupt/main.h
 %%DATADIR%%/examples/load_balancer/Makefile
 %%DATADIR%%/examples/load_balancer/config.c
 %%DATADIR%%/examples/load_balancer/init.c
@@ -91,14 +81,11 @@ lib/dpdk
 %%DATADIR%%/examples/multi_process/client_server_mp/mp_server/init.c
 %%DATADIR%%/examples/multi_process/client_server_mp/mp_server/init.h
 %%DATADIR%%/examples/multi_process/client_server_mp/mp_server/main.c
-%%DATADIR%%/examples/multi_process/client_server_mp/mp_server/main.h
 %%DATADIR%%/examples/multi_process/client_server_mp/shared/common.h
-%%DATADIR%%/examples/multi_process/client_server_mp/shared/init_drivers.h
 %%DATADIR%%/examples/multi_process/l2fwd_fork/Makefile
 %%DATADIR%%/examples/multi_process/l2fwd_fork/flib.c
 %%DATADIR%%/examples/multi_process/l2fwd_fork/flib.h
 %%DATADIR%%/examples/multi_process/l2fwd_fork/main.c
-%%DATADIR%%/examples/multi_process/l2fwd_fork/main.h
 %%DATADIR%%/examples/multi_process/simple_mp/Makefile
 %%DATADIR%%/examples/multi_process/simple_mp/main.c
 %%DATADIR%%/examples/multi_process/simple_mp/mp_commands.c
@@ -143,20 +130,13 @@ lib/dpdk
 %%DATADIR%%/examples/quota_watermark/qwctl/commands.h
 %%DATADIR%%/examples/quota_watermark/qwctl/qwctl.c
 %%DATADIR%%/examples/quota_watermark/qwctl/qwctl.h
+%%DATADIR%%/examples/skeleton/Makefile
+%%DATADIR%%/examples/skeleton/basicfwd.c
 %%DATADIR%%/examples/timer/Makefile
 %%DATADIR%%/examples/timer/main.c
-%%DATADIR%%/examples/timer/main.h
 %%DATADIR%%/examples/vhost/Makefile
-%%DATADIR%%/examples/vhost/eventfd_link/Makefile
-%%DATADIR%%/examples/vhost/eventfd_link/eventfd_link.c
-%%DATADIR%%/examples/vhost/eventfd_link/eventfd_link.h
-%%DATADIR%%/examples/vhost/libvirt/qemu-wrap.py
 %%DATADIR%%/examples/vhost/main.c
 %%DATADIR%%/examples/vhost/main.h
-%%DATADIR%%/examples/vhost/vhost-net-cdev.c
-%%DATADIR%%/examples/vhost/vhost-net-cdev.h
-%%DATADIR%%/examples/vhost/virtio-net.c
-%%DATADIR%%/examples/vhost/virtio-net.h
 %%DATADIR%%/examples/vhost_xen/Makefile
 %%DATADIR%%/examples/vhost_xen/main.c
 %%DATADIR%%/examples/vhost_xen/main.h
@@ -164,13 +144,26 @@ lib/dpdk
 %%DATADIR%%/examples/vhost_xen/virtio-net.h
 %%DATADIR%%/examples/vhost_xen/xen_vhost.h
 %%DATADIR%%/examples/vhost_xen/xenstore_parse.c
+%%DATADIR%%/examples/vm_power_manager/Makefile
+%%DATADIR%%/examples/vm_power_manager/channel_manager.c
+%%DATADIR%%/examples/vm_power_manager/channel_manager.h
+%%DATADIR%%/examples/vm_power_manager/channel_monitor.c
+%%DATADIR%%/examples/vm_power_manager/channel_monitor.h
+%%DATADIR%%/examples/vm_power_manager/guest_cli/Makefile
+%%DATADIR%%/examples/vm_power_manager/guest_cli/main.c
+%%DATADIR%%/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
+%%DATADIR%%/examples/vm_power_manager/guest_cli/vm_power_cli_guest.h
+%%DATADIR%%/examples/vm_power_manager/main.c
+%%DATADIR%%/examples/vm_power_manager/power_manager.c
+%%DATADIR%%/examples/vm_power_manager/power_manager.h
+%%DATADIR%%/examples/vm_power_manager/vm_power_cli.c
+%%DATADIR%%/examples/vm_power_manager/vm_power_cli.h
 %%DATADIR%%/examples/vmdq/Makefile
 %%DATADIR%%/examples/vmdq/main.c
-%%DATADIR%%/examples/vmdq/main.h
 %%DATADIR%%/examples/vmdq_dcb/Makefile
 %%DATADIR%%/examples/vmdq_dcb/main.c
-%%DATADIR%%/examples/vmdq_dcb/main.h
 %%DATADIR%%/mk/arch/i686/rte.vars.mk
+%%DATADIR%%/mk/arch/ppc_64/rte.vars.mk
 %%DATADIR%%/mk/arch/x86_64/rte.vars.mk
 %%DATADIR%%/mk/exec-env/bsdapp/rte.app.mk
 %%DATADIR%%/mk/exec-env/bsdapp/rte.vars.mk
@@ -192,6 +185,7 @@ lib/dpdk
 %%DATADIR%%/mk/machine/ivb/rte.vars.mk
 %%DATADIR%%/mk/machine/native/rte.vars.mk
 %%DATADIR%%/mk/machine/nhm/rte.vars.mk
+%%DATADIR%%/mk/machine/power8/rte.vars.mk
 %%DATADIR%%/mk/machine/snb/rte.vars.mk
 %%DATADIR%%/mk/machine/wsm/rte.vars.mk
 %%DATADIR%%/mk/rte.app.mk
@@ -238,7 +232,13 @@ lib/dpdk
 %%DATADIR%%/x86_64-native-bsdapp-clang/app/testhost
 %%DATADIR%%/x86_64-native-bsdapp-clang/app/testpipeline
 %%DATADIR%%/x86_64-native-bsdapp-clang/app/testpmd
-%%DATADIR%%/x86_64-native-bsdapp-clang/include/arch/rte_atomic.h
+%%DATADIR%%/x86_64-native-bsdapp-clang/include/generic/rte_atomic.h
+%%DATADIR%%/x86_64-native-bsdapp-clang/include/generic/rte_byteorder.h
+%%DATADIR%%/x86_64-native-bsdapp-clang/include/generic/rte_cpuflags.h
+%%DATADIR%%/x86_64-native-bsdapp-clang/include/generic/rte_cycles.h
+%%DATADIR%%/x86_64-native-bsdapp-clang/include/generic/rte_memcpy.h
+%%DATADIR%%/x86_64-native-bsdapp-clang/include/generic/rte_prefetch.h
+%%DATADIR%%/x86_64-native-bsdapp-clang/include/generic/rte_spinlock.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/cmdline.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/cmdline_cirbuf.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/cmdline_parse.h
@@ -251,18 +251,19 @@ lib/dpdk
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/cmdline_socket.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/cmdline_vt100.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/exec-env/rte_interrupts.h
-%%DATADIR%%/x86_64-native-bsdapp-clang/include/exec-env/rte_kni_common.h
-%%DATADIR%%/x86_64-native-bsdapp-clang/include/exec-env/rte_lcore.h
-%%DATADIR%%/x86_64-native-bsdapp-clang/include/exec-env/rte_per_lcore.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_acl.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_acl_osdep.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_alarm.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_approx.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_arp.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_atomic.h
+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_atomic_32.h
+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_atomic_64.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_bitmap.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_branch_prediction.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_byteorder.h
+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_byteorder_32.h
+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_byteorder_64.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_cfgfile.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_common.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_common_vect.h
@@ -277,6 +278,8 @@ lib/dpdk
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_eal_memconfig.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_errno.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_eth_bond.h
+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_eth_bond_8023ad.h
+%%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_eth_ctrl.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_eth_ring.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_ethdev.h
 %%DATADIR%%/x86_64-native-bsdapp-clang/include/rte_ether.h
@@ -357,6 +360,7 @@ lib/dpdk
 %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pipeline.a
 %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_bond.a
 %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_e1000.a
+%%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_enic.a
 %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_i40e.a
 %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_ixgbe.a
 %%DATADIR%%/x86_64-native-bsdapp-clang/lib/librte_pmd_pcap.a