From owner-svn-ports-head@FreeBSD.ORG  Sat Nov 24 13:48:10 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 95A745D6;
 Sat, 24 Nov 2012 13:48:10 +0000 (UTC) (envelope-from osa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 73F6B8FC0C;
 Sat, 24 Nov 2012 13:48:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAODmAwZ062517;
 Sat, 24 Nov 2012 13:48:10 GMT (envelope-from osa@svn.freebsd.org)
Received: (from osa@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAODmA2w062513;
 Sat, 24 Nov 2012 13:48:10 GMT (envelope-from osa@svn.freebsd.org)
Message-Id: <201211241348.qAODmA2w062513@svn.freebsd.org>
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Sat, 24 Nov 2012 13:48:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307717 - in head/databases: redis redis-devel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Nov 2012 13:48:10 -0000

Author: osa
Date: Sat Nov 24 13:48:09 2012
New Revision: 307717
URL: http://svnweb.freebsd.org/changeset/ports/307717

Log:
  Fix pkg-plist for packages.
  
  Feature safe: yes

Modified:
  head/databases/redis-devel/Makefile
  head/databases/redis-devel/pkg-plist
  head/databases/redis/Makefile
  head/databases/redis/pkg-plist

Modified: head/databases/redis-devel/Makefile
==============================================================================
--- head/databases/redis-devel/Makefile	Sat Nov 24 12:38:06 2012	(r307716)
+++ head/databases/redis-devel/Makefile	Sat Nov 24 13:48:09 2012	(r307717)
@@ -3,6 +3,7 @@
 
 PORTNAME=	redis
 DISTVERSION=	2.6.5
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMESUFFIX=	-devel

Modified: head/databases/redis-devel/pkg-plist
==============================================================================
--- head/databases/redis-devel/pkg-plist	Sat Nov 24 12:38:06 2012	(r307716)
+++ head/databases/redis-devel/pkg-plist	Sat Nov 24 13:48:09 2012	(r307717)
@@ -6,8 +6,10 @@ bin/redis-sentinel
 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
-etc/sentinel.conf.sample
 @exec [ -f %B/redis.conf ] || cp %B/%f %B/redis.conf
+@unexec (cmp -s %D/etc/sentinel.conf %D/etc/sentinel.conf.sample && rm -f %D/etc/sentinel.conf) || true
+etc/sentinel.conf.sample
+@exec [ -f %B/sentinel.conf ] || cp %B/%f %B/sentinel.conf
 @exec [ -d %%REDIS_DBDIR%% ] || mkdir -p %%REDIS_DBDIR%%
 @exec chown %%REDIS_USER%%:%%REDIS_GROUP%% %%REDIS_DBDIR%%
 @unexec if [ -z ${UPGRADE_PORT} ] ; then rmdir %%REDIS_DBDIR%% 2>/dev/null; fi

Modified: head/databases/redis/Makefile
==============================================================================
--- head/databases/redis/Makefile	Sat Nov 24 12:38:06 2012	(r307716)
+++ head/databases/redis/Makefile	Sat Nov 24 13:48:09 2012	(r307717)
@@ -3,6 +3,7 @@
 
 PORTNAME=	redis
 DISTVERSION=	2.6.5
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	GOOGLE_CODE
 

Modified: head/databases/redis/pkg-plist
==============================================================================
--- head/databases/redis/pkg-plist	Sat Nov 24 12:38:06 2012	(r307716)
+++ head/databases/redis/pkg-plist	Sat Nov 24 13:48:09 2012	(r307717)
@@ -6,8 +6,10 @@ bin/redis-sentinel
 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
-etc/sentinel.conf.sample
 @exec [ -f %B/redis.conf ] || cp %B/%f %B/redis.conf
+@unexec (cmp -s %D/etc/sentinel.conf %D/etc/sentinel.conf.sample && rm -f %D/etc/sentinel.conf) || true
+etc/sentinel.conf.sample
+@exec [ -f %B/sentinel.conf ] || cp %B/%f %B/sentinel.conf
 @exec [ -d %%REDIS_DBDIR%% ] || mkdir -p %%REDIS_DBDIR%%
 @exec chown %%REDIS_USER%%:%%REDIS_GROUP%% %%REDIS_DBDIR%%
 @unexec if [ -z ${UPGRADE_PORT} ] ; then rmdir %%REDIS_DBDIR%% 2>/dev/null; fi