Index: head/devel/kore/Makefile
===================================================================
--- head/devel/kore/Makefile	(revision 474941)
+++ head/devel/kore/Makefile	(revision 474942)
@@ -1,95 +1,96 @@
 # Created by: Tobias Kortkamp <t@tobik.me>
 # $FreeBSD$
 
 PORTNAME=	kore
 PORTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	devel www
 MASTER_SITES=	https://kore.io/releases/
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Web application framework for writing web APIs in C
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_powerpc64=	fails to compile: cc1: error: -Werror=c11-extensions: No option -Wc11-extensions
 
 FLAVORS=	default notls
 notls_PKGNAMESUFFIX=	-notls
 
 USES=		compiler gmake ssl
 
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}} -I${OPENSSLINC}
 CFLAGS_clang=	-Wno-error=c11-extensions # 12.0 + -pedantic
 LDFLAGS+=	-L${OPENSSLLIB}
 
 DATADIR=	${PREFIX}/share/kore${PKGNAMESUFFIX}
 EXAMPLESDIR=	${PREFIX}/share/examples/kore${PKGNAMESUFFIX}
 PLIST_SUB=	SUFFIX=${PKGNAMESUFFIX}
 
 OPTIONS_DEFINE=	DEBUG EXAMPLES HTTP JSONRPC PGSQL PYTHON TASKS TLS
 OPTIONS_DEFAULT=	HTTP JSONRPC PGSQL PYTHON TASKS TLS
 .if ${FLAVOR:U} == notls
 OPTIONS_EXCLUDE=	TLS
 .endif
 OPTIONS_SUB=	yes
 
 HTTP_DESC=	Build with HTTP support
 JSONRPC_DESC=	Build with JSON-RPC support
 TASKS_DESC=	Build with tasks support
 
 DEBUG_MAKE_ARGS=	DEBUG=1
 
 PORTEXAMPLES=		*
 
 JSONRPC_IMPLIES=	HTTP
 JSONRPC_LIB_DEPENDS=	libyajl.so:devel/yajl
 JSONRPC_MAKE_ARGS=	JSONRPC=1
 
 HTTP_MAKE_ARGS_OFF=	NOHTTP=1
 
 PGSQL_IMPLIES=		HTTP
 PGSQL_MAKE_ARGS=	PGSQL=1
 PGSQL_USES=		pgsql
 
 PYTHON_MAKE_ARGS=	PYTHON=1
 PYTHON_USES=		gettext-runtime python:3.6+
 
 TASKS_MAKE_ARGS=	TASKS=1
 
 TLS_MAKE_ARGS_OFF=	NOTLS=1
 
 post-patch:
 # Disable kore's own optimizations flags, make sure the correct paths
 # are set when LOCALBASE is not /usr/local
 	@${REINPLACE_CMD} -e 's|CFLAGS+=-O|#|g' \
 		-e 's|/usr/local/|${LOCALBASE}/|g' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|%%SUFFIX%%|${PKGNAMESUFFIX}|g' \
 		-e 's|%%OPENSSLINC%%|${OPENSSLINC}|g' \
 		${WRKSRC}/src/cli.c ${WRKSRC}/src/utils.c
 
 post-patch-PYTHON-on:
 # BINARY_ALIAS is not an option here because python3?-config will
 # find the wrong install prefix when symlinked and would start
 # outputting bogus paths inside WRKDIR cf. PR 229749.
 	@${REINPLACE_CMD} 's,python3-config,${PYTHON_CMD}-config,' \
 		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/kore ${STAGEDIR}${PREFIX}/bin/kore${PKGNAMESUFFIX}
 	${INSTALL_PROGRAM} ${WRKSRC}/kodev/kodev ${STAGEDIR}${PREFIX}/bin/kodev${PKGNAMESUFFIX}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/kore.features ${STAGEDIR}${DATADIR}/features
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/kore${PKGNAMESUFFIX}
 	@cd ${WRKSRC}/include && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${PREFIX}/include/kore${PKGNAMESUFFIX}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/share/man/kodev.1 \
 		${STAGEDIR}${PREFIX}/man/man1/kodev${PKGNAMESUFFIX}.1
 
 do-install-EXAMPLES-on:
 	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/devel/kore/files/patch-src_cli.c
===================================================================
--- head/devel/kore/files/patch-src_cli.c	(revision 474941)
+++ head/devel/kore/files/patch-src_cli.c	(revision 474942)
@@ -1,12 +1,39 @@
 --- src/cli.c.orig	2018-07-18 14:25:49 UTC
 +++ src/cli.c
+@@ -800,7 +800,7 @@ cli_info(int argc, char **argv)
+ 		printf("kore source  \t %s\n", bopt->kore_source);
+ 	} else {
+ 		cli_kore_features(bopt, &features, &len);
+-		printf("kore binary  \t %s/bin/kore\n", prefix);
++		printf("kore binary  \t %s/bin/kore%%SUFFIX%%\n", prefix);
+ 		printf("kore features\t %.*s\n", (int)len, features);
+ 		free(features);
+ 	}
+@@ -1537,7 +1537,7 @@ cli_run_kore(void)
+ 		(void)cli_vasprintf(&cmd, "./%s", appl);
+ 	} else {
+ 		flags = "-fnrc";
+-		(void)cli_vasprintf(&cmd, "%s/bin/kore", prefix);
++		(void)cli_vasprintf(&cmd, "%s/bin/kore%%SUFFIX%%", prefix);
+ 		(void)cli_vasprintf(&cpath, "conf/%s.conf", appl);
+ 	}
+ 
 @@ -1838,6 +1838,9 @@ cli_build_flags_common(struct buildopt *bopt, struct c
  	else
  		cli_buf_appendf(buf, "-I%s/include ", bopt->kore_source);
  
 +
-+	cli_buf_appendf(buf, "-I/usr/local/include ");
-+	cli_buf_appendf(buf, "-I%s/include/kore ", PREFIX);
++	cli_buf_appendf(buf, "-I%%OPENSSLINC%% ");
++	cli_buf_appendf(buf, "-I%s/include/kore%%SUFFIX%% ", PREFIX);
  #if defined(__MACH__)
  	/* Add default openssl include path from homebrew / ports under OSX. */
  	cli_buf_appendf(buf, "-I/opt/local/include ");
+@@ -1996,7 +1999,7 @@ cli_kore_features(struct buildopt *bopt, char **out, s
+ 	if (bopt->single_binary) {
+ 		(void)cli_vasprintf(&path, ".objs/features");
+ 	} else {
+-		(void)cli_vasprintf(&path, "%s/share/kore/features", prefix);
++		(void)cli_vasprintf(&path, "%s/share/kore%%SUFFIX%%/features", prefix);
+ 	}
+ 
+ 	cli_file_open(path, O_RDONLY, &fd);