Date: Fri, 31 Aug 2018 08:08:22 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478528 - head/security/webfwlog Message-ID: <201808310808.w7V88MZt028404@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Aug 31 08:08:22 2018 New Revision: 478528 URL: https://svnweb.freebsd.org/changeset/ports/478528 Log: Fix race condition on setting USES. Modified: head/security/webfwlog/Makefile (contents, props changed) Modified: head/security/webfwlog/Makefile ============================================================================== --- head/security/webfwlog/Makefile Fri Aug 31 07:35:48 2018 (r478527) +++ head/security/webfwlog/Makefile Fri Aug 31 08:08:22 2018 (r478528) @@ -37,7 +37,6 @@ MODPHP_USES_OFF= php:web MYSQL_CONFIGURE_WITH= mysql MYSQL_USE= php=mysqli -MYSQL_USES= mysql:client MYSQLIPV6_DESC= Build plugin for Mysql IPv6 support (implies MYSQL) MYSQLIPV6_IMPLIES= MYSQL @@ -45,7 +44,6 @@ MYSQLIPV6_CONFIGURE_ENABLE= mysql-ipv6 MYSQLIPV6_PLUGIN_DIR_REL= lib/mysql/plugin MYSQLIPV6_PLUGIN_DIR= ${LOCALBASE}/${MYSQLIPV6_PLUGIN_DIR_REL} MYSQLIPV6_CONFIGURE_ON= --libdir=${MYSQLIPV6_PLUGIN_DIR} -MYSQLIPV6_USES= libtool mysql:server,client MYSQLIPV6_USE= ldconfig=${MYSQLIPV6_PLUGIN_DIR} MYSQLIPV6_PLIST_FILES= ${MYSQLIPV6_PLUGIN_DIR_REL}/libwebfwlog_udf.so \ ${MYSQLIPV6_PLUGIN_DIR_REL}/libwebfwlog_udf.so.0 \ @@ -76,6 +74,12 @@ SUB_LIST+= VERSION=${PORTVERSION} PLIST_SUB+= WWWGRP=${WWWGRP} .include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MMYSQLIPV6} +USES+= mysql:server,client +.elif ${PORT_OPTIONS:MMYSQL} +USES+= mysql:client +.endif do-install: @${MKDIR} ${STAGEDIR}${WWWDIR}/include/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808310808.w7V88MZt028404>