svn commit: r455656 - in head: . devel devel/kore devel/kore-notls

[Tobias Kortkamp]

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 at ipv6|2017-12-06|Moved to a flavored version
+devel/kore-notls|devel/kore at 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