From owner-svn-ports-all@freebsd.org Mon Mar 11 08:08:29 2019 Return-Path: Delivered-To: svn-ports-all@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 F18CD153676C; Mon, 11 Mar 2019 08:08:28 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8F9E7891FD; Mon, 11 Mar 2019 08:08:28 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 845BC7E6F; Mon, 11 Mar 2019 08:08:28 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2B88S3c099712; Mon, 11 Mar 2019 08:08:28 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2B88SeT099711; Mon, 11 Mar 2019 08:08:28 GMT (envelope-from meta@FreeBSD.org) Message-Id: <201903110808.x2B88SeT099711@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Mon, 11 Mar 2019 08:08:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495328 - head/textproc/kibana6 X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: head/textproc/kibana6 X-SVN-Commit-Revision: 495328 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8F9E7891FD X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.98)[-0.976,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-0.99)[-0.994,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 11 Mar 2019 08:08:29 -0000 Author: meta Date: Mon Mar 11 08:08:28 2019 New Revision: 495328 URL: https://svnweb.freebsd.org/changeset/ports/495328 Log: textproc/kibana6: Fix do-install I broke in the previous commit I meant WWWDIR_REL not WWWDIR here but the usage of @mode macro was wrong. It does not take a file argument. Use COPYTREE_BIN instead to keep executable permissions for binaries. PR: 236243 Reported by: tobik Modified: head/textproc/kibana6/Makefile Modified: head/textproc/kibana6/Makefile ============================================================================== --- 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= kibana PORTVERSION= 6.5.4 DISTVERSIONSUFFIX= -linux-x86_64 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= textproc www MASTER_SITES= 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.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: ${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}