From owner-svn-ports-head@freebsd.org Tue May 2 15:43:44 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D3C7FD5A7D1; Tue, 2 May 2017 15:43:44 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 955FBA9D; Tue, 2 May 2017 15:43:44 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v42FhhC5031944; Tue, 2 May 2017 15:43:43 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v42Fhhdf031939; Tue, 2 May 2017 15:43:43 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201705021543.v42Fhhdf031939@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 2 May 2017 15:43:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439957 - in head/devel: . kore kore-notls kore/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 May 2017 15:43:44 -0000 Author: tobik Date: Tue May 2 15:43:42 2017 New Revision: 439957 URL: https://svnweb.freebsd.org/changeset/ports/439957 Log: Add a devel/kore slave with TLS support disabled TLS=on changes Kore's behavior and it is not currently possible to disable TLS at runtime. This will allow deploying TLS-enabled and non-TLS apps on the same host. - While here remove an old FreeBSD 9 patch Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D10296 Added: head/devel/kore-notls/ head/devel/kore-notls/Makefile (contents, props changed) Deleted: head/devel/kore/files/patch-src_bsd.c Modified: head/devel/Makefile head/devel/kore/Makefile head/devel/kore/files/patch-src_cli.c head/devel/kore/pkg-plist Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Tue May 2 15:39:54 2017 (r439956) +++ head/devel/Makefile Tue May 2 15:43:42 2017 (r439957) @@ -1210,6 +1210,7 @@ SUBDIR += kickassembler SUBDIR += kimwitu SUBDIR += kore + SUBDIR += kore-notls SUBDIR += ksql SUBDIR += kyra SUBDIR += kyua Added: head/devel/kore-notls/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/kore-notls/Makefile Tue May 2 15:43:42 2017 (r439957) @@ -0,0 +1,8 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -notls +MASTERDIR= ${.CURDIR}/../kore +EXAMPLESDIR= ${PREFIX}/share/examples/${KORE_BIN} +OPTIONS_EXCLUDE= TLS + +.include "${MASTERDIR}/Makefile" Modified: head/devel/kore/Makefile ============================================================================== --- head/devel/kore/Makefile Tue May 2 15:39:54 2017 (r439956) +++ head/devel/kore/Makefile Tue May 2 15:43:42 2017 (r439957) @@ -4,7 +4,7 @@ PORTNAME= kore PORTVERSION= 2.0.0 DISTVERSIONSUFFIX= -release -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel www MAINTAINER= tobik@FreeBSD.org @@ -20,11 +20,10 @@ GH_ACCOUNT= jorisvink CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} CFLAGS_clang= -Wno-error=c11-extensions # 12.0 + -pedantic -MAKE_ARGS= INSTALL_DIR="${STAGEDIR}${PREFIX}/bin" \ - INCLUDE_DIR="${STAGEDIR}${PREFIX}/include/kore" -OPTIONS_DEFINE= DEBUG HTTP JSONRPC PGSQL TASKS TLS +OPTIONS_DEFINE= DEBUG EXAMPLES HTTP JSONRPC PGSQL TASKS TLS OPTIONS_DEFAULT= HTTP JSONRPC PGSQL TASKS TLS +OPTIONS_SUB= yes HTTP_DESC= Build with HTTP support JSONRPC_DESC= Build with JSON-RPC support @@ -50,19 +49,26 @@ JSONRPC_LIB_DEPENDS= libyajl.so:devel/ya DEBUG_VARS= MAKE_ARGS+=DEBUG=1 +KORE_BIN= kore${PKGNAMESUFFIX} +PLIST_SUB= KORE_BIN="${KORE_BIN}" + post-patch: -# Disable kore's own optimizations flags, make sure the correct flags -# are set when LOCALBASE is not /usr/local, and allow __generic on -# FreeBSD 12.0-CURRENT after r308264 +# 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' \ ${WRKSRC}/Makefile - -pre-install: - ${STRIP_CMD} ${WRKSRC}/kore - -post-install: - cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} + @${REINPLACE_CMD} -e 's|"kore"|"${PREFIX}/bin/${KORE_BIN}"|g' \ + -e 's|%%KORE_BIN%%|${KORE_BIN}|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 + +do-install-EXAMPLES-on: + @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} + @cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/devel/kore/files/patch-src_cli.c ============================================================================== --- head/devel/kore/files/patch-src_cli.c Tue May 2 15:39:54 2017 (r439956) +++ head/devel/kore/files/patch-src_cli.c Tue May 2 15:43:42 2017 (r439957) @@ -13,3 +13,11 @@ 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 Modified: head/devel/kore/pkg-plist ============================================================================== --- head/devel/kore/pkg-plist Tue May 2 15:39:54 2017 (r439956) +++ head/devel/kore/pkg-plist Tue May 2 15:43:42 2017 (r439957) @@ -1,9 +1,9 @@ -bin/kore -include/kore/http.h -include/kore/jsonrpc.h -include/kore/kore.h -include/kore/pgsql.h -include/kore/tasks.h +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