svn commit: r495328 - head/textproc/kibana6

[Koichiro Iwao]

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}