PHP: clean Makefile.inc of 5.x specifics

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
11 messages Options
Reply | Threaded
Open this post in threaded view
|

PHP: clean Makefile.inc of 5.x specifics

Martijn van Duren-7
Hello ports@,

As requested by sthen@ I will cut up my big patch into smaller pieces.
This is the first part of that undertaking.

I will send in 1 at the time since a lot intermingles with Makefile.inc
and I don't want stacking patches to cause trouble.

If someone objects to a certain patch I'll just drop it till it's the
right time to discuss it, so to not keep the things that can move along.

OK for the patch below?

martijn@

Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile.inc
--- Makefile.inc 14 Nov 2017 11:57:25 -0000 1.97
+++ Makefile.inc 14 Nov 2017 18:02:26 -0000
@@ -71,12 +71,8 @@ CONFIGURE_ARGS+= --enable-shared \
  --with-pdo-sqlite \
  --enable-sqlite-utf8 \
  --with-sqlite3 \
- --program-suffix=-${PV}
-
-# readline is broken in PHP-5.3
-.if ${PV} != 5.3
-CONFIGURE_ARGS += --with-readline
-.endif
+ --program-suffix=-${PV} \
+ --with-readline
 
 # apache module
 CONFIGURE_ARGS+= --with-apxs2=${LOCALBASE}/sbin/apxs2
@@ -143,7 +139,7 @@ MULTI_PACKAGES+= -gd
 COMMENT-gd= image manipulation extensions for php5
 LIB_DEPENDS-gd= graphics/jpeg \
  graphics/png
-.if ${PV} != "7.0"
+.if ${PV} == "5.6"
 LIB_DEPENDS-gd+= devel/t1lib
 WANTLIB-gd+= t1>=5
 .endif
