- Simplify logic

- Minor spelling nit

1 files changed, 9 insertions, 14 deletions

diff --git a/games/yadex/Makefile b/games/yadex/Makefile
index 7273fb7f008c..dbebe04c1af6 100644
--- a/games/yadex/Makefile
+++ b/games/yadex/Makefile
@@ -28,7 +28,7 @@ MAN6=		yadex.6
 OPTIONS=	WHITE_BG "Use alternative (black-on-white) color scheme" off \
 		3D_RENDER "Build with a 3D preview function" off \
 		SEARCH "Search for a thing, linedef or sector by type" off \
-		EXTRA_TOOLS "Add a few extra tools to Yadex's repertoire" off \
+		EXTRA_TOOLS "Add a few extra tools to Yadex' repertoire" off \
 		LAPTOP_KEYS "Key bindings to make editing easier on laptops" off
 
 .include <bsd.port.pre.mk>
@@ -40,25 +40,20 @@ PATCH_PREFIX=	${PORTNAME:U:C/^(.).*$/\1/g}${PORTNAME:C/^(.)//}_${PORTVERSION:S/.
 PATCH_SUFFIX=	.diff
 PATCHFILES=	${PATCH_PREFIX}_Depend${PATCH_SUFFIX}
 
-.if defined(WITH_3D_RENDER) || defined(WITH_SEARCH) \
-	|| defined(WITH_EXTRA_TOOLS) || defined(WITH_LAPTOP_KEYS)
-. if defined(WITH_3D_RENDER)
+.if defined(WITH_3D_RENDER)
 PATCHFILES+=	${PATCH_PREFIX}_Render3D${PATCH_SUFFIX}
 PLIST_SUB+=	3DRENDER=""
-. else
+.else
 PLIST_SUB+=	3DRENDER="@comment "
-. endif
-. if defined(WITH_SEARCH)
+.endif
+.if defined(WITH_SEARCH)
 PATCHFILES+=	${PATCH_PREFIX}_Find${PATCH_SUFFIX}
-. endif
-. if defined(WITH_EXTRA_TOOLS)
+.endif
+.if defined(WITH_EXTRA_TOOLS)
 PATCHFILES+=	${PATCH_PREFIX}_Tools${PATCH_SUFFIX}
-. endif
-. if defined(WITH_LAPTOP_KEYS)
+.endif
+.if defined(WITH_LAPTOP_KEYS)
 PATCHFILES+=	${PATCH_PREFIX}_Keys${PATCH_SUFFIX}
-. endif
-.else
-PLIST_SUB+=	3DRENDER="@comment "
 .endif
 
 .if defined(WITH_WHITE_BG)