diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index d1ee077167cc..a8bd3c030ecf 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -1,148 +1,150 @@
 PORTNAME=	calibre
 PORTVERSION=	8.16.2
 PORTREVISION=	2
 CATEGORIES=	deskutils python
 MASTER_SITES=	https://download.calibre-ebook.com/${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Ebook management application
 WWW=		https://calibre-ebook.com/
 
 LICENSE=	GPLv3
 
 EXTRACT_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 BUILD_DEPENDS=		${LOCALBASE}/bin/cmake:devel/cmake-core \
 			${NONEXISTENT}:misc/iso-codes:extract \
 			${PY_SETUPTOOLS} \
 			${PYTHON_PKGNAMEPREFIX}apsw>=3.50.4.0:databases/py-apsw@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.12.2:www/py-beautifulsoup@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.10:www/py-css-parser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.12:www/py-html5-parser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}lxml>=6.0.1:devel/py-lxml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}mechanize>=0.4.8:www/py-mechanize@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.7:devel/py-msgpack@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pillow>=10.3.0:graphics/py-pillow@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}regex>=2023.8.8:textproc/py-regex@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}xxhash>3.3.0:devel/py-xxhash@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}zeroconf>0.115.0:net/py-zeroconf@${PY_FLAVOR} \
 			liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf \
 			MathJax3>0:www/mathjax3
 LIB_DEPENDS=		libavcodec.so:multimedia/ffmpeg \
 			libfreetype.so:print/freetype2 \
 			libhunspell-1.7.so:textproc/hunspell \
 			libhyphen.so:textproc/hyphen \
 			libicudata.so:devel/icu \
 			libmtp.so:multimedia/libmtp \
 			libpodofo.so:graphics/podofo \
 			libstemmer.so:textproc/snowballstemmer \
 			libuchardet.so:textproc/uchardet \
 			libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}apsw>=3.50.4.0:databases/py-apsw@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.12.2:www/py-beautifulsoup@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.10:www/py-css-parser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}dnspython>=2.6.1:dns/py-dnspython@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.10:textproc/py-feedparser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.12:www/py-html5-parser@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}jeepney>=0.8.0:devel/py-jeepney@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}lxml>=6.0.1:devel/py-lxml@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}markdown>=3.4.4:textproc/py-markdown@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}mechanize>=0.4.8:www/py-mechanize@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}msgpack>=1.0.7:devel/py-msgpack@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}netifaces>=0.11.0:net/py-netifaces@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pillow>=10.3.0:graphics/py-pillow@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.19.1:security/py-pycryptodome@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}regex>=2023.8.8:textproc/py-regex@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}xxhash>=3.3.0:devel/py-xxhash@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}zeroconf>0.115.0:net/py-zeroconf@${PY_FLAVOR} \
 			liberation-fonts-ttf>=2.1.3:x11-fonts/liberation-fonts-ttf \
 			MathJax3>0:www/mathjax3 \
 			pdftohtml:graphics/poppler-utils \
 			xdg-open:devel/xdg-utils
 
