From owner-svn-ports-all@freebsd.org Fri Aug 31 08:08:23 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 66648F77A5E; Fri, 31 Aug 2018 08:08:23 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1EBAC882A2; Fri, 31 Aug 2018 08:08:23 +0000 (UTC) (envelope-from mat@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EFACF18988; Fri, 31 Aug 2018 08:08:22 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7V88MD3028405; Fri, 31 Aug 2018 08:08:22 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7V88MZt028404; Fri, 31 Aug 2018 08:08:22 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201808310808.w7V88MZt028404@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 31 Aug 2018 08:08:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478528 - head/security/webfwlog X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: head/security/webfwlog X-SVN-Commit-Revision: 478528 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Aug 2018 08:08:23 -0000 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 + +.if ${PORT_OPTIONS:MMYSQLIPV6} +USES+= mysql:server,client +.elif ${PORT_OPTIONS:MMYSQL} +USES+= mysql:client +.endif do-install: @${MKDIR} ${STAGEDIR}${WWWDIR}/include/