CVS commit: pkgsrc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Mar 10 16:35:17 UTC 2021

Modified Files:
        pkgsrc/lang/php73: buildlink3.mk
        pkgsrc/lang/php74: buildlink3.mk
        pkgsrc/lang/php80: buildlink3.mk
        pkgsrc/www/unit-php: Makefile

Log Message:
unit-php: Obtain package options for PHP using pkg-build-options.mk

This should unbreak things that attempt to scan the pkgsrc tree without
building dependencies, as observed in morden.netbsd.org daily pkgsrc output


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php73/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php74/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php80/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/unit-php/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php73/buildlink3.mk
diff -u pkgsrc/lang/php73/buildlink3.mk:1.4 pkgsrc/lang/php73/buildlink3.mk:1.5
--- pkgsrc/lang/php73/buildlink3.mk:1.4 Thu Nov  5 09:06:58 2020
+++ pkgsrc/lang/php73/buildlink3.mk     Wed Mar 10 16:35:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2020/11/05 09:06:58 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2021/03/10 16:35:16 nia Exp $
 
 BUILDLINK_TREE+=       php
 
@@ -9,6 +9,9 @@ BUILDLINK_API_DEPENDS.php+=     php>=7.3.0<7
 BUILDLINK_ABI_DEPENDS.php+=    php>=7.3.24nb1
 BUILDLINK_PKGSRCDIR.php?=      ../../lang/php73
 
+pkgbase := php
+.include "../../mk/pkg-build-options.mk"
+
 .include "../../textproc/libxml2/buildlink3.mk"
 .endif # PHP_BUILDLINK3_MK
 

Index: pkgsrc/lang/php74/buildlink3.mk
diff -u pkgsrc/lang/php74/buildlink3.mk:1.3 pkgsrc/lang/php74/buildlink3.mk:1.4
--- pkgsrc/lang/php74/buildlink3.mk:1.3 Thu Nov  5 09:06:58 2020
+++ pkgsrc/lang/php74/buildlink3.mk     Wed Mar 10 16:35:17 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/11/05 09:06:58 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2021/03/10 16:35:17 nia Exp $
 
 BUILDLINK_TREE+=       php
 
@@ -9,6 +9,9 @@ BUILDLINK_API_DEPENDS.php+=     php>=7.4.0<7
 BUILDLINK_ABI_DEPENDS.php+=    php>=7.4.12nb1
 BUILDLINK_PKGSRCDIR.php?=      ../../lang/php74
 
+pkgbase := php
+.include "../../mk/pkg-build-options.mk"
+
 .include "../../textproc/libxml2/buildlink3.mk"
 .endif # PHP_BUILDLINK3_MK
 

Index: pkgsrc/lang/php80/buildlink3.mk
diff -u pkgsrc/lang/php80/buildlink3.mk:1.1 pkgsrc/lang/php80/buildlink3.mk:1.2
--- pkgsrc/lang/php80/buildlink3.mk:1.1 Sun Mar  7 13:41:36 2021
+++ pkgsrc/lang/php80/buildlink3.mk     Wed Mar 10 16:35:17 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2021/03/07 13:41:36 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/03/10 16:35:17 nia Exp $
 
 BUILDLINK_TREE+=       php
 
@@ -9,6 +9,8 @@ BUILDLINK_API_DEPENDS.php+=     php>=8.0.0<9
 BUILDLINK_ABI_DEPENDS.php+=    php>=8.0.0
 BUILDLINK_PKGSRCDIR.php?=      ../../lang/php80
 
+pkgbase := php
+.include "../../mk/pkg-build-options.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .endif # PHP_BUILDLINK3_MK
 

Index: pkgsrc/www/unit-php/Makefile
diff -u pkgsrc/www/unit-php/Makefile:1.4 pkgsrc/www/unit-php/Makefile:1.5
--- pkgsrc/www/unit-php/Makefile:1.4    Sat Feb 27 20:58:26 2021
+++ pkgsrc/www/unit-php/Makefile        Wed Mar 10 16:35:17 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/02/27 20:58:26 otis Exp $
+# $NetBSD: Makefile,v 1.5 2021/03/10 16:35:17 nia Exp $
 
 PKGNAME=       unit-${LANG}${PHP_VERSION:R:S|.||g}-${UNIT_VERSION}
 COMMENT=       PHP module for NGINX Unit
@@ -12,11 +12,6 @@ PHP_VERSIONS_ACCEPTED?=      56 73 74
 
 .include "../../lang/php/phpversion.mk"
 
-PHP_BUILD_OPTIONS!=    ${RUN} ${PKG_INFO} -Bn php | ${GREP} PKG_OPTIONS
-.if empty(PHP_BUILD_OPTIONS:Mphp-embed)
-BROKEN=                "Requires the php-embed option enabled in PHP."
-.endif
-
 post-configure:
        ${RUN} cd ${WRKSRC} && ${SETENV} ${_CONFIGURE_SCRIPT_ENV}       \
                ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS}                   \
@@ -25,6 +20,9 @@ post-configure:
                                --module=${MODNAME}
 
 .include "${PHPPKGSRCDIR}/buildlink3.mk"
+.if empty(PKG_BUILD_OPTIONS.php:Mphp-embed)
+BROKEN=                "Requires the php-embed option enabled in PHP."
+.endif
 .include "../../www/unit/ext.mk"
 .include "../../www/unit/Makefile.common"
 .include "../../mk/bsd.pkg.mk"