diff --git a/biology/salmon/Makefile b/biology/salmon/Makefile
index 1b042365ed13..7097ee7a77df 100644
--- a/biology/salmon/Makefile
+++ b/biology/salmon/Makefile
@@ -1,61 +1,60 @@
 PORTNAME=		salmon
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.10.3
 PORTREVISION=	1
 CATEGORIES=		biology
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Transcript-level quantification of RNA-seq from lightweight alignments
 WWW=		https://github.com/COMBINE-lab/salmon
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=		armv6 armv7 i386 mips powerpc powerpcspe
 NOT_FOR_ARCHS_REASON=	Requires 64-bit processor
 
 # libtool and auto* are run manually in submodules, so don't put them in USES
 BUILD_DEPENDS=	bash:shells/bash \
 		cereal>=1.3.0:devel/cereal \
 		libgff==2.0.0:biology/libgff \
 		libtool:devel/libtool \
 		autoreconf:devel/autoconf \
 		aclocal:devel/automake \
 		eigen>0:math/eigen3 \
 		libdivide>0:math/libdivide \
 		curl>0:ftp/curl
 LIB_DEPENDS=	libtbb.so:devel/onetbb \
 		libboost_thread.so:devel/boost-libs
 
 USES=		cmake:noninja gmake localbase shebangfix
 USE_GITHUB=	yes
 
 # Can't unbundle io_lib unless we also unbundle htscodecs from io_lib,
 # which is a nightmare: explicitly integrated into configure files and
 # installs htscodecs files, conflicting with separate htscodecs port.
 GH_ACCOUNT=	COMBINE-lab
 GH_TUPLE+=	COMBINE-lab:pufferfish:salmon-v${DISTVERSION}:pf/external/pufferfish
 GH_TUPLE+=	jkbonfield:io_lib:io_lib-1-15-1:sio/external/staden-io_lib
 # Update commit hash from io_lib release branch
 GH_TUPLE+=	samtools:htscodecs:de42211:htscodec/external/staden-io_lib/htscodecs
 SHEBANG_FILES=	scripts/*
 
 PLIST_FILES=	bin/salmon
 CMAKE_ARGS+=	-DHAVE_FAST_MALLOC:BOOL=on \
 		-DBOOST_ROOT:PATH=${LOCALBASE} \
 		-DFETCHED_PUFFERFISH:BOOL=on \
 		-DFETCHED_LIBGFF:BOOL=on \
 		-DFETCH_STADEN:BOOL=true
-WITH_DEBUG=	yes
 CXXFLAGS+=	-I${LOCALBASE}/include/eigen3
 LDFLAGS+=	-lpthread
 
 pre-configure:
 	${RM} -rf ${WRKSRC}/include/eigen3 \
 		${WRKSRC}/external/pufferfish/include/libdivide
 	(cd ${WRKSRC}/external/staden-io_lib && ./bootstrap)
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/src/salmon ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/sysutils/fwupd/Makefile b/sysutils/fwupd/Makefile
index 6cf0c3e3ee29..cad3b26c86ad 100644
--- a/sysutils/fwupd/Makefile
+++ b/sysutils/fwupd/Makefile
@@ -1,74 +1,73 @@
 PORTNAME=	fwupd
 DISTVERSION=	2.0.18
 PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Update firmware automatically, safely, and reliably
 
 LICENSE=	LGPL21
 
 BROKEN_FreeBSD_13=	requires at least FreeBSD 14
 
 BUILD_DEPENDS=	blkid:filesystems/libblkid \
 		flashrom>0:sysutils/flashrom \
 		help2man:misc/help2man \
 		${LOCALBASE}/libdata/pkgconfig/fwupd-efi.pc:sysutils/fwupd-efi \
 		open-sans>0:x11-fonts/open-sans \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygobject>0:devel/py-pygobject@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pangocffi>0:x11-toolkits/py-pangocffi@${PY_FLAVOR} \
 		valgrind>0:devel/valgrind
 LIB_DEPENDS=	libcbor.so:devel/libcbor \
 		libcurl.so:ftp/curl \
 		libdrm.so:graphics/libdrm \
 		libefiboot.so:devel/efivar \
 		libelf.so:devel/libelf \
 		libgcab-1.0.so:archivers/gcab \
 		libgnutls.so:security/gnutls \
 		libgpg-error.so:security/libgpg-error \
 		libgpgme.so:security/gpgme \
 		libgusb.so:devel/libgusb \
 		libjcat.so:textproc/libjcat \
 		libjson-glib-1.0.so:devel/json-glib \
 		libprotobuf-c.so:devel/protobuf-c \
 		libxmlb.so:textproc/libxmlb
 RUN_DEPENDS=	blkid:filesystems/libblkid \
 		dbus-daemon:devel/dbus \
 		flashrom>0:sysutils/flashrom \
 		${LOCALBASE}/libdata/pkgconfig/fwupd-efi.pc:sysutils/fwupd-efi \
 		valgrind>0:devel/valgrind
 
 USES=		cmake:indirect gettext gnome libarchive meson pkgconfig python readline shebangfix sqlite vala:build
 USE_GITHUB=	yes
 USE_GNOME=	glib20 introspection:build
 USE_LDCONFIG=	yes
-WITH_DEBUG=	yes
 USE_RC_SUBR=	fwupd
 
 OPTIONS_DEFINE=	DOCS TEST
 OPTIONS_SUB=	yes
 
 DOCS_BUILD_DEPENDS=	gtkdoc-scan:textproc/gtk-doc \
 			${PYTHON_PKGNAMEPREFIX}gi-docgen>0:textproc/py-gi-docgen@${PY_FLAVOR}
 DOCS_MESON_ENABLED=	docs
 TEST_MESON_TRUE=	tests
 
 SHEBANG_GLOB=	*.py
 
 MESON_ARGS+=	-Dlibmnl=disabled \
 		-Dpolkit=disabled \
 		-Dsystemd=disabled \
 		-Dpassim=disabled \
 		-Dumockdev_tests=disabled \
 		-Dplugin_modem_manager=disabled \
 		-Dpython=${PYTHON_CMD}
 
 .include <bsd.port.options.mk>
 
 # FreeBSD 14.x needs extra libinotify dependency
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500000
 LIB_DEPENDS+=	libinotify.so:devel/libinotify
 .endif
 
 .include <bsd.port.mk>