-USES=		desktop-file-utils gettext-runtime:build gl localbase:ldflags \
+USES=		cpe desktop-file-utils gettext-runtime:build gl localbase:ldflags \
 		pkgconfig pyqt:6 python:3.11+ qt:6 shared-mime-info shebangfix sqlite ssl \
 		tar:xz xorg
 USE_GITHUB=	nodefault
 GH_TUPLE=	kovidgoyal:calibre-translations:94d8062:translations \
 		LibreOffice:dictionaries:fe49c66:hypenation
 USE_GL=		opengl
 USE_PYQT=	pyqt6 pysip webengine qtbuilder:build sip:build
 USE_QT=		base
 USE_RC_SUBR=	calibre
 USE_XORG=	x11 xext xrender
 
 SHEBANG_GLOB=	*.py *.recipe *.sh
 python_OLD_CMD=	"/usr/bin/env  python" ${LOCALBASE}/bin/python3
 MAKE_ENV=	CALIBRE_CONFIG_DIRECTORY=${WRKDIR}/calibre-config \
 		FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
 		FC_LIB_DIR="${LOCALBASE}/lib" \
 		OVERRIDE_CFLAGS="${CFLAGS}" \
 		OVERRIDE_LDFLAGS="${LDFLAGS}" \
 		PODOFO_INC_DIR="${LOCALBASE}/include/podofo" \
 		PODOFO_LIB_DIR="${LOCALBASE}/lib" \
 		PYTHONDONTWRITEBYTECODE=true \
 		QMAKE=${QMAKE} \
 		SIP_BIN=${SIP} \
 		SIP_DIR=${PYQT_SIPDIR} \
 		WITH_USB=yes \
 		XDG_CONFIG_HOME=${WRKDIR}/xdg-config \
 		XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \
 		XDG_UTILS_INSTALL_MODE=system
 SUB_LIST=	PYTHON_VERSION=${PYTHON_VERSION}
 
 ISOCODESWRKSRC_CMD=	${BSDMAKE} -C ${.CURDIR}/../../misc/iso-codes -V WRKSRC
 
