From owner-svn-ports-head@freebsd.org  Mon Mar 11 07:57:48 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB5AB1536134;
 Mon, 11 Mar 2019 07:57:48 +0000 (UTC)
 (envelope-from meta@FreeBSD.org)
Received: from smtp.freebsd.org (smtp.freebsd.org
 [IPv6:2610:1c1:1:606c::24b:4])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "smtp.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 6AB7088BBA;
 Mon, 11 Mar 2019 07:57:48 +0000 (UTC)
 (envelope-from meta@FreeBSD.org)
Received: from icepick.vmeta.jp (unknown
 [IPv6:2405:6586:2280:1200:bcd7:6ea1:3b39:ada8])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 (Authenticated sender: meta/mail)
 by smtp.freebsd.org (Postfix) with ESMTPSA id 071A4125F9;
 Mon, 11 Mar 2019 07:57:46 +0000 (UTC)
 (envelope-from meta@FreeBSD.org)
Date: Mon, 11 Mar 2019 16:57:44 +0900
From: Koichiro Iwao <meta@FreeBSD.org>
To: Tobias Kortkamp <tobik@freebsd.org>
Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: Re: svn commit: r495326 - in head/textproc/kibana6: . files
Message-ID: <20190311075743.rvs36dfw44ve5pc6@icepick.vmeta.jp>
References: <201903110543.x2B5hKYs027206@repo.freebsd.org>
 <20190311063230.GA62788@urd.tobik.me>
 <20190311073200.4tvhu6rcam2ipiv4@icepick.vmeta.jp>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20190311073200.4tvhu6rcam2ipiv4@icepick.vmeta.jp>
X-Operating-System: FreeBSD 12.0-STABLE amd64
User-Agent: NeoMutt/20180716
X-Rspamd-Queue-Id: 6AB7088BBA
X-Spamd-Bar: ------
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-6.98 / 15.00];
 NEURAL_HAM_MEDIUM(-1.00)[-0.998,0];
 NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[];
 NEURAL_HAM_SHORT(-0.99)[-0.985,0]
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Mar 2019 07:57:49 -0000

This works as what I really intended:

Index: Makefile
===================================================================
--- Makefile    (revision 495326)
+++ Makefile    (working copy)
@@ -33,7 +33,8 @@
        ${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana.yml.sample
        (cd ${WRKSRC} && \
                ${RM} -r config node optimize && \
-               ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
+               ${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR} && \
+               ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "-not -name bin -type d")
        ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${WWWDIR}/config

 post-install:
@@ -40,7 +41,6 @@
        ${ECHO} "@sample ${ETCDIR}/kibana.yml.sample" >> ${TMPPLIST}
        ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
                ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
-       ${REINPLACE_CMD} -e "s|\(${WWWDIR}/bin/.*\)|@mode 0755 \1|" ${TMPPLIST}
        ${ECHO} "@dir(www,www) ${WWWDIR}/data" >> ${TMPPLIST}
        ${ECHO} "@dir ${WWWDIR}/plugins" >> ${TMPPLIST}
        ${ECHO} "@dir ${WWWDIR}/src/ui/public/factories" >> ${TMPPLIST}

-- 
meta <meta@FreeBSD.org>