CVS commit: pkgsrc/databases/redis/patches

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Dec 13 19:35:12 UTC 2018

Added Files:
        pkgsrc/databases/redis/patches: patch-redis.conf patch-src_Makefile

Log Message:
redis: ... and new patches


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/redis/patches/patch-redis.conf \
    pkgsrc/databases/redis/patches/patch-src_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/databases/redis/patches/patch-redis.conf
diff -u /dev/null pkgsrc/databases/redis/patches/patch-redis.conf:1.1
--- /dev/null   Thu Dec 13 19:35:12 2018
+++ pkgsrc/databases/redis/patches/patch-redis.conf     Thu Dec 13 19:35:12 2018
@@ -0,0 +1,42 @@
+$NetBSD: patch-redis.conf,v 1.1 2018/12/13 19:35:12 adam Exp $
+
+Sane defaults for the config file.
+
+--- redis.conf.orig    2018-12-12 12:25:58.000000000 +0000
++++ redis.conf
+@@ -133,7 +133,7 @@ tcp-keepalive 300
+ 
+ # By default Redis does not run as a daemon. Use 'yes' if you need it.
+ # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+-daemonize no
++daemonize yes
+ 
+ # If you run Redis from upstart or systemd, Redis can interact with your
+ # supervision tree. Options:
+@@ -155,7 +155,7 @@ supervised no
+ #
+ # Creating a pid file is best effort: if Redis is not able to create it
+ # nothing bad happens, the server will start and run normally.
+-pidfile /var/run/redis_6379.pid
++pidfile @REDIS_PIDDIR@/redis.pid
+ 
+ # Specify the server verbosity level.
+ # This can be one of:
+@@ -168,7 +168,7 @@ loglevel notice
+ # Specify the log file name. Also the empty string can be used to force
+ # Redis to log on the standard output. Note that if you use standard
+ # output for logging but daemonize, logs will be sent to /dev/null
+-logfile ""
++logfile @REDIS_LOGDIR@/redis.log
+ 
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -260,7 +260,7 @@ dbfilename dump.rdb
+ # The Append Only File will also be created inside this directory.
+ #
+ # Note that you must specify a directory here, not a file name.
+-dir ./
++dir @REDIS_DATADIR@ 
+ 
+ ################################# REPLICATION #################################
+ 
Index: pkgsrc/databases/redis/patches/patch-src_Makefile
diff -u /dev/null pkgsrc/databases/redis/patches/patch-src_Makefile:1.1
--- /dev/null   Thu Dec 13 19:35:12 2018
+++ pkgsrc/databases/redis/patches/patch-src_Makefile   Thu Dec 13 19:35:12 2018
@@ -0,0 +1,36 @@
+$NetBSD: patch-src_Makefile,v 1.1 2018/12/13 19:35:12 adam Exp $
+
+Add DESTDIR support. Fix NetBSD support.
+
+--- src/Makefile.orig  2018-12-12 12:25:58.000000000 +0000
++++ src/Makefile
+@@ -30,8 +30,8 @@ WARN=-Wall -W -Wno-missing-field-initial
+ OPT=$(OPTIMIZATION)
+ 
+ PREFIX?=/usr/local
+-INSTALL_BIN=$(PREFIX)/bin
+-INSTALL=install
++INSTALL_BIN=$(DESTDIR)$(PREFIX)/bin
++INSTALL=$(BSD_INSTALL_PROGRAM)
+ 
+ # Default allocator defaults to Jemalloc if it's not an ARM
+ MALLOC=libc
+@@ -109,6 +109,10 @@ ifeq ($(uname_S),OpenBSD)
+       endif
+ 
+ else
++ifeq ($(uname_S),NetBSD)
++      # NetBSD
++      FINAL_LIBS+= -lpthread
++else
+ ifeq ($(uname_S),FreeBSD)
+       # FreeBSD
+       FINAL_LIBS+= -lpthread -lexecinfo
+@@ -126,6 +130,7 @@ endif
+ endif
+ endif
+ endif
++endif
+ # Include paths to dependencies
+ FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
+