Index: head/databases/redis-devel/Makefile
===================================================================
--- head/databases/redis-devel/Makefile	(revision 383543)
+++ head/databases/redis-devel/Makefile	(revision 383544)
@@ -1,103 +1,98 @@
 # Created by: Sergey Skvortsov <skv@protey.ru>
 # $FreeBSD$
 
 PORTNAME=	redis
-DISTVERSION=	3.0.0-rc4
+DISTVERSION=	3.0.0
 CATEGORIES=	databases
-MASTER_SITES=	https://github.com/antirez/redis/archive/
+MASTER_SITES=	http://download.redis.io/releases/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${DISTVERSION}
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	Persistent key-value database with built-in net interface
 
 LICENSE=	BSD3CLAUSE
 
 USES=		execinfo
 
 OPTIONS_DEFINE=	TESTS
 OPTIONS_RADIO=	EXTLUA
 OPTIONS_RADIO_EXTLUA=	LUA LUAJIT
 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
 
-FETCH_ARGS=	-Fpr
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
-
 .include <bsd.port.options.mk>
 
 .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:${PORTSDIR}/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
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lpthread -lm -lexecinfo
 
-CONFLICTS?=	redis-2.*
+CONFLICTS?=	redis-3.*
 
 USES+=		gmake
 MAKE_ENV=	"V=yo"
 USE_RC_SUBR=	redis
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-dump \
 		redis-cli redis-sentinel redis-server
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 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}
 
 .if ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUA}
 post-patch:
 	@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/
 	${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}
 
 regression-test: build
 	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
 
 .include <bsd.port.mk>
Index: head/databases/redis-devel/distinfo
===================================================================
--- head/databases/redis-devel/distinfo	(revision 383543)
+++ head/databases/redis-devel/distinfo	(revision 383544)
@@ -1,2 +1,2 @@
-SHA256 (redis/3.0.0-rc4.tar.gz) = 1787b7fd57ec019e84691e881e81a8d8b67cf0d2457bd484d4da8c6eaca4a731
-SIZE (redis/3.0.0-rc4.tar.gz) = 1365919
+SHA256 (redis-3.0.0.tar.gz) = 654c95c6236692dcb916fccba9a34d0877cc91338c8b6a372511e6eb080e34bf
+SIZE (redis-3.0.0.tar.gz) = 1358081
Index: head/databases/redis-devel/files/patch-src-Makefile
===================================================================
--- head/databases/redis-devel/files/patch-src-Makefile	(revision 383543)
+++ head/databases/redis-devel/files/patch-src-Makefile	(revision 383544)
@@ -1,39 +1,39 @@
---- src/Makefile.orig	2014-10-11 01:09:55.000000000 +0400
-+++ src/Makefile	2014-10-11 01:12:53.000000000 +0400
+--- src/Makefile.orig	2015-04-01 17:01:44.000000000 +0300
++++ src/Makefile	2015-04-07 21:30:22.464962000 +0300
 @@ -22,7 +22,7 @@
  WARN=-Wall -W
  OPT=$(OPTIMIZATION)
  
 -PREFIX?=/usr/local
 +PREFIX:=$(PREFIX)
  INSTALL_BIN=$(PREFIX)/bin
  INSTALL=install
  
 @@ -52,7 +52,6 @@
  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
 @@ -63,6 +62,11 @@
  ifeq ($(uname_S),Darwin)
  	# Darwin (nothing to do)
  else
 +ifeq ($(uname_S),FreeBSD)
 +        # FreeBSD
 +        FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
-+        FINAL_LDFLAGS= $(LDFLAGS)
++        FINAL_LDFLAGS= $(LDFLAGS) -pthread
 +else
  ifeq ($(uname_S),AIX)
          # AIX
          FINAL_LDFLAGS+= -Wl,-bexpall
 @@ -75,6 +79,7 @@
  endif
  endif
  endif
 +endif
  # Include paths to dependencies
  FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
  
Index: head/databases/redis-devel/files/patch-src-config.h
===================================================================
--- head/databases/redis-devel/files/patch-src-config.h	(revision 383543)
+++ head/databases/redis-devel/files/patch-src-config.h	(revision 383544)
@@ -1,11 +1,11 @@
---- src/config.h.orig	2013-02-11 21:47:44.000000000 +0400
-+++ src/config.h	2013-02-11 21:50:10.000000000 +0400
-@@ -54,7 +54,7 @@
+--- src/config.h.orig	2015-04-07 21:24:36.634829000 +0300
++++ src/config.h	2015-04-07 21:24:53.388849000 +0300
+@@ -62,7 +62,7 @@
  #endif
  
  /* Test for backtrace() */
--#if defined(__APPLE__) || defined(__linux__)
-+#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__)
+-#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__))
++#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) || defined(__FreeBSD__)
  #define HAVE_BACKTRACE 1
  #endif