From owner-svn-ports-head@freebsd.org Wed Feb 24 08:39:21 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0CB965557C4; Wed, 24 Feb 2021 08:39:21 +0000 (UTC) (envelope-from dch@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dlq8m700Sz4gHr; Wed, 24 Feb 2021 08:39:20 +0000 (UTC) (envelope-from dch@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 E2DF828DFA; Wed, 24 Feb 2021 08:39:20 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11O8dKVp032696; Wed, 24 Feb 2021 08:39:20 GMT (envelope-from dch@FreeBSD.org) Received: (from dch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11O8dKoU032695; Wed, 24 Feb 2021 08:39:20 GMT (envelope-from dch@FreeBSD.org) Message-Id: <202102240839.11O8dKoU032695@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dch set sender to dch@FreeBSD.org using -f From: Dave Cottlehuber Date: Wed, 24 Feb 2021 08:39:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566456 - in head/www: h2o h2o-devel X-SVN-Group: ports-head X-SVN-Commit-Author: dch X-SVN-Commit-Paths: in head/www: h2o h2o-devel X-SVN-Commit-Revision: 566456 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Feb 2021 08:39:21 -0000 Author: dch Date: Wed Feb 24 08:39:20 2021 New Revision: 566456 URL: https://svnweb.freebsd.org/changeset/ports/566456 Log: www/h2o*: revert r566455 - broken with current libressl Sponsored by: SkunkWerks, GmbH Modified: head/www/h2o-devel/Makefile head/www/h2o/Makefile Modified: head/www/h2o-devel/Makefile ============================================================================== --- head/www/h2o-devel/Makefile Wed Feb 24 08:00:18 2021 (r566455) +++ head/www/h2o-devel/Makefile Wed Feb 24 08:39:20 2021 (r566456) @@ -4,7 +4,6 @@ PORTNAME= h2o DISTVERSIONPREFIX= v DISTVERSION= 2.3.0-beta2 -PORTREVISION= 1 CATEGORIES= www PKGNAMESUFFIX= -devel @@ -60,6 +59,15 @@ MRUBY_CMAKE_BOOL= WITH_MRUBY MRUBY_USES= bison MRUBY_USE= ruby=yes MRUBY_VARS= RUBY_NO_RUN_DEPENDS=yes + +post-patch: + @${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \ + ${WRKSRC}/share/h2o/annotate-backtrace-symbols \ + ${WRKSRC}/share/h2o/fastcgi-cgi \ + ${WRKSRC}/share/h2o/fetch-ocsp-response \ + ${WRKSRC}/share/h2o/kill-on-close \ + ${WRKSRC}/share/h2o/setuidgid \ + ${WRKSRC}/share/h2o/start_server post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} \ Modified: head/www/h2o/Makefile ============================================================================== --- head/www/h2o/Makefile Wed Feb 24 08:00:18 2021 (r566455) +++ head/www/h2o/Makefile Wed Feb 24 08:39:20 2021 (r566456) @@ -4,7 +4,6 @@ PORTNAME= h2o DISTVERSIONPREFIX= v DISTVERSION= 2.2.6 -PORTREVISION= 1 CATEGORIES= www MAINTAINER= dch@FreeBSD.org @@ -23,7 +22,7 @@ LIB_DEPENDS= libuv.so:devel/libuv USES= cmake:noninja compiler:c11 cpe perl5 shebangfix ssl pkgconfig USE_GITHUB= yes USE_PERL5= run -USE_LDCONFIG= yes +USE_LDCONFIG= yes CPE_VENDOR= h2o_project @@ -60,6 +59,15 @@ MRUBY_CMAKE_BOOL= WITH_MRUBY MRUBY_USES= bison MRUBY_USE= ruby=yes MRUBY_VARS= RUBY_NO_RUN_DEPENDS=yes + +post-patch: + @${REINPLACE_CMD} -e 's|exec perl|exec ${LOCALBASE}/bin/perl|' \ + ${WRKSRC}/share/h2o/annotate-backtrace-symbols \ + ${WRKSRC}/share/h2o/fastcgi-cgi \ + ${WRKSRC}/share/h2o/fetch-ocsp-response \ + ${WRKSRC}/share/h2o/kill-on-close \ + ${WRKSRC}/share/h2o/setuidgid \ + ${WRKSRC}/share/h2o/start_server post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} \