From a6c7794cd4a763aed6042ff81036b7bce0f5a495 Mon Sep 17 00:00:00 2001 From: Dave Cottlehuber Date: Wed, 16 Sep 2015 09:54:43 +0200 Subject: [PATCH] h2o: fix rc.d script after perl changes --- www/h2o/Makefile | 11 +++++++++-- www/h2o/files/h2o.in | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/www/h2o/Makefile b/www/h2o/Makefile index 1df1ca1..dc16b19 100644 --- a/www/h2o/Makefile +++ b/www/h2o/Makefile @@ -4,7 +4,7 @@ PORTNAME= h2o PORTVERSION= 1.4.4 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= dch@skunkwerks.at @@ -14,7 +14,7 @@ LICENSE= MIT USE_GITHUB= yes -USES= cmake compiler:c11 shebangfix +USES= cmake compiler:c11 perl5 shebangfix SHEBANG_FILES= share/h2o/start_server PORTDOCS= README.md @@ -40,6 +40,13 @@ USE_RC_SUBR= ${PORTNAME} CMAKE_ARGS+= -DWITH_BUNDLED_SSL=OFF -DEXTRA_LIBRARIES=OFF USE_OPENSSL_PORT= yes +post-patch: + @${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \ + ${WRKSRC}/share/h2o/annotate-backtrace-symbols \ + ${WRKSRC}/share/h2o/fetch-ocsp-response \ + ${WRKSRC}/share/h2o/kill-on-close \ + ${WRKSRC}/share/h2o/start_server + post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} \ ${STAGEDIR}${ETCDIR} \ diff --git a/www/h2o/files/h2o.in b/www/h2o/files/h2o.in index 3b13fb0..a6d335b 100644 --- a/www/h2o/files/h2o.in +++ b/www/h2o/files/h2o.in @@ -28,7 +28,7 @@ rcvar=h2o_enable pidfile=`grep pid-file ${h2o_config} | cut -d' ' -f2` command="%%PREFIX%%/bin/${name}" command_args="-m daemon -c ${h2o_config}" -procname="perl" +procname="%%LOCALBASE%%/bin/perl" load_rc_config $name run_rc_command "$1"