diff --git a/games/heretic/Makefile b/games/heretic/Makefile
index 88a5e2890aca..500dfd912761 100644
--- a/games/heretic/Makefile
+++ b/games/heretic/Makefile
@@ -8,70 +8,62 @@ CATEGORIES=	games
 MASTER_SITES=	http://files.kyle-evans.net/freebsd/:source \
 		http://files.kyle-evans.net/freebsd/:wad
 DISTNAME=	gl${PORTNAME}-${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:source
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Unix source-port of the famous Heretic game by id Software
 
 USES=		dos2unix gmake
 DOS2UNIX_FILES=	opengl/gl_struct.h
-USE_XORG=	x11 xi xpm xau
 
-OPTIONS_DEFINE=	WAD DOCS
-OPTIONS_SINGLE=	SG1
+OPTIONS_DEFINE=		WAD DOCS
+OPTIONS_SINGLE=		SG1
 OPTIONS_SINGLE_SG1=	X11 FASTX11 SDL
-FASTX11_DESC=	Use FastX11
-WAD_DESC=	With shareware WAD
-SG1_DESC=	Graphics Selections
+
+FASTX11_DESC=		Use FastX11
+WAD_DESC=		With shareware WAD
+SG1_DESC=		Graphics Selections
 
 OPTIONS_DEFAULT=	X11 WAD
+OPTIONS_SUB=		yes
 
-.include <bsd.port.options.mk>
+X11_ALL_TARGET=		x11
+X11_VARS=		BINARY=xheretic
+X11_USE=		XORG=x11,xext
 
-.if ${PORT_OPTIONS:MX11}
-ALL_TARGET=	x11
-BINARY=		xheretic
-.endif
+FASTX11_ALL_TARGET=	fastx11
+FASTX11_VARS=		BINARY=xaheretic
+FASTX11_USE=		XORG=x11,xext
 
-.if ${PORT_OPTIONS:MFASTX11}
-ALL_TARGET=	fastx11
-BINARY=		xaheretic
-.endif
+SDL_ALL_TARGET=		sdl
+SDL_USES=		sdl
+SDL_VARS=		BINARY=sdlheretic
+SDL_CFLAGS=		`${SDL_CONFIG} --cflags`
+SDL_USE=		SDL=sdl
 
-.if ${PORT_OPTIONS:MSDL}
-USE_SDL=	sdl
-ALL_TARGET=	sdl
-BINARY=		sdlheretic
-CFLAGS+=	`${SDL_CONFIG} --cflags`
-.endif
-
-.if ${PORT_OPTIONS:MWAD}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:source heretic_share.wad.gz:wad
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-PLIST_SUB+=	WAD=""
-.else
-PLIST_SUB+=	WAD="@comment "
-.endif
+WAD_DISTFILES=		heretic_share.wad.gz:wad
 
 post-extract:
-.if ${PORT_OPTIONS:MWAD}
-	@${GZIP_CMD} -dc ${_DISTDIR}/heretic_share.wad.gz \
-		> ${WRKSRC}/heretic_share.wad
-.endif
 	@${FIND} ${WRKSRC} -name .depend -type f -delete
 	@${RM} ${WRKSRC}/i_ipx.c
 
+post-extract-WAD-on:
+	@${GZIP_CMD} -dc ${_DISTDIR}/heretic_share.wad.gz \
+		> ${WRKSRC}/heretic_share.wad
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${STAGEDIR}${PREFIX}/bin/heretic
 	${INSTALL_PROGRAM} ${WRKSRC}/sndserver ${STAGEDIR}${PREFIX}/bin/sndserver
-.if ${PORT_OPTIONS:MWAD}
+
+do-install-WAD-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/heretic
 	${INSTALL_DATA} ${WRKSRC}/heretic_share.wad ${STAGEDIR}${PREFIX}/share/heretic
-.endif
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in "End User License Heretic Source Code.txt" Gamekeys.txt README.txt AUTHORS SourceReadme.txt Changelog README.opengl
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>