Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -9807,3 +9807,4 @@
 java/bootstrap-openjdk|java/bootstrap-openjdk6|2017-12-01|Has expired: superseded by java/bootstrap-openjdk[68]
 lang/gcc46|lang/gcc6|2017-12-01|Has expired: Unsupported by upstream. Use GCC 6 or newer instead.
 security/krb5-113|security/krb5-114|2017-12-03|Has expired: EOL twelve months after release of krb5-1.15
+devel/kore-notls|devel/kore@notls|2017-12-06|Moved to a flavored version
Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -1291,7 +1291,6 @@
     SUBDIR += kickassembler
     SUBDIR += kimwitu
     SUBDIR += kore
-    SUBDIR += kore-notls
     SUBDIR += ksql
     SUBDIR += kyra
     SUBDIR += kyua
Index: devel/kore-notls/Makefile
===================================================================
--- devel/kore-notls/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $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
@@ -15,21 +15,27 @@
 
 BROKEN_powerpc64=	fails to compile: cc1: error: -Werror=c11-extensions: No option -Wc11-extensions
 
-USES=		compiler gmake
+FLAVORS=	default notls
+notls_PKGNAMESUFFIX=	-notls
 
+USES=		compiler gmake uniquefiles
 USE_GITHUB=	yes
 GH_ACCOUNT=	jorisvink
 
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
 CFLAGS_clang=	-Wno-error=c11-extensions # 12.0 + -pedantic
 
-KORE_BIN=	kore${PKGNAMESUFFIX}
-PLIST_SUB=	KORE_BIN="${KORE_BIN}"
+PLIST_SUB=	PKGNAMESUFFIX=${PKGNAMESUFFIX}
 
 OPTIONS_DEFINE=	DEBUG EXAMPLES HTTP JSONRPC PGSQL TASKS TLS
 OPTIONS_DEFAULT=	HTTP JSONRPC PGSQL TASKS TLS
-OPTIONS_SUB=	yes
 
+.if ${FLAVOR:U} == notls
+OPTIONS_EXCLUDE=	TLS
+EXAMPLESDIR=	${PREFIX}/share/examples/kore${PKGNAMESUFFIX}
+UNIQUE_SUFFIX_FILES=	bin/kore include/kore
+.endif
+
 HTTP_DESC=	Build with HTTP support
 JSONRPC_DESC=	Build with JSON-RPC support
 TASKS_DESC=	Build with tasks support
@@ -60,14 +66,14 @@
 	@${REINPLACE_CMD} -e 's|CFLAGS+=-O|#|g' \
 		-e 's|/usr/local/|${LOCALBASE}/|g' \
 		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|"kore"|"${PREFIX}/bin/${KORE_BIN}"|g' \
-		-e 's|%%KORE_BIN%%|${KORE_BIN}|g' \
+	@${REINPLACE_CMD} -e 's|"kore"|"${PREFIX}/bin/kore${PKGNAMESUFFIX}"|g' \
+		-e 's|%%KORE_BIN%%|kore${PKGNAMESUFFIX}|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
+	${INSTALL_PROGRAM} ${WRKSRC}/kore ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/kore/kore
+	@cd ${WRKSRC}/includes && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/kore/kore
 
 do-install-EXAMPLES-on:
 	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
Index: devel/kore/pkg-plist
===================================================================
--- devel/kore/pkg-plist
+++ devel/kore/pkg-plist
@@ -1,9 +1,9 @@
-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
+bin/kore
+include/kore%%PKGNAMESUFFIX%%/kore/http.h
+include/kore%%PKGNAMESUFFIX%%/kore/jsonrpc.h
+include/kore%%PKGNAMESUFFIX%%/kore/kore.h
+include/kore%%PKGNAMESUFFIX%%/kore/pgsql.h
+include/kore%%PKGNAMESUFFIX%%/kore/tasks.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/.gitignore
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/README.md
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/conf/build.conf