Update to latest stable version 2.0.1.

Previous stable release redis-1.2.6 repocopied to databases/redis1.
This commit is contained in:
Sergey A. Osokin 2010-09-20 17:46:19 +00:00
parent 0ecf12b8e1
commit 673fc573d7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=261498
8 changed files with 46 additions and 42 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= redis
PORTVERSION= 1.2.6
PORTREVISION= 1
DISTVERSION= 2.0.1
CATEGORIES= databases
MASTER_SITES= GOOGLE_CODE
@ -18,11 +17,12 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
CFLAGS+= -I${LOCALBASE}/include
CONFLICTS?= redis-devel-2.*
CONFLICTS?= redis1-1.*
USE_GMAKE= yes
USE_RC_SUBR= redis.sh
BIN_FILES= redis-server redis-benchmark redis-cli
BIN_FILES= redis-benchmark redis-check-aof redis-check-dump \
redis-cli redis-server
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
@ -47,9 +47,9 @@ SUB_LIST+= PORTNAME="${PORTNAME}" \
REDIS_DBDIR="${REDIS_DBDIR}" \
REDIS_RUNDIR="${REDIS_RUNDIR}"
PATTERN= '10d;13s|$$$$(ARCH) ||'
PATTERN= '16d;119d;15s|$$$$(ARCH) ||'
.if !defined(WITH_DEBUG)
PATTERN:= ${PATTERN:S/'$/;14s|^|\#|'/}
PATTERN:= ${PATTERN:S/'$/;5s|^|\#|'/}
.endif
post-patch:

View File

@ -1,3 +1,3 @@
MD5 (redis-1.2.6.tar.gz) = 0c5355e57606523f9e8ce816db5e542f
SHA256 (redis-1.2.6.tar.gz) = bed0641225f786f225a2c4897ffbec1e6573a3c31e9f899884ee3041eab96873
SIZE (redis-1.2.6.tar.gz) = 213341
MD5 (redis-2.0.1.tar.gz) = 7c0fd3521bbee3ba777b195dedeac5c4
SHA256 (redis-2.0.1.tar.gz) = 4a20e667fe4267e1eb743d9b929a3662f7d5e211ef036c8dd4a7280f51a3b169
SIZE (redis-2.0.1.tar.gz) = 347301

View File

@ -1,32 +1,32 @@
--- redis.conf.orig 2009-12-27 11:54:09.000000000 +0300
+++ redis.conf 2009-12-27 11:56:16.000000000 +0300
@@ -2,11 +2,11 @@
--- redis.conf.orig 2010-07-02 16:00:49.000000000 +0400
+++ redis.conf 2010-07-02 16:01:46.000000000 +0400
@@ -14,11 +14,11 @@
# 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
# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
# You can specify a custom pid file location here.
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
# default. You can specify a custom pid file location here.
-pidfile /var/run/redis.pid
+pidfile %%REDIS_RUNDIR%%/redis.pid
# Accept connections on the specified port, default is 6379
port 6379
@@ -29,7 +29,7 @@
@@ -42,7 +42,7 @@
# Specify the log file name. Also 'stdout' can be used to force
# the demon to log on the standard output. Note that if you use standard
# 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 stdout
+logfile %%REDIS_LOGDIR%%/redis.log
# Set the number of databases. The default database is DB 0, you can select
# a different one on a per-connection basis using SELECT <dbid> where
@@ -64,7 +64,7 @@
# For default save/load DB in/from the working directory
# Note that you must specify a directory not a file name.
@@ -86,7 +86,7 @@
# Also the Append Only File will be created inside this directory.
#
# Note that you must specify a directory here, not a file name.
-dir ./
+dir %%REDIS_DBDIR%%/

View File

@ -1,6 +1,8 @@
bin/redis-server
bin/redis-benchmark
bin/redis-check-aof
bin/redis-check-dump
bin/redis-cli
bin/redis-server
@unexec (cmp -s %D/etc/redis.conf %D/etc/redis.conf.sample && rm -f %D/etc/redis.conf) || true
etc/redis.conf.sample
@exec [ -f %B/redis.conf ] || cp %B/%f %B/redis.conf

