Received: by mail.netbsd.org (Postfix, from userid 605) id 0CF3884D23; Fri, 2 Jul 2021 15:18:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E9F2A84CD8 for ; Fri, 2 Jul 2021 15:18:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id RjBf8hGqbMHB for ; Fri, 2 Jul 2021 15:18:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 667ED84C71 for ; Fri, 2 Jul 2021 15:18:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 55D78FA95; Fri, 2 Jul 2021 15:18:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1625239122222530" MIME-Version: 1.0 Date: Fri, 2 Jul 2021 15:18:42 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/databases/php-mysqli To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210702151842.55D78FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1625239122222530 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Jul 2 15:18:42 UTC 2021 Modified Files: pkgsrc/databases/php-mysqli: Makefile Added Files: pkgsrc/databases/php-mysqli: options.mk Log Message: php-mysqli: split options.mk into separate file To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/php-mysqli/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/databases/php-mysqli/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1625239122222530 Content-Disposition: inline Content-Length: 1694 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/php-mysqli/Makefile diff -u pkgsrc/databases/php-mysqli/Makefile:1.14 pkgsrc/databases/php-mysqli/Makefile:1.15 --- pkgsrc/databases/php-mysqli/Makefile:1.14 Wed Jun 23 20:33:08 2021 +++ pkgsrc/databases/php-mysqli/Makefile Fri Jul 2 15:18:42 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2021/06/23 20:33:08 nia Exp $ +# $NetBSD: Makefile,v 1.15 2021/07/02 15:18:42 nia Exp $ PKGREVISION= 1 MODNAME= mysqli @@ -9,18 +9,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org CONFLICTS= php-mysqli-[0-9]* -PKG_OPTIONS_VAR= PKG_OPTIONS.php-mysqli -PKG_SUPPORTED_OPTIONS= mysqlnd -PKG_SUGGESTED_OPTIONS= # empty - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mmysqlnd) -CONFIGURE_ARGS+= --with-${MODNAME}=shared,mysqlnd -.else -. include "../../mk/mysql.buildlink3.mk" -CONFIGURE_ARGS+= --with-${MODNAME}=${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config -.endif - +.include "options.mk" .include "../../lang/php/ext.mk" .include "../../mk/bsd.pkg.mk" Added files: Index: pkgsrc/databases/php-mysqli/options.mk diff -u /dev/null pkgsrc/databases/php-mysqli/options.mk:1.1 --- /dev/null Fri Jul 2 15:18:42 2021 +++ pkgsrc/databases/php-mysqli/options.mk Fri Jul 2 15:18:42 2021 @@ -0,0 +1,14 @@ +# $NetBSD: options.mk,v 1.1 2021/07/02 15:18:42 nia Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.php-mysqli +PKG_SUPPORTED_OPTIONS= mysqlnd +PKG_SUGGESTED_OPTIONS= # empty + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mmysqlnd) +CONFIGURE_ARGS+= --with-${MODNAME}=shared,mysqlnd +.else +. include "../../mk/mysql.buildlink3.mk" +CONFIGURE_ARGS+= --with-${MODNAME}=${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config +.endif --_----------=_1625239122222530--