lang/php*: clean up php langauges

Clean up php languages.

* Clean up php/phpversions.mk a little.
* Add php/replace.mk to provide common shebang line replace for PHP.
* Define USE_TOOLS before including <bsd.prefs.mk>.
* Fix most warnings of pkglint.

No functional change should be done.

11 files changed, 35 insertions, 42 deletions

diff --git a/lang/php73/Makefile b/lang/php73/Makefile
index 22da81ae7b1..9bc9d50fa53 100644
--- a/lang/php73/Makefile
+++ b/lang/php73/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/10/02 14:08:05 taca Exp $
+# $NetBSD: Makefile,v 1.7 2019/12/16 15:58:19 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -28,6 +28,8 @@ MAKE_ENV+=		INSTALL_ROOT=${DESTDIR}
 CONF_FILES=		${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
 PLIST_SUBST+=		PHPEXTDIR="${PHP_EXTENSION_DIR}"
 
+REPLACE_PHP=		ext/phar/phar/phar.php run-tests.php
+
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing common paths.
 SUBST_STAGE.path=	pre-configure
@@ -59,4 +61,5 @@ post-install:
 		${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php
 
+.include "../../lang/php/replace.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/php73/Makefile.php b/lang/php73/Makefile.php
index a826d41ab80..6228a71c426 100644
--- a/lang/php73/Makefile.php
+++ b/lang/php73/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.2 2019/10/02 14:08:05 taca Exp $
+# $NetBSD: Makefile.php,v 1.3 2019/12/16 15:58:19 taca Exp $
 # used by lang/php73/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -13,17 +13,17 @@ CONFIGURE_ARGS+=	--disable-gcc-global-regs
 # the binary actually needs full dep on PCRE
 BUILDLINK_DEPMETHOD.pcre2=	full
 
-.include "../../lang/php73/Makefile.common"
-
-DISTINFO_FILE=	${.CURDIR}/../../lang/php73/distinfo
-PATCHDIR=	${.CURDIR}/../../lang/php73/patches
-
 USE_LIBTOOL=		YES
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 BUILD_DEFS+=		VARBASE
 PLIST_VARS+=		dtrace
 
+.include "../../lang/php73/Makefile.common"
+
+DISTINFO_FILE=	${.CURDIR}/../../lang/php73/distinfo
+PATCHDIR=	${.CURDIR}/../../lang/php73/patches
+
 CONFIGURE_ENV+=		EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/lang/php73/distinfo b/lang/php73/distinfo
index c7c8c067c86..3437e61e5ca 100644
--- a/lang/php73/distinfo
+++ b/lang/php73/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2019/11/25 03:12:50 taca Exp $
+$NetBSD: distinfo,v 1.16 2019/12/16 15:58:19 taca Exp $
 
 SHA1 (php-7.3.12.tar.xz) = eee16ac54b148c6826c9ff29a58a114be42f1eeb
 RMD160 (php-7.3.12.tar.xz) = 236a3aa08bf7a6e69c2ca61596df04e782e496ab
@@ -7,15 +7,13 @@ Size (php-7.3.12.tar.xz) = 12095212 bytes
 SHA1 (patch-configure) = 08b80528ba90c705398e8841c232382663479a3b
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335
-SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426
-SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8
+SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_recode_recode.c) = 639bf762302c7a30c88d3f3fa862494e0f847bdb
-SHA1 (patch-ext_tidy_config.m4) = 4d6b4bf71c606fdb244937dc8a92b49e268060e6
+SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
 SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627
-SHA1 (patch-php.ini-development) = 0150deec620db99272d10bc01585a503b2fc4b86
-SHA1 (patch-php.ini-production) = 8c3451ff6253c9cd0dbf342761231c8fe54fdc52
-SHA1 (patch-run-tests.php) = 278cd99b3c5f3d2131eef564e18eb2ee9924db5a
-SHA1 (patch-sapi_cgi_Makefile.frag) = 18769900f588ff81cc34474542afa1d65c070e65
+SHA1 (patch-php.ini-development) = e6815f2774ba071baa510fd5490fb5fa377d2462
+SHA1 (patch-php.ini-production) = 3ee4d2e2e4fb4dbcb5b64df86751f7feeef0e20d
+SHA1 (patch-sapi_cgi_Makefile.frag) = f4cd64d334884c49787d8854115c8cd69cc79bb8
 SHA1 (patch-sapi_cli_Makefile.frag) = 1cd29d09042863acbf5330e406410fdcf75d06b3
 SHA1 (patch-sapi_fpm_fpm_events_port.c) = b82b7caffffde1343190fae430a68eb411b5cf8a
-SHA1 (patch-sapi_fpm_php-fpm.conf.in) = b3c4fd499cbfd2dffd9176abb54e298ea542a5d7
+SHA1 (patch-sapi_fpm_php-fpm.conf.in) = acf9b4e70d4c5ea2b96e37e7bbf9005379ecc4d0
diff --git a/lang/php73/patches/patch-ext_phar_Makefile.frag b/lang/php73/patches/patch-ext_phar_Makefile.frag
index adeec9e2fcc..e3ec8e01bac 100644
--- a/lang/php73/patches/patch-ext_phar_Makefile.frag
+++ b/lang/php73/patches/patch-ext_phar_Makefile.frag
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_phar_Makefile.frag,v 1.1 2018/12/15 17:12:44 taca Exp $
+$NetBSD: patch-ext_phar_Makefile.frag,v 1.2 2019/12/16 15:58:19 taca Exp $
+
+Set shbang for phar correctly.
 
 --- ext/phar/Makefile.frag.orig	2015-06-23 17:33:33.000000000 +0000
 +++ ext/phar/Makefile.frag
diff --git a/lang/php73/patches/patch-ext_phar_phar_phar.php b/lang/php73/patches/patch-ext_phar_phar_phar.php
deleted file mode 100644
index 6d205739ef3..00000000000
--- a/lang/php73/patches/patch-ext_phar_phar_phar.php
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ext_phar_phar_phar.php,v 1.1 2018/12/15 17:12:44 taca Exp $
-
---- ext/phar/phar/phar.php.orig	2015-06-23 17:33:33.000000000 +0000
-+++ ext/phar/phar/phar.php
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php
-+#!@PREFIX@/bin/php
- <?php
- 
- /** @file phar.php
diff --git a/lang/php73/patches/patch-ext_tidy_config.m4 b/lang/php73/patches/patch-ext_tidy_config.m4
index 222fb7e2458..909896b32e0 100644
--- a/lang/php73/patches/patch-ext_tidy_config.m4
+++ b/lang/php73/patches/patch-ext_tidy_config.m4
@@ -1,4 +1,6 @@
-$NetBSD: patch-ext_tidy_config.m4,v 1.1 2018/12/15 17:12:44 taca Exp $
+$NetBSD: patch-ext_tidy_config.m4,v 1.2 2019/12/16 15:58:19 taca Exp $
+
+Fix portability.
 
 --- ext/tidy/config.m4.orig	2018-12-04 16:12:28.000000000 +0000
 +++ ext/tidy/config.m4
diff --git a/lang/php73/patches/patch-php.ini-development b/lang/php73/patches/patch-php.ini-development
index e486ff46382..8dfe2452e87 100644
--- a/lang/php73/patches/patch-php.ini-development
+++ b/lang/php73/patches/patch-php.ini-development
@@ -1,4 +1,6 @@
-$NetBSD: patch-php.ini-development,v 1.1 2018/12/15 17:12:44 taca Exp $
+$NetBSD: patch-php.ini-development,v 1.2 2019/12/16 15:58:19 taca Exp $
+
+Set proper default configuration values.
 
 --- php.ini-development.orig	2018-12-04 16:12:20.000000000 +0000
 +++ php.ini-development
diff --git a/lang/php73/patches/patch-php.ini-production b/lang/php73/patches/patch-php.ini-production
index 15a7e031530..0b9f4fc6025 100644
--- a/lang/php73/patches/patch-php.ini-production
+++ b/lang/php73/patches/patch-php.ini-production
@@ -1,4 +1,6 @@
-$NetBSD: patch-php.ini-production,v 1.1 2018/12/15 17:12:44 taca Exp $
+$NetBSD: patch-php.ini-production,v 1.2 2019/12/16 15:58:19 taca Exp $
+
+Set proper default configuration values.
 
 --- php.ini-production.orig	2018-12-04 16:12:20.000000000 +0000
 +++ php.ini-production
diff --git a/lang/php73/patches/patch-run-tests.php b/lang/php73/patches/patch-run-tests.php
deleted file mode 100644
index 76861e9908b..00000000000
--- a/lang/php73/patches/patch-run-tests.php
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-run-tests.php,v 1.1 2018/12/15 17:12:44 taca Exp $
-
---- run-tests.php.orig	2018-12-04 16:12:20.000000000 +0000
-+++ run-tests.php
-@@ -1,4 +1,4 @@
--#!/usr/bin/env php
-+#!/usr/pkg/bin/php
- <?php
- /*
-    +----------------------------------------------------------------------+
diff --git a/lang/php73/patches/patch-sapi_cgi_Makefile.frag b/lang/php73/patches/patch-sapi_cgi_Makefile.frag
index 9378c0c6e72..fbf053026b2 100644
--- a/lang/php73/patches/patch-sapi_cgi_Makefile.frag
+++ b/lang/php73/patches/patch-sapi_cgi_Makefile.frag
@@ -1,4 +1,6 @@
-$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.1 2018/12/15 17:12:44 taca Exp $
+$NetBSD: patch-sapi_cgi_Makefile.frag,v 1.2 2019/12/16 15:58:19 taca Exp $
+
+Install to CGI directory.
 
 --- sapi/cgi/Makefile.frag.orig	2015-06-23 17:33:33.000000000 +0000
 +++ sapi/cgi/Makefile.frag
diff --git a/lang/php73/patches/patch-sapi_fpm_php-fpm.conf.in b/lang/php73/patches/patch-sapi_fpm_php-fpm.conf.in
index 4faa3ea5cc5..c040e9b6cc4 100644
--- a/lang/php73/patches/patch-sapi_fpm_php-fpm.conf.in
+++ b/lang/php73/patches/patch-sapi_fpm_php-fpm.conf.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-sapi_fpm_php-fpm.conf.in,v 1.1 2018/12/15 17:12:44 taca Exp $
+$NetBSD: patch-sapi_fpm_php-fpm.conf.in,v 1.2 2019/12/16 15:58:19 taca Exp $
+
+Set proper default configuration values.
 
 --- sapi/fpm/php-fpm.conf.in.orig	2015-06-23 17:33:33.000000000 +0000
 +++ sapi/fpm/php-fpm.conf.in