From owner-svn-ports-all@freebsd.org Fri Nov 18 20:00:46 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 6E4DDC48F92; Fri, 18 Nov 2016 20:00:46 +0000 (UTC) (envelope-from pawel@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 A6AC71D84; Fri, 18 Nov 2016 20:00:45 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAIK0iio056829; Fri, 18 Nov 2016 20:00:44 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAIK0irt056828; Fri, 18 Nov 2016 20:00:44 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201611182000.uAIK0irt056828@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Fri, 18 Nov 2016 20:00:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426338 - head/games/linux-dwarffortress 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.23 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, 18 Nov 2016 20:00:46 -0000 Author: pawel Date: Fri Nov 18 20:00:44 2016 New Revision: 426338 URL: https://svnweb.freebsd.org/changeset/ports/426338 Log: - Add missing dri dependency - Convert sdl_ttf to RUN_DEPENDS hack, USE_LINUX=sdlttf seems to be gone - Use brandelf(1) on installed libraries also, game runs on 12-current but on FreeBSD 10.3 execution fails with: ./libs/Dwarf_Fortress: error while loading shared libraries: /usr/local/libexec/dwarffortress/libgraphics.so: ELF file OS ABI invalid Modified: head/games/linux-dwarffortress/Makefile Modified: head/games/linux-dwarffortress/Makefile ============================================================================== --- head/games/linux-dwarffortress/Makefile Fri Nov 18 19:49:07 2016 (r426337) +++ head/games/linux-dwarffortress/Makefile Fri Nov 18 20:00:44 2016 (r426338) @@ -3,6 +3,7 @@ PORTNAME= dwarffortress DISTVERSION= 0.43.05 +PORTREVISION= 1 CATEGORIES= games linux MASTER_SITES= http://www.bay12games.com/dwarves/ PKGNAMEPREFIX= linux- @@ -26,8 +27,10 @@ LICENSE_TEXT= Copyright (c) 2002-2016. A contact Tarn Adams at toadyone@bay12games.com. LICENSE_PERMS= dist-mirror pkg-mirror auto-accept +RUN_DEPENDS= linux-${linux_ARGS}-sdl_ttf>0:graphics/linux-${linux_ARGS}-sdl_ttf + USES= linux tar:bzip2 -USE_LINUX= gtk2 libsndfile openal-soft sdlimage sdlttf xorglibs +USE_LINUX= dri gtk2 libsndfile openal-soft sdlimage xorglibs SUB_FILES= dwarffortress NO_BUILD= yes @@ -48,8 +51,11 @@ do-install: ${BRANDELF} -t Linux ${WRKSRC}/libs/Dwarf_Fortress ${INSTALL_PROGRAM} ${WRKSRC}/libs/Dwarf_Fortress \ ${STAGEDIR}${PREFIX}/libexec/dwarffortress - (cd ${WRKSRC}/libs && ${INSTALL_LIB} libgcc_s.so.1 libgraphics.so \ - libstdc++.so.6 ${STAGEDIR}${PREFIX}/libexec/dwarffortress) +.for lib in libgcc_s.so.1 libgraphics.so libstdc++.so.6 + ${BRANDELF} -t Linux ${WRKSRC}/libs/${lib} + ${INSTALL_LIB} ${WRKSRC}/libs/${lib} \ + ${STAGEDIR}${PREFIX}/libexec/dwarffortress +.endfor @${MKDIR} ${STAGEDIR}${DATADIR}/data (cd ${WRKSRC} && ${COPYTREE_SHARE} raw ${STAGEDIR}${DATADIR}) (cd ${WRKSRC}/data && ${COPYTREE_SHARE} "announcement art dipscript \