Update kore to 3.0.0.

www/kore/Makefile

@@ -1,11 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2018/03/10 23:00:33 fcambus Exp $
+# $OpenBSD: Makefile,v 1.7 2018/07/09 17:39:57 fcambus Exp $
 
 COMMENT =	web application framework for writing scalable web APIs in C
 
-V =		2.0.0-release
-DISTNAME =	kore-${V}
-PKGNAME =	${DISTNAME:S/-release//}
-REVISION =	1
+DISTNAME =	kore-3.0.0
 
 CATEGORIES =	www
 
@@ -18,7 +15,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB +=	c crypto pthread ssl
 
-MASTER_SITES =	https://github.com/jorisvink/kore/releases/download/$V/
+MASTER_SITES =	https://kore.io/releases/
 
 FLAVORS =	debug pgsql
 FLAVOR ?=
@@ -33,8 +30,6 @@ WANTLIB +=	pq
 LIB_DEPENDS +=	databases/postgresql,-main
 .endif
 
-WRKDIST =	${WRKDIR}/kore
-
 USE_GMAKE =	Yes
 
 MAKE_ENV +=	CC="${CC}" TASKS=1

www/kore/distinfo

@@ -1,2 +1,2 @@
-SHA256 (kore-2.0.0-release.tar.gz) = tTi7n0+3qpBMX5JdaazB7zVCvCFqKvdS5kebclJnmfU=
-SIZE (kore-2.0.0-release.tar.gz) = 947926
+SHA256 (kore-3.0.0.tar.gz) = qmgi9wqKg5/IgchoSgKJ4ILsNEce2ju8qaHKU9LFFko=
+SIZE (kore-3.0.0.tar.gz) = 985007

www/kore/patches/patch-Makefile

@@ -1,16 +1,27 @@
-$OpenBSD: patch-Makefile,v 1.1 2017/05/01 19:32:31 fcambus Exp $
+$OpenBSD: patch-Makefile,v 1.2 2018/07/09 17:39:57 fcambus Exp $
+
+Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -22,12 +22,6 @@ ifneq ("$(DEBUG)", "")
- 	NOOPT=1
- endif
+@@ -6,7 +6,7 @@ OBJDIR?=obj
+ KORE=kore
+ KODEV=kodev/kodev
+ INSTALL_DIR=$(PREFIX)/bin
+-MAN_DIR=$(PREFIX)/share/man
++MAN_DIR=$(PREFIX)/man
+ SHARE_DIR=$(PREFIX)/share/kore
+ INCLUDE_DIR=$(PREFIX)/include/kore
  
+@@ -35,12 +35,6 @@ ifneq ("$(DEBUG)", "")
+ 	CFLAGS+=-DKORE_DEBUG -g
+ 	FEATURES+=-DKORE_DEBUG
+ 	NOOPT=1
+-endif
+-
 -ifneq ("$(NOOPT)", "")
 -	CFLAGS+=-O0
 -else
 -	CFLAGS+=-O2
--endif
--
- ifneq ("$(NOHTTP)", "")
- 	CFLAGS+=-DKORE_NO_HTTP
- else
+ endif
+ 
+ ifneq ("$(NOSENDFILE)", "")

www/kore/patches/patch-includes_pgsql_h

@@ -1,18 +0,0 @@
-$OpenBSD: patch-includes_pgsql_h,v 1.1 2017/05/02 19:55:23 fcambus Exp $
-
-https://github.com/jorisvink/kore/commit/7eced6f035c83c02680d9b58371851f8662a0e8a
-
---- includes/pgsql.h.orig
-+++ includes/pgsql.h
-@@ -66,9 +66,9 @@ void	kore_pgsql_cleanup(struct kore_pgsql *);
- void	kore_pgsql_continue(struct http_request *, struct kore_pgsql *);
- int	kore_pgsql_query(struct kore_pgsql *, const char *);
- int	kore_pgsql_query_params(struct kore_pgsql *,
--	    const char *, int, u_int8_t, ...);
-+	    const char *, int, int, ...);
- int	kore_pgsql_v_query_params(struct kore_pgsql *,
--	    const char *, int, u_int8_t, va_list);
-+	    const char *, int, int, va_list);
- int	kore_pgsql_register(const char *, const char *);
- int	kore_pgsql_ntuples(struct kore_pgsql *);
- void	kore_pgsql_logerror(struct kore_pgsql *);

www/kore/patches/patch-kodev_Makefile

@@ -0,0 +1,18 @@
+$OpenBSD: patch-kodev_Makefile,v 1.1 2018/07/09 17:39:57 fcambus Exp $
+
+Index: kodev/Makefile
+--- kodev/Makefile.orig
++++ kodev/Makefile
+@@ -14,12 +14,6 @@ CFLAGS+=-Wsign-compare -Iincludes -std=c99 -pedantic
+ CFLAGS+=-DPREFIX='"$(PREFIX)"'
+ LDFLAGS=-lcrypto
+ 
+-ifneq ("$(NOOPT)", "")
+-	CFLAGS+=-O0
+-else
+-	CFLAGS+=-O2
+-endif
+-
+ OSNAME=$(shell uname -s | sed -e 's/[-_].*//g' | tr A-Z a-z)
+ ifeq ("$(OSNAME)", "darwin")
+ 	CFLAGS+=-I/opt/local/include/ -I/usr/local/opt/openssl/include

www/kore/patches/patch-src_pgsql_c

@@ -1,38 +0,0 @@
-$OpenBSD: patch-src_pgsql_c,v 1.1 2017/05/02 19:55:23 fcambus Exp $
-
-https://github.com/jorisvink/kore/commit/7eced6f035c83c02680d9b58371851f8662a0e8a
-https://github.com/jorisvink/kore/commit/c071d64bdddacbe1b69d238e14994d666a86f7cf
-
---- src/pgsql.c.orig
-+++ src/pgsql.c
-@@ -151,7 +151,7 @@ kore_pgsql_query(struct kore_pgsql *pgsql, const char 
- 
- int
- kore_pgsql_v_query_params(struct kore_pgsql *pgsql,
--    const char *query, int result, u_int8_t count, va_list args)
-+    const char *query, int result, int count, va_list args)
- {
- 	u_int8_t	i;
- 	char		**values;
-@@ -214,18 +214,16 @@ cleanup:
- 
- int
- kore_pgsql_query_params(struct kore_pgsql *pgsql,
--    const char *query, int result, u_int8_t count, ...)
-+    const char *query, int result, int count, ...)
- {
- 	int		ret;
- 	va_list		args;
- 
--	if (count > 0)
--		va_start(args, count);
-+	va_start(args, count);
- 
- 	ret = kore_pgsql_v_query_params(pgsql, query, result, count, args);
- 
--	if (count > 0)
--		va_end(args);
-+	va_end(args);
- 
- 	return (ret);
- }

www/kore/pkg/PLIST

@@ -1,12 +1,18 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2016/10/31 10:24:52 fcambus Exp $
+@comment $OpenBSD: PLIST,v 1.2 2018/07/09 17:39:57 fcambus Exp $
+@bin bin/kodev
 @bin bin/kore
 include/kore/
 include/kore/http.h
 include/kore/jsonrpc.h
 include/kore/kore.h
 include/kore/pgsql.h
+include/kore/python_api.h
+include/kore/python_methods.h
 include/kore/tasks.h
+@man man/man1/kodev.1
 share/doc/kore/
 share/doc/kore/README.md
 share/examples/kore/
 share/examples/kore/kore.conf.example
+share/kore/
+share/kore/features