Index: head/devel/kore/Makefile =================================================================== --- head/devel/kore/Makefile (revision 548165) +++ head/devel/kore/Makefile (revision 548166) @@ -1,78 +1,69 @@ # Created by: Tobias Kortkamp # $FreeBSD$ PORTNAME= kore -PORTVERSION= 4.0.0 +PORTVERSION= 4.0.1 CATEGORIES= devel www MASTER_SITES= https://kore.io/releases/ MAINTAINER= tobik@FreeBSD.org COMMENT= Web application framework for writing web APIs in C LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c11 gmake ssl MAKE_ARGS= OPENSSL_PATH=${OPENSSLBASE} CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} # 12.0 + -pedantic CFLAGS_clang= -Wno-error=c11-extensions PORTEXAMPLES= * 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 HTTP_MAKE_ARGS_OFF= NOHTTP=1 JSONRPC_IMPLIES= HTTP JSONRPC_LIB_DEPENDS= libyajl.so:devel/yajl JSONRPC_MAKE_ARGS= JSONRPC=1 PGSQL_IMPLIES= HTTP PGSQL_USES= pgsql 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 post-patch: .if ${LOCALBASE} != /usr/local @${REINPLACE_CMD} 's|/usr/local/|${LOCALBASE}/|g' \ ${WRKSRC}/Makefile .endif @${REINPLACE_CMD} 's|%%OPENSSLINC%%|${OPENSSLINC}|g' \ ${WRKSRC}/src/cli.c -do-install: - ${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 - @cd ${WRKSRC}/include && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/kore - ${INSTALL_DATA} ${WRKSRC}/share/man/kodev.1 \ - ${STAGEDIR}${PREFIX}/share/man/man1 +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/kodev \ + ${STAGEDIR}${PREFIX}/bin/kore -do-install-EXAMPLES-on: +post-install-EXAMPLES-on: @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} @cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include Index: head/devel/kore/distinfo =================================================================== --- head/devel/kore/distinfo (revision 548165) +++ head/devel/kore/distinfo (revision 548166) @@ -1,3 +1,3 @@ -TIMESTAMP = 1599048567 -SHA256 (kore-4.0.0.tar.gz) = c4f5629c9fca7ede7664063a318021f58c7909cbff822dad8dca88da7d9043c2 -SIZE (kore-4.0.0.tar.gz) = 1064443 +TIMESTAMP = 1599692055 +SHA256 (kore-4.0.1.tar.gz) = bc8bf755133faf67755c3a4ea53db49f208986efeed734ce6be562a3e5a81057 +SIZE (kore-4.0.1.tar.gz) = 1063050 Index: head/devel/kore/files/patch-Makefile =================================================================== --- head/devel/kore/files/patch-Makefile (revision 548165) +++ head/devel/kore/files/patch-Makefile (revision 548166) @@ -1,24 +1,15 @@ ---- Makefile.orig 2020-08-26 07:20:35 UTC +--- Makefile.orig 2020-09-08 19:35:30 UTC +++ Makefile -@@ -46,12 +46,6 @@ ifneq ("$(DEBUG)", "") +@@ -48,12 +48,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) Index: head/devel/kore/files/patch-kodev_Makefile =================================================================== --- head/devel/kore/files/patch-kodev_Makefile (revision 548165) +++ head/devel/kore/files/patch-kodev_Makefile (revision 548166) @@ -1,13 +1,19 @@ ---- kodev/Makefile.orig 2018-07-09 12:06:06 UTC +--- kodev/Makefile.orig 2020-09-08 19:35:30 UTC +++ kodev/Makefile -@@ -11,8 +11,8 @@ S_SRC= ../src/cli.c +@@ -12,14 +12,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 +-else +- CFLAGS+=-O2 +-endif ++CFLAGS+=-DPREFIX='"$(PREFIX)"' -I$(OPENSSL_PATH)/include ++LDFLAGS+=-L$(OPENSSL_PATH)/lib -lcrypto - ifneq ("$(NOOPT)", "") - CFLAGS+=-O0 + ifneq ("$(MINIMAL)", "") + CFLAGS+=-DKODEV_MINIMAL Index: head/devel/kore/pkg-plist =================================================================== --- head/devel/kore/pkg-plist (revision 548165) +++ head/devel/kore/pkg-plist (revision 548166) @@ -1,14 +1,14 @@ 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 +include/kore/acme.h +include/kore/curl.h +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/seccomp.h +include/kore/tasks.h %%DATADIR%%/features share/man/man1/kodev.1.gz