Attachment 191430 Details for Bug 226537 – freeminer-update.patch v2

[patch] freeminer-update.patch v2

freeminer-update.patch (text/plain), 3.80 KB, created by Val Packett on 2018-03-11 19:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Val Packett

Created: 2018-03-11 19:20:09 UTC

Size: 3.80 KB

patch

obsolete

>diff --git c/games/freeminer-default/Makefile i/games/freeminer-default/Makefile
>index 45d0f2e9bfc1..f5e64649c0f3 100644
>--- c/games/freeminer-default/Makefile
>+++ i/games/freeminer-default/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	default
>-PORTVERSION=	0.4.10.4
>+PORTVERSION=	0.4.14.8
> CATEGORIES=	games
> PKGNAMEPREFIX=	freeminer-
> 
>diff --git c/games/freeminer-default/distinfo i/games/freeminer-default/distinfo
>index 070a8077253e..6b93d097580f 100644
>--- c/games/freeminer-default/distinfo
>+++ i/games/freeminer-default/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (freeminer-default-0.4.10.4_GH0.tar.gz) = 0f3a0d67ed2e16ddfc69401e552c5f14a8a646b6a7ea05a153e744ca3f9ac157
>-SIZE (freeminer-default-0.4.10.4_GH0.tar.gz) = 741235
>+TIMESTAMP = 1520795896
>+SHA256 (freeminer-default-0.4.14.8_GH0.tar.gz) = 316edd086813830066751476f6eb0eb95d0ed66ad5e039a73da58dbff3c3163b
>+SIZE (freeminer-default-0.4.14.8_GH0.tar.gz) = 800202
>diff --git c/games/freeminer/Makefile i/games/freeminer/Makefile
>index 44059eb2b09b..ae1bdafea8ec 100644
>--- c/games/freeminer/Makefile
>+++ i/games/freeminer/Makefile
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	freeminer
>-PORTVERSION=	0.4.10.4
>-PORTREVISION=	5
>+PORTVERSION=	0.4.14.8
> CATEGORIES=	games
> 
> MAINTAINER=	amdmi3@FreeBSD.org
>@@ -13,7 +12,12 @@ LICENSE=	LGPL21+ GPLv3+ # source mentions GPLv3+, LICENSE.txt LGPL21+
> LICENSE_COMB=	multi
> LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING # don't remove space
> 
>-LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
>+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
>+	libenet.so:net/enet \
>+	libgmp.so:math/gmp \
>+	libsnappy.so:archivers/snappy \
>+	libjsoncpp.so:devel/jsoncpp \
>+	libmsgpackc.so:devel/msgpack
> 
> USE_GITHUB=	yes
> 
>@@ -21,6 +25,8 @@ USES=		compiler:c++11-lib cmake
> LLD_UNSAFE=	yes
> CMAKE_ARGS=	-DCUSTOM_MANDIR="${PREFIX}/man" \
> 		-DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" \
>+		-DENABLE_SYSTEM_JSONCPP=ON \
>+		-DENABLE_SYSTEM_MSGPACK=ON \
> 		-DRUN_IN_PLACE=0
> 
> PORTDATA=	*
>@@ -41,9 +47,10 @@ LUAJIT_DESC=	LuaJIT support
> CLIENT_CMAKE_ON=	-DBUILD_CLIENT=1
> CLIENT_CMAKE_OFF=	-DBUILD_CLIENT=0
> CLIENT_LIB_DEPENDS=	libpng.so:graphics/png \
>+			libogg.so:audio/libogg \
> 			libIrrlicht.so:x11-toolkits/irrlicht
> CLIENT_USES=		jpeg
>-CLIENT_USE=		GL=gl XORG=x11
>+CLIENT_USE=		GL=gl,glu XORG=x11,sm,ice,xext,xxf86vm
> SERVER_CMAKE_ON=	-DBUILD_SERVER=1
> SERVER_CMAKE_OFF=	-DBUILD_SERVER=0
> CURL_CMAKE_ON=		-DENABLE_CURL=1
>@@ -92,6 +99,9 @@ post-patch:
> .if ! ${PORT_OPTIONS:MLUAJIT}
> 	@${REINPLACE_CMD} -e '/find_/ s|LUA_|NO&|g' \
> 		${WRKSRC}/src/CMakeLists.txt
>+.else
>+	@${REINPLACE_CMD} -e 's|const luaL_reg|const luaL_Reg|' \
>+		${WRKSRC}/src/script/lua_api/*
> .endif
> 
> post-install:
>diff --git c/games/freeminer/distinfo i/games/freeminer/distinfo
>index f0852be47d44..90247a9597e8 100644
>--- c/games/freeminer/distinfo
>+++ i/games/freeminer/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (freeminer-freeminer-0.4.10.4_GH0.tar.gz) = a4d2e4f069542f92b4aa4463e85a04b66af485c5195c23e96070e8ad1c60e146
>-SIZE (freeminer-freeminer-0.4.10.4_GH0.tar.gz) = 5770010
>+TIMESTAMP = 1520793430
>+SHA256 (freeminer-freeminer-0.4.14.8_GH0.tar.gz) = 2a7d044d30aed20e4669c8804a1d38e6ce060ba1a89ce11a8f00cf46b3c2de7e
>+SIZE (freeminer-freeminer-0.4.14.8_GH0.tar.gz) = 5650886
>diff --git c/games/freeminer/files/patch-cmake_Modules_FindLuaJIT.cmake i/games/freeminer/files/patch-cmake_Modules_FindLuaJIT.cmake
>new file mode 100644
>index 000000000000..8f3ffa764753
>--- /dev/null
>+++ i/games/freeminer/files/patch-cmake_Modules_FindLuaJIT.cmake
>@@ -0,0 +1,11 @@
>+--- cmake/Modules/FindLuaJIT.cmake.orig	2018-03-11 18:37:44 UTC
>++++ cmake/Modules/FindLuaJIT.cmake
>+@@ -9,7 +9,7 @@
>+ FIND_PATH(LUA_INCLUDE_DIR luajit.h
>+ 	HINTS
>+ 	$ENV{LUA_DIR}
>+-	PATH_SUFFIXES include/luajit-2.0 include/luajit-5_1-2.0 include
>++	PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include/luajit-5_1-2.0 include
>+ 	PATHS
>+ 	~/Library/Frameworks
>+ 	/Library/Frameworks

Actions: View | Diff

Attachments on bug 226537: 191429 | 191430