From owner-svn-ports-all@FreeBSD.ORG Tue Apr 15 17:45:55 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C05F2D43; Tue, 15 Apr 2014 17:45:55 +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 A07D11798; Tue, 15 Apr 2014 17:45:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3FHjtBC051946; Tue, 15 Apr 2014 17:45:55 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3FHjtEe051944; Tue, 15 Apr 2014 17:45:55 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201404151745.s3FHjtEe051944@svn.freebsd.org> From: Steve Wills Date: Tue, 15 Apr 2014 17:45:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351357 - head/databases/riak 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.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2014 17:45:55 -0000 Author: swills Date: Tue Apr 15 17:45:54 2014 New Revision: 351357 URL: http://svnweb.freebsd.org/changeset/ports/351357 QAT: https://qat.redports.org/buildarchive/r351357/ Log: - Stage - Add LICENSE - Pet portlint - pkg-plist fix PR: ports/188664 Submitted by: Bartek Rutkowski (maintainer) Modified: head/databases/riak/Makefile head/databases/riak/pkg-plist Modified: head/databases/riak/Makefile ============================================================================== --- head/databases/riak/Makefile Tue Apr 15 17:40:46 2014 (r351356) +++ head/databases/riak/Makefile Tue Apr 15 17:45:54 2014 (r351357) @@ -7,7 +7,9 @@ MASTER_SITES= http://s3.amazonaws.com/do http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/ MAINTAINER= ports@robakdesign.com -COMMENT= Riak is an open source, distributed database +COMMENT= Riak is an open source, distributed, noSQL database + +LICENSE= APACHE20 BUILD_DEPENDS= ${LOCALBASE}/lib/erlang15/bin/erlc:${PORTSDIR}/lang/erlang-runtime15 @@ -35,13 +37,14 @@ MANCOMPRESSED= yes ALL_TARGET= rel MAKE_JOBS_UNSAFE=yes MAKE_ENV= PATH=${LOCALBASE}/lib/erlang15/bin:${PATH} -NO_STAGE= yes .include pre-install: ${RM} -f ${PLIST} ${CAT} ${PKGDIR}/pkg-plist >> ${PLIST} + ${ECHO} "@owner ${USERS}" >> ${PLIST} + ${ECHO} "@group ${GROUPS}" >> ${PLIST} cd ${WRKSRC}/rel/${PORTNAME}; ${FIND} releases -type f \ | ${AWK} '{print length, $$0}' | ${SORT} -rn | ${SED} -e 's/^/lib\//' \ | ${AWK} '{print "lib/riak/"$$2 }' >> ${PLIST} @@ -67,35 +70,34 @@ pre-install: do-install: .for d in ${RIAK_CONFDIR} ${RIAK_LOGDIR} ${RIAK_DBDIR} ${RIAK_LIBDIR} ${RIAK_HOMEDIR} - [ -d ${d} ] || ${MKDIR} ${d} && ${CHOWN} ${USERS}:${GROUPS} ${d} + [ -d ${STAGEDIR}${d} ] || ${MKDIR} ${STAGEDIR}${d} .endfor - ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/vm.args ${RIAK_CONFDIR}/vm.args.sample - ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/app.config ${RIAK_CONFDIR}/app.config.sample - ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/cert.pem ${RIAK_CONFDIR}/cert.pem.sample - ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/key.pem ${RIAK_CONFDIR}/key.pem.sample - (cd ${WRKSRC}/rel/riak/lib/ && ${COPYTREE_BIN} . ${RIAK_LIBDIR}) - (cd ${WRKSRC}/rel/riak/bin/ && ${COPYTREE_BIN} . ${PREFIX}/sbin/) - (cd ${WRKSRC}/rel/riak/lib/basho-patches && ${COPYTREE_SHARE} . ${RIAK_LIBDIR}/basho-patches) - (cd ${WRKSRC}/rel/riak/releases && ${COPYTREE_SHARE} . ${RIAK_HOMEDIR}/releases) - ${CP} -R ${WRKSRC}/rel/riak/erts-* ${RIAK_HOMEDIR} - ${CHOWN} -R ${USERS}:${GROUPS} ${PREFIX}/lib/${PORTNAME} - ${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak.1.gz ${MANPREFIX}/man/man1/ - ${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak-admin.1.gz ${MANPREFIX}/man/man1/ - ${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak-debug.1.gz ${MANPREFIX}/man/man1/ - ${INSTALL_MAN} ${WRKSRC}/doc/man/man1/search-cmd.1.gz ${MANPREFIX}/man/man1/ + ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/vm.args ${STAGEDIR}${RIAK_CONFDIR}/vm.args.sample + ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/app.config ${STAGEDIR}${RIAK_CONFDIR}/app.config.sample + ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/cert.pem ${STAGEDIR}${RIAK_CONFDIR}/cert.pem.sample + ${INSTALL_DATA} ${WRKSRC}/rel/riak/etc/key.pem ${STAGEDIR}${RIAK_CONFDIR}/key.pem.sample + (cd ${WRKSRC}/rel/riak/lib/ && ${COPYTREE_BIN} . ${STAGEDIR}${RIAK_LIBDIR}) + (cd ${WRKSRC}/rel/riak/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/sbin/) + (cd ${WRKSRC}/rel/riak/lib/basho-patches && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAK_LIBDIR}/basho-patches) + (cd ${WRKSRC}/rel/riak/releases && ${COPYTREE_SHARE} . ${STAGEDIR}${RIAK_HOMEDIR}/releases) + ${CP} -R ${WRKSRC}/rel/riak/erts-* ${STAGEDIR}${RIAK_HOMEDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak-admin.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/doc/man/man1/riak-debug.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/doc/man/man1/search-cmd.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/ post-install: - @if [ ! -f ${RIAK_CONFDIR}/vm.args ]; then \ - ${CP} -p ${RIAK_CONFDIR}/vm.args.sample ${RIAK_CONFDIR}/vm.args; \ + @if [ ! -f ${STAGEDIR}${RIAK_CONFDIR}/vm.args ]; then \ + ${CP} -p ${STAGEDIR}${RIAK_CONFDIR}/vm.args.sample ${STAGEDIR}${RIAK_CONFDIR}/vm.args; \ fi - @if [ ! -f ${RIAK_CONFDIR}/app.config ]; then \ - ${CP} -p ${RIAK_CONFDIR}/app.config.sample ${RIAK_CONFDIR}/app.config; \ + @if [ ! -f ${STAGEDIR}${RIAK_CONFDIR}/app.config ]; then \ + ${CP} -p ${STAGEDIR}${RIAK_CONFDIR}/app.config.sample ${STAGEDIR}${RIAK_CONFDIR}/app.config; \ fi - @if [ ! -f ${RIAK_CONFDIR}/cert.pem ]; then \ - ${CP} -p ${RIAK_CONFDIR}/cert.pem.sample ${RIAK_CONFDIR}/cert.pem; \ + @if [ ! -f ${STAGEDIR}${RIAK_CONFDIR}/cert.pem ]; then \ + ${CP} -p ${STAGEDIR}${RIAK_CONFDIR}/cert.pem.sample ${STAGEDIR}${RIAK_CONFDIR}/cert.pem; \ fi - @if [ ! -f ${RIAK_CONFDIR}/key.pem ]; then \ - ${CP} -p ${RIAK_CONFDIR}/key.pem.sample ${RIAK_CONFDIR}/key.pem; \ + @if [ ! -f ${STAGEDIR}${RIAK_CONFDIR}/key.pem ]; then \ + ${CP} -p ${STAGEDIR}${RIAK_CONFDIR}/key.pem.sample ${STAGEDIR}${RIAK_CONFDIR}/key.pem; \ fi .include Modified: head/databases/riak/pkg-plist ============================================================================== --- head/databases/riak/pkg-plist Tue Apr 15 17:40:46 2014 (r351356) +++ head/databases/riak/pkg-plist Tue Apr 15 17:45:54 2014 (r351357) @@ -2,6 +2,10 @@ sbin/riak sbin/riak-admin sbin/riak-debug sbin/search-cmd +man/man1/riak-admin.1.gz +man/man1/riak-debug.1.gz +man/man1/riak.1.gz +man/man1/search-cmd.1.gz @exec mkdir -p %%RIAK_CONFDIR%% @exec mkdir -p %%RIAK_LOGDIR%% @exec mkdir -p %%RIAK_DBDIR%%