1 files changed, 28 insertions, 26 deletions

diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile
index dc7ec26d277d..da570616f456 100644
--- a/games/eduke32/Makefile
+++ b/games/eduke32/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	eduke32
 PORTVERSION=	20201209
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://dukeworld.com/eduke32/synthesis/${PORTVERSION}-${GITREVISION}/:eduke32 \
 		http://www.duke4.org/files/nightfright/hrp/:hrp \
@@ -33,7 +34,7 @@ LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libvpx.so:multimedia/libvpx \
 		libpng.so:graphics/png
 
-USES=		dos2unix gl gmake gnome localbase pkgconfig sdl tar:xz
+USES=		compiler:c11 dos2unix gl gmake gnome localbase pkgconfig sdl tar:xz
 USE_GL=		gl glu
 USE_GNOME=	gtk20
 USE_SDL=	sdl2 mixer2
@@ -47,21 +48,16 @@ MAKE_ARGS=	CC=${CC} CXX=${CXX}
 PLIST_FILES=	bin/eduke32 bin/mapster32
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=		EXAMPLES GCC HRP OFFENSIVE VOXEL
+OPTIONS_DEFINE=		EXAMPLES HRP OFFENSIVE VOXEL
 OPTIONS_RADIO=		GAMEDATA
 OPTIONS_RADIO_GAMEDATA=	SHAREWARE FULL
+OPTIONS_DEFINE_amd64=	ASM
+OPTIONS_DEFAULT_amd64=	ASM
 OPTIONS_DEFINE_i386=	ASM
 OPTIONS_DEFAULT_i386=	ASM
-OPTIONS_DEFAULT_amd64=	GCC
-OPTIONS_DEFAULT_powerpc=	GCC
-OPTIONS_DEFAULT_powerpcspe=	GCC
-OPTIONS_DEFAULT_powerpc64=	GCC
-OPTIONS_DEFAULT_sparc64=	GCC
 
 ASM_BUILD_DEPENDS=	nasm:devel/nasm
 ASM_MAKE_ARGS_OFF=	NOASM=1
-GCC_MAKE_ARGS_OFF=	CLANG=1 LTO=0
-GCC_USE=		gcc=yes
 HRP_DESC=		Install High Resolution Pack
 HRP_DISTFILES=		duke3d_hrp.zip:hrp
 HRP_PLIST_FILES=	${DATADIR}/duke3d_hrp.zip
@@ -80,6 +76,28 @@ FULL_DESC=		Install duke3d.grp and duke.rts from $${DISTDIR}/duke3d
 FULL_DISTFILES=		duke3d/duke3d.grp duke3d/duke.rts
 FULL_PLIST_FILES=	${DATADIR}/duke3d.grp ${DATADIR}/duke.rts
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFULL}
+
+# Avoid checksumming original (commercial) game data files: A variety of
+# editions exist with the same file names and they should all work.
+# This is a hack that would break when bsd.port.mk changes or DIST_SUBDIR
+# is set.
+_CKSUMFILES=	${ALLFILES:Nduke3d/duke*}
+
+.if !exists(${DISTDIR}/duke3d/duke3d.grp) || !exists(${DISTDIR}/duke3d/duke.rts)
+IGNORE=	option FULL selected, but duke3d.grp or duke.rts not found in ${DISTDIR}/duke3d
+.endif
+
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == clang
+MAKE_ARGS+=	CLANG=1
+.endif
+
 post-extract-SHAREWARE-on:
 	@cd ${WRKDIR} && ${UNZIP_NATIVE_CMD} -qo DN3DSW13.SHR
 
@@ -118,20 +136,4 @@ do-install-FULL-on:
 	${INSTALL_DATA} ${DISTDIR}/duke3d/duke3d.grp ${STAGEDIR}${DATADIR}/duke3d.grp
 	${INSTALL_DATA} ${DISTDIR}/duke3d/duke.rts ${STAGEDIR}${DATADIR}/duke.rts
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFULL}
-
-# Avoid checksumming original (commercial) game data files: A variety of
-# editions exist with the same file names and they should all work.
-# This is a hack that would break when bsd.port.mk changes or DIST_SUBDIR
-# is set.
-_CKSUMFILES=	${ALLFILES:Nduke3d/duke*}
-
-.if !exists(${DISTDIR}/duke3d/duke3d.grp) || !exists(${DISTDIR}/duke3d/duke.rts)
-IGNORE=	option FULL selected, but duke3d.grp or duke.rts not found in ${DISTDIR}/duke3d
-.endif
-
-.endif
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>