Date: Wed, 18 Jul 2018 12:37:44 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474858 - in head/devel/kore: . files Message-ID: <201807181237.w6ICbiCm059147@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Wed Jul 18 12:37:43 2018 New Revision: 474858 URL: https://svnweb.freebsd.org/changeset/ports/474858 Log: devel/kore: Update to 3.0.0 Changes: https://www.kore.io/releases/3.0.0#changelog Added: head/devel/kore/files/patch-kodev_Makefile (contents, props changed) Deleted: head/devel/kore/files/patch-includes_pgsql.h head/devel/kore/files/patch-src_pgsql.c Modified: head/devel/kore/Makefile head/devel/kore/distinfo head/devel/kore/files/patch-src_cli.c head/devel/kore/pkg-plist Modified: head/devel/kore/Makefile ============================================================================== --- head/devel/kore/Makefile Wed Jul 18 12:35:47 2018 (r474857) +++ head/devel/kore/Makefile Wed Jul 18 12:37:43 2018 (r474858) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= kore -PORTVERSION= 2.0.0 -DISTVERSIONSUFFIX= -release -PORTREVISION= 2 +PORTVERSION= 3.0.0 CATEGORIES= devel www +MASTER_SITES= https://kore.io/releases/ MAINTAINER= tobik@FreeBSD.org COMMENT= Web application framework for writing web APIs in C @@ -18,20 +17,18 @@ BROKEN_powerpc64= fails to compile: cc1: error: -Werro FLAVORS= default notls notls_PKGNAMESUFFIX= -notls -USES= compiler gmake +USES= compiler gmake ssl -USE_GITHUB= yes -GH_ACCOUNT= jorisvink - -CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} +CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} -I${OPENSSLINC} CFLAGS_clang= -Wno-error=c11-extensions # 12.0 + -pedantic +LDFLAGS+= -L${OPENSSLLIB} -KORE_BIN= kore${PKGNAMESUFFIX} -EXAMPLESDIR= ${PREFIX}/share/examples/${KORE_BIN} -PLIST_SUB= KORE_BIN="${KORE_BIN}" +DATADIR= ${PREFIX}/share/kore${PKGNAMESUFFIX} +EXAMPLESDIR= ${PREFIX}/share/examples/kore${PKGNAMESUFFIX} +PLIST_SUB= SUFFIX=${PKGNAMESUFFIX} -OPTIONS_DEFINE= DEBUG EXAMPLES HTTP JSONRPC PGSQL TASKS TLS -OPTIONS_DEFAULT= HTTP JSONRPC PGSQL TASKS TLS +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 @@ -43,23 +40,24 @@ 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 -# If TLS=off and HTTP=on kore will still link with libcrypto, so add -# an OpenSSL dependency here. -HTTP_USES= ssl 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 -TLS_USES= ssl post-patch: # Disable kore's own optimizations flags, make sure the correct paths @@ -67,14 +65,28 @@ post-patch: @${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|%%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_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/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} Modified: head/devel/kore/distinfo ============================================================================== --- head/devel/kore/distinfo Wed Jul 18 12:35:47 2018 (r474857) +++ head/devel/kore/distinfo Wed Jul 18 12:37:43 2018 (r474858) @@ -1,3 +1,3 @@ -TIMESTAMP = 1470351284 -SHA256 (jorisvink-kore-2.0.0-release_GH0.tar.gz) = e9573a3bd986bc7d91ce3fb8898cb542523d6ed274761281cea72a81963549c1 -SIZE (jorisvink-kore-2.0.0-release_GH0.tar.gz) = 947440 +TIMESTAMP = 1531153725 +SHA256 (kore-3.0.0.tar.gz) = aa6822f70a8a839fc881c8684a0289e082ec34471eda3bbca9a1ca53d2c5164a +SIZE (kore-3.0.0.tar.gz) = 985007 Added: head/devel/kore/files/patch-kodev_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/kore/files/patch-kodev_Makefile Wed Jul 18 12:37:43 2018 (r474858) @@ -0,0 +1,13 @@ +--- kodev/Makefile.orig 2018-07-09 12:06:06 UTC ++++ kodev/Makefile +@@ -11,8 +11,8 @@ S_SRC= ../src/cli.c + CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes + CFLAGS+=-Wmissing-declarations -Wshadow -Wpointer-arith -Wcast-qual + CFLAGS+=-Wsign-compare -Iincludes -std=c99 -pedantic +-CFLAGS+=-DPREFIX='"$(PREFIX)"' +-LDFLAGS=-lcrypto ++CFLAGS+=-DPREFIX='"$(PREFIX)"' -I${OPENSSLINC} ++LDFLAGS+=-L${OPENSSLLIB} -lcrypto + + ifneq ("$(NOOPT)", "") + CFLAGS+=-O0 Modified: head/devel/kore/files/patch-src_cli.c ============================================================================== --- head/devel/kore/files/patch-src_cli.c Wed Jul 18 12:35:47 2018 (r474857) +++ head/devel/kore/files/patch-src_cli.c Wed Jul 18 12:37:43 2018 (r474858) @@ -1,23 +1,39 @@ ---- src/cli.c.orig 2016-08-01 07:59:32 UTC +--- src/cli.c.orig 2018-07-09 12:06:06 UTC +++ src/cli.c -@@ -267,9 +267,9 @@ static int s_fd = -1; - static char *appl = NULL; - static int run_after = 0; - static char *rootdir = NULL; --static char *compiler_c = "gcc"; --static char *compiler_cpp = "g++"; --static char *compiler_ld = "gcc"; -+static char *compiler_c = "cc"; -+static char *compiler_cpp = "c++"; -+static char *compiler_ld = "cc"; - 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 +@@ -795,7 +795,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); + } +@@ -1532,7 +1532,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); + } + +@@ -1833,6 +1833,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%%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 "); +@@ -1991,7 +1994,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); Modified: head/devel/kore/pkg-plist ============================================================================== --- head/devel/kore/pkg-plist Wed Jul 18 12:35:47 2018 (r474857) +++ head/devel/kore/pkg-plist Wed Jul 18 12:37:43 2018 (r474858) @@ -1,117 +1,11 @@ -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 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/conf/cpp.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/dh2048.pem -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/src/cpp.cpp -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/src/example_class.cpp -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpp/src/example_class.h -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic/assets/index.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic/assets/intro.jpg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic/assets/params.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic/assets/private.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic/assets/private_test.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic/assets/style.css -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic/assets/upload.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic/conf/generic.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic/src/example.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/headers/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/headers/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/headers/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/headers/conf/headers.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/headers/src/headers.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/integers/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/integers/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/integers/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/integers/conf/integers.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/integers/src/check_integers.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/json_yajl/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/json_yajl/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/json_yajl/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/json_yajl/conf/json_yajl.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/json_yajl/src/json_yajl.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jsonrpc/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jsonrpc/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jsonrpc/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jsonrpc/conf/jsonrpc.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jsonrpc/src/home.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jsonrpc/src/v1.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jsonrpc/test/integ/jsonrpc.bats -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kore.conf.example -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ktunnel/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ktunnel/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ktunnel/client/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ktunnel/client/client.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ktunnel/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ktunnel/conf/ktunnel.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ktunnel/src/ktunnel.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/messaging/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/messaging/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/messaging/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/messaging/conf/messaging.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/messaging/src/messaging.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nohttp/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nohttp/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nohttp/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nohttp/conf/nohttp.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nohttp/src/nohttp.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parameters/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parameters/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parameters/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parameters/conf/parameters.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parameters/src/parameters.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgsql-sync/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgsql-sync/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgsql-sync/conf/pgsql-sync.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgsql-sync/src/pgsql-sync.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgsql/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgsql/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgsql/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgsql/conf/pgsql.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgsql/src/pgsql.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pipe_task/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pipe_task/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pipe_task/assets/frontend.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pipe_task/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pipe_task/conf/pipe_task.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pipe_task/src/pipe_task.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sse/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sse/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sse/assets/index.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sse/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sse/conf/sse.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sse/src/sse.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tasks/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tasks/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tasks/conf/tasks.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tasks/src/tasks.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tls-proxy/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tls-proxy/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tls-proxy/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tls-proxy/conf/tls-proxy.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tls-proxy/src/proxy.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload/conf/upload.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload/src/upload.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/video_stream/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/video_stream/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/video_stream/assets/video.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/video_stream/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/video_stream/conf/video_stream.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/video_stream/src/stream.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/video_stream/videos/placeholder -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/websocket/.gitignore -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/websocket/README.md -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/websocket/assets/frontend.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/websocket/conf/build.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/websocket/conf/websocket.conf -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/websocket/src/websocket.c +bin/kodev%%SUFFIX%% +bin/kore%%SUFFIX%% +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 +%%DATADIR%%/features
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807181237.w6ICbiCm059147>