Date: Fri, 22 Jan 2021 20:45:34 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r562339 - head/games/eduke32 Message-ID: <202101222045.10MKjYqW024873@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Fri Jan 22 20:45:34 2021 New Revision: 562339 URL: https://svnweb.freebsd.org/changeset/ports/562339 Log: games/eduke32: add ASM for amd64, don't use GCC where unnecessary, use LTO with Clang Modified: head/games/eduke32/Makefile Modified: head/games/eduke32/Makefile ============================================================================== --- head/games/eduke32/Makefile Fri Jan 22 20:43:02 2021 (r562338) +++ head/games/eduke32/Makefile Fri Jan 22 20:45:34 2021 (r562339) @@ -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 $${DI 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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101222045.10MKjYqW024873>