Index: head/databases/redis-devel/Makefile =================================================================== --- head/databases/redis-devel/Makefile (revision 518680) +++ head/databases/redis-devel/Makefile (revision 518681) @@ -1,128 +1,126 @@ # Created by: Sergey Skvortsov # $FreeBSD$ PORTNAME= redis -PORTVERSION= 6.0.0.20191125 +PORTVERSION= 6.0.0.20191129 CATEGORIES= databases PKGNAMESUFFIX= -devel MAINTAINER= osa@FreeBSD.org COMMENT= Persistent key-value database with built-in net interface LICENSE= BSD3CLAUSE +USES+= compiler gmake USE_GITHUB= yes -GH_ACCOUNT= antirez -GH_PROJECT= ${PORTNAME} -GH_TAGNAME= a1b6548 +GH_TUPLE= antirez:${PORTNAME}:f5d4853 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.) -USES+= compiler gmake MAKE_ENV= "V=yo" .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?= redis4-4.* redis-5.* 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} .include post-patch: .if ${PORT_OPTIONS:MJEMALLOC} @${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile .endif .if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} @cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/ .endif .if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 ${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/src/lzf_d.c .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 518680) +++ head/databases/redis-devel/distinfo (revision 518681) @@ -1,3 +1,3 @@ -TIMESTAMP = 1574869655 -SHA256 (antirez-redis-6.0.0.20191125-a1b6548_GH0.tar.gz) = 33f9e9af6339d7d6aaa583ba8fefc42986a3577cacc63db3750175f88a484f58 -SIZE (antirez-redis-6.0.0.20191125-a1b6548_GH0.tar.gz) = 2164648 +TIMESTAMP = 1575048154 +SHA256 (antirez-redis-6.0.0.20191129-f5d4853_GH0.tar.gz) = ad80a318994bd763362825d73b5b2c674dbbee66a7caa25bbe33608025bcf0dd +SIZE (antirez-redis-6.0.0.20191129-f5d4853_GH0.tar.gz) = 2164641 Index: head/databases/redis-devel/files/patch-deps-hiredis-Makefile =================================================================== --- head/databases/redis-devel/files/patch-deps-hiredis-Makefile (revision 518680) +++ head/databases/redis-devel/files/patch-deps-hiredis-Makefile (revision 518681) @@ -1,40 +1,40 @@ ---- deps/hiredis/Makefile.orig 2019-11-24 18:44:27.552196000 -0500 -+++ deps/hiredis/Makefile 2019-11-24 19:16:28.147610000 -0500 -@@ -21,7 +21,7 @@ +--- deps/hiredis/Makefile.orig 2019-11-29 16:35:59 UTC ++++ deps/hiredis/Makefile +@@ -21,7 +21,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}') # Installation related variables and target -PREFIX?=/usr/local +PREFIX?=${PREFIX} INCLUDE_PATH?=include/hiredis LIBRARY_PATH?=lib PKGCONF_PATH?=pkgconfig -@@ -44,10 +44,8 @@ +@@ -44,10 +44,8 @@ export REDIS_TEST_CONFIG # Fallback to gcc when $CC is not in $PATH. CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') -OPTIMIZATION?=-O3 WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers -DEBUG_FLAGS?= -g -ggdb -REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) +REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) REAL_LDFLAGS=$(LDFLAGS) DYLIBSUFFIX=so -@@ -82,6 +80,16 @@ +@@ -82,6 +80,16 @@ endif ifeq ($(uname_S),SunOS) REAL_LDFLAGS+= -ldl -lnsl -lsocket DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS) +endif +ifeq ($(uname_S),FreeBSD) + CFLAGS?=$(CFLAGS) + CCLINK?=pthread + LDFLAGS?=-L. -Wl,-rpath,. + DYLIBNAME?=libhiredis.so + DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ} + STLIBNAME?=libhiredis.a + STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} + SSL_LDFLAGS+= ${OPENSSL_LDFLAGS} endif ifeq ($(uname_S),Darwin) DYLIBSUFFIX=dylib Index: head/databases/redis-devel/files/patch-deps_Makefile =================================================================== --- head/databases/redis-devel/files/patch-deps_Makefile (nonexistent) +++ head/databases/redis-devel/files/patch-deps_Makefile (revision 518681) @@ -0,0 +1,18 @@ +--- deps/Makefile.orig 2019-11-29 16:35:59 UTC ++++ deps/Makefile +@@ -76,12 +76,12 @@ lua: .make-prerequisites + + .PHONY: lua + +-JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS) ++JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS) + JEMALLOC_LDFLAGS= $(LDFLAGS) + + jemalloc: .make-prerequisites + @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) +- cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" +- cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a ++ cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" ++ cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a + + .PHONY: jemalloc Property changes on: head/databases/redis-devel/files/patch-deps_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/redis-devel/files/patch-src-Makefile =================================================================== --- head/databases/redis-devel/files/patch-src-Makefile (revision 518680) +++ head/databases/redis-devel/files/patch-src-Makefile (revision 518681) @@ -1,39 +1,39 @@ ---- src/Makefile.orig 2019-09-25 10:40:18 UTC +--- src/Makefile.orig 2019-11-29 16:35:59 UTC +++ src/Makefile @@ -29,7 +29,7 @@ endif WARN=-Wall -W -Wno-missing-field-initializers OPT=$(OPTIMIZATION) -PREFIX?=/usr/local +PREFIX:=$(PREFIX) INSTALL_BIN=$(PREFIX)/bin INSTALL=install @@ -75,7 +75,6 @@ endif FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) FINAL_LIBS=-lm -DEBUG=-g -ggdb - ifeq ($(uname_S),SunOS) - # SunOS -@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin) - # Darwin - FINAL_LIBS+= -ldl + # Linux ARM needs -latomic at linking time + ifneq (,$(filter aarch64 armv,$(uname_M))) +@@ -105,6 +104,11 @@ ifeq ($(uname_S),Darwin) + OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include + OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib else +ifeq ($(uname_S),FreeBSD) + # FreeBSD + FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include + FINAL_LDFLAGS= $(LDFLAGS) -pthread +else ifeq ($(uname_S),AIX) # AIX FINAL_LDFLAGS+= -Wl,-bexpall -@@ -120,6 +124,7 @@ else +@@ -131,6 +135,7 @@ else # All the other OSes (notably Linux) FINAL_LDFLAGS+= -rdynamic FINAL_LIBS+=-ldl -pthread -lrt +endif endif endif endif