Index: Makefile =================================================================== --- Makefile (revision 520822) +++ Makefile (working copy) @@ -4,6 +4,7 @@ PORTNAME= h2o DISTVERSIONPREFIX= v DISTVERSION= 2.2.6 +PORTREVISION= 1 CATEGORIES= www MAINTAINER= dch@FreeBSD.org @@ -22,7 +23,7 @@ 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,14 +61,10 @@ 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 +.include +.if ${SSL_DEFAULT:Mlibressl*} +USES+= localbase +.endif post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} \ @@ -80,4 +77,4 @@ ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} -.include +.include Index: files/patch-deps_neverbleed-neverbleed.c =================================================================== --- files/patch-deps_neverbleed-neverbleed.c (nonexistent) +++ files/patch-deps_neverbleed-neverbleed.c (working copy) @@ -0,0 +1,39 @@ +--- deps/neverbleed/neverbleed.c.orig 2019-12-27 07:57:52 UTC ++++ deps/neverbleed/neverbleed.c +@@ -631,8 +631,11 @@ static int sign_stub(struct expbuf_t *buf) + } + + #if !OPENSSL_1_1_API +- ++#if !defined(LIBRESSL_VERSION_NUMBER) + static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) ++#else ++void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) ++#endif + { + if (n) { + *n = rsa->n; +@@ -647,7 +650,11 @@ static void RSA_get0_key(const RSA *rsa, const BIGNUM + } + } + ++#if !defined(LIBRESSL_VERSION_NUMBER) + static int RSA_set0_key(RSA *rsa, BIGNUM *n, BIGNUM *e, BIGNUM *d) ++#else ++int RSA_set0_key(RSA *rsa, BIGNUM *n, BIGNUM *e, BIGNUM *d) ++#endif + { + if (n == NULL || e == NULL) { + return 0; +@@ -663,7 +670,11 @@ static int RSA_set0_key(RSA *rsa, BIGNUM *n, BIGNUM *e + return 1; + } + ++#if !defined(LIBRESSL_VERSION_NUMBER) + static void RSA_set_flags(RSA *r, int flags) ++#else ++void RSA_set_flags(RSA *r, int flags) ++#endif + { + r->flags |= flags; + } Property changes on: files/patch-deps_neverbleed-neverbleed.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property