svn commit: r362529 - head/net/rabbitmq

[Jimmy Olgeni]

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 @@
+ at 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%%
- at exec mkdir -p %D/etc/rabbitmq
 @dirrmtry etc/rabbitmq
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rabbitmq.config.example
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%