From owner-svn-ports-head@freebsd.org Tue Feb 11 08:52:18 2020 Return-Path: Delivered-To: svn-ports-head@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 1DAF722CB19; Tue, 11 Feb 2020 08:52:18 +0000 (UTC) (envelope-from 0mp@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48GxNf02xMz3Dwt; Tue, 11 Feb 2020 08:52:18 +0000 (UTC) (envelope-from 0mp@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 F1000580C; Tue, 11 Feb 2020 08:52:17 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01B8qHfY028472; Tue, 11 Feb 2020 08:52:17 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01B8qHRY028471; Tue, 11 Feb 2020 08:52:17 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202002110852.01B8qHRY028471@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Tue, 11 Feb 2020 08:52:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525796 - head/games/devilutionX X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: head/games/devilutionX X-SVN-Commit-Revision: 525796 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2020 08:52:18 -0000 Author: 0mp Date: Tue Feb 11 08:52:17 2020 New Revision: 525796 URL: https://svnweb.freebsd.org/changeset/ports/525796 Log: Remove unnecessary INSTALLS_ICONS Setting INSTALLS_ICONS makes no sense as the port is not setting USES=gnome. Also while here: - Use MY_DEPENDS for shared build and run time dependencies. - Sort variables. - Use CMAKE_ON instead of CMAKE_ARGS where possible. Approved by: portmgr (blanket approval) Modified: head/games/devilutionX/Makefile Modified: head/games/devilutionX/Makefile ============================================================================== --- head/games/devilutionX/Makefile Tue Feb 11 08:46:34 2020 (r525795) +++ head/games/devilutionX/Makefile Tue Feb 11 08:52:17 2020 (r525796) @@ -10,28 +10,29 @@ COMMENT= Diablo I engine for modern operating systems LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/share/fonts/CharisSIL/CharisSIL-B.ttf:x11-fonts/charis -RUN_DEPENDS:= ${BUILD_DEPENDS} +MY_DEPENDS= ${LOCALBASE}/share/fonts/CharisSIL/CharisSIL-B.ttf:x11-fonts/charis +BUILD_DEPENDS= ${MY_DEPENDS} LIB_DEPENDS= libsodium.so:security/libsodium +RUN_DEPENDS= ${MY_DEPENDS} USES= cmake compiler:c++11-lang dos2unix sdl -USE_SDL= mixer2 sdl2 ttf2 +DOS2UNIX_GLOB= *.c *.h CMakeLists.txt USE_GITHUB= yes - GH_ACCOUNT= diasurgical -DOS2UNIX_GLOB= *.c *.h CMakeLists.txt -INSTALLS_ICONS= yes +USE_SDL= mixer2 sdl2 ttf2 -CXXFLAGS+= -DTTF_FONT_PATH=\\\"${LOCALBASE}/share/fonts/CharisSIL/CharisSIL-B.ttf\\\" -CMAKE_ARGS+= -D CMAKE_INSTALL_BINDIR:PATH=${BINDIR} \ - -D CMAKE_INSTALL_SHAREDIR:PATH=${PREFIX}/share \ - -D GIT_TAG=${PORTVERSION} +CMAKE_ARGS+= -D \ + CMAKE_INSTALL_BINDIR:PATH=${BINDIR} \ + CMAKE_INSTALL_SHAREDIR:PATH=${PREFIX}/share \ + GIT_TAG=${PORTVERSION} .if defined(WITH_DEBUG) -CMAKE_ARGS+= -D NIGHTLY_BUILD:BOOL=ON +CMAKE_ON= NIGHTLY_BUILD .else -CMAKE_ARGS+= -D BINARY_RELEASE:BOOL=ON +CMAKE_ON= BINARY_RELEASE .endif + +CXXFLAGS+= -DTTF_FONT_PATH=\\\"${LOCALBASE}/share/fonts/CharisSIL/CharisSIL-B.ttf\\\" PLIST_FILES= bin/devilutionx \ share/applications/devilutionx.desktop \