From owner-svn-ports-all@freebsd.org Fri Jun 29 17:49:57 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A95D4F72173; Fri, 29 Jun 2018 17:49:57 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 59005745B1; Fri, 29 Jun 2018 17:49:57 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 36E652408B; Fri, 29 Jun 2018 17:49:57 +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 w5THnvYH015158; Fri, 29 Jun 2018 17:49:57 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5THnvb7015157; Fri, 29 Jun 2018 17:49:57 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201806291749.w5THnvb7015157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 29 Jun 2018 17:49:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473566 - head/games/holotz-castle X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/games/holotz-castle X-SVN-Commit-Revision: 473566 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.26 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: Fri, 29 Jun 2018 17:49:57 -0000 Author: amdmi3 Date: Fri Jun 29 17:49:56 2018 New Revision: 473566 URL: https://svnweb.freebsd.org/changeset/ports/473566 Log: - Switch to options helpers - Fix build with clang 6 Modified: head/games/holotz-castle/Makefile Modified: head/games/holotz-castle/Makefile ============================================================================== --- head/games/holotz-castle/Makefile Fri Jun 29 17:45:34 2018 (r473565) +++ head/games/holotz-castle/Makefile Fri Jun 29 17:49:56 2018 (r473566) @@ -26,6 +26,8 @@ MAKE_ARGS= HC_BASE=${PREFIX}/share/${PORTNAME}/ \ HC_BIN_DIR=${PREFIX}/bin/ MAKE_JOBS_UNSAFE= yes +CXXFLAGS+= -Wno-reserved-user-defined-literal + INSTALLS_ICONS= yes ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 128x128 @@ -41,13 +43,9 @@ OPTIONS_SUB= yes SOLUTIONS_RUN_DEPENDS= mplayer:multimedia/mplayer -.include +SOLUTIONS_DISTFILES= ${PORTNAME}_solutions${EXTRACT_SUFX} +SOLUTIONS_EXTRACT_ONLY= ${PORTNAME}_solutions${EXTRACT_SUFX} -.if ${PORT_OPTIONS:MSOLUTIONS} -DISTFILES+= ${PORTNAME}_solutions${EXTRACT_SUFX} -EXTRACT_ONLY+= ${PORTNAME}_solutions${EXTRACT_SUFX} -.endif - post-install: .for f in ${PORTNAME} ${PORTNAME}-editor (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${f} ${STAGEDIR}${PREFIX}/bin/) @@ -62,12 +60,11 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} (cd ${WRKSRC}/man && ${INSTALL_MAN} *.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/) -.if ${PORT_OPTIONS:MSOLUTIONS} +post-install-SOLUTIONS-on: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-solutions ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}-solutions.desktop \ ${STAGEDIR}${DESKTOPDIR} @${MKDIR} ${STAGEDIR}${DATADIR}/solutions @(cd ${WRKDIR} && ${INSTALL_DATA} *.avi ${STAGEDIR}${DATADIR}/solutions) -.endif .include