View File

@ -6,8 +6,7 @@
#
PORTNAME= redis
PORTVERSION= 1.2.6
PORTREVISION= 1
DISTVERSION= 2.0.1
CATEGORIES= databases
MASTER_SITES= GOOGLE_CODE
@ -18,11 +17,12 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
CFLAGS+= -I${LOCALBASE}/include
CONFLICTS?= redis-devel-2.*
CONFLICTS?= redis1-1.*
USE_GMAKE= yes
USE_RC_SUBR= redis.sh
BIN_FILES= redis-server redis-benchmark redis-cli
BIN_FILES= redis-benchmark redis-check-aof redis-check-dump \
redis-cli redis-server
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
@ -47,9 +47,9 @@ SUB_LIST+= PORTNAME="${PORTNAME}" \
REDIS_DBDIR="${REDIS_DBDIR}" \
REDIS_RUNDIR="${REDIS_RUNDIR}"
PATTERN= '10d;13s|$$$$(ARCH) ||'
PATTERN= '16d;119d;15s|$$$$(ARCH) ||'
.if !defined(WITH_DEBUG)
PATTERN:= ${PATTERN:S/'$/;14s|^|\#|'/}
PATTERN:= ${PATTERN:S/'$/;5s|^|\#|'/}
.endif
post-patch:

View File

@ -1,3 +1,3 @@
MD5 (redis-1.2.6.tar.gz) = 0c5355e57606523f9e8ce816db5e542f
SHA256 (redis-1.2.6.tar.gz) = bed0641225f786f225a2c4897ffbec1e6573a3c31e9f899884ee3041eab96873
SIZE (redis-1.2.6.tar.gz) = 213341
MD5 (redis-2.0.1.tar.gz) = 7c0fd3521bbee3ba777b195dedeac5c4
SHA256 (redis-2.0.1.tar.gz) = 4a20e667fe4267e1eb743d9b929a3662f7d5e211ef036c8dd4a7280f51a3b169
SIZE (redis-2.0.1.tar.gz) = 347301

View File

@ -1,32 +1,32 @@
--- redis.conf.orig 2009-12-27 11:54:09.000000000 +0300
+++ redis.conf 2009-12-27 11:56:16.000000000 +0300
@@ -2,11 +2,11 @@
--- redis.conf.orig 2010-07-02 16:00:49.000000000 +0400
+++ redis.conf 2010-07-02 16:01:46.000000000 +0400
@@ -14,11 +14,11 @@
# 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
# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
# You can specify a custom pid file location here.
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
# default. You can specify a custom pid file location here.
-pidfile /var/run/redis.pid
+pidfile %%REDIS_RUNDIR%%/redis.pid
# Accept connections on the specified port, default is 6379
port 6379
@@ -29,7 +29,7 @@
@@ -42,7 +42,7 @@
# Specify the log file name. Also 'stdout' can be used to force
# the demon to log on the standard output. Note that if you use standard
# 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 stdout
+logfile %%REDIS_LOGDIR%%/redis.log
# Set the number of databases. The default database is DB 0, you can select
# a different one on a per-connection basis using SELECT <dbid> where
@@ -64,7 +64,7 @@
# For default save/load DB in/from the working directory
# Note that you must specify a directory not a file name.
@@ -86,7 +86,7 @@
# Also the Append Only File will be created inside this directory.
#
# Note that you must specify a directory here, not a file name.
-dir ./
+dir %%REDIS_DBDIR%%/

View File

@ -1,6 +1,8 @@
bin/redis-server
bin/redis-benchmark
bin/redis-check-aof
bin/redis-check-dump
bin/redis-cli
bin/redis-server
@unexec (cmp -s %D/etc/redis.conf %D/etc/redis.conf.sample && rm -f %D/etc/redis.conf) || true
etc/redis.conf.sample
@exec [ -f %B/redis.conf ] || cp %B/%f %B/redis.conf