From owner-svn-ports-head@freebsd.org Wed Dec 6 15:49:48 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 E87E9E839EA; Wed, 6 Dec 2017 15:49:48 +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 9668976E93; Wed, 6 Dec 2017 15:49:48 +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 vB6FnlkJ078638; Wed, 6 Dec 2017 15:49:47 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB6Fnlkk078635; Wed, 6 Dec 2017 15:49:47 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201712061549.vB6Fnlkk078635@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 6 Dec 2017 15:49:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455656 - in head: . devel devel/kore devel/kore-notls X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head: . devel devel/kore devel/kore-notls X-SVN-Commit-Revision: 455656 X-SVN-Commit-Repository: ports 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.25 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: Wed, 06 Dec 2017 15:49:49 -0000 Author: tobik Date: Wed Dec 6 15:49:47 2017 New Revision: 455656 URL: https://svnweb.freebsd.org/changeset/ports/455656 Log: Make devel/kore-notls a flavor of devel/kore and remove it Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D13393 Deleted: head/devel/kore-notls/ Modified: head/MOVED head/devel/Makefile head/devel/kore/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Wed Dec 6 15:40:48 2017 (r455655) +++ head/MOVED Wed Dec 6 15:49:47 2017 (r455656) @@ -9808,3 +9808,4 @@ java/bootstrap-openjdk|java/bootstrap-openjdk6|2017-12 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 Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Wed Dec 6 15:40:48 2017 (r455655) +++ head/devel/Makefile Wed Dec 6 15:49:47 2017 (r455656) @@ -1291,7 +1291,6 @@ SUBDIR += kickassembler SUBDIR += kimwitu SUBDIR += kore - SUBDIR += kore-notls SUBDIR += ksql SUBDIR += kyra SUBDIR += kyua Modified: head/devel/kore/Makefile ============================================================================== --- head/devel/kore/Makefile Wed Dec 6 15:40:48 2017 (r455655) +++ head/devel/kore/Makefile Wed Dec 6 15:49:47 2017 (r455656) @@ -15,6 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_powerpc64= fails to compile: cc1: error: -Werror=c11-extensions: No option -Wc11-extensions +FLAVORS= default notls +notls_PKGNAMESUFFIX= -notls + USES= compiler gmake USE_GITHUB= yes @@ -24,10 +27,14 @@ CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} CFLAGS_clang= -Wno-error=c11-extensions # 12.0 + -pedantic KORE_BIN= kore${PKGNAMESUFFIX} +EXAMPLESDIR= ${PREFIX}/share/examples/${KORE_BIN} PLIST_SUB= KORE_BIN="${KORE_BIN}" OPTIONS_DEFINE= DEBUG EXAMPLES HTTP JSONRPC PGSQL TASKS TLS OPTIONS_DEFAULT= HTTP JSONRPC PGSQL TASKS TLS +.if ${FLAVOR:U} == notls +OPTIONS_EXCLUDE= TLS +.endif OPTIONS_SUB= yes HTTP_DESC= Build with HTTP support