svn commit: r307717 - in head/databases: redis redis-devel

[Sergey A. Osokin]

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
+ at unexec (cmp -s %D/etc/sentinel.conf %D/etc/sentinel.conf.sample && rm -f %D/etc/sentinel.conf) || true
+etc/sentinel.conf.sample
+ at 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
+ at unexec (cmp -s %D/etc/sentinel.conf %D/etc/sentinel.conf.sample && rm -f %D/etc/sentinel.conf) || true
+etc/sentinel.conf.sample
+ at 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