Index: head/databases/redis-devel/Makefile =================================================================== --- head/databases/redis-devel/Makefile (revision 479207) +++ head/databases/redis-devel/Makefile (revision 479208) @@ -1,120 +1,120 @@ # Created by: Sergey Skvortsov # $FreeBSD$ PORTNAME= redis -DISTVERSION= 5.0-rc4 +DISTVERSION= 5.0-rc5 CATEGORIES= databases PKGNAMESUFFIX= -devel MAINTAINER= osa@FreeBSD.org COMMENT= Persistent key-value database with built-in net interface LICENSE= BSD3CLAUSE USE_GITHUB= yes GH_ACCOUNT= antirez OPTIONS_DEFINE= JEMALLOC TESTS TRIB OPTIONS_RADIO= EXTLUA OPTIONS_RADIO_EXTLUA= LUA LUAJIT 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 TESTS_DESC= Install lang/tcl for redis unit tests TRIB_DESC= Install redis-trib.rb (lang/ruby req.) .include .if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} # Needed for __atomic_fetch_add_8 USE_GCC= yes CFLAGS+= -march=i586 .endif .if ${PORT_OPTIONS:MJEMALLOC} MAKE_ENV= "USE_JEMALLOC=yes" .endif .if ${PORT_OPTIONS:MTRIB} CATEGORIES+= ruby USE_RUBY= yes RUN_DEPENDS= rubygem-redis>=2.2:databases/rubygem-redis .endif .if ${PORT_OPTIONS:MLUA} USES+= lua:51 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.lua .endif .if ${PORT_OPTIONS:MLUAJIT} LIB_DEPENDS+= libluajit-5.1.so:lang/luajit EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-Makefile.luajit .endif .if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} CFLAGS+= -fPIC LDFLAGS+= -Wl,-E .endif .if ${PORT_OPTIONS:MTESTS} USES+= tcl:build .endif LDFLAGS+= -lpthread -lm -lexecinfo CONFLICTS?= redis-4.* USES+= gmake MAKE_ENV= "V=yo" USE_RC_SUBR= redis sentinel BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \ redis-cli redis-sentinel redis-server USERS= redis GROUPS= redis REDIS_DBDIR?= /var/db/redis REDIS_RUNDIR?= /var/run/redis REDIS_LOGDIR?= /var/log/redis SUB_FILES= pkg-message SUB_LIST+= PORTNAME=${PORTNAME} \ REDIS_USER=${USERS} \ REDIS_DBDIR=${REDIS_DBDIR} \ REDIS_LOGDIR=${REDIS_LOGDIR} \ REDIS_RUNDIR=${REDIS_RUNDIR} PLIST_SUB+= REDIS_USER=${USERS} \ REDIS_GROUP=${GROUPS} \ REDIS_LOGDIR=${REDIS_LOGDIR} \ REDIS_DBDIR=${REDIS_DBDIR} \ REDIS_RUNDIR=${REDIS_RUNDIR} post-patch: .if ${PORT_OPTIONS:MJEMALLOC} @${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile .endif .if ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUA} @cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/ .endif post-build: ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf do-install: ${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/ .if ${PORT_OPTIONS:MTRIB} ${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/ .endif ${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample ${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample ${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \ ${STAGEDIR}${REDIS_DBDIR} \ ${STAGEDIR}${REDIS_RUNDIR} do-test: @cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl .include Index: head/databases/redis-devel/distinfo =================================================================== --- head/databases/redis-devel/distinfo (revision 479207) +++ head/databases/redis-devel/distinfo (revision 479208) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533485248 -SHA256 (antirez-redis-5.0-rc4_GH0.tar.gz) = 99a3bfc31517f5f560a459141c14e030e6ad0980e5ae5cb16f319e57980b6db4 -SIZE (antirez-redis-5.0-rc4_GH0.tar.gz) = 1937238 +TIMESTAMP = 1536357782 +SHA256 (antirez-redis-5.0-rc5_GH0.tar.gz) = d070c8a3514e40da5cef9ec26dfd594df0468c203c36398ef2d359a32502b548 +SIZE (antirez-redis-5.0-rc5_GH0.tar.gz) = 1941761 Index: head/databases/redis-devel/files/patch-src-mkreleasehdr.sh =================================================================== --- head/databases/redis-devel/files/patch-src-mkreleasehdr.sh (revision 479207) +++ head/databases/redis-devel/files/patch-src-mkreleasehdr.sh (revision 479208) @@ -1,11 +1,11 @@ ---- src/mkreleasehdr.sh.orig 2013-08-13 15:39:40.000000000 +0400 -+++ src/mkreleasehdr.sh 2013-08-13 15:39:55.000000000 +0400 +--- src/mkreleasehdr.sh.orig 2018-09-06 07:04:23.000000000 -0400 ++++ src/mkreleasehdr.sh 2018-09-07 18:05:03.013274000 -0400 @@ -1,6 +1,6 @@ #!/bin/sh -GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1` -GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l` +GIT_SHA1="00000000" +GIT_DIRTY="0" BUILD_ID=`uname -n`"-"`date +%s` - test -f release.h || touch release.h - (cat release.h | grep SHA1 | grep $GIT_SHA1) && \ + if [ -n "$SOURCE_DATE_EPOCH" ]; then + BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u %s)