Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Feb 2014 20:45:30 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r344143 - in head/games/freeminer: . files
Message-ID:  <201402132045.s1DKjUGU050873@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Feb 13 20:45:30 2014
New Revision: 344143
URL: http://svnweb.freebsd.org/changeset/ports/344143
QAT: https://qat.redports.org/buildarchive/r344143/

Log:
  - Make server-only installation not bring in X11 depends

Added:
  head/games/freeminer/files/extra-patch-irrlichtdepend   (contents, props changed)
Modified:
  head/games/freeminer/Makefile

Modified: head/games/freeminer/Makefile
==============================================================================
--- head/games/freeminer/Makefile	Thu Feb 13 20:45:24 2014	(r344142)
+++ head/games/freeminer/Makefile	Thu Feb 13 20:45:30 2014	(r344143)
@@ -11,8 +11,7 @@ COMMENT=	Open source sandbox game inspir
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libIrrlicht.so:${PORTSDIR}/x11-toolkits/irrlicht \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}
@@ -40,7 +39,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
@@ -74,6 +74,14 @@ USERS=		minetest # reuse, as freeminer i
 GROUPS=		minetest
 .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/freeminer/files/extra-patch-irrlichtdepend
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/freeminer/files/extra-patch-irrlichtdepend	Thu Feb 13 20:45:30 2014	(r344143)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2014-01-22 21:36:09.000000000 +0400
++++ CMakeLists.txt	2014-02-14 00:36:49.874504157 +0400
+@@ -58,7 +58,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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402132045.s1DKjUGU050873>