From owner-svn-ports-head@freebsd.org Mon Mar 11 08:28:39 2019 Return-Path: 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 7F38315371FB; Mon, 11 Mar 2019 08:28:39 +0000 (UTC) (envelope-from tobik@freebsd.org) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) (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 18E9089EE8; Mon, 11 Mar 2019 08:28:39 +0000 (UTC) (envelope-from tobik@freebsd.org) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 1741D2208A; Mon, 11 Mar 2019 04:28:38 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Mon, 11 Mar 2019 04:28:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=kcuGb7 9nCtV0TumbN4nm69R8RQIIw04zqaYLMl4vnZA=; b=wcp90xDujXFfF3FnmqujKN rVgr5lXqn6SRyh0LSgU3l+J6WuKv+wCn45efibZgQhl3+1GFKUuadTO5L808sM1W Dt3UI0f//8i5fWw7bgBc1Jk/MYBj6PqSn8pS+wR46KOgk0OVuedGgABrRQpvlQQP i6qg3PyfcaPeslrVrOSD3s6LRcdg1z7rac9u4fx6GFkzay2CgAg16qh8S6rkBItR jutidScP+Ac444LGgXuwWw5+vOEdxG9MpnNbwXZ39Oh5mlEMt5uR8L/35OUlQI5H IGKflkBw3mCRnGEVFefUf79iKwQN427o9VXZN8I4JhUG7jrMkqkl01EYyp1drlzQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrgeehgdduudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkfhggtggujggfsehgtd erredtredvnecuhfhrohhmpefvohgsihgrshcumfhorhhtkhgrmhhpuceothhosghikhes fhhrvggvsghsugdrohhrgheqnecuffhomhgrihhnpehfrhgvvggsshgurdhorhhgpdgtrg htrghlohhgrdhmkhdpvghlrghsthhitgdrtghonecukfhppeelhedrledtrddvtddvrdef leenucfrrghrrghmpehmrghilhhfrhhomhepthhosghikhesfhhrvggvsghsugdrohhrgh enucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from urd.tobik.me (ip5f5aca27.dynamic.kabel-deutschland.de [95.90.202.39]) by mail.messagingengine.com (Postfix) with ESMTPA id D6A7C10310; Mon, 11 Mar 2019 04:28:36 -0400 (EDT) Date: Mon, 11 Mar 2019 09:28:38 +0100 From: Tobias Kortkamp To: Koichiro Iwao 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> References: <201903110808.x2B88SeT099711@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="8t9RHnE3ZwKMSgU+" Content-Disposition: inline In-Reply-To: <201903110808.x2B88SeT099711@repo.freebsd.org> User-Agent: Mutt/1.11.3 (2019-02-01) X-Rspamd-Queue-Id: 18E9089EE8 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.96)[-0.963,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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2019 08:28:39 -0000 --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+--