From owner-svn-ports-all@freebsd.org Fri Jan 22 20:45:35 2021
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 389AA4FE331;
Fri, 22 Jan 2021 20:45:35 +0000 (UTC)
(envelope-from pkubaj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4DMrqz16hVz3wHr;
Fri, 22 Jan 2021 20:45:35 +0000 (UTC)
(envelope-from pkubaj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1957824A46;
Fri, 22 Jan 2021 20:45:35 +0000 (UTC)
(envelope-from pkubaj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10MKjYsA024874;
Fri, 22 Jan 2021 20:45:34 GMT (envelope-from pkubaj@FreeBSD.org)
Received: (from pkubaj@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10MKjYqW024873;
Fri, 22 Jan 2021 20:45:34 GMT (envelope-from pkubaj@FreeBSD.org)
Message-Id: <202101222045.10MKjYqW024873@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to
pkubaj@FreeBSD.org using -f
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Date: Fri, 22 Jan 2021 20:45:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r562339 - head/games/eduke32
X-SVN-Group: ports-head
X-SVN-Commit-Author: pkubaj
X-SVN-Commit-Paths: head/games/eduke32
X-SVN-Commit-Revision: 562339
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jan 2021 20:45:35 -0000
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>