diff -Naur /tmp/devel/usr/ports/net/openvswitch/Makefile /usr/ports/net/openvswitch/Makefile --- /tmp/devel/usr/ports/net/openvswitch/Makefile 2020-06-18 10:09:41.000000000 +0200 +++ /usr/ports/net/openvswitch/Makefile 2020-06-19 10:56:01.655146000 +0200 @@ -2,7 +2,7 @@ # $FreeBSD: head/net/openvswitch/Makefile 515818 2019-10-27 19:26:14Z pkubaj $ PORTNAME= openvswitch -DISTVERSION= 2.12.0 +DISTVERSION= 2.13.0 CATEGORIES= net MASTER_SITES= http://openvswitch.org/releases/ @@ -15,10 +15,9 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} -USES= compiler:c11 cpe gmake libtool perl5 pkgconfig python:2.7 \ +USES= compiler:c11 cpe gmake libtool perl5 pkgconfig python \ shebangfix ssl -SHEBANG_FILES= ovn/utilities/ovndb-servers.ocf \ - utilities/bugtool/ovs-bugtool-ovs-ofctl-loop-over-bridges \ +SHEBANG_FILES= utilities/bugtool/ovs-bugtool-ovs-ofctl-loop-over-bridges \ utilities/ovs-docker \ utilities/ovs-appctl-bashcomp.bash \ vtep/ovs-vtep.in diff -Naur /tmp/devel/usr/ports/net/openvswitch/distinfo /usr/ports/net/openvswitch/distinfo --- /tmp/devel/usr/ports/net/openvswitch/distinfo 2019-10-07 17:24:13.000000000 +0200 +++ /usr/ports/net/openvswitch/distinfo 2020-06-19 08:46:12.871208000 +0200 @@ -1,3 +1,3 @@ TIMESTAMP = 1570040636 -SHA256 (openvswitch-2.12.0.tar.gz) = 13fd42703180b4b1146c7e97926d09225485868cc2fbbd58dc0c421b4b8fe8f8 -SIZE (openvswitch-2.12.0.tar.gz) = 8162771 +SHA256 (openvswitch-2.13.0.tar.gz) = dd5f727427e36cab22bdeae61529d8c8fccacc53d968cfa7658f7f935ddda531 +SIZE (openvswitch-2.13.0.tar.gz) = 7233892 diff -Naur /tmp/devel/usr/ports/net/openvswitch/files/patch-configure /usr/ports/net/openvswitch/files/patch-configure --- /tmp/devel/usr/ports/net/openvswitch/files/patch-configure 2018-04-13 11:25:42.000000000 +0200 +++ /usr/ports/net/openvswitch/files/patch-configure 2020-06-19 08:52:28.293528000 +0200 @@ -1,9 +1,9 @@ ---- configure.orig 2018-04-11 14:28:38 UTC -+++ configure -@@ -18310,8 +18310,8 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ovs_cv_sphinx" >&5 - $as_echo "$ovs_cv_sphinx" >&6; } - if test "$ovs_cv_sphinx" = yes; then +--- configure.orig 2020-06-19 08:50:07.517843000 +0200 ++++ configure 2020-06-19 08:51:37.527501000 +0200 +@@ -18458,8 +18458,8 @@ + + + if test "$SPHINXBUILD" != none; then - HAVE_SPHINX_TRUE= - HAVE_SPHINX_FALSE='#' + HAVE_SPHINX_TRUE='#' diff -Naur /tmp/devel/usr/ports/net/openvswitch/pkg-message /usr/ports/net/openvswitch/pkg-message --- /tmp/devel/usr/ports/net/openvswitch/pkg-message 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/net/openvswitch/pkg-message 2020-06-19 10:35:07.077319000 +0200 @@ -0,0 +1 @@ +Don't forget to run "ovsdb-tool convert /var/db/openvswitch/conf.db" when upgrading an existing installation. diff -Naur /tmp/devel/usr/ports/net/openvswitch/pkg-plist /usr/ports/net/openvswitch/pkg-plist --- /tmp/devel/usr/ports/net/openvswitch/pkg-plist 2019-10-07 17:24:13.000000000 +0200 +++ /usr/ports/net/openvswitch/pkg-plist 2020-06-19 09:02:42.196699000 +0200 @@ -1,12 +1,3 @@ -bin/ovn-controller -bin/ovn-controller-vtep -bin/ovn-detrace -bin/ovn-docker-overlay-driver -bin/ovn-docker-underlay-driver -bin/ovn-nbctl -bin/ovn-northd -bin/ovn-sbctl -bin/ovn-trace bin/ovs-appctl bin/ovs-docker bin/ovs-dpctl @@ -18,8 +9,8 @@ bin/ovs-pki bin/ovs-tcpdump bin/ovs-tcpundump -bin/ovs-testcontroller bin/ovs-test +bin/ovs-testcontroller bin/ovs-vlan-test bin/ovs-vsctl bin/ovsdb-client @@ -27,6 +18,8 @@ bin/vtep-ctl etc/bash_completion.d/ovs-appctl-bashcomp.bash etc/bash_completion.d/ovs-vsctl-bashcomp.bash +etc/rc.d/ovs-vswitchd +etc/rc.d/ovsdb-server include/openflow/intel-ext.h include/openflow/netronome-ext.h include/openflow/nicira-ext.h @@ -66,8 +59,8 @@ include/openvswitch/ofp-parse.h include/openvswitch/ofp-port.h include/openvswitch/ofp-print.h -include/openvswitch/ofp-protocol.h include/openvswitch/ofp-prop.h +include/openvswitch/ofp-protocol.h include/openvswitch/ofp-queue.h include/openvswitch/ofp-switch.h include/openvswitch/ofp-table.h @@ -87,19 +80,12 @@ include/openvswitch/vconn.h include/openvswitch/version.h include/openvswitch/vlog.h -include/ovn/actions.h -include/ovn/expr.h -include/ovn/lex.h -include/ovn/logical-fields.h lib/libofproto-%%SHLIB_VER%%.so.0 lib/libofproto-%%SHLIB_VER%%.so.0.0.0 lib/libofproto.so lib/libopenvswitch-%%SHLIB_VER%%.so.0 lib/libopenvswitch-%%SHLIB_VER%%.so.0.0.0 lib/libopenvswitch.so -lib/libovn-%%SHLIB_VER%%.so.0 -lib/libovn-%%SHLIB_VER%%.so.0.0.0 -lib/libovn.so lib/libovsdb-%%SHLIB_VER%%.so.0 lib/libovsdb-%%SHLIB_VER%%.so.0.0.0 lib/libovsdb.so @@ -113,40 +99,21 @@ libdata/pkgconfig/libopenvswitch.pc libdata/pkgconfig/libovsdb.pc libdata/pkgconfig/libsflow.pc -man/man1/ovn-detrace.1.gz man/man1/ovs-pcap.1.gz -man/man1/ovs-tcpundump.1.gz man/man1/ovsdb-client.1.gz man/man1/ovsdb-server.1.gz man/man1/ovsdb-tool.1.gz -man/man5/ovn-nb.5.gz -man/man5/ovn-sb.5.gz man/man5/ovs-vswitchd.conf.db.5.gz man/man5/ovsdb-server.5.gz man/man5/vtep.5.gz man/man7/ovs-actions.7.gz -man/man7/ovn-architecture.7.gz man/man7/ovs-fields.7.gz -man/man8/ovs-appctl.8.gz man/man8/ovs-bugtool.8.gz -man/man8/ovn-controller-vtep.8.gz -man/man8/ovn-controller.8.gz -man/man8/ovn-ctl.8.gz -man/man8/ovn-nbctl.8.gz -man/man8/ovn-northd.8.gz -man/man8/ovn-sbctl.8.gz -man/man8/ovn-trace.8.gz -man/man8/ovs-ctl.8.gz man/man8/ovs-dpctl-top.8.gz man/man8/ovs-dpctl.8.gz man/man8/ovs-kmod-ctl.8.gz -man/man8/ovs-l3ping.8.gz man/man8/ovs-ofctl.8.gz -man/man8/ovs-parse-backtrace.8.gz -man/man8/ovs-pki.8.gz -man/man8/ovs-tcpdump.8.gz man/man8/ovs-testcontroller.8.gz -man/man8/ovs-vlan-bug-workaround.8.gz man/man8/ovs-vsctl.8.gz man/man8/ovs-vswitchd.8.gz man/man8/vtep-ctl.8.gz @@ -155,12 +122,9 @@ sbin/ovsdb-server %%DATADIR%%/bugtool-plugins/kernel-info/openvswitch.xml %%DATADIR%%/bugtool-plugins/network-status/openvswitch.xml -%%DATADIR%%/bugtool-plugins/network-status/ovn.xml %%DATADIR%%/bugtool-plugins/system-configuration.xml %%DATADIR%%/bugtool-plugins/system-configuration/openvswitch.xml %%DATADIR%%/bugtool-plugins/system-logs/openvswitch.xml -%%DATADIR%%/ovn-nb.ovsschema -%%DATADIR%%/ovn-sb.ovsschema %%DATADIR%%/python/ovs/__init__.py %%DATADIR%%/python/ovs/compat/__init__.py %%DATADIR%%/python/ovs/compat/sortedcontainers/__init__.py @@ -206,17 +170,13 @@ %%DATADIR%%/scripts/ovs-bugtool-daemons-ver %%DATADIR%%/scripts/ovs-bugtool-fdb-show %%DATADIR%%/scripts/ovs-bugtool-get-dpdk-nic-numa -%%DATADIR%%/scripts/ovs-bugtool-qos-configs -%%DATADIR%%/scripts/ovn-bugtool-nbctl-show +%%DATADIR%%/scripts/ovs-bugtool-get-port-stats %%DATADIR%%/scripts/ovs-bugtool-ovs-appctl-dpif %%DATADIR%%/scripts/ovs-bugtool-ovs-bridge-datapath-type %%DATADIR%%/scripts/ovs-bugtool-ovs-ofctl-loop-over-bridges %%DATADIR%%/scripts/ovs-bugtool-ovs-vswitchd-threads-affinity -%%DATADIR%%/scripts/ovn-bugtool-sbctl-lflow-list -%%DATADIR%%/scripts/ovn-bugtool-sbctl-show +%%DATADIR%%/scripts/ovs-bugtool-qos-configs %%DATADIR%%/scripts/ovs-bugtool-tc-class-show -%%DATADIR%%/scripts/ovn-ctl -%%DATADIR%%/scripts/ovndb-servers.ocf %%DATADIR%%/scripts/ovs-check-dead-ifs %%DATADIR%%/scripts/ovs-ctl %%DATADIR%%/scripts/ovs-kmod-ctl @@ -226,9 +186,9 @@ %%DATADIR%%/scripts/ovs-vtep %%DATADIR%%/vswitch.ovsschema %%DATADIR%%/vtep.ovsschema +@dir %%ETCDIR%% @dir /var/lib/openvswitch/pki @dir /var/lib/openvswitch @dir /var/lib @dir /var/log/openvswitch @dir /var/run/openvswitch -@dir %%ETCDIR%%