diff --git a/cad/admesh/Makefile b/cad/admesh/Makefile
index 50eba9b4fabd..be292dfc77cd 100644
--- a/cad/admesh/Makefile
+++ b/cad/admesh/Makefile
@@ -1,35 +1,37 @@
 PORTNAME=	admesh
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.98.5
 PORTREVISION=	1
 CATEGORIES=	cad
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program for processing STL triangulated solid meshes
 WWW=		https://launchpad.net/admesh
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf libtool
+USES=		autoreconf cpe libtool
 USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 PLIST_FILES=	bin/admesh \
 		include/admesh/stl.h \
 		lib/libadmesh.so \
 		lib/libadmesh.so.1 \
 		lib/libadmesh.so.1.0.0 \
 		libdata/pkgconfig/libadmesh.pc \
 		share/man/man1/admesh.1.gz
 
+CPE_VENDOR=	${PORTNAME}_project
+
 do-install-DOCS-on:
 	@${RM} ${STAGEDIR}${DOCSDIR}/COPYING
 
 .include <bsd.port.mk>
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index cd8f1be4886a..bef70dabe21f 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,43 +1,45 @@
 PORTNAME=	gtkwave
 DISTVERSION=	3.3.127
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/${DISTNAME}
 DISTNAME=	${PORTNAME}-gtk3-${DISTVERSION}
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Electronic Waveform Viewer
 WWW=		https://gtkwave.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	gdk-pixbuf-extra>0:graphics/gdk-pixbuf-extra
 
-USES=		desktop-file-utils gettext-runtime gmake gnome gperf pkgconfig \
+USES=		cpe desktop-file-utils gettext-runtime gmake gnome gperf pkgconfig \
 		shared-mime-info
 USE_GNOME=	cairo gdkpixbuf gtk30
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-mime-update \
 		--enable-gtk3 \
 		--without-gconf
 
 PORTDOCS=	gtkwave.odt
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		DOCS EXAMPLES TCL
 TCL_DESC=		Enable support for TCL/TK
 TCL_USES=		tcl tk
 TCL_CONFIGURE_ON=	--with-tcl=${TCL_LIBDIR} \
 			--with-tk=${TK_LIBDIR}
 TCL_CONFIGURE_OFF=	--disable-tcl
 
+CPE_VENDOR=		tonybybell
+
 post-patch-EXAMPLES-off:
 	${REINPLACE_CMD} '/^SUBDIRS/s|examples||' ${WRKSRC}/Makefile.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/lib3mf/Makefile b/cad/lib3mf/Makefile
index 7f3c9f934ac8..32f7094a5923 100644
--- a/cad/lib3mf/Makefile
+++ b/cad/lib3mf/Makefile
@@ -1,50 +1,52 @@
 PORTNAME=	lib3mf
 DISTVERSION=	2.5.0
 CATEGORIES=	cad
 MASTER_SITES=	https://github.com/3MFConsortium/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source-with-submodules
 
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Implementation of the 3D Manufacturing Format file standard
 WWW=		http://3mf.io/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	fast_float>0:math/fast_float
 LIB_DEPENDS=	libzip.so:archivers/libzip
 TEST_DEPENDS=	googletest>0:devel/googletest
 
-USES=		compiler:c++17-lang cmake:testing localbase:ldflags pathfix \
+USES=		compiler:c++17-lang cmake:testing cpe localbase:ldflags pathfix \
 		pkgconfig python
 USE_LDCONFIG=	yes
 
 EXTRACT_SUFX=	.zip
 EXTRACT_AFTER_ARGS=	--exclude Autogenerated/Bindings/Java* \
 			--exclude Libraries/fast_float \
 			--exclude Libraries/googletest \
 			--exclude Libraries/libressl \
 			--exclude Libraries/libzip \
 			--exclude Libraries/zlib \
 			--exclude submodules/fast_float \
 			--exclude submodules/googletest \
 			--exclude submodules/libzip \
 			--exclude submodules/zlib \
 			--no-same-owner --no-same-permissions
 
 NO_WRKSUBDIR=	yes
 
 CXXFLAGS+=	-I${LOCALBASE}/include/fast_float
 
 .if make(test)
 LDFLAGS+=	-lgmock -lgtest
 .endif
 
 CMAKE_TESTING_ON=	LIB3MF_TESTS
 
 CMAKE_OFF=	USE_INCLUDED_LIBZIP \
 		USE_INCLUDED_ZLIB \
 		USE_INCLUDED_SSL \
 		LIB3MF_TESTS
 
+CPE_VENDOR=	3mf
+
 .include <bsd.port.mk>
diff --git a/cad/openfpgaloader/Makefile b/cad/openfpgaloader/Makefile
index b4a08e9328ee..5ae2164275cb 100644
--- a/cad/openfpgaloader/Makefile
+++ b/cad/openfpgaloader/Makefile
@@ -1,25 +1,27 @@
 PORTNAME=	openfpgaloader
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.1
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Universal utility for programming FPGA
 WWW=		https://github.com/trabucayre/openFPGALoader
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libftdi1.so:devel/libftdi1 \
 		libhidapi.so:comms/hidapi \
 		libudev.so:devel/libudev-devd
 
-USES=		cmake compiler:c++11-lang localbase:ldflags pkgconfig
+USES=		cmake compiler:c++11-lang cpe localbase:ldflags pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	trabucayre
 GH_PROJECT=	openFPGALoader
 
 DATADIR=	${PREFIX}/share/openFPGALoader
 
+CPE_VENDOR=	trabucayre
+
 .include <bsd.port.mk>