From 23c5e4bd2960b807f8b35156908a32c652ceae7e Mon Sep 17 00:00:00 2001 From: Dave Cottlehuber Date: Tue, 15 Sep 2015 22:29:42 +0000 Subject: [PATCH] h2o: fix rc.d script after perl changes --- www/h2o/Makefile | 2 +- www/h2o/files/h2o.in | 2 +- www/h2o/files/patch-share_h2o_annotate-backtrace-symbols | 9 +++++++++ www/h2o/files/patch-share_h2o_fetch-ocsp-response | 9 +++++++++ www/h2o/files/patch-share_h2o_kill-on-close | 9 +++++++++ www/h2o/files/patch-share_h2o_start__server | 9 +++++++++ 6 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 www/h2o/files/patch-share_h2o_annotate-backtrace-symbols create mode 100644 www/h2o/files/patch-share_h2o_fetch-ocsp-response create mode 100644 www/h2o/files/patch-share_h2o_kill-on-close create mode 100644 www/h2o/files/patch-share_h2o_start__server diff --git a/www/h2o/Makefile b/www/h2o/Makefile index 1df1ca1..4b4b3da 100644 --- a/www/h2o/Makefile +++ b/www/h2o/Makefile @@ -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 diff --git a/www/h2o/files/h2o.in b/www/h2o/files/h2o.in index 3b13fb0..8baa1ad 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="/usr/local/bin/perl" load_rc_config $name run_rc_command "$1" diff --git a/www/h2o/files/patch-share_h2o_annotate-backtrace-symbols b/www/h2o/files/patch-share_h2o_annotate-backtrace-symbols new file mode 100644 index 0000000..5fc4898 --- /dev/null +++ b/www/h2o/files/patch-share_h2o_annotate-backtrace-symbols @@ -0,0 +1,9 @@ +--- share/h2o/annotate-backtrace-symbols.orig 2015-09-15 22:13:10 UTC ++++ share/h2o/annotate-backtrace-symbols +@@ -1,5 +1,5 @@ + #! /bin/sh +-exec perl -x $0 "$@" ++exec /usr/local/bin/perl -x $0 "$@" + #! perl + + use strict; diff --git a/www/h2o/files/patch-share_h2o_fetch-ocsp-response b/www/h2o/files/patch-share_h2o_fetch-ocsp-response new file mode 100644 index 0000000..d37cb76 --- /dev/null +++ b/www/h2o/files/patch-share_h2o_fetch-ocsp-response @@ -0,0 +1,9 @@ +--- share/h2o/fetch-ocsp-response.orig 2015-09-14 13:47:04 UTC ++++ share/h2o/fetch-ocsp-response +@@ -1,5 +1,5 @@ + #! /bin/sh +-exec perl -x $0 "$@" ++exec /usr/local/bin/perl -x $0 "$@" + #! perl + + # Copyright (c) 2015 DeNA Co., Ltd., Kazuho Oku, Tatsuhiro Tsujikawa diff --git a/www/h2o/files/patch-share_h2o_kill-on-close b/www/h2o/files/patch-share_h2o_kill-on-close new file mode 100644 index 0000000..310fe50 --- /dev/null +++ b/www/h2o/files/patch-share_h2o_kill-on-close @@ -0,0 +1,9 @@ +--- share/h2o/kill-on-close.orig 2015-09-14 13:47:04 UTC ++++ share/h2o/kill-on-close +@@ -1,5 +1,5 @@ + #! /bin/sh +-exec perl -x $0 "$@" ++exec /usr/local/bin/perl -x $0 "$@" + #! perl + + use strict; diff --git a/www/h2o/files/patch-share_h2o_start__server b/www/h2o/files/patch-share_h2o_start__server new file mode 100644 index 0000000..ae9dc9f --- /dev/null +++ b/www/h2o/files/patch-share_h2o_start__server @@ -0,0 +1,9 @@ +--- share/h2o/start_server.orig 2015-09-14 13:47:04 UTC ++++ share/h2o/start_server +@@ -1,5 +1,5 @@ + #! /bin/sh +-exec perl -x $0 "$@" ++exec /usr/local/bin/perl -x $0 "$@" + #! perl + # This chunk of stuff was generated by App::FatPacker. To find the original + # file's code, look for the end of this BEGIN block or the string 'FATPACK'