Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Nov 2015 11:56:18 +0000 (UTC)
From:      William Grzybowski <wg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r400924 - head/sysutils/riak-cs
Message-ID:  <201511061156.tA6BuIkc090266@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wg
Date: Fri Nov  6 11:56:18 2015
New Revision: 400924
URL: https://svnweb.freebsd.org/changeset/ports/400924

Log:
  sysutils/riak-cs: fix shebangs and configs
  
  - Fix shebangs
  - Fix config giles, @sample is used incorrectly
  - Add LICENSE_FILE
  - Remove needless @dir
  
  PR:		204324
  Submitted by:	amdmi3

Modified:
  head/sysutils/riak-cs/Makefile
  head/sysutils/riak-cs/pkg-plist

Modified: head/sysutils/riak-cs/Makefile
==============================================================================
--- head/sysutils/riak-cs/Makefile	Fri Nov  6 11:53:13 2015	(r400923)
+++ head/sysutils/riak-cs/Makefile	Fri Nov  6 11:56:18 2015	(r400924)
@@ -2,18 +2,23 @@
 
 PORTNAME=	riak-cs
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://s3.amazonaws.com/downloads.basho.com/riak-cs/${PORTVERSION:R}/${PORTVERSION}/ \
-	http://downloads.basho.com.s3.amazonaws.com/riak-cs/${PORTVERSION:R}/${PORTVERSION}/
+		http://downloads.basho.com.s3.amazonaws.com/riak-cs/${PORTVERSION:R}/${PORTVERSION}/
 
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Open source, distributed, S3 interface to Riak KV
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/riak-erlang/bin/erlc:${PORTSDIR}/lang/erlang-riak
 
-USES=		gmake readline
+USES=		gmake readline shebangfix
+SHEBANG_FILES=	deps/eper/priv/bin/dtop \
+		deps/eper/priv/bin/ntop \
+		deps/eper/priv/bin/redbug
 USE_RC_SUBR=	riak-cs
 
 USERS=		riakcs
@@ -44,10 +49,10 @@ do-install:
 	${MKDIR} ${STAGEDIR}${RIAKCS_CONFDIR}
 	${MKDIR} ${STAGEDIR}${RIAKCS_DBDIR}
 	${MKDIR} ${STAGEDIR}${RIAKCS_LOGDIR}
-	${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/riak-cs.conf ${STAGEDIR}${RIAKCS_CONFDIR}/riak-cs.conf
-	${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/advanced.config ${STAGEDIR}${RIAKCS_CONFDIR}/advanced.config
-	${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/cert.pem ${STAGEDIR}${RIAKCS_CONFDIR}/cert.pem
-	${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/key.pem ${STAGEDIR}${RIAKCS_CONFDIR}/key.pem
+	${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/riak-cs.conf ${STAGEDIR}${RIAKCS_CONFDIR}/riak-cs.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/advanced.config ${STAGEDIR}${RIAKCS_CONFDIR}/advanced.config.sample
+	${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/cert.pem ${STAGEDIR}${RIAKCS_CONFDIR}/cert.pem.sample
+	${INSTALL_DATA} ${WRKSRC}/rel/riak-cs/etc/key.pem ${STAGEDIR}${RIAKCS_CONFDIR}/key.pem.sample
 	(cd ${WRKSRC}/rel/riak-cs/lib/ && ${COPYTREE_BIN} . ${STAGEDIR}${RIAKCS_LIBDIR})
 	(cd ${WRKSRC}/rel/riak-cs/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin/)
 	(cd ${WRKSRC}/rel/riak-cs/lib/basho-patches && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAKCS_LIBDIR}/basho-patches)

Modified: head/sysutils/riak-cs/pkg-plist
==============================================================================
--- head/sysutils/riak-cs/pkg-plist	Fri Nov  6 11:53:13 2015	(r400923)
+++ head/sysutils/riak-cs/pkg-plist	Fri Nov  6 11:56:18 2015	(r400924)
@@ -7,11 +7,10 @@ sbin/riak-cs-multibag
 sbin/riak-cs-stanchion
 sbin/riak-cs-storage
 sbin/riak-cs-supercluster
-@sample %%RIAKCS_CONFDIR%%/riak-cs.conf
-@sample %%RIAKCS_CONFDIR%%/advanced.config
-@sample %%RIAKCS_CONFDIR%%/key.pem
-@sample %%RIAKCS_CONFDIR%%/cert.pem
-@dir %%RIAKCS_CONFDIR%%
+@sample %%RIAKCS_CONFDIR%%/riak-cs.conf.sample
+@sample %%RIAKCS_CONFDIR%%/advanced.config.sample
+@sample %%RIAKCS_CONFDIR%%/key.pem.sample
+@sample %%RIAKCS_CONFDIR%%/cert.pem.sample
 @owner %%USERS%%
 @group %%GROUPS%%
 @dir %%RIAKCS_DBDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511061156.tA6BuIkc090266>