6 files changed, 77 insertions, 91 deletions

diff --git a/MOVED b/MOVED
index 24318a108d82..d1a878f2a422 100644
--- a/MOVED
+++ b/MOVED
@@ -9696,7 +9696,7 @@ java/bootstrap-openjdk|java/bootstrap-openjdk6|2017-12-01|Has expired: supersede
 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
 net/bird6|net/bird@ipv6|2017-12-06|Moved to a flavored version
-devel/kore-notls|devel/kore@notls|2017-12-06|Moved to a flavored version
+devel/kore-notls|devel/kore|2017-12-06|Moved to a flavored version
 devel/llvm-cheri128|devel/llvm-cheri|2017-12-07|A single cheri compiler can now target 128-bit and 256-bit capabilities
 audio/cd-console||2017-12-13|Has expired: No public distfiles
 textproc/pecl-cld||2017-12-13|Has expired: Depends on expired devel/cld
@@ -15419,3 +15419,5 @@ www/py-pySmartDL|www/py-pysmartdl|2020-09-05|Rename to match our py- port naming
 astro/py-RO|astro/py-ro|2020-09-05|Rename to match our py- port naming
 astro/py-astLib|astro/py-astlib|2020-09-05|Rename to match our py- port naming
 www/py-MechanicalSoup|www/py-mechanicalsoup|2020-09-05|Rename to match our py- port naming
+devel/kore@default|devel/kore|2020-09-07|Flavor removed
+devel/kore@notls|devel/kore|2020-09-07|Flavor removed
diff --git a/devel/kore/Makefile b/devel/kore/Makefile
index f9adce8d6c83..28ba4ea07c38 100644
--- a/devel/kore/Makefile
+++ b/devel/kore/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kore
-PORTVERSION=	3.3.1
-PORTREVISION=	1
+PORTVERSION=	4.0.0
 CATEGORIES=	devel www
 MASTER_SITES=	https://kore.io/releases/
 
@@ -13,76 +12,64 @@ COMMENT=	Web application framework for writing web APIs in C
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-FLAVORS=	default notls
-notls_PKGNAMESUFFIX=	-notls
-
 USES=		compiler:c11 gmake ssl
 
-CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}} -I${OPENSSLINC}
-CFLAGS_clang=	-Wno-error=c11-extensions # 12.0 + -pedantic
-LDFLAGS+=	-L${OPENSSLLIB}
+MAKE_ARGS=	OPENSSL_PATH=${OPENSSLBASE}
+CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
+# 12.0 + -pedantic
+CFLAGS_clang=	-Wno-error=c11-extensions
 
-DATADIR=	${PREFIX}/share/kore${PKGNAMESUFFIX}
-EXAMPLESDIR=	${PREFIX}/share/examples/kore${PKGNAMESUFFIX}
-PLIST_SUB=	SUFFIX=${PKGNAMESUFFIX}
+PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=		CURL DEBUG EXAMPLES HTTP JSONRPC PGSQL PYTHON TASKS TLS
-OPTIONS_DEFAULT=	CURL HTTP JSONRPC PGSQL PYTHON TASKS TLS
-.if ${FLAVOR:U} == notls
-OPTIONS_EXCLUDE=	TLS
-.endif
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		ACME CURL DEBUG EXAMPLES HTTP JSONRPC PGSQL PYTHON \
+			TASKS TLS
+OPTIONS_DEFAULT=	ACME CURL HTTP JSONRPC PGSQL PYTHON TASKS TLS
+OPTIONS_SUB=		yes
 
+ACME_DESC=	Build with ACME support
 HTTP_DESC=	Build with HTTP support
 JSONRPC_DESC=	Build with JSON-RPC support
 TASKS_DESC=	Build with tasks support
 
+ACME_MAKE_ARGS=		ACME=1
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_MAKE_ARGS=		CURL=1
-
 DEBUG_MAKE_ARGS=	DEBUG=1
-
-PORTEXAMPLES=		*
-
+HTTP_MAKE_ARGS_OFF=	NOHTTP=1
 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_BINARY_ALIAS=	python3-config=${PYTHON_CMD}-config
-PYTHON_MAKE_ARGS=	PYTHON=1
+PGSQL_MAKE_ARGS=	PGSQL=1
 PYTHON_USES=		gettext-runtime python:3.6+
-
+PYTHON_MAKE_ARGS=	PYTHON=1
+PYTHON_BINARY_ALIAS=	python3-config=${PYTHON_CMD}-config
 TASKS_MAKE_ARGS=	TASKS=1
-
 TLS_MAKE_ARGS_OFF=	NOTLS=1
 
