From owner-svn-ports-all@FreeBSD.ORG  Tue Jul 22 10:27:51 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 451E5A6D;
 Tue, 22 Jul 2014 10:27:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1855024A9;
 Tue, 22 Jul 2014 10:27:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6MARoXm007852;
 Tue, 22 Jul 2014 10:27:50 GMT (envelope-from olgeni@svn.freebsd.org)
Received: (from olgeni@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6MARoZY007850;
 Tue, 22 Jul 2014 10:27:50 GMT (envelope-from olgeni@svn.freebsd.org)
Message-Id: <201407221027.s6MARoZY007850@svn.freebsd.org>
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Tue, 22 Jul 2014 10:27:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r362529 - head/net/rabbitmq
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jul 2014 10:27:51 -0000

Author: olgeni
Date: Tue Jul 22 10:27:50 2014
New Revision: 362529
URL: http://svnweb.freebsd.org/changeset/ports/362529
QAT: https://qat.redports.org/buildarchive/r362529/

Log:
  Install sample rabbitmq.config.
  
  Fix etc paths in rabbitmq-env.conf(5).

Modified:
  head/net/rabbitmq/Makefile
  head/net/rabbitmq/pkg-plist

Modified: head/net/rabbitmq/Makefile
==============================================================================
--- head/net/rabbitmq/Makefile	Tue Jul 22 10:14:52 2014	(r362528)
+++ head/net/rabbitmq/Makefile	Tue Jul 22 10:27:50 2014	(r362529)
@@ -3,6 +3,7 @@
 
 PORTNAME=	rabbitmq
 PORTVERSION=	3.3.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
@@ -53,7 +54,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|erl|${LOCALBASE}/bin/erl|g' \
 		${SCRIPTS_DIR}/rabbitmq-server ${SCRIPTS_DIR}/rabbitmqctl \
 		${SCRIPTS_DIR}/rabbitmq-env ${SCRIPTS_DIR}/rabbitmq-plugins \
-		${SCRIPTS_DIR}/rabbitmq-defaults
+		${SCRIPTS_DIR}/rabbitmq-defaults \
+		${WRKSRC}/docs/rabbitmq-env.conf.5.xml
 	@${REINPLACE_CMD} -e 's|VERSION=0.0.0|VERSION=${PORTVERSION}|g' \
 		${WRKSRC}/plugins-src/rabbitmq-erlang-client/Makefile \
 		${WRKSRC}/plugins-src/release.mk
@@ -67,6 +69,8 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/rabbitmq
 	@${MKDIR} ${STAGEDIR}/var/db/rabbitmq/mnesia
 	@${MKDIR} ${STAGEDIR}/var/log/rabbitmq
+	${INSTALL_DATA} ${WRKSRC}/docs/rabbitmq.config.example \
+		${STAGEDIR}${PREFIX}/etc/rabbitmq/rabbitmq.config.sample
 .if ${PORT_OPTIONS:MADMIN}
 	${INSTALL} ${WRKSRC}/plugins-src/rabbitmq-management/bin/rabbitmqadmin ${STAGEDIR}${PREFIX}/bin
 .endif

Modified: head/net/rabbitmq/pkg-plist
==============================================================================
--- head/net/rabbitmq/pkg-plist	Tue Jul 22 10:14:52 2014	(r362528)
+++ head/net/rabbitmq/pkg-plist	Tue Jul 22 10:27:50 2014	(r362529)
@@ -1,3 +1,4 @@
+@sample etc/rabbitmq/rabbitmq.config.sample
 %%ADMIN%%bin/rabbitmqadmin
 sbin/rabbitmq-defaults
 sbin/rabbitmq-env
@@ -208,7 +209,6 @@ man/man5/rabbitmq-env.conf.5.gz
 @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin
 @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin
 @dirrm lib/erlang/lib/rabbitmq_server-%%VERSION%%
-@exec mkdir -p %D/etc/rabbitmq
 @dirrmtry etc/rabbitmq
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rabbitmq.config.example
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%