Date: Mon, 11 Mar 2019 09:28:38 +0100 From: Tobias Kortkamp <tobik@freebsd.org> To: Koichiro Iwao <meta@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r495328 - head/textproc/kibana6 Message-ID: <20190311082837.GA52711@urd.tobik.me> In-Reply-To: <201903110808.x2B88SeT099711@repo.freebsd.org> References: <201903110808.x2B88SeT099711@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--8t9RHnE3ZwKMSgU+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 11, 2019 at 08:08:28AM +0000, Koichiro Iwao wrote: > Author: meta > Date: Mon Mar 11 08:08:28 2019 > New Revision: 495328 > URL: https://svnweb.freebsd.org/changeset/ports/495328 >=20 > Log: > textproc/kibana6: Fix do-install I broke in the previous commit > =20 > I meant WWWDIR_REL not WWWDIR here but the usage of @mode macro was wro= ng. > It does not take a file argument. Use COPYTREE_BIN instead to keep > executable permissions for binaries. > =20 > PR: 236243 > Reported by: tobik >=20 > Modified: > head/textproc/kibana6/Makefile >=20 > Modified: head/textproc/kibana6/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/textproc/kibana6/Makefile Mon Mar 11 07:57:05 2019 (r495327) > +++ head/textproc/kibana6/Makefile Mon Mar 11 08:08:28 2019 (r495328) > @@ -4,7 +4,7 @@ > PORTNAME=3D kibana > PORTVERSION=3D 6.5.4 > DISTVERSIONSUFFIX=3D -linux-x86_64 > -PORTREVISION=3D 0 > +PORTREVISION=3D 1 > CATEGORIES=3D textproc www > MASTER_SITES=3D https://artifacts.elastic.co/downloads/kibana/ \ > http://artifacts.elastic.co/downloads/kibana/ > @@ -33,14 +33,14 @@ do-install: > ${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana= =2Eyml.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 > =20 > post-install: > ${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} Thanks, but the package now barely installs any files: $ pkg info -l kibana6 kibana6-6.5.4_1: /usr/local/etc/kibana/kibana.yml.sample /usr/local/etc/rc.d/kibana /usr/local/share/licenses/kibana6-6.5.4_1/APACHE20 /usr/local/share/licenses/kibana6-6.5.4_1/LICENSE /usr/local/share/licenses/kibana6-6.5.4_1/catalog.mk /usr/local/www/kibana6/bin/kibana /usr/local/www/kibana6/bin/kibana-keystore /usr/local/www/kibana6/bin/kibana-plugin /usr/local/www/kibana6/config $ --8t9RHnE3ZwKMSgU+ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEElXvTEJc6ePgdQuobpPCftzzFH2EFAlyGHDJfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk1 N0JEMzEwOTczQTc4RjgxRDQyRUExQkE0RjA5RkI3M0NDNTFGNjEACgkQpPCftzzF H2FxpAf/Uc7mPBkbVoxiNuZ3fGOQ+oaLHwHT+5KDNXcPAXme4VE88mVCQI0mJ9O4 Qwi3TLcophMpfDjIA27surffOx5UODlmqnYZ2R5V54d+asyLqhvymZT0tR+ekquR jZ7Mj3al3t76J466We5AW9hexD5mpxtTkvRNlw6LnaMESI7bY88ZM5p5+TuIUtoi /OELc6ZsGWcsFg3gwtTEnXHp8DaSnsEKLra0H2ZPuCV5g+SvLHYWy4kLsx4fqYx3 icy646MqCp0g/GMui0ZsUuZLOo3OWlh97AfQ12sOlP5/rTKoGV340GDl4G2qc3BI koZDrvGeIL06uuJnhzhueRbGv7p1Zw== =HYhn -----END PGP SIGNATURE----- --8t9RHnE3ZwKMSgU+--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190311082837.GA52711>