+.include <bsd.port.options.mk>
+
 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' \
+.if ${LOCALBASE} != /usr/local
+	@${REINPLACE_CMD} '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
+.endif
+	@${REINPLACE_CMD} 's|%%OPENSSLINC%%|${OPENSSLINC}|g' \
+		${WRKSRC}/src/cli.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/kore ${STAGEDIR}${PREFIX}/bin/kore${PKGNAMESUFFIX}
-	${INSTALL_PROGRAM} ${WRKSRC}/kodev/kodev ${STAGEDIR}${PREFIX}/bin/kodev${PKGNAMESUFFIX}
+	${INSTALL_PROGRAM} ${WRKSRC}/kore \
+		${WRKSRC}/kodev/kodev \
+		${STAGEDIR}${PREFIX}/bin
 	@${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}/kore.features \
+		${STAGEDIR}${DATADIR}/features
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/kore
+	@cd ${WRKSRC}/include && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/kore
 	${INSTALL_DATA} ${WRKSRC}/share/man/kodev.1 \
-		${STAGEDIR}${PREFIX}/man/man1/kodev${PKGNAMESUFFIX}.1
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-EXAMPLES-on:
 	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
diff --git a/devel/kore/distinfo b/devel/kore/distinfo
index a5bfbdb4c075..d44ad80561c5 100644
--- a/devel/kore/distinfo
+++ b/devel/kore/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559570792
-SHA256 (kore-3.3.1.tar.gz) = c80d7a817883e631adf9eb5271b4ffa6ebb06c2e2fca40ce6c3c75638c08b67a
-SIZE (kore-3.3.1.tar.gz) = 1009866
+TIMESTAMP = 1599048567
+SHA256 (kore-4.0.0.tar.gz) = c4f5629c9fca7ede7664063a318021f58c7909cbff822dad8dca88da7d9043c2
+SIZE (kore-4.0.0.tar.gz) = 1064443
diff --git a/devel/kore/files/patch-Makefile b/devel/kore/files/patch-Makefile
new file mode 100644
index 000000000000..0695457167f6
--- /dev/null
+++ b/devel/kore/files/patch-Makefile
@@ -0,0 +1,24 @@
+--- Makefile.orig	2020-08-26 07:20:35 UTC
++++ Makefile
+@@ -46,12 +46,6 @@ ifneq ("$(DEBUG)", "")
+ 	FEATURES+=-DKORE_DEBUG
+ endif
+ 
+-ifneq ("$(NOOPT)", "")
+-	CFLAGS+=-O0
+-else
+-	CFLAGS+=-O2
+-endif
+-
+ ifneq ("$(NOSENDFILE)", "")
+ 	CFLAGS+=-DKORE_NO_SENDFILE
+ endif
+@@ -202,6 +196,8 @@ uninstall:
+ 
+ $(OBJDIR)/%.o: src/%.c
+ 	$(CC) $(CFLAGS) -c $< -o $@
++
++src/python.c: $(PYTHON_CURLOPT)
+ 
+ clean:
+ 	rm -f $(VERSION)
diff --git a/devel/kore/files/patch-src_cli.c b/devel/kore/files/patch-src_cli.c
index f2e9a36f3a95..431e9b88ea96 100644
--- a/devel/kore/files/patch-src_cli.c
+++ b/devel/kore/files/patch-src_cli.c
@@ -1,39 +1,10 @@
---- src/cli.c.orig	2018-07-18 14:25:49 UTC
+--- src/cli.c.orig	2020-08-26 07:20:35 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
+@@ -1922,6 +1922,7 @@ 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%%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);
diff --git a/devel/kore/pkg-plist b/devel/kore/pkg-plist
index 4b57506469a4..ee0c5d81da0c 100644
--- a/devel/kore/pkg-plist
+++ b/devel/kore/pkg-plist
@@ -1,12 +1,14 @@
-bin/kodev%%SUFFIX%%
-bin/kore%%SUFFIX%%
-include/kore%%SUFFIX%%/kore/curl.h
-include/kore%%SUFFIX%%/kore/http.h
-include/kore%%SUFFIX%%/kore/jsonrpc.h
-include/kore%%SUFFIX%%/kore/kore.h
-include/kore%%SUFFIX%%/kore/pgsql.h
-include/kore%%SUFFIX%%/kore/python_api.h
-include/kore%%SUFFIX%%/kore/python_methods.h
-include/kore%%SUFFIX%%/kore/tasks.h
-man/man1/kodev%%SUFFIX%%.1.gz
+bin/kodev
+bin/kore
+include/kore/kore/acme.h
+include/kore/kore/curl.h
+include/kore/kore/http.h
+include/kore/kore/jsonrpc.h
+include/kore/kore/kore.h
+include/kore/kore/pgsql.h
+include/kore/kore/python_api.h
+include/kore/kore/python_methods.h
+include/kore/kore/seccomp.h
+include/kore/kore/tasks.h
 %%DATADIR%%/features
+share/man/man1/kodev.1.gz