diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2019-12-08 13:02:48 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2019-12-08 13:02:48 +0000 |
| commit | f7f8a8ebd2857778715647aeb05d63a7e4b07073 (patch) | |
| tree | 0e85750ca9e52e7f47655386f104fbe1a706ffe4 | |
| parent | Belatedly update Doom Legacy to version 1.47.2 (r1412) and unbreak. (diff) | |
Update to the recent 7e24e21 commit on Dec 5, 2019.
Port to the openresty flavor of luajit.
Notes
Notes:
svn path=/head/; revision=519299
| -rw-r--r-- | databases/redis-devel/Makefile | 17 | ||||
| -rw-r--r-- | databases/redis-devel/distinfo | 6 |
2 files changed, 15 insertions, 8 deletions
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 500b39ddc3c1..2fbf4c6765d3 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= redis -PORTVERSION= 6.0.0.20191203 +PORTVERSION= 6.0.0.20191205 CATEGORIES= databases PKGNAMESUFFIX= -devel @@ -13,15 +13,16 @@ LICENSE= BSD3CLAUSE USES+= compiler:c11 gmake USE_GITHUB= yes -GH_TUPLE= antirez:${PORTNAME}:7b5f4b1 +GH_TUPLE= antirez:${PORTNAME}:7e24e21 OPTIONS_DEFINE= JEMALLOC TESTS TRIB OPTIONS_RADIO= EXTLUA -OPTIONS_RADIO_EXTLUA= LUA LUAJIT +OPTIONS_RADIO_EXTLUA= LUA LUAJIT LUAJITOR OPTIONS_SUB= yes JEMALLOC_DESC= Use jemalloc LUA_DESC= Use lang/lua instead of builtin lua LUAJIT_DESC= Use lang/luajit instead of builtin lua +LUAJITOR_DESC= Use lang/luajit-openresty instead of builtin lua TESTS_DESC= Install lang/tcl for redis unit tests TRIB_DESC= Install redis-trib.rb (lang/ruby req.) @@ -55,7 +56,13 @@ LIB_DEPENDS+= libluajit-5.1.so:lang/luajit EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.luajit .endif -.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} +.if ${PORT_OPTIONS:MLUAJITOR} +LIB_DEPENDS+= libluajit-5.1.so:lang/luajit-openresty +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ + ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c +.endif + +.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUAJITOR} CFLAGS+= -fPIC LDFLAGS+= -Wl,-E .endif @@ -98,7 +105,7 @@ post-patch: .if ${PORT_OPTIONS:MJEMALLOC} @${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile .endif -.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} +.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUAJITOR} @cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/ .endif diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo index f9b9803bec43..5c175bf827df 100644 --- a/databases/redis-devel/distinfo +++ b/databases/redis-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1575507634 -SHA256 (antirez-redis-6.0.0.20191203-7b5f4b1_GH0.tar.gz) = d9d76066f0664453db3a4d2b4e349808d0ba5777ed5e58406ca2537d64c7bdf3 -SIZE (antirez-redis-6.0.0.20191203-7b5f4b1_GH0.tar.gz) = 2162083 +TIMESTAMP = 1575809952 +SHA256 (antirez-redis-6.0.0.20191205-7e24e21_GH0.tar.gz) = 95b95b11f384b2a2ab26e6d64f3aabfe6e1f810f2baddc2b1b8d3c4edf4239be +SIZE (antirez-redis-6.0.0.20191205-7e24e21_GH0.tar.gz) = 2162089 |