diff --git a/x11/deforaos-integration/Makefile b/x11/deforaos-integration/Makefile
index 92a7f0558469..e44899892e5a 100644
--- a/x11/deforaos-integration/Makefile
+++ b/x11/deforaos-integration/Makefile
@@ -1,46 +1,44 @@
 PORTNAME=	deforaos-integration
 PORTVERSION=	0.1.2
 PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Integration/
 DISTNAME=	Integration-${PORTVERSION}
 
 MAINTAINER=	khorben@defora.org
 COMMENT=	DeforaOS desktop integration
 WWW=		https://www.defora.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/bin/surfer:www/deforaos-surfer \
 				${LOCALBASE}/bin/metacity:x11-wm/metacity \
 				gnome-icon-theme>=0:misc/gnome-icon-theme
 BUILD_DEPENDS=	${LOCALBASE}/include/Desktop/Locker.h:x11/deforaos-locker \
 				${LOCALBASE}/include/Desktop/Keyboard.h:x11/deforaos-keyboard \
 				${LOCALBASE}/include/Desktop/Player.h:multimedia/deforaos-player \
 				${LOCALBASE}/include/Desktop/Phone.h:comms/deforaos-phone
 LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
 		libDesktop.so:x11/deforaos-libdesktop \
 		libpurple.so:net-im/libpurple \
 		libsofia-sip-ua.so:net/sofia-sip \
 		libpulse.so:audio/pulseaudio \
 		libPanel.so.0:x11-wm/deforaos-panel \
 		libharfbuzz.so:print/harfbuzz \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libdbus-1.so:devel/dbus
 
 USES=		gnome pkgconfig xorg desktop-file-utils
 
 USE_GNOME=	gtk30 cairo gdkpixbuf2
 USE_XORG=	x11
 USE_LDCONFIG=	yes
-#MAKE_ARGS+=	PREFIX=${PREFIX}
-#MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/Phone/modem/*.so \
 	${STAGEDIR}${PREFIX}/lib/Phone/plugins/*.so \
 	${STAGEDIR}${PREFIX}/lib/Locker/plugins/*.so \
 	${STAGEDIR}${PREFIX}/lib/Panel/applets/*.so
 
 .include <bsd.port.mk>
diff --git a/x11/xkb-switch/Makefile b/x11/xkb-switch/Makefile
index e2011d545f4a..5a0b6b977b8a 100644
--- a/x11/xkb-switch/Makefile
+++ b/x11/xkb-switch/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	xkb-switch
 PORTVERSION=	1.8.5
 PORTREVIDSION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Switch your X keyboard layouts from the command line
 WWW=		https://github.com/ierton/xkb-switch
 
 LICENSE=	GPLv3
 
 USES=		cmake xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	ierton
 USE_XORG=	x11 xkbfile
 USE_LDCONFIG=	yes
 
-CMAKE_ARGS=	-DMAN_COMPRESSION="gz" -DMANDIR="${MANPREFIX}/share/man"
+CMAKE_ARGS=	-DMAN_COMPRESSION="gz" -DMANDIR="${PREFIX}/share/man"
 
 OPTIONS_DEFINE=	DOCS
 
 PLIST_FILES=	bin/xkb-switch \
 		lib/libxkbswitch.so \
 		lib/libxkbswitch.so.1 \
 		lib/libxkbswitch.so.1.8.5 \
 		share/man/man1/xkb-switch.1.gz
 
 PORTDOCS=	README.md
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>