Skip site navigation (1)Skip section navigation (2)
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>
In-Reply-To: <20190311073200.4tvhu6rcam2ipiv4@icepick.vmeta.jp>
References:  <201903110543.x2B5hKYs027206@repo.freebsd.org> <20190311063230.GA62788@urd.tobik.me> <20190311073200.4tvhu6rcam2ipiv4@icepick.vmeta.jp>

next in thread | previous in thread | raw e-mail | index | archive | help
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>



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