From owner-svn-ports-head@FreeBSD.ORG Thu Feb 13 20:45:25 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 03EFF799; Thu, 13 Feb 2014 20:45: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 C515D11FF; Thu, 13 Feb 2014 20:45:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1DKjOZx050781; Thu, 13 Feb 2014 20:45:24 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1DKjOjS050779; Thu, 13 Feb 2014 20:45:24 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201402132045.s1DKjOjS050779@svn.freebsd.org> From: Dmitry Marakasov Date: Thu, 13 Feb 2014 20:45:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344142 - in head/games/minetest: . 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: Thu, 13 Feb 2014 20:45:25 -0000 Author: amdmi3 Date: Thu Feb 13 20:45:24 2014 New Revision: 344142 URL: http://svnweb.freebsd.org/changeset/ports/344142 QAT: https://qat.redports.org/buildarchive/r344142/ Log: - Make server-only installation not bring in X11 depends Added: head/games/minetest/files/extra-patch-irrlichtdepend (contents, props changed) Modified: head/games/minetest/Makefile Modified: head/games/minetest/Makefile ============================================================================== --- head/games/minetest/Makefile Thu Feb 13 20:42:54 2014 (r344141) +++ head/games/minetest/Makefile Thu Feb 13 20:45:24 2014 (r344142) @@ -10,8 +10,7 @@ COMMENT= Infiniminer/Minecraft inspired LICENSE= LGPL21 -LIB_DEPENDS= libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht \ - sqlite3:${PORTSDIR}/databases/sqlite3 +LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 USE_GITHUB= yes GH_ACCOUNT= minetest @@ -39,7 +38,8 @@ LUAJIT_DESC= LuaJIT support CLIENT_CMAKE_ON= -DBUILD_CLIENT=1 CLIENT_CMAKE_OFF= -DBUILD_CLIENT=0 CLIENT_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ - libpng.so:${PORTSDIR}/graphics/png + libpng.so:${PORTSDIR}/graphics/png \ + libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht CLIENT_USE= GL=gl XORG=x11 SERVER_CMAKE_ON= -DBUILD_SERVER=1 SERVER_CMAKE_OFF= -DBUILD_SERVER=0 @@ -73,6 +73,14 @@ USERS= ${PORTNAME} GROUPS= ${PORTNAME} .endif +# hacky way to not bring irrlicht and X11 depends for server only +.if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSERVER} +BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/irrlicht:patch +IRRLICHT_INCLUDE_DIR= `${MAKE} -C ${PORTSDIR}/x11-toolkits/irrlicht -V WRKSRC`/include +CMAKE_ARGS+= -DIRRLICHT_INCLUDE_DIR:STRING="${IRRLICHT_INCLUDE_DIR}" +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-irrlichtdepend +.endif + post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/cmake/Modules/*.cmake Added: head/games/minetest/files/extra-patch-irrlichtdepend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/minetest/files/extra-patch-irrlichtdepend Thu Feb 13 20:45:24 2014 (r344142) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2014-01-02 01:54:28.000000000 +0400 ++++ CMakeLists.txt 2014-02-07 05:16:36.652533717 +0400 +@@ -57,7 +57,7 @@ + include(${CMAKE_SOURCE_DIR}/cmake/Modules/misc.cmake) + + # This is done here so that relative search paths are more reasnable +-find_package(Irrlicht) ++set(IRRLICHT_LIBRARY "") + + # + # Installation