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>