On 2018/06/15 10:04, Martijn van Duren wrote:
> Any takers for this one?
There are some hardcoded /usr/local which should use a variable.
Also, what testing have you done?
> martijn@
>
> On 06/05/18 21:56, Martijn van Duren wrote:
> > On 06/05/18 18:17, Stuart Henderson wrote:
> >> On 2018/06/05 14:25, Nigel Taylor wrote:
> >>> I had sent issue to sthen@ already. Got past this by
> >>
> >> Received your initial report about an hour after this mail, I'd recommend
> >> sending to this address rather than the openbsd.org one to avoid
> >> greylisting
> >> on lists.openbsd.org which doesn't do too well with btinternet's mail
> >> provider.
> >>
> >>> doas -u _pbuild env CFLAGS="-I /usr/local/include" make package
> >>>
> >>> works.
> >>>
> >>>
> >>> Default is to build with php5.6, but pear-utils builds/runs with php 7.0
> >>> so have two versions of PHP present when building if just install build
> >>> dependencies for this port - should really only ever be one or the other
> >>> PHP version, would need a pear/pear-utils for both php 5.6 and 7.0.
> >>> Needs sorting out cleaning up, if going to have both flavors. It should
> >>> be possible to build and run with just a single php version and never
> >>> require the other.
> >>
> >> I looked at this when I did the switchover and came to the conclusion
> >> that for the minimal number of ports using php 5.6 it's not worth
> >> splitting into "pear-utils with php-5.6 in the #! line" and "pear-utils
> >> with php-7.0 in the #! line" just to avoid a build dep.
> >>
> >>> I've built everything else with LDEP's or RDEP's providing all the
> >>> dependencies have been defined just waiting on libreoffice to complete -
> >>> I used sqlport to determine what dependencies needed rebuilding, there
> >>> are BDEPS only's which may not have been rebuilt (seems unlikely to a
> >>> BDEP on php and not a matching RDEP) checked and the only cases found
> >>> are where there are -php subpackages the other subpackages -main etc
> >>> have no php runtime requirement, I normally build all the subpackages.
> >>>
> >>> So it's looks like just the one port with an issue with the include, and
> >>> simple enough to fix.
> >>
> >> I think better initially to just backout the breakage (which I've done)
> >> then consider what needs doing to fix it.
> >>
> > My bad, I had this in my branch from a year ago.
> >
> > With diff below OK to restore backout?
> >
> Index: 5.6/patches/patch-scripts_php-config_in
> ===================================================================
> RCS file: /cvs/ports/lang/php/5.6/patches/patch-scripts_php-config_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-scripts_php-config_in
> --- 5.6/patches/patch-scripts_php-config_in 15 Nov 2014 13:43:01 -0000
> 1.1
> +++ 5.6/patches/patch-scripts_php-config_in 5 Jun 2018 19:51:07 -0000
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-scripts_php-config_in,v 1.1 2014/11/15 13:43:01 robert Exp $
> ---- scripts/php-config.in.orig.port Thu Jul 18 16:37:33 2013
> -+++ scripts/php-config.in Sun Jul 28 11:30:20 2013
> -@@ -1,12 +1,12 @@
> +Index: scripts/php-config.in
> +--- scripts/php-config.in.orig
> ++++ scripts/php-config.in
> +@@ -1,13 +1,13 @@
> #! /bin/sh
>
> SED="@SED@"
> @@ -12,11 +13,13 @@ $OpenBSD: patch-scripts_php-config_in,v
> version="@PHP_VERSION@"
> vernum="@PHP_VERSION_ID@"
> -include_dir="@includedir@/php"
> +-includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM
> -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
> +include_dir="@PEAR_INSTALLDIR@/include"
> - includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM
> -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
> ++includes="-I/usr/local/include -I$include_dir -I$include_dir/main
> -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext
> -I$include_dir/ext/date/lib"
> ldflags="@PHP_LDFLAGS@"
> libs="@EXTRA_LIBS@"
> -@@ -24,10 +24,11 @@ php_sapis="@PHP_INSTALLED_SAPIS@"
> + extension_dir='@EXTENSION_DIR@'
> +@@ -24,10 +24,10 @@ php_sapis="@PHP_INSTALLED_SAPIS@"
> for sapi in $php_sapis; do
> case $sapi in
> cli)
> @@ -24,7 +27,7 @@ $OpenBSD: patch-scripts_php-config_in,v
> + php_cli_binary="/usr/local/bin/php${program_suffix}"
> ;;
> cgi)
> -
> php_cgi_binary="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}"
> +-
> php_cgi_binary="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}"
> + php_cgi_binary="/usr/local/bin/php-cgi${program_suffix}"
> ;;
> esac
> Index: 7.0/patches/patch-scripts_php-config_in
> ===================================================================
> RCS file: /cvs/ports/lang/php/7.0/patches/patch-scripts_php-config_in,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-scripts_php-config_in
> --- 7.0/patches/patch-scripts_php-config_in 14 Dec 2015 17:58:46 -0000
> 1.1.1.1
> +++ 7.0/patches/patch-scripts_php-config_in 5 Jun 2018 19:51:07 -0000
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-scripts_php-config_in,v 1.1.1.1 2015/12/14 17:58:46 robert
> Exp $
> ---- scripts/php-config.in.orig.port Thu Jul 18 16:37:33 2013
> -+++ scripts/php-config.in Sun Jul 28 11:30:20 2013
> -@@ -1,12 +1,12 @@
> +Index: scripts/php-config.in
> +--- scripts/php-config.in.orig
> ++++ scripts/php-config.in
> +@@ -1,13 +1,13 @@
> #! /bin/sh
>
> SED="@SED@"
> @@ -12,11 +13,13 @@ $OpenBSD: patch-scripts_php-config_in,v
> version="@PHP_VERSION@"
> vernum="@PHP_VERSION_ID@"
> -include_dir="@includedir@/php"
> +-includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM
> -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
> +include_dir="@PEAR_INSTALLDIR@/include"
> - includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM
> -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
> ++includes="-I/usr/local/include -I$include_dir -I$include_dir/main
> -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext
> -I$include_dir/ext/date/lib"
> ldflags="@PHP_LDFLAGS@"
> libs="@EXTRA_LIBS@"
> -@@ -24,10 +24,11 @@ php_sapis="@PHP_INSTALLED_SAPIS@"
> + extension_dir='@EXTENSION_DIR@'
> +@@ -24,10 +24,10 @@ php_sapis="@PHP_INSTALLED_SAPIS@"
> for sapi in $php_sapis; do
> case $sapi in
> cli)
> @@ -24,7 +27,7 @@ $OpenBSD: patch-scripts_php-config_in,v
> + php_cli_binary="/usr/local/bin/php${program_suffix}"
> ;;
> cgi)
> -
> php_cgi_binary="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}"
> +-
> php_cgi_binary="@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}"
> + php_cgi_binary="/usr/local/bin/php-cgi${program_suffix}"
> ;;
> esac
>
