Index: head/sysutils/riak-cs/Makefile
===================================================================
--- head/sysutils/riak-cs/Makefile	(revision 400923)
+++ head/sysutils/riak-cs/Makefile	(revision 400924)
@@ -1,79 +1,84 @@
 # $FreeBSD$
 
 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
 GROUPS=		riak
 
 RIAKCS_CONFDIR?=${PREFIX}/etc/riak-cs
 RIAKCS_DBDIR?=	/var/db/riak-cs
 RIAKCS_HOMEDIR?=${PREFIX}/lib/riak-cs
 RIAKCS_LIBDIR?=	${PREFIX}/lib/riak-cs/lib
 RIAKCS_LOGDIR?=	/var/log/riak-cs
 
 PLIST_SUB+=	RIAKCS_CONFDIR=${RIAKCS_CONFDIR} \
 	RIAKCS_DBDIR=${RIAKCS_DBDIR} \
 	RIAKCS_HOMEDIR=${RIAKCS_HOMEDIR} \
 	RIAKCS_LIBDIR=${RIAKCS_LIBDIR} \
 	RIAKCS_LOGDIR=${RIAKCS_LOGDIR} \
  	USERS=${USERS} \
 	GROUPS=${GROUPS}
 
 ALL_TARGET=	rel
 MAKE_JOBS_UNSAFE=yes
 MAKE_ENV=	PATH=${LOCALBASE}/lib/riak-erlang/bin:${PATH}
 
 post-patch:
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/rel/vars.config
 
 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)
 	(cd ${WRKSRC}/rel/riak-cs/releases && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAKCS_HOMEDIR}/releases)
 	${CP} -R ${WRKSRC}/rel/riak-cs/erts-* ${STAGEDIR}${RIAKCS_HOMEDIR}
 
 post-install:
 	(cd ${STAGEDIR}${RIAKCS_HOMEDIR}; ${FIND} releases -type f \
 		| ${SED} -e 's,^\./,,g' \
 		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
 		| ${AWK} '{print "lib/riak-cs/"$$2 }' >> ${TMPPLIST})
 	(cd ${STAGEDIR}${RIAKCS_HOMEDIR}; ${FIND} erts-* -type f \
 		| ${SED} -e 's,^\./,,g' \
 		| ${AWK} '{print length, $$0}' | ${SORT} -rn  \
 		| ${AWK} '{print "lib/riak-cs/"$$2 }' >> ${TMPPLIST})
 	(cd ${STAGEDIR}${RIAKCS_HOMEDIR}; ${FIND} erts-* -type d -empty \
 		| ${SED} -e 's,^\./,,g' \
 		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
 		| ${AWK} '{print "@dir lib/riak-cs/"$$2 }' >> ${TMPPLIST})
 	(cd ${STAGEDIR}${RIAKCS_LIBDIR}; ${FIND} . -type f \
 		| ${SED} -e 's,^\./,,g' \
 		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
 		| ${AWK} '{print "lib/riak-cs/lib/"$$2 }' >> ${TMPPLIST})
 	(cd ${STAGEDIR}${RIAKCS_LIBDIR}; ${FIND} . -type d -empty \
 		| ${SED} -e 's,^\./,,g' \
 		| ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \
 		| ${AWK} '{print "@dir lib/riak-cs/lib/"$$2 }' >> ${TMPPLIST})
 
 .include <bsd.port.mk>
Index: head/sysutils/riak-cs/pkg-plist
===================================================================
--- head/sysutils/riak-cs/pkg-plist	(revision 400923)
+++ head/sysutils/riak-cs/pkg-plist	(revision 400924)
@@ -1,20 +1,19 @@
 sbin/riak-cs
 sbin/riak-cs-access
 sbin/riak-cs-admin
 sbin/riak-cs-debug
 sbin/riak-cs-gc
 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%%
 @dir %%RIAKCS_HOMEDIR%%
 @dir %%RIAKCS_LIBDIR%%
 @dir %%RIAKCS_LOGDIR%%