svn commit: r455333 - head/devel/kore

[Tobias Kortkamp]

Author: tobik
Date: Sat Dec  2 06:28:29 2017
New Revision: 455333
URL: https://svnweb.freebsd.org/changeset/ports/455333

Log:
  devel/kore: Sort options helpers and use *_MAKE_ARGS* helpers

Modified:
  head/devel/kore/Makefile

Modified: head/devel/kore/Makefile
==============================================================================
--- head/devel/kore/Makefile	Sat Dec  2 03:32:16 2017	(r455332)
+++ head/devel/kore/Makefile	Sat Dec  2 06:28:29 2017	(r455333)
@@ -23,6 +23,9 @@ GH_ACCOUNT=	jorisvink
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
 CFLAGS_clang=	-Wno-error=c11-extensions # 12.0 + -pedantic
 
+KORE_BIN=	kore${PKGNAMESUFFIX}
+PLIST_SUB=	KORE_BIN="${KORE_BIN}"
+
 OPTIONS_DEFINE=	DEBUG EXAMPLES HTTP JSONRPC PGSQL TASKS TLS
 OPTIONS_DEFAULT=	HTTP JSONRPC PGSQL TASKS TLS
 OPTIONS_SUB=	yes
@@ -31,28 +34,25 @@ HTTP_DESC=	Build with HTTP support
 JSONRPC_DESC=	Build with JSON-RPC support
 TASKS_DESC=	Build with tasks support
 
-TASKS_VARS=	MAKE_ARGS+=TASKS=1
+DEBUG_MAKE_ARGS=	DEBUG=1
 
-PGSQL_IMPLIES=	HTTP
-PGSQL_VARS=	MAKE_ARGS+=PGSQL=1
-PGSQL_USES=	pgsql
+JSONRPC_IMPLIES=	HTTP
+JSONRPC_LIB_DEPENDS=	libyajl.so:devel/yajl
+JSONRPC_MAKE_ARGS=	JSONRPC=1
 
-TLS_VARS_OFF=	MAKE_ARGS+=NOTLS=1
-TLS_USES=	ssl
-
-HTTP_VARS_OFF=	MAKE_ARGS+=NOHTTP=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
+HTTP_USES=		ssl
 
-JSONRPC_IMPLIES=	HTTP
-JSONRPC_VARS=	MAKE_ARGS+=JSONRPC=1
-JSONRPC_LIB_DEPENDS=	libyajl.so:devel/yajl
+PGSQL_IMPLIES=		HTTP
+PGSQL_MAKE_ARGS=	PGSQL=1
+PGSQL_USES=		pgsql
 
-DEBUG_VARS=	MAKE_ARGS+=DEBUG=1
+TASKS_MAKE_ARGS=	TASKS=1
 
-KORE_BIN=	kore${PKGNAMESUFFIX}
-PLIST_SUB=	KORE_BIN="${KORE_BIN}"
+TLS_MAKE_ARGS_OFF=	NOTLS=1
+TLS_USES=		ssl
 
 post-patch:
 # Disable kore's own optimizations flags, make sure the correct paths