From 6abff2b35448b58f657cf0500fb846c2b034c8f0 Mon Sep 17 00:00:00 2001
From: Andrew Walker <awalker@ixsystems.com>
Date: Tue, 19 Mar 2024 16:42:24 -0700
Subject: [PATCH] Fix ports building on FreeBSD 13.3 (#316)

Various ports have been renamed, this is addressed in the
current PR.

python-dns by default builds with asnyc QUIC support which
brings in a rust dependency. Since we don't use QUIC for
middleware, it's safe to remove and avoid building rust.
---
 build/profiles/freenas/ports-system.pyd | 20 +++++++++++---------
 build/profiles/freenas/repos.pyd        |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/build/profiles/freenas/ports-system.pyd b/build/profiles/freenas/ports-system.pyd
index 4006cb3..cb1467c 100644
--- a/build/profiles/freenas/ports-system.pyd
+++ b/build/profiles/freenas/ports-system.pyd
@@ -44,7 +44,6 @@ ports += {
 ports += "security/stunnel"
 ports += "comms/lrzsz"
 ports += "sysutils/kiconvtool"
-ports += "sysutils/screen"
 ports += "sysutils/iohyve"
 ports += "sysutils/vm-bhyve"
 ports += "sysutils/pciutils"
@@ -74,7 +73,7 @@ ports += {
 ports += "misc/cpuid"
 ports += "net-mgmt/clog"
 ports += "net/mosh"
-ports += "net/wireguard"
+ports += "net/wireguard-tools"
 ports += "net-mgmt/sipcalc"
 
 ports += "security/cyrus-sasl2-gssapi"
@@ -110,10 +109,6 @@ ports += {
 }
 ports += "lang/python3"
 ports += "lang/python"
-ports += {
-    "name": "lang/python39-debugging",
-    "install": False,
-}
 ports += "sysutils/scanlnk"
 ports += "sysutils/iocage"
 ports += "security/pam_mkhomedir"
@@ -169,7 +164,10 @@ ports += {
 }
 ports += {
     "name": "sysutils/nut",
-    "options": ["OPTIONS_FILE_UNSET+=NEON"]
+    "options": [
+        "OPTIONS_FILE_UNSET+=NEON",
+        "OPTIONS_FILE_SET+=DEV"
+    ],
 }
 #ports += "devel/gio-fam-backend"
 ports += "sysutils/jailme"
@@ -227,9 +225,13 @@ ports += "sysutils/megacli"
 ports += "sysutils/areca-cli"
 ports += "sysutils/hptcli"
 ports += {
-    "name": "net/py-ldap",
+    "name": "net/py-python-ldap",
     "options": ["OPTIONS_FILE_SET+=SASL"]
 }
+ports += {
+    "name": "dns/py-dnspython",
+    "options": ["OPTIONS_FILE_UNSET+=DOQ"]
+}
 ports += {
     "name": "devel/dbus",
     "options": ["OPTIONS_FILE_UNSET+=X11"]
@@ -324,7 +326,7 @@ ports += "misc/xtail"
 ports += "sysutils/edk2@bhyve"
 ports += "benchmarks/fio"
 ports += "sysutils/cmdwatch"
-ports += "sysutils/devcpu-data"
+ports += "sysutils/cpu-microcode"
 ports += "sysutils/htop"
 ports += "sysutils/mcelog"
 ports += {
diff --git a/build/profiles/freenas/repos.pyd b/build/profiles/freenas/repos.pyd
index 19fefaf..b359706 100644
--- a/build/profiles/freenas/repos.pyd
+++ b/build/profiles/freenas/repos.pyd
@@ -34,7 +34,7 @@ repos += {
     "name": "freenas",
     "path": "freenas",
     "url": "http://github.com/freenas/freenas.git",
-    "branch": "truenas/13.1-stable"
+    "branch": "truenas/13.3-stable"
 }