From owner-svn-ports-head@FreeBSD.ORG Mon Mar 24 01:09:25 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BBEE792F; Mon, 24 Mar 2014 01:09:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A833DBEF; Mon, 24 Mar 2014 01:09:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2O19PLq098099; Mon, 24 Mar 2014 01:09:25 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2O19Paa098095; Mon, 24 Mar 2014 01:09:25 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201403240109.s2O19Paa098095@svn.freebsd.org> From: Rusmir Dusko Date: Mon, 24 Mar 2014 01:09:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348917 - in head/games/tome4: . files X-SVN-Group: ports-head 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.17 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: Mon, 24 Mar 2014 01:09:25 -0000 Author: nemysis Date: Mon Mar 24 01:09:24 2014 New Revision: 348917 URL: http://svnweb.freebsd.org/changeset/ports/348917 QAT: https://qat.redports.org/buildarchive/r348917/ Log: - Bump PORTREVISION - Change Desktop entry file - Remove not needed MKDIR - Adjust patches, fix usage with nvidia cards PR: ports/187688, ports/186565 Submitted by: Nikolai Lifanov , "Mikhail T." Modified: head/games/tome4/Makefile head/games/tome4/files/patch-build__te4core.lua (contents, props changed) head/games/tome4/files/patch-premake4.lua (contents, props changed) Modified: head/games/tome4/Makefile ============================================================================== --- head/games/tome4/Makefile Mon Mar 24 00:55:05 2014 (r348916) +++ head/games/tome4/Makefile Mon Mar 24 01:09:24 2014 (r348917) @@ -3,6 +3,7 @@ PORTNAME= tome4 PORTVERSION= 1.1.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://te4.org/dl/t-engine/ \ SF/lifanov-ports-icons/${PORTNAME}/:icons @@ -18,8 +19,8 @@ LICENSE= GPLv3 BUILD_DEPENDS= premake4:${PORTSDIR}/devel/premake4 LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis -DESKTOP_ENTRIES="ToME 4" "${COMMENT}" "${PORTNAME}" \ - "${PORTNAME}" "Game;RolePlaying;" false +DESKTOP_ENTRIES="ToME 4" "" "${PORTNAME}" \ + "${PORTNAME}" "Game;RolePlaying;" "" WRKSRC= ${WRKDIR}/t-engine4-src-${PORTVERSION} MAKE_ARGS+= config=release verbose=yes ARCH="" @@ -27,19 +28,17 @@ USES= gmake openal:al tar:bzip2 USE_SDL= image2 sdl2 ttf2 USE_GL= gl SUB_FILES= tome4 - MAKE_JOBS_UNSAFE=yes pre-build: - (cd ${WRKSRC}; premake4 gmake) + (cd ${WRKSRC} && premake4 gmake) @${REINPLACE_CMD} 's|-lpthread|-pthread|' ${WRKSRC}/build/TEngine.make do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/t-engine ${STAGEDIR}${DATADIR} - ${INSTALL} -m 0755 ${WRKDIR}/tome4 ${STAGEDIR}${PREFIX}/bin + ${INSTALL} -m 0755 ${WRKDIR}/tome4 ${STAGEDIR}${PREFIX}/bin/ (cd ${WRKSRC}; ${COPYTREE_SHARE} "bootstrap game" ${STAGEDIR}${DATADIR}) ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \ Modified: head/games/tome4/files/patch-build__te4core.lua ============================================================================== --- head/games/tome4/files/patch-build__te4core.lua Mon Mar 24 00:55:05 2014 (r348916) +++ head/games/tome4/files/patch-build__te4core.lua Mon Mar 24 01:09:24 2014 (r348917) @@ -1,14 +1,5 @@ --- ./build/te4core.lua.orig 2014-01-05 19:42:37.000000000 -0500 -+++ ./build/te4core.lua 2014-02-06 13:23:22.476164878 -0500 -@@ -109,7 +109,7 @@ - - configuration "bsd" - libdirs {"/usr/local/lib/"} -- links { "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" } -+ links { "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m" } - defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } - - configuration {"Debug"} ++++ ./build/te4core.lua 2014-01-05 19:42:37.000000000 -0500 @@ -159,7 +159,7 @@ files { "../src/luajit2/src/host/minilua.c" } Modified: head/games/tome4/files/patch-premake4.lua ============================================================================== --- head/games/tome4/files/patch-premake4.lua Mon Mar 24 00:55:05 2014 (r348916) +++ head/games/tome4/files/patch-premake4.lua Mon Mar 24 01:09:24 2014 (r348917) @@ -1,6 +1,12 @@ ---- ./premake4.lua.orig 2014-02-06 13:23:35.469164876 -0500 -+++ ./premake4.lua 2014-02-06 13:34:48.071117476 -0500 -@@ -35,6 +35,9 @@ +--- ./premake4.lua.orig 2014-01-06 20:04:42.000000000 -0500 ++++ ./premake4.lua 2014-03-23 19:34:38.037102075 -0400 +@@ -30,11 +30,14 @@ + + configuration "bsd" + libdirs { +- "/usr/local/lib", ++ "bin/Release", "/usr/local/lib", + } includedirs { "/usr/local/include", }