+CPE_VENDOR=	calibre-ebook
+
 post-extract:
 	@${CP} ${FILESDIR}/user-agent-data.json ${WRKSRC}/resources
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|#!/usr/bin/env python{py_major_version}|#!${PYTHON_CMD}|" \
 			-e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \
 		${WRKSRC}/setup/install.py \
 		${WRKSRC}/src/calibre/gui2/dialogs/custom_recipes.py \
 		${WRKSRC}/src/calibre/gui2/preferences/tweaks.py
 
 do-configure:
 	# do nothing
 
 do-build:
 	@${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		${PYSETUP} bootstrap \
 		--system-liberation_fonts \
 		--path-to-liberation_fonts=${LOCALBASE}/share/fonts/Liberation \
 		--system-mathjax \
 		--path-to-mathjax=${LOCALBASE}/www/MathJax3 \
 		--path-to-hyphenation=${WRKSRC_hypenation} \
 		--path-to-translations=${WRKSRC_translations} \
 		--path-to-cacerts=${LOCALBASE}/share/certs/ca-root-nss.crt \
 		--path-to-isocodes=$$(${ISOCODESWRKSRC_CMD}) --isocodes-extracted \
 	)
 	@${RMDIR} ${LOCALBASE}/libexec/qt6/locales 2>/dev/null || ${TRUE}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor \
 		${STAGEDIR}${PREFIX}/share/applications \
 		${STAGEDIR}${PREFIX}/share/desktop-directories \
 		${STAGEDIR}${PREFIX}/share/mime/packages
 	# Create this file to avoid what looks like a bug in xdg-desktop-menu
 	@${TOUCH} ${STAGEDIR}${PREFIX}/share/applications/defaults.list
 	(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		${PYSETUP} install --prefix ${PREFIX} \
 		--staging-root ${STAGEDIR}${PREFIX})
 	@${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall \
 		${STAGEDIR}${PREFIX}/share/applications/defaults.list
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/*
 
 update-recent-uas: patch
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		${PYSETUP} recent_uas)
 	${CP} ${BUILD_WRKSRC}/resources/user-agent-data.json ${FILESDIR}
 
 .include <bsd.port.mk>
diff --git a/deskutils/cherrytree/Makefile b/deskutils/cherrytree/Makefile
index b33c546382f2..842ee38ea1b2 100644
--- a/deskutils/cherrytree/Makefile
+++ b/deskutils/cherrytree/Makefile
@@ -1,45 +1,47 @@
 PORTNAME=	cherrytree
 PORTVERSION=	1.7.0
 CATEGORIES=	deskutils
 MASTER_SITES=	https://www.giuspen.com/software/ \
 		https://github.com/giuspen/cherrytree/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Advanced hierarchical note-taking application
 WWW=		https://www.giuspen.com/cherrytree/
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libenchant-2.so:textproc/enchant2 \
 		libfmt.so:devel/libfmt \
 		libfribidi.so:converters/fribidi \
 		libgspell-1.so:textproc/gspell \
 		libharfbuzz.so:print/harfbuzz \
 		libspdlog.so:devel/spdlog \
 		libuchardet.so:textproc/uchardet
 
-USES=		cmake compiler:c++17-lang desktop-file-utils gnome \
+USES=		cmake compiler:c++17-lang cpe desktop-file-utils gnome \
 		pkgconfig python:build sqlite tar:xz
 USE_GNOME=	gtkmm30 gtksourceview4 libxml++26
 
 CMAKE_ARGS=	-DPYTHON_EXEC:FILEPATH=${PYTHON_CMD} \
 		-DBUILD_TESTING:BOOL=OFF
 
 OPTIONS_DEFINE=	DOCS NLS VTE
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext-tools
 NLS_CMAKE_OFF=	-DUSE_NLS:BOOL=OFF
 
 VTE_DESC=	Virtual terminal support
 VTE_USE=	GNOME=vte3
 VTE_CMAKE_OFF=	-DUSE_VTE:BOOL=OFF
 
+CPE_VENDOR=	${PORTNAME}_project
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/changelog.txt ${WRKSRC}/docs/* \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-font-viewer/Makefile b/deskutils/gnome-font-viewer/Makefile
index 0404f8f49aea..68a433e37d5d 100644
--- a/deskutils/gnome-font-viewer/Makefile
+++ b/deskutils/gnome-font-viewer/Makefile
@@ -1,26 +1,28 @@
 PORTNAME=	gnome-font-viewer
 PORTVERSION=	47.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME font viewer utility
 WWW=		https://github.com/GNOME/gnome-font-viewer
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libfribidi.so:converters/fribidi
 
 PORTSCOUT=	limitw:1,even
 
-USES=		compiler:c11 desktop-file-utils gettext gnome localbase meson \
+USES=		compiler:c11 cpe desktop-file-utils gettext gnome localbase meson \
 		pkgconfig tar:xz
 USE_LDCONFIG=	yes
 USE_GNOME=	gtk40 libadwaita
 
+CPE_VENDOR=	gnome
+
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-maps/Makefile b/deskutils/gnome-maps/Makefile
index 4373399a79e6..e61d7dfcf95c 100644
--- a/deskutils/gnome-maps/Makefile
+++ b/deskutils/gnome-maps/Makefile
@@ -1,35 +1,37 @@
 PORTNAME=	gnome-maps
 DISTVERSION=	47.9
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Map application for GNOME
 WWW=		https://apps.gnome.org/Maps/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 PORTSCOUT=	limit:^47\.
 
 BUILD_DEPENDS=	geoclue>=0:net/geoclue
 LIB_DEPENDS=	libgeocode-glib-2.so:net/geocode-glib2 \
 		libgjs.so:lang/gjs \
 		libgweather-4.so:net/libgweather4 \
 		librest-1.0.so:net/librest1 \
 		libshumate-1.0.so:x11-toolkits/libshumate \
 		libsoup-3.0.so:devel/libsoup3 \
 		libportal.so:deskutils/libportal \
 		libportal-gtk4.so:deskutils/libportal-gtk4 \
 		libjson-glib-1.0.so:devel/json-glib
 RUN_DEPENDS=	geoclue>=0:net/geoclue
 
-USES=		desktop-file-utils gettext gnome meson pkgconfig tar:xz
+USES=		cpe desktop-file-utils gettext gnome meson pkgconfig tar:xz
 USE_GNOME=	cairo glib20 gtk40 introspection:build libadwaita \
 		libxml2 librsvg2
 USE_LDCONFIG=	yes
 
 GLIB_SCHEMAS=	org.gnome.Maps.gschema.xml
 
+CPE_VENDOR=	gnome
+
 .include <bsd.port.mk>
diff --git a/deskutils/vnote/Makefile b/deskutils/vnote/Makefile
index dc6c9081b6d8..04921c453320 100644
--- a/deskutils/vnote/Makefile
+++ b/deskutils/vnote/Makefile
@@ -1,42 +1,44 @@
 PORTNAME=	vnote
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.20.0
 CATEGORIES=	deskutils
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Pleasant Qt-based note-taking platform
 WWW=		https://app.vnote.fun/en_us/
 
 LICENSE=	LGPL3
 
 BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers \
 		pkgconf>0:devel/pkgconf
 LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
 
-USES=		compiler:c++17-lang cmake desktop-file-utils gl qt:6 xorg
+USES=		compiler:c++17-lang cmake cpe desktop-file-utils gl qt:6 xorg
 USE_GL=		opengl
 USE_QT=		5compat base declarative imageformats pdf positioning \
 		sqldriver-sqlite:run svg webchannel webengine
 USE_XORG=	ice sm x11 xcb xext
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}x
 GH_PROJECT=	QHotkey:qhk vtextedit:vte syntax-highlighting:shl sonnet:s
 GH_TAGNAME=	d7b5250:qhk c8fe95e:vte 25f6871:shl 7320206:s
 GH_SUBDIR=	libs/QHotkey:qhk libs/vtextedit:vte \
 		libs/vtextedit/libs/sonnet:s \
 		libs/vtextedit/libs/syntax-highlighting:shl
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_DATADIR=${DATADIR}
 
+CPE_VENDOR=	${PORTNAME}_project
+
 post-patch:
 	@${REINPLACE_CMD} -E '/add_subdirectory\((demo|tests)\)/d' \
 		${WRKSRC}/libs/vtextedit/CMakeLists.txt \
 		${WRKSRC}/CMakeLists.txt
 	@${GREP} -Rl --null Q_OS_LINUX ${WRKSRC}/src | ${XARGS} -0 \
 		${REINPLACE_CMD} -e 's,Q_OS_LINUX,Q_OS_UNIX,'
 	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \
 		${WRKSRC}/src/core/configmgr.cpp
 
 .include <bsd.port.mk>
diff --git a/deskutils/xdg-desktop-portal/Makefile b/deskutils/xdg-desktop-portal/Makefile
index cf88fb440de2..7b9cbb6c52f9 100644
--- a/deskutils/xdg-desktop-portal/Makefile
+++ b/deskutils/xdg-desktop-portal/Makefile
@@ -1,43 +1,45 @@
 PORTNAME=	xdg-desktop-portal
 DISTVERSION=	1.20.3
 CATEGORIES=	deskutils
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Portal frontend service for Flatpak
 WWW=		https://github.com/flatpak/xdg-desktop-portal/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfuse3.so:filesystems/fusefs-libs3 \
 		libgeoclue-2.so:net/geoclue \
 		libgudev-1.0.so:devel/libgudev \
 		libjson-glib-1.0.so:devel/json-glib \
 		libpipewire-0.3.so:multimedia/pipewire \
 		libportal.so:deskutils/libportal
 
-USES=		gettext-tools gmake gnome gstreamer meson pkgconfig \
+USES=		cpe gettext-tools gmake gnome gstreamer meson pkgconfig \
 		python:build shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	flatpak
 USE_GNOME=	gdkpixbuf glib20
 
 SHEBANG_FILES=	src/generate-method-info.py
 
 MESON_ARGS=	-Ddocumentation=disabled \
 		-Dflatpak-interfaces=disabled \
 		-Dsandboxed-image-validation=disabled \
 		-Dsandboxed-sound-validation=disabled \
 		-Dsystemd=disabled \
 		-Dtests=disabled
 
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_SUB=	yes
 
 MANPAGES_BUILD_DEPENDS=	rst2man:textproc/py-docutils
 MANPAGES_MESON_ENABLED=	man-pages
 
+CPE_VENDOR=	flatpak
+
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
 
 .include <bsd.port.mk>