From melvyn@magemana.nl  Sat May 24 06:51:35 2014
Return-Path: <melvyn@magemana.nl>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id E63E5BF0;
	Sat, 24 May 2014 06:51:35 +0000 (UTC)
Received: from fire.magemana.nl (magemana.nl [IPv6:2a01:7c8:aaae:25e::1])
	by mx1.freebsd.org (Postfix) with ESMTP id B207320BF;
	Sat, 24 May 2014 06:51:35 +0000 (UTC)
Received: by fire.magemana.nl (Postfix, from userid 1003)
	id CD9374AB526; Sat, 24 May 2014 08:51:33 +0200 (CEST)
Message-Id: <20140524065133.CD9374AB526@fire.magemana.nl>
Date: Sat, 24 May 2014 08:51:33 +0200 (CEST)
From: Melvyn Sopacua <melvyn@magemana.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc: osa@FreeBSD.org
Subject: [PATCH] databases/redis: Fix luajit extra patch
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         190163
>Category:       ports
>Synopsis:       [PATCH] databases/redis: Fix luajit extra patch
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    osa
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 24 07:00:00 UTC 2014
>Closed-Date:    
>Last-Modified:  Sat May 24 07:00:05 UTC 2014
>Originator:     Melvyn Sopacua
>Release:        FreeBSD 9.2-RELEASE-p6 amd64
>Organization:
>Environment:
System: FreeBSD fire.magemana.nl 9.2-RELEASE-p6 FreeBSD 9.2-RELEASE-p6 #2 r266258: Sat May 17 00:26:49 CEST 2014     melvyn@fire.magemana.nl:/usr/obj/usr/src/sys/TRANSIP  amd64

>Description:
When LUAJIT option is set, patch fails. This is cause upstream added the
hyperloglog object.

>How-To-Repeat:

Enable LUAJIT option and build databases/redis

>Fix:

--- redis-luajit.patch begins here ---
diff -r 99186f37ebce -r 1e3dc8a25f4f databases/redis/files/extra-patch-src-Makefile.luajit
--- a/databases/redis/files/extra-patch-src-Makefile.luajit	Sat May 24 08:35:08 2014 +0200
+++ b/databases/redis/files/extra-patch-src-Makefile.luajit	Sat May 24 08:46:30 2014 +0200
@@ -31,7 +31,7 @@
 @@ -105,6 +108,7 @@
  REDIS_SERVER_NAME=redis-server
  REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o migrate.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o
+ REDIS_SERVER_OBJ=adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o migrate.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o hyperloglog.o
 +REDIS_SERVER_OBJ+= lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
  REDIS_CLI_NAME=redis-cli
  REDIS_CLI_OBJ=anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
--- redis-luajit.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->osa 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat May 24 07:00:04 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=190163 
>Unformatted:
