From 4dbdcb690bb2543e81244159443675b91f791df2 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sat, 21 May 2022 09:43:00 +0000
Subject: [PATCH] no more need for SUBST_VARS=MODPHP_BIN, suggested by aja@

---
 databases/pg_stats_reporter/Makefile | 2 +-
 devel/boris/Makefile                 | 2 --
 mail/roundcubemail/Makefile          | 2 +-
 net/librenms/Makefile                | 2 +-
 www/composer/Makefile                | 2 --
 www/drush/Makefile                   | 1 -
 www/nextcloud/Makefile.inc           | 2 +-
 www/pear/Makefile                    | 1 -
 www/wp-cli/Makefile                  | 2 --
 9 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/databases/pg_stats_reporter/Makefile b/databases/pg_stats_reporter/Makefile
index 2dc84f0c55c..0e35e773964 100644
--- a/databases/pg_stats_reporter/Makefile
+++ b/databases/pg_stats_reporter/Makefile
@@ -16,7 +16,7 @@ NO_TEST =	Yes
 PREFIX =		${VARBASE}/www
 INSTDIR =	${PREFIX}/pg_stats_reporter_lib/
 
-SUBST_VARS +=	INSTDIR MODPHP_BIN
+SUBST_VARS +=	INSTDIR
 MODULES =	lang/php
 MODPHP_VERSION = 7.4
 RUN_DEPENDS =	lang/php/${MODPHP_VERSION},-pgsql \
diff --git a/devel/boris/Makefile b/devel/boris/Makefile
index 464156b92d9..b4b3706046e 100644
--- a/devel/boris/Makefile
+++ b/devel/boris/Makefile
@@ -19,8 +19,6 @@ RUN_DEPENDS +=		lang/php/${MODPHP_VERSION},-pcntl
 NO_BUILD =		Yes
 NO_TEST =		Yes
 
-SUBST_VARS +=		MODPHP_BIN
-
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/boris ${PREFIX}/lib/boris
 	${INSTALL_DATA} ${WRKSRC}/{LICENSE,README.md} ${PREFIX}/share/doc/boris
diff --git a/mail/roundcubemail/Makefile b/mail/roundcubemail/Makefile
index e0b1c449b94..ef03133ef49 100644
--- a/mail/roundcubemail/Makefile
+++ b/mail/roundcubemail/Makefile
@@ -26,7 +26,7 @@ PKG_ARCH=	*
 PREFIX=		${VARBASE}/www
 INSTDIR=	${PREFIX}/roundcubemail
 TINSTDIR=	${TRUEPREFIX}/roundcubemail
-SUBST_VARS=	INSTDIR TINSTDIR MODPHP_BIN
+SUBST_VARS=	INSTDIR TINSTDIR
 
 MODULES=	lang/php
 
diff --git a/net/librenms/Makefile b/net/librenms/Makefile
index ab082543f26..b7d3c0c3132 100644
--- a/net/librenms/Makefile
+++ b/net/librenms/Makefile
@@ -46,7 +46,7 @@ NO_TEST=	Yes
 
 PREFIX=		/var/www
 INSTDIR=	${PREFIX}/librenms
-SUBST_VARS=	INSTDIR MODPHP_BIN
+SUBST_VARS=	INSTDIR
 UPDATE_PLIST_ARGS += -i MODPHP_VERSION
 
 R =	s,^\#!( )?(/usr/bin/env |/bin/)bash,\#!${LOCALBASE}/bin/bash,;
diff --git a/www/composer/Makefile b/www/composer/Makefile
index 2eb9dd7ff0c..5cbfb11eed6 100644
--- a/www/composer/Makefile
+++ b/www/composer/Makefile
@@ -23,8 +23,6 @@ NO_BUILD=	Yes
 NO_TEST=	Yes
 PKG_ARCH=	*
 
-SUBST_VARS=	MODPHP_BIN
-
 do-extract:
 	mkdir ${WRKSRC}; \
 	  cp ${FULLDISTDIR}/composer-$V.phar ${WRKSRC}/composer.phar
diff --git a/www/drush/Makefile b/www/drush/Makefile
index 0495a65d844..b9cde86ea8d 100644
--- a/www/drush/Makefile
+++ b/www/drush/Makefile
@@ -18,7 +18,6 @@ PERMIT_PACKAGE=	Yes
 NO_BUILD=	Yes
 RUN_DEPENDS=	archivers/gtar \
 		${MODPHP_PDO_DEPENDS}
-SUBST_VARS=	MODPHP_BIN
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/libexec/drush
diff --git a/www/nextcloud/Makefile.inc b/www/nextcloud/Makefile.inc
index c3deee9a80a..d1b122a66bc 100644
--- a/www/nextcloud/Makefile.inc
+++ b/www/nextcloud/Makefile.inc
@@ -35,7 +35,7 @@ INSTDIR=		${PREFIX}/nextcloud
 TINSTDIR=		${TRUEPREFIX}/nextcloud
 VR=			${V:R}
 MAJOR=			${VR:R}
-SUBST_VARS=		INSTDIR TINSTDIR MODPHP_BIN VR MAJOR
+SUBST_VARS=		INSTDIR TINSTDIR VR MAJOR
 DESCR=			${.CURDIR}/../pkg/DESCR
 UNMESSAGE=		${.CURDIR}/../pkg/UNMESSAGE
 FILESDIR=		${.CURDIR}/../files
diff --git a/www/pear/Makefile b/www/pear/Makefile
index 9c7a0ab0b57..ee58ff62597 100644
--- a/www/pear/Makefile
+++ b/www/pear/Makefile
@@ -35,7 +35,6 @@ PREFIX-utils=	/usr/local
 NO_TEST=	Yes
 
 BUILD_DEPENDS+=	devel/p5-Expect
-SUBST_VARS=	MODPHP_BIN
 
 do-extract:
 	cp ${FULLDISTDIR}/go-pear-${VERSION}.phar ${WRKSRC}/go-pear.phar
diff --git a/www/wp-cli/Makefile b/www/wp-cli/Makefile
index fa5be2ed106..46d0ddf595e 100644
--- a/www/wp-cli/Makefile
+++ b/www/wp-cli/Makefile
@@ -22,8 +22,6 @@ NO_BUILD =	Yes
 
 NO_TEST =	Yes
 
-SUBST_VARS +=	MODPHP_BIN
-
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/bin
 	cp ${FULLDISTDIR}/${DISTNAME}.phar ${PREFIX}/bin/wp-cli.phar