[pkgsrc/trunk]: pkgsrc/lang/php72 Switch php72 to use pkgsrc sqlite3 library ...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a7e4bd3674ee
branches:  trunk
changeset: 375163:a7e4bd3674ee
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sun Feb 04 16:19:00 2018 +0000

description:
Switch php72 to use pkgsrc sqlite3 library instead of the bundled one

PHP bundles a sqlite3 lib, it's used when the build can't find
system one. Switch to the pkgsrc-provided one, eliminating also
need to maintain a local patch for it. While here make this into a
tunable compile option 'sqlite3', by default on, same as before.

diffstat:

 lang/php72/Makefile                                      |   3 ++-
 lang/php72/Makefile.php                                  |  13 ++++++++++---
 lang/php72/distinfo                                      |   3 +--
 lang/php72/patches/patch-ext_sqlite3_libsqlite_sqlite3.c |  13 -------------
 4 files changed, 13 insertions(+), 19 deletions(-)

diffs (83 lines):

diff -r d071c6a335f8 -r a7e4bd3674ee lang/php72/Makefile
--- a/lang/php72/Makefile       Sun Feb 04 15:38:41 2018 +0000
+++ b/lang/php72/Makefile       Sun Feb 04 16:19:00 2018 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2017/11/30 20:45:46 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2018/02/04 16:19:00 jdolecek Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               php-${PHP_VERSION:S/RC/rc/}
 CATEGORIES=            lang
+PKGREVISION=    1
 
 HOMEPAGE=              http://www.php.net/
 COMMENT=               PHP Hypertext Preprocessor version 7.2
diff -r d071c6a335f8 -r a7e4bd3674ee lang/php72/Makefile.php
--- a/lang/php72/Makefile.php   Sun Feb 04 15:38:41 2018 +0000
+++ b/lang/php72/Makefile.php   Sun Feb 04 16:19:00 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.2 2018/01/31 21:10:18 jdolecek Exp $
+# $NetBSD: Makefile.php,v 1.3 2018/02/04 16:19:00 jdolecek Exp $
 # used by lang/php72/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -45,8 +45,8 @@
 .include "../../textproc/libxml2/buildlink3.mk"
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}
-PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline argon2
-PKG_SUGGESTED_OPTIONS+=        inet6 ssl readline
+PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline argon2 sqlite3
+PKG_SUGGESTED_OPTIONS+=        inet6 ssl readline sqlite3
 
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
 PKG_SUPPORTED_OPTIONS+=        dtrace
@@ -97,5 +97,12 @@
 .include "../../security/argon2/buildlink3.mk"
 .endif
 
+.if !empty(PKG_OPTIONS:Msqlite3)
+CONFIGURE_ARGS+=       --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
+.include "../../databases/sqlite3/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=    --without-sqlite3
+.endif
+
 DL_AUTO_VARS=          yes
 .include "../../mk/dlopen.buildlink3.mk"
diff -r d071c6a335f8 -r a7e4bd3674ee lang/php72/distinfo
--- a/lang/php72/distinfo       Sun Feb 04 15:38:41 2018 +0000
+++ b/lang/php72/distinfo       Sun Feb 04 16:19:00 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2018/02/04 15:38:41 jdolecek Exp $
+$NetBSD: distinfo,v 1.15 2018/02/04 16:19:00 jdolecek Exp $
 
 SHA1 (php-7.2.2.tar.bz2) = 69903dabf7ceb4a84620683092e235b29d2d1066
 RMD160 (php-7.2.2.tar.bz2) = c7193e0298ae8e709ad19129023ff213085f50ca
@@ -11,7 +11,6 @@
 SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
 SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
 SHA1 (patch-ext_recode_recode.c) = 639bf762302c7a30c88d3f3fa862494e0f847bdb
-SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5
 SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
 SHA1 (patch-php.ini-development) = dd65962000ec06439fae3c9bf252fa46be4e33fd
 SHA1 (patch-php.ini-production) = ae61dffedf574b688fe576b0b2af748b7a28cd89
diff -r d071c6a335f8 -r a7e4bd3674ee lang/php72/patches/patch-ext_sqlite3_libsqlite_sqlite3.c
--- a/lang/php72/patches/patch-ext_sqlite3_libsqlite_sqlite3.c  Sun Feb 04 15:38:41 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ext_sqlite3_libsqlite_sqlite3.c,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
-
---- ext/sqlite3/libsqlite/sqlite3.c.orig       2015-06-23 17:33:33.000000000 +0000
-+++ ext/sqlite3/libsqlite/sqlite3.c
-@@ -8408,7 +8408,7 @@ struct sqlite3_rtree_query_info {
- ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
- ** it.
- */
--#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__)
-+#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__sun)
- #  define _XOPEN_SOURCE 600
- #endif
-