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

[Thierry M]

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.inc14 Nov 2017 11:57:25 -  1.97
+++ Makefile.inc14 Nov 2017 18:02:26 -
@@ -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

Re: Update: lang/php

[Thierry M]

Updated version below. The original diff included a typo 
('--with-readline' was not correctly appended to the preceeding 
CONFIGURE_ARGS). Thanks to Markus Lude for the feedback.




Index: Makefile.inc
===
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile.inc
--- Makefile.inc3 Apr 2015 12:21:20 -   1.64
+++ Makefile.inc16 Jun 2015 08:10:23 -
@@ -48,9 +48,6 @@ MODULES_SUBDIR=   lib/php-${PV}/modules
 MODULES_DIR=   ${LOCALBASE}/${MODULES_SUBDIR}

 FLAVORS=   ap2
-.if ${PV} == "5.3"
-FLAVORS+=  no_suhosin
-.endif
 FLAVOR?=

 PATCHORIG= .orig.port
@@ -76,12 +73,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

 .if ${FLAVOR:Map2}
 CONFIGURE_ARGS+=   --with-apxs2=${LOCALBASE}/sbin/apxs2
@@ -112,8 +105,7 @@ CONFIGURE_ARGS+=--with-openssl \
--enable-sysvshm \
--enable-mbstring \
--enable-exif \
-   --enable-zend-multibyte \
-   --enable-fastcgi
+   --enable-cgi

 TEST_TARGET=   test
 TEST_FLAGS=NO_INTERACTION=1





On 15-06-2015 20:09, Thierry M wrote :
A few update proposals to Makefile.inc, now that php 5.3 has been 
unhooked.


In particular, the following 2 configure option changes are from
http://php.net/manual/en/configure.about.php :

- 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)

...

Update: lang/php

[Thierry M]

A few update proposals to Makefile.inc, now that php 5.3 has been 
unhooked.


In particular, the following 2 configure option changes are from 
http://php.net/manual/en/configure.about.php :


- 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)



Index: Makefile.inc
===
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile.inc
--- Makefile.inc3 Apr 2015 12:21:20 -   1.64
+++ Makefile.inc15 Jun 2015 17:13:46 -
@@ -48,9 +48,6 @@ MODULES_SUBDIR=   lib/php-${PV}/modules
 MODULES_DIR=   ${LOCALBASE}/${MODULES_SUBDIR}

 FLAVORS=   ap2
-.if ${PV} == "5.3"
-FLAVORS+=  no_suhosin
-.endif
 FLAVOR?=

 PATCHORIG= .orig.port
@@ -77,11 +74,7 @@ CONFIGURE_ARGS+= --enable-shared \
--enable-sqlite-utf8 \
--with-sqlite3 \
--program-suffix=-${PV}
-
-# readline is broken in PHP-5.3
-.if ${PV} != 5.3
-CONFIGURE_ARGS +=  --with-readline
-.endif
+   --with-readline

 .if ${FLAVOR:Map2}
 CONFIGURE_ARGS+=   --with-apxs2=${LOCALBASE}/sbin/apxs2
@@ -112,8 +105,7 @@ CONFIGURE_ARGS+=--with-openssl \
--enable-sysvshm \
--enable-mbstring \
--enable-exif \
-   --enable-zend-multibyte \
-   --enable-fastcgi
+   --enable-cgi

 TEST_TARGET=   test
 TEST_FLAGS=NO_INTERACTION=1