From owner-svn-ports-all@freebsd.org Wed Jul 27 16:55:40 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A54E7BA65B4; Wed, 27 Jul 2016 16:55:40 +0000 (UTC) (envelope-from amdmi3@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 mx1.freebsd.org (Postfix) with ESMTPS id 5F4A21A81; Wed, 27 Jul 2016 16:55:40 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6RGtdDF007589; Wed, 27 Jul 2016 16:55:39 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6RGtdIq007588; Wed, 27 Jul 2016 16:55:39 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201607271655.u6RGtdIq007588@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 27 Jul 2016 16:55:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419187 - head/games/xonotic X-SVN-Group: ports-head 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.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jul 2016 16:55:40 -0000 Author: amdmi3 Date: Wed Jul 27 16:55:39 2016 New Revision: 419187 URL: https://svnweb.freebsd.org/changeset/ports/419187 Log: - Use clang where possible - Add missing xorg dependency PR: 211258 Submitted by: jbeich@FreeBSD.org Modified: head/games/xonotic/Makefile Modified: head/games/xonotic/Makefile ============================================================================== --- head/games/xonotic/Makefile Wed Jul 27 16:48:54 2016 (r419186) +++ head/games/xonotic/Makefile Wed Jul 27 16:55:39 2016 (r419187) @@ -13,7 +13,7 @@ COMMENT= Fast-paced, chaotic, and intens LIB_DEPENDS= libcurl.so:ftp/curl \ libpng.so:graphics/png -USES= jpeg shebangfix zip:infozip +USES= compiler:features jpeg shebangfix zip:infozip SHEBANG_FILES= server/rcon.pl server/rcon2irc/rcon2irc.pl WRKSRC= ${WRKDIR}/Xonotic BUILD_WRKSRC= ${WRKSRC}/source/darkplaces @@ -25,7 +25,6 @@ MAKE_ARGS= DP_FS_BASEDIR="${DATADIR}" \ STRIP="${STRIP_CMD}" MAKE_JOBS_UNSAFE=yes ALL_TARGET= # empty -USE_GCC= yes PORTDATA= * @@ -39,7 +38,7 @@ CLIENT_LIB_DEPENDS= libmodplug.so:audio/ libtheora.so:multimedia/libtheora \ libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg -CLIENT_USE= SDL=sdl +CLIENT_USE= SDL=sdl XORG=x11 CLIENT_ALL_TARGET= sdl-release CLIENT_PLIST_FILES= bin/${PORTNAME} share/pixmaps/${PORTNAME}.ico CLIENT_DESKTOP_ENTRIES= "Xonotic" \ @@ -56,6 +55,13 @@ DEDICATED_PLIST_FILES= bin/${PORTNAME}-d ENCRYPTION_DESC= Build encryption (required for stats submission) ENCRYPTION_LIB_DEPENDS= libd0_rijndael.so:security/d0_blind_id +.include + +.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} == 42 +# internal compiler error with base gcc +USE_GCC= yes +.endif + post-patch: @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \ ${BUILD_WRKSRC}/${MAKEFILE} ${BUILD_WRKSRC}/makefile.inc @@ -81,4 +87,4 @@ do-install-DEDICATED-on: do-install-ENCRYPTION-on: ${INSTALL_DATA} ${WRKSRC}/key_0.d0pk ${STAGEDIR}${DATADIR}/ -.include +.include