Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -1210,6 +1210,7 @@
     SUBDIR += kickassembler
     SUBDIR += kimwitu
     SUBDIR += kore
+    SUBDIR += kore-notls
     SUBDIR += ksql
     SUBDIR += kyra
     SUBDIR += kyua
Index: devel/kore-notls/Makefile
===================================================================
--- /dev/null
+++ devel/kore-notls/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-notls
+MASTERDIR=	${.CURDIR}/../kore
+EXAMPLESDIR=	${PREFIX}/share/examples/${KORE_BIN}
+OPTIONS_EXCLUDE=	TLS
+
+.include "${MASTERDIR}/Makefile"
Index: devel/kore/Makefile
===================================================================
--- devel/kore/Makefile
+++ devel/kore/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	kore
 PORTVERSION=	2.0.0
 DISTVERSIONSUFFIX=	-release
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel www
 
 MAINTAINER=	tobik@FreeBSD.org
@@ -20,11 +20,10 @@
 
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
 CFLAGS_clang=	-Wno-error=c11-extensions # 12.0 + -pedantic
-MAKE_ARGS=	INSTALL_DIR="${STAGEDIR}${PREFIX}/bin" \
-		INCLUDE_DIR="${STAGEDIR}${PREFIX}/include/kore"
 
-OPTIONS_DEFINE=	DEBUG HTTP JSONRPC PGSQL TASKS TLS
+OPTIONS_DEFINE=	DEBUG EXAMPLES HTTP JSONRPC PGSQL TASKS TLS
 OPTIONS_DEFAULT=	HTTP JSONRPC PGSQL TASKS TLS
+OPTIONS_SUB=	yes
 
 HTTP_DESC=	Build with HTTP support
 JSONRPC_DESC=	Build with JSON-RPC support
@@ -50,19 +49,26 @@
 
 DEBUG_VARS=	MAKE_ARGS+=DEBUG=1
 
+KORE_BIN=	kore${PKGNAMESUFFIX}
+PLIST_SUB=	KORE_BIN="${KORE_BIN}"
+
 post-patch:
-# Disable kore's own optimizations flags, make sure the correct flags
-# are set when LOCALBASE is not /usr/local, and allow __generic on
-# FreeBSD 12.0-CURRENT after r308264
+# 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
-
-pre-install:
-	${STRIP_CMD} ${WRKSRC}/kore
-
-post-install:
-	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+	@${REINPLACE_CMD} -e 's|"kore"|"${PREFIX}/bin/${KORE_BIN}"|g' \
+		-e 's|%%KORE_BIN%%|${KORE_BIN}|g' \
+		${WRKSRC}/src/cli.c ${WRKSRC}/src/utils.c
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/kore ${STAGEDIR}${PREFIX}/bin/${KORE_BIN}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/${KORE_BIN}/kore
+	@cd ${WRKSRC}/includes && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/${KORE_BIN}/kore
+
+do-install-EXAMPLES-on:
+	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+	@cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: devel/kore/files/patch-src_bsd.c
===================================================================
--- devel/kore/files/patch-src_bsd.c
+++ /dev/null
@@ -1,27 +0,0 @@
-Needed for building on FreeBSD 9.x.  Once FreeBSD 9 support ends this
-patch can be removed.
-
-cc1: warnings being treated as errors
-src/bsd.c: In function 'kore_platform_worker_setcpu':
-src/bsd.c:65: warning: declaration of 'cpuset' shadows a global declaration
-/usr/include/sys/cpuset.h:131: warning: shadowed declaration is here
-
---- src/bsd.c.orig	2016-08-01 07:59:32 UTC
-+++ src/bsd.c
-@@ -62,12 +62,12 @@ void
- kore_platform_worker_setcpu(struct kore_worker *kw)
- {
- #if defined(__FreeBSD_version)
--	cpuset_t	cpuset;
-+	cpuset_t	cpuset1;
- 
--	CPU_ZERO(&cpuset);
--	CPU_SET(kw->cpu, &cpuset);
-+	CPU_ZERO(&cpuset1);
-+	CPU_SET(kw->cpu, &cpuset1);
- 	if (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID,
--	    -1, sizeof(cpuset), &cpuset) == -1) {
-+	    -1, sizeof(cpuset1), &cpuset1) == -1) {
- 		fatal("failed: %s", errno_s);
- 	}
- 
Index: devel/kore/files/patch-src_cli.c
===================================================================
--- devel/kore/files/patch-src_cli.c
+++ devel/kore/files/patch-src_cli.c
@@ -13,3 +13,11 @@
  static struct cfile_list	source_files;
  static struct buildopt_list	build_options;
  static int			source_files_count;
+@@ -1459,6 +1459,7 @@ cli_build_flags_common(struct kore_buf* 
+ 	    "-fPIC -I%s/src -I%s/src/includes ", rootdir, rootdir);
+ #if defined(PREFIX)
+ 	kore_buf_appendf(buf, "-I%s/include ", PREFIX);
++	kore_buf_appendf(buf, "-I%s/include/%%KORE_BIN%% ", PREFIX);
+ #else
+ 	kore_buf_appendf(buf, "-I/usr/local/include ");
+ #endif
Index: devel/kore/pkg-plist
===================================================================
--- devel/kore/pkg-plist
+++ devel/kore/pkg-plist
@@ -1,9 +1,9 @@
-bin/kore
-include/kore/http.h
-include/kore/jsonrpc.h
-include/kore/kore.h
-include/kore/pgsql.h
-include/kore/tasks.h
+bin/%%KORE_BIN%%
+include/%%KORE_BIN%%/kore/http.h
+include/%%KORE_BIN%%/kore/jsonrpc.h
+include/%%KORE_BIN%%/kore/kore.h
+include/%%KORE_BIN%%/kore/pgsql.h
+include/%%KORE_BIN%%/kore/tasks.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/.gitignore
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/README.md
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/conf/build.conf