diff --git a/x11-toolkits/qscintilla/Makefile b/x11-toolkits/qscintilla/Makefile
index dca7d56bca0f..db3b8070b897 100644
--- a/x11-toolkits/qscintilla/Makefile
+++ b/x11-toolkits/qscintilla/Makefile
@@ -71,7 +71,7 @@ PLIST_SUB+=	LANG_RU=""
 .else
 PLIST_SUB+=	LANG_RU="@comment "
 .endif
-.if ${PORT_OPTIONS:MLANG_DE} && ${PORT_OPTIONS:MLANG_FR} && ${PORT_OPTIONS:MLANG_PTBR} && ${PORT_OPTIONS:MLANG_RU}
+.if !empty(PORT_OPTIONS:MLANG_DE) && !empty(PORT_OPTIONS:MLANG_FR) && !empty(PORT_OPTIONS:MLANG_PTBR) && !empty(PORT_OPTIONS:MLANG_RU)
 PLIST_SUB+=	TRANSLATIONS=""
 .else
 PLIST_SUB+=	TRANSLATIONS="@comment "
@@ -117,7 +117,7 @@ do-install:
 	( cd ${WRKSRC} && \
 		${INSTALL_DATA} designer/libqscintillaplugin.so ${PLUGINDIR} )
 .endif
-.if ${PORT_OPTIONS:MLANG_DE} || ${PORT_OPTIONS:MLANG_FR} || ${PORT_OPTIONS:MLANG_PTBR} || ${PORT_OPTIONS:MLANG_RU}
+.if !empty(PORT_OPTIONS:MLANG_DE) || !empty(PORT_OPTIONS:MLANG_FR) || !empty(PORT_OPTIONS:MLANG_PTBR) || !empty(PORT_OPTIONS:MLANG_RU)
 	${MKDIR} -m 0755 ${DATADIR}/translations
 .endif
 .if ${PORT_OPTIONS:MLANG_DE}
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 5c2e9c512663..46c742922f14 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -108,7 +108,7 @@ CONFIGURE_ARGS+=	--disable-gtk
 PLIST_SUB+=	GTK2="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MMETACITY} && ${PORT_OPTIONS:MGNOME} && ${PORT_OPTIONS:MGTK2}
+.if !empty(PORT_OPTIONS:MMETACITY) && !empty(PORT_OPTIONS:MGNOME) && !empty(PORT_OPTIONS:MGTK2)
 CONFIGURE_ARGS+=	--enable-metacity
 USE_GNOME+=	metacity
 .else