diff options
| author | Koichiro Iwao <meta@FreeBSD.org> | 2019-03-11 16:08:28 +0800 |
|---|---|---|
| committer | Koichiro Iwao <meta@FreeBSD.org> | 2019-03-11 16:08:28 +0800 |
| commit | 89757275627c24a3613d797d293c3dc133998214 (patch) | |
| tree | 8585e30781db2d6fe130dc724375caae187830e2 | |
| parent | 67bfc2ad77577ba72f4d4d68f55a8b163720c28e (diff) | |
| download | freebsd-ports-gnome-89757275627c24a3613d797d293c3dc133998214.tar.gz freebsd-ports-gnome-89757275627c24a3613d797d293c3dc133998214.tar.zst freebsd-ports-gnome-89757275627c24a3613d797d293c3dc133998214.zip | |
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
| -rw-r--r-- | textproc/kibana6/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/textproc/kibana6/Makefile b/textproc/kibana6/Makefile index 129279b8fec9..bb4b456d0835 100644 --- a/textproc/kibana6/Makefile +++ b/textproc/kibana6/Makefile @@ -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} |