On Wed, May 22, 2019 at 10:44:02AM +0100, Stuart Henderson wrote:
> Modified from a port from otto@ based on openbsd-wip port from
> David Carlier. The build is a nasty mess of cmake and autoconf and
> I would definitely appreciate another porters' eyes on it ..
I expected worse ;-)

The port itself looks good, a few small spaces where tabs should be,
ninja fails in the build target not configure, and your cmake patch
may be replaced by `ln -sf ${RUBY} ${WRKDIR}/bin/ruby'.

See diff below for these bits.

www/wslay is searched for during configure as optional dependency, do
you want to pick it up as well for WebSocket support?

Despite the libuv LDEP, I see `-DH2O_USE_LIBUV=0' in the build logs;
that seems off.

I've lightly tested the server on amd64 where clients successfully
upgrade from HTTP/1.1 to HTTP/2, but nothing fancy.

--- Makefile.orig       Thu May 23 00:21:59 2019
+++ Makefile    Thu May 23 21:40:33 2019
@@ -8,9 +8,9 @@
 
 CATEGORIES =   www
 
-GH_ACCOUNT =    h2o
-GH_PROJECT =    h2o
-GH_TAGNAME =    v2.2.5
+GH_ACCOUNT =   h2o
+GH_PROJECT =   h2o
+GH_TAGNAME =   v2.2.5
 
 HOMEPAGE =     https://h2o.examp1e.net/
 MAINTAINER =   Otto Moerbeek <o...@drijf.net>
@@ -26,18 +26,21 @@
 MODULES =              devel/cmake \
                        lang/ruby
 
-# fails in configure with ninja
-USE_NINJA =             No
+# ninja: error: 'mruby/host/lib/libmruby.a', needed by 'h2o',
+# missing and no known rule to make it
+USE_NINJA =            No
 
-BUILD_DEPENDS =         devel/bison
+BUILD_DEPENDS =                devel/bison
 
-LIB_DEPENDS =           devel/libuv
+LIB_DEPENDS =          devel/libuv
 
 CONFIGURE_ARGS =       -DBUILD_SHARED_LIBS=ON \
                        -DCMAKE_INSTALL_SYSCONFDIR=${SYSCONFDIR}/h2o \
-                       -DRUBYEXE=${RUBY} \
                        -DWITH_BUNDLED_SSL=OFF \
                        -DWITH_MRUBY=ON
+
+pre-configure:
+       ln -sf ${RUBY} ${WRKDIR}/bin/ruby
 
 post-install:
        #${INSTALL_DATA_DIR} ${PREFIX}/share/doc/h2o

Reply via email to