@@ -194,15 +190,6 @@ CONFIGURE_ARGS+= --with-mcrypt=shared,${
 LIB_DEPENDS-mcrypt= security/libmcrypt devel/libtool,-ltdl
 WANTLIB-mcrypt= mcrypt ltdl>=1 pthread
 
-.if ${PV} != "7.0"
-# mysql
-MULTI_PACKAGES+= -mysql
-COMMENT-mysql= mysql database access extensions for php5
-CONFIGURE_ARGS+= --with-mysql=shared,${LOCALBASE}
-LIB_DEPENDS-mysql= databases/mariadb
-WANTLIB-mysql= pthread lib/mysql/mysqlclient
-.endif
-
 # mysqli
 MULTI_PACKAGES+= -mysqli
 COMMENT-mysqli= mysql database access extensions for php5
@@ -215,10 +202,7 @@ MULTI_PACKAGES+= -odbc
 COMMENT-odbc= odbc database access extensions for php5
 CONFIGURE_ARGS+=        --with-iodbc=shared,${LOCALBASE}
 LIB_DEPENDS-odbc= databases/iodbc
-WANTLIB-odbc= iodbc>=2 pthread
-.if ${PV} != "5.3"
-WANTLIB-odbc+= iodbcinst
-.endif
+WANTLIB-odbc= iodbc>=2 pthread iodbcinst
 
 # pcntl
 MULTI_PACKAGES+= -pcntl
@@ -276,15 +260,6 @@ CONFIGURE_ARGS+= --with-snmp=shared,${LO
 LIB_DEPENDS-snmp= net/net-snmp
 WANTLIB-snmp= crypto m netsnmp>=6.2 pthread
 
-.if ${PV} != "7.0"
-# sybase-ct
-MULTI_PACKAGES+= -sybase_ct
-COMMENT-sybase_ct= sybase database access extensions for php5
-CONFIGURE_ARGS+= --with-sybase-ct=shared,${LOCALBASE}
-LIB_DEPENDS-sybase_ct= databases/freetds
-WANTLIB-sybase_ct= ct pthread
-.endif
-
 # pdo-dblib
 MULTI_PACKAGES+= -pdo_dblib
 COMMENT-pdo_dblib= PDO DB-LIB support for php5
@@ -292,15 +267,6 @@ CONFIGURE_ARGS+=        --with-pdo-dblib
 LIB_DEPENDS-pdo_dblib= databases/freetds
 WANTLIB-pdo_dblib= sybdb>=6 pthread
 
-.if ${PV} != "7.0"
-# mssql
-MULTI_PACKAGES+= -mssql
-COMMENT-mssql= microsoft sql access extensions for php5
-CONFIGURE_ARGS+=        --with-mssql=shared,${LOCALBASE}
-LIB_DEPENDS-mssql= databases/freetds
-WANTLIB-mssql= sybdb>=6 pthread
-.endif
-
 # tidy
 MULTI_PACKAGES+= -tidy
 COMMENT-tidy= tidy HTML cleaner bindings
@@ -341,7 +307,6 @@ PHPXS_SUBST+= -e 's,${i},${${i}},'
 WANTLIB-main+= c crypto iconv intl lzma m pthread ssl xml2>=8 z
 WANTLIB-main+= ncurses readline ${COMPILER_LIBCXX}
 
-# php 5.4/5.5 : WANTLIB-main += ${COMPILER_LIBCXX}
 WANTLIB-fastcgi= ${WANTLIB-main}
 LIB_DEPENDS-main= devel/gettext \
  textproc/libxml
Index: 5.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- 5.6/Makefile 14 Nov 2017 11:57:25 -0000 1.52
+++ 5.6/Makefile 14 Nov 2017 18:02:26 -0000
@@ -2,27 +2,48 @@
 
 BROKEN-alpha= pcre_jit_compile.c:65:2: error: #error Unsupported architecture
 
-PV= 5.6
-V= ${PV}.31
+PV= 5.6
+V= ${PV}.31
 
-MASTER_SITES0= https://download.suhosin.org/
+MASTER_SITES0= https://download.suhosin.org/
 
-WANTLIB-main+= ${COMPILER_LIBCXX} ncurses readline
+WANTLIB-main+= ${COMPILER_LIBCXX} ncurses readline
 
-FLAVORS= no_suhosin
+FLAVORS= no_suhosin
 FLAVOR?=
 
-SUHOSIN_V= 0.9.38
+SUHOSIN_V= 0.9.38
 
-SUPDISTFILES= suhosin-${SUHOSIN_V}.tar.gz:0
+SUPDISTFILES= suhosin-${SUHOSIN_V}.tar.gz:0
 
 .if !${FLAVOR:Mno_suhosin}
-DISTFILES+= suhosin-${SUHOSIN_V}.tar.gz:0
-PATCH_LIST= patch-* suhosin-*
-CONFIGURE_ARGS+= --enable-suhosin
+DISTFILES+= suhosin-${SUHOSIN_V}.tar.gz:0
+PATCH_LIST= patch-* suhosin-*
+CONFIGURE_ARGS+= --enable-suhosin
 
 pre-patch:
  @mv ${WRKDIR}/suhosin-${SUHOSIN_V} ${WRKSRC}/ext/suhosin
 .endif
+
+# mysql
+MULTI_PACKAGES+= -mysql
+COMMENT-mysql= mysql database access extensions for php5
+CONFIGURE_ARGS+= --with-mysql=shared,${LOCALBASE}
+LIB_DEPENDS-mysql= databases/mariadb
+WANTLIB-mysql= pthread lib/mysql/mysqlclient
+
+# sybase-ct
+MULTI_PACKAGES+= -sybase_ct
+COMMENT-sybase_ct= sybase database access extensions for php5
+CONFIGURE_ARGS+= --with-sybase-ct=shared,${LOCALBASE}
+LIB_DEPENDS-sybase_ct= databases/freetds
+WANTLIB-sybase_ct= ct pthread
+
+# mssql
+MULTI_PACKAGES+= -mssql
+COMMENT-mssql= microsoft sql access extensions for php5
+CONFIGURE_ARGS+=        --with-mssql=shared,${LOCALBASE}
+LIB_DEPENDS-mssql= databases/freetds
+WANTLIB-mssql= sybdb>=6 pthread
 
 .include <bsd.port.mk>

Reply | Threaded
Open this post in threaded view
|

Re: PHP: clean Makefile.inc of 5.x specifics

Stuart Henderson
On 2017/11/14 19:54, Martijn van Duren wrote:

> Hello ports@,
>
> As requested by sthen@ I will cut up my big patch into smaller pieces.
> This is the first part of that undertaking.
>
> I will send in 1 at the time since a lot intermingles with Makefile.inc
> and I don't want stacking patches to cause trouble.
>
> If someone objects to a certain patch I'll just drop it till it's the
> right time to discuss it, so to not keep the things that can move along.
>
> OK for the patch below?
>
> martijn@
>
> Index: Makefile.inc
> ===================================================================
> RCS file: /cvs/ports/lang/php/Makefile.inc,v
> retrieving revision 1.97
> diff -u -p -r1.97 Makefile.inc
> --- Makefile.inc 14 Nov 2017 11:57:25 -0000 1.97
> +++ Makefile.inc 14 Nov 2017 18:02:26 -0000
> @@ -71,12 +71,8 @@ CONFIGURE_ARGS+= --enable-shared \
>   --with-pdo-sqlite \
>   --enable-sqlite-utf8 \
>   --with-sqlite3 \
> - --program-suffix=-${PV}
> -
> -# readline is broken in PHP-5.3
> -.if ${PV} != 5.3
> -CONFIGURE_ARGS += --with-readline
> -.endif
> + --program-suffix=-${PV} \
> + --with-readline
>  
>  # apache module
>  CONFIGURE_ARGS+= --with-apxs2=${LOCALBASE}/sbin/apxs2
> @@ -143,7 +139,7 @@ MULTI_PACKAGES+= -gd
>  COMMENT-gd= image manipulation extensions for php5
>  LIB_DEPENDS-gd= graphics/jpeg \
>   graphics/png
> -.if ${PV} != "7.0"
> +.if ${PV} == "5.6"
>  LIB_DEPENDS-gd+= devel/t1lib
>  WANTLIB-gd+= t1>=5
>  .endif
> @@ -194,15 +190,6 @@ CONFIGURE_ARGS+= --with-mcrypt=shared,${
>  LIB_DEPENDS-mcrypt= security/libmcrypt devel/libtool,-ltdl
>  WANTLIB-mcrypt= mcrypt ltdl>=1 pthread
>  
> -.if ${PV} != "7.0"
> -# mysql
> -MULTI_PACKAGES+= -mysql
> -COMMENT-mysql= mysql database access extensions for php5
> -CONFIGURE_ARGS+= --with-mysql=shared,${LOCALBASE}
> -LIB_DEPENDS-mysql= databases/mariadb
> -WANTLIB-mysql= pthread lib/mysql/mysqlclient
> -.endif
> -
>  # mysqli
>  MULTI_PACKAGES+= -mysqli
>  COMMENT-mysqli= mysql database access extensions for php5
> @@ -215,10 +202,7 @@ MULTI_PACKAGES+= -odbc
>  COMMENT-odbc= odbc database access extensions for php5
>  CONFIGURE_ARGS+=        --with-iodbc=shared,${LOCALBASE}
>  LIB_DEPENDS-odbc= databases/iodbc
> -WANTLIB-odbc= iodbc>=2 pthread
> -.if ${PV} != "5.3"
> -WANTLIB-odbc+= iodbcinst
> -.endif
> +WANTLIB-odbc= iodbc>=2 pthread iodbcinst
>  
>  # pcntl
>  MULTI_PACKAGES+= -pcntl
> @@ -276,15 +260,6 @@ CONFIGURE_ARGS+= --with-snmp=shared,${LO
>  LIB_DEPENDS-snmp= net/net-snmp
>  WANTLIB-snmp= crypto m netsnmp>=6.2 pthread
>  
> -.if ${PV} != "7.0"
> -# sybase-ct
> -MULTI_PACKAGES+= -sybase_ct
> -COMMENT-sybase_ct= sybase database access extensions for php5
> -CONFIGURE_ARGS+= --with-sybase-ct=shared,${LOCALBASE}
> -LIB_DEPENDS-sybase_ct= databases/freetds
> -WANTLIB-sybase_ct= ct pthread
> -.endif
> -
>  # pdo-dblib
>  MULTI_PACKAGES+= -pdo_dblib
>  COMMENT-pdo_dblib= PDO DB-LIB support for php5
> @@ -292,15 +267,6 @@ CONFIGURE_ARGS+=        --with-pdo-dblib
>  LIB_DEPENDS-pdo_dblib= databases/freetds
>  WANTLIB-pdo_dblib= sybdb>=6 pthread
>  
> -.if ${PV} != "7.0"
> -# mssql
> -MULTI_PACKAGES+= -mssql
> -COMMENT-mssql= microsoft sql access extensions for php5
> -CONFIGURE_ARGS+=        --with-mssql=shared,${LOCALBASE}
> -LIB_DEPENDS-mssql= databases/freetds
> -WANTLIB-mssql= sybdb>=6 pthread
> -.endif
> -
>  # tidy
>  MULTI_PACKAGES+= -tidy
>  COMMENT-tidy= tidy HTML cleaner bindings
> @@ -341,7 +307,6 @@ PHPXS_SUBST+= -e 's,${i},${${i}},'
>  WANTLIB-main+= c crypto iconv intl lzma m pthread ssl xml2>=8 z
>  WANTLIB-main+= ncurses readline ${COMPILER_LIBCXX}
>  
> -# php 5.4/5.5 : WANTLIB-main += ${COMPILER_LIBCXX}
>  WANTLIB-fastcgi= ${WANTLIB-main}
>  LIB_DEPENDS-main= devel/gettext \
>   textproc/libxml

^^ ok.

> Index: 5.6/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/php/5.6/Makefile,v
> retrieving revision 1.52
> diff -u -p -r1.52 Makefile
> --- 5.6/Makefile 14 Nov 2017 11:57:25 -0000 1.52
> +++ 5.6/Makefile 14 Nov 2017 18:02:26 -0000
> @@ -2,27 +2,48 @@
>  
>  BROKEN-alpha= pcre_jit_compile.c:65:2: error: #error Unsupported architecture
>  
> -PV= 5.6
> -V= ${PV}.31
> +PV= 5.6
> +V= ${PV}.31
>  
> -MASTER_SITES0= https://download.suhosin.org/
> +MASTER_SITES0= https://download.suhosin.org/
>  
> -WANTLIB-main+= ${COMPILER_LIBCXX} ncurses readline
> +WANTLIB-main+= ${COMPILER_LIBCXX} ncurses readline
>  
> -FLAVORS= no_suhosin
> +FLAVORS= no_suhosin
>  FLAVOR?=
>  
> -SUHOSIN_V= 0.9.38
> +SUHOSIN_V= 0.9.38
>  
> -SUPDISTFILES= suhosin-${SUHOSIN_V}.tar.gz:0
> +SUPDISTFILES= suhosin-${SUHOSIN_V}.tar.gz:0
>
>  .if !${FLAVOR:Mno_suhosin}
> -DISTFILES+= suhosin-${SUHOSIN_V}.tar.gz:0
> -PATCH_LIST= patch-* suhosin-*
> -CONFIGURE_ARGS+= --enable-suhosin
> +DISTFILES+= suhosin-${SUHOSIN_V}.tar.gz:0
> +PATCH_LIST= patch-* suhosin-*
> +CONFIGURE_ARGS+= --enable-suhosin

^^ Is all the extra horizontal whitespace really necessary? Especially
the bits towards the top of the file seem like too much of a gap when
I look at the patched file in an editor.

>  
>  pre-patch:
>   @mv ${WRKDIR}/suhosin-${SUHOSIN_V} ${WRKSRC}/ext/suhosin
>  .endif
> +
> +# mysql
> +MULTI_PACKAGES+= -mysql
> +COMMENT-mysql= mysql database access extensions for php5
> +CONFIGURE_ARGS+= --with-mysql=shared,${LOCALBASE}
> +LIB_DEPENDS-mysql= databases/mariadb
> +WANTLIB-mysql= pthread lib/mysql/mysqlclient
> +
> +# sybase-ct
> +MULTI_PACKAGES+= -sybase_ct
> +COMMENT-sybase_ct= sybase database access extensions for php5
> +CONFIGURE_ARGS+= --with-sybase-ct=shared,${LOCALBASE}
> +LIB_DEPENDS-sybase_ct= databases/freetds
> +WANTLIB-sybase_ct= ct pthread
> +
> +# mssql
> +MULTI_PACKAGES+= -mssql
> +COMMENT-mssql= microsoft sql access extensions for php5
> +CONFIGURE_ARGS+=        --with-mssql=shared,${LOCALBASE}
> +LIB_DEPENDS-mssql= databases/freetds
> +WANTLIB-mssql= sybdb>=6 pthread
>  
>  .include <bsd.port.mk>

^^ ok.

Reply | Threaded
Open this post in threaded view
|

Re: PHP: clean Makefile.inc of 5.x specifics

Martijn van Duren-7
On 11/14/17 21:50, Stuart Henderson wrote:>
> ^^ Is all the extra horizontal whitespace really necessary? Especially
> the bits towards the top of the file seem like too much of a gap when
> I look at the patched file in an editor.
>
Not necessary, but I prefer having all values lined up when reasonable.
Matter of taste and I don't insist on it.

So OK as a whole or should I take out the whitespace?

Reply | Threaded
Open this post in threaded view
|

Re: PHP: clean Makefile.inc of 5.x specifics

Stuart Henderson
On 2017/11/14 21:56, Martijn van Duren wrote:
> On 11/14/17 21:50, Stuart Henderson wrote:>
> > ^^ Is all the extra horizontal whitespace really necessary? Especially
> > the bits towards the top of the file seem like too much of a gap when
> > I look at the patched file in an editor.
> >
> Not necessary, but I prefer having all values lined up when reasonable.
> Matter of taste and I don't insist on it.
>
> So OK as a whole or should I take out the whitespace?

They don't line up either way, there isn't space for an extra tab after
BROKEN-alpha..

Reply | Threaded
Open this post in threaded view
|

Re: PHP: clean Makefile.inc of 5.x specifics

Daniel Jakots-3
In reply to this post by Martijn van Duren-7
On Tue, 14 Nov 2017 19:54:55 +0100, Martijn van Duren
<[hidden email]> wrote:

> Hello ports@,
>
> As requested by sthen@ I will cut up my big patch into smaller pieces.
> This is the first part of that undertaking.
>
> I will send in 1 at the time since a lot intermingles with
> Makefile.inc and I don't want stacking patches to cause trouble.
>
> If someone objects to a certain patch I'll just drop it till it's the
> right time to discuss it, so to not keep the things that can move
> along.
>

Subject: PHP: clean Makefile.inc of 5.x specifics: then would you mind
running "/usr/ports/lang/php$ sed -i 's/php5/php/' Makefile.inc"? :p
It's a bit weird to do a pkg_info and see:
php-curl-7.0.23     curl URL library extensions for php5

Cheers,
Daniel

Reply | Threaded
Open this post in threaded view
|

Re: PHP: clean Makefile.inc of 5.x specifics

Stuart Henderson
On 2017/11/14 16:53, Daniel Jakots wrote:

> On Tue, 14 Nov 2017 19:54:55 +0100, Martijn van Duren
> <[hidden email]> wrote:
>
> > Hello ports@,
> >
> > As requested by sthen@ I will cut up my big patch into smaller pieces.
> > This is the first part of that undertaking.
> >
> > I will send in 1 at the time since a lot intermingles with
> > Makefile.inc and I don't want stacking patches to cause trouble.
> >
> > If someone objects to a certain patch I'll just drop it till it's the
> > right time to discuss it, so to not keep the things that can move
> > along.
> >
>
> Subject: PHP: clean Makefile.inc of 5.x specifics: then would you mind
> running "/usr/ports/lang/php$ sed -i 's/php5/php/' Makefile.inc"? :p
> It's a bit weird to do a pkg_info and see:
> php-curl-7.0.23     curl URL library extensions for php5
>
> Cheers,
> Daniel
>

I agree this makes sense. It will need more than just s//, all subpackages
will need bumping too.

Reply | Threaded
Open this post in threaded view
|

Re: PHP: clean Makefile.inc of 5.x specifics

Martijn van Duren-7
On 11/14/17 23:20, Stuart Henderson wrote:

> On 2017/11/14 16:53, Daniel Jakots wrote:
>> On Tue, 14 Nov 2017 19:54:55 +0100, Martijn van Duren
>> <[hidden email]> wrote:
>>
>>> Hello ports@,
>>>
>>> As requested by sthen@ I will cut up my big patch into smaller pieces.
>>> This is the first part of that undertaking.
>>>
>>> I will send in 1 at the time since a lot intermingles with
>>> Makefile.inc and I don't want stacking patches to cause trouble.
>>>
>>> If someone objects to a certain patch I'll just drop it till it's the
>>> right time to discuss it, so to not keep the things that can move
>>> along.
>>>
>>
>> Subject: PHP: clean Makefile.inc of 5.x specifics: then would you mind
>> running "/usr/ports/lang/php$ sed -i 's/php5/php/' Makefile.inc"? :p
>> It's a bit weird to do a pkg_info and see:
>> php-curl-7.0.23     curl URL library extensions for php5
>>
>> Cheers,
>> Daniel
>>
>
> I agree this makes sense. It will need more than just s//, all subpackages
> will need bumping too.
>
That was the next thing on my agenda. This was also in my original patch,
but one thing at a time.
I'll probably leave these 3 as is, since they disappeared in php7, so it's
a bit more informative why they're not there for php7.

@sthen@: Do we want that bump with the coming diff for the s/php5/php/
diff and all the following, or shall we accumulate these minor diffs
that don't change anything substantial and bump them all in one go? (maybe
when we jump to 5.6.32 and 7.0.25?)

Reply | Threaded
Open this post in threaded view
|

Re: PHP: clean Makefile.inc of 5.x specifics

Thierry M
In reply to this post by Martijn van Duren-7
You may wish to add the following to your diff for
/cvs/ports/lang/php/Makefile.inc:

- remove '--enable-zend-multibyte' (This feature has been DEPRECATED as
of
PHP 5.3.0 and REMOVED as of PHP 5.4.0)

- rename '--enable-fastcgi' to '--enable-cgi' (As of PHP 5.3.0 this
argument
no longer exists and is enabled by --enable-cgi instead)

(taken from https://secure.php.net/manual/en/configure.about.php )



Le 14-11-2017 19:54, Martijn van Duren a écrit :

> Hello ports@,
>
> As requested by sthen@ I will cut up my big patch into smaller pieces.
> This is the first part of that undertaking.
>
> I will send in 1 at the time since a lot intermingles with Makefile.inc
> and I don't want stacking patches to cause trouble.
>
> If someone objects to a certain patch I'll just drop it till it's the
> right time to discuss it, so to not keep the things that can move
> along.
>
> OK for the patch below?
>
> martijn@
>
> Index: Makefile.inc
> ===================================================================
> RCS file: /cvs/ports/lang/php/Makefile.inc,v
> retrieving revision 1.97
> diff -u -p -r1.97 Makefile.inc
> --- Makefile.inc 14 Nov 2017 11:57:25 -0000 1.97
> +++ Makefile.inc 14 Nov 2017 18:02:26 -0000
> @@ -71,12 +71,8 @@ CONFIGURE_ARGS+= --enable-shared \
>   --with-pdo-sqlite \
>   --enable-sqlite-utf8 \
>   --with-sqlite3 \
> - --program-suffix=-${PV}
> -
> -# readline is broken in PHP-5.3
> -.if ${PV} != 5.3
> -CONFIGURE_ARGS += --with-readline
> -.endif
> + --program-suffix=-${PV} \
> + --with-readline
>
> ....

Reply | Threaded
Open this post in threaded view
|

Re: PHP: clean Makefile.inc of 5.x specifics

Martijn van Duren-7
On 11/15/17 10:03, Thierry M wrote:
> You may wish to add the following to your diff for /cvs/ports/lang/php/Makefile.inc:
>
> - remove '--enable-zend-multibyte' (This feature has been DEPRECATED as of
> PHP 5.3.0 and REMOVED as of PHP 5.4.0)
>
> - rename '--enable-fastcgi' to '--enable-cgi' (As of PHP 5.3.0 this argument
> no longer exists and is enabled by --enable-cgi instead)
>
> (taken from https://secure.php.net/manual/en/configure.about.php )

Same as with php5, due for a next patch and part of my original big diff.

Reply | Threaded
Open this post in threaded view
|

Re: PHP: clean Makefile.inc of 5.x specifics

Stuart Henderson
In reply to this post by Martijn van Duren-7
On 2017/11/15 07:59, Martijn van Duren wrote:

> On 11/14/17 23:20, Stuart Henderson wrote:
> > On 2017/11/14 16:53, Daniel Jakots wrote:
> >> On Tue, 14 Nov 2017 19:54:55 +0100, Martijn van Duren
> >> <[hidden email]> wrote:
> >>
> >>> Hello ports@,
> >>>
> >>> As requested by sthen@ I will cut up my big patch into smaller pieces.
> >>> This is the first part of that undertaking.
> >>>
> >>> I will send in 1 at the time since a lot intermingles with
> >>> Makefile.inc and I don't want stacking patches to cause trouble.
> >>>
> >>> If someone objects to a certain patch I'll just drop it till it's the
> >>> right time to discuss it, so to not keep the things that can move
> >>> along.
> >>>
> >>
> >> Subject: PHP: clean Makefile.inc of 5.x specifics: then would you mind
> >> running "/usr/ports/lang/php$ sed -i 's/php5/php/' Makefile.inc"? :p
> >> It's a bit weird to do a pkg_info and see:
> >> php-curl-7.0.23     curl URL library extensions for php5
> >>
> >> Cheers,
> >> Daniel
> >>
> >
> > I agree this makes sense. It will need more than just s//, all subpackages
> > will need bumping too.
> >
> That was the next thing on my agenda. This was also in my original patch,
> but one thing at a time.
> I'll probably leave these 3 as is, since they disappeared in php7, so it's
> a bit more informative why they're not there for php7.
>
> @sthen@: Do we want that bump with the coming diff for the s/php5/php/
> diff and all the following, or shall we accumulate these minor diffs
> that don't change anything substantial and bump them all in one go? (maybe
> when we jump to 5.6.32 and 7.0.25?)

It seems sensible to change those with the updates, it doesn't add too
much noise to the diff.

Reply | Threaded
Open this post in threaded view
|

Re: PHP: clean Makefile.inc of 5.x specifics

Stuart Henderson
In reply to this post by Thierry M
On 2017/11/15 10:03, Thierry M wrote:

> You may wish to add the following to your diff for
> /cvs/ports/lang/php/Makefile.inc:
>
> - remove '--enable-zend-multibyte' (This feature has been DEPRECATED as of
> PHP 5.3.0 and REMOVED as of PHP 5.4.0)
>
> - rename '--enable-fastcgi' to '--enable-cgi' (As of PHP 5.3.0 this
> argument
> no longer exists and is enabled by --enable-cgi instead)
>
> (taken from https://secure.php.net/manual/en/configure.about.php )

If you check the rest of the thread, the idea is to split the diff into
manageable chunks. Please either check Martijn's jumbo diff to see if it's
already there (and therefore already known about), or wait until the dust
settles :)