From 932c5f9d64901d12a555d5e94061507e5c4e9a2f Mon Sep 17 00:00:00 2001
From: Dima Panov <fluffy@FreeBSD.org>
Date: Thu, 27 Apr 2023 22:42:09 +0300
Subject: [PATCH 2/3] net/openvswitch-lts: update to 2.17.6 LTS release

Fix build with modern python

Release Notes:	https://www.openvswitch.org/releases/NEWS-2.16.7.txt
---
 net/openvswitch-lts/Makefile              | 11 ++++++++---
 net/openvswitch-lts/distinfo              |  6 +++---
 net/openvswitch-lts/files/patch-configure | 11 -----------
 net/openvswitch-lts/pkg-plist             | 10 +++++-----
 4 files changed, 16 insertions(+), 22 deletions(-)
 delete mode 100644 net/openvswitch-lts/files/patch-configure

diff --git a/net/openvswitch-lts/Makefile b/net/openvswitch-lts/Makefile
index 903bb7ec1484..2f28fdcfaf27 100644
--- a/net/openvswitch-lts/Makefile
+++ b/net/openvswitch-lts/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	openvswitch
-DISTVERSION=	2.17.3
+DISTVERSION=	2.17.6
 CATEGORIES=	net
+PKGNAMESUFFIX=	-lts
 MASTER_SITES=	http://openvswitch.org/releases/
 
 MAINTAINER=	nc@FreeBSD.org
@@ -13,7 +14,7 @@ BROKEN_mips64=		fails to compile: ofp-actions.h:486: flexible array member in ot
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
-USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig python:3.7-3.9 \
+USES=		compiler:c11 cpe gmake libtool perl5 pkgconfig python \
 		shebangfix ssl
 SHEBANG_FILES=	ipsec/ovs-monitor-ipsec.in \
 		utilities/bugtool/ovs-bugtool-get-port-stats \
@@ -37,12 +38,16 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --disable-static --localstatedir=/var \
 		--with-dbdir=/var/db/${PORTNAME} \
 		--with-openssl=${OPENSSLBASE}
+CONFIGURE_ENV+=	PYTHON3=${PYTHON_CMD}
 USE_RC_SUBR=	ovs-vswitchd ovsdb-server
 LDFLAGS+=	-lpthread
 INSTALL_TARGET=install-strip
 
+CONFLICTS_INSTALL=	openswitch
+
 SHLIB_VER=	${DISTVERSION:C/\.[0-9]*$//}
-PLIST_SUB=	SHLIB_VER=${SHLIB_VER}
+SO_VER=		0.0.${DISTVERSION:E}
+PLIST_SUB=	SHLIB_VER=${SHLIB_VER} SO_VER=${SO_VER}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|uuid_from_string(|uuid_from_string_ovs(|g' \
diff --git a/net/openvswitch-lts/distinfo b/net/openvswitch-lts/distinfo
index 92208ae83a78..19e48ec66fe8 100644
--- a/net/openvswitch-lts/distinfo
+++ b/net/openvswitch-lts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665347341
-SHA256 (openvswitch-2.17.3.tar.gz) = 446811fc91ae245cc31904a69371fb0bf0446f7b24eb239a037db400353011c0
-SIZE (openvswitch-2.17.3.tar.gz) = 7977353
+TIMESTAMP = 1682623835
+SHA256 (openvswitch-2.17.6.tar.gz) = 74daaf2be7348ae5dd4017ba45b8dac65341f159f4fb4a5a79c542fed41010d9
+SIZE (openvswitch-2.17.6.tar.gz) = 8092331
diff --git a/net/openvswitch-lts/files/patch-configure b/net/openvswitch-lts/files/patch-configure
deleted file mode 100644
index afac13f26bf6..000000000000
--- a/net/openvswitch-lts/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2021-02-15 18:24:25 UTC
-+++ configure
-@@ -18326,7 +18326,7 @@ else
-         ovs_cv_python3=$PYTHON3
-       else
-         ovs_cv_python3=no
--        for binary in python3 python3.4 python3.5 python3.6 python3.7; do
-+        for binary in python3 python3.4 python3.5 python3.6 python3.7 python3.8 python3.9; do
-           ovs_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-           for dir in $PATH; do
-             IFS=$ovs_save_IFS
diff --git a/net/openvswitch-lts/pkg-plist b/net/openvswitch-lts/pkg-plist
index d0f324342202..855d13f76851 100644
--- a/net/openvswitch-lts/pkg-plist
+++ b/net/openvswitch-lts/pkg-plist
@@ -80,19 +80,19 @@ include/openvswitch/vconn.h
 include/openvswitch/version.h
 include/openvswitch/vlog.h
 lib/libofproto-%%SHLIB_VER%%.so.0
-lib/libofproto-%%SHLIB_VER%%.so.0.0.3
+lib/libofproto-%%SHLIB_VER%%.so.%%SO_VER%%
 lib/libofproto.so
 lib/libopenvswitch-%%SHLIB_VER%%.so.0
-lib/libopenvswitch-%%SHLIB_VER%%.so.0.0.3
+lib/libopenvswitch-%%SHLIB_VER%%.so.%%SO_VER%%
 lib/libopenvswitch.so
 lib/libovsdb-%%SHLIB_VER%%.so.0
-lib/libovsdb-%%SHLIB_VER%%.so.0.0.3
+lib/libovsdb-%%SHLIB_VER%%.so.%%SO_VER%%
 lib/libovsdb.so
 lib/libsflow-%%SHLIB_VER%%.so.0
-lib/libsflow-%%SHLIB_VER%%.so.0.0.3
+lib/libsflow-%%SHLIB_VER%%.so.%%SO_VER%%
 lib/libsflow.so
 lib/libvtep-%%SHLIB_VER%%.so.0
-lib/libvtep-%%SHLIB_VER%%.so.0.0.3
+lib/libvtep-%%SHLIB_VER%%.so.%%SO_VER%%
 lib/libvtep.so
 libdata/pkgconfig/libofproto.pc
 libdata/pkgconfig/libopenvswitch.pc
-- 
2.40.0