On 2018/06/04 13:47, Martijn van Duren wrote:
> Hello ports@,
>
> This diff links the PHP SAPIs to libpcre instead of embedding pcre 8.38.
> Since the pcre extension can't be build as a module (at least not
> without patching the config0.m4) keep it in the SAPI itself.
>
> OK?
>
> martijn@
>
> Index: Makefile.inc
> ===================================================================
> RCS file: /cvs/ports/lang/php/Makefile.inc,v
> retrieving revision 1.115
> diff -u -p -r1.115 Makefile.inc
> --- Makefile.inc 1 Jun 2018 11:27:18 -0000 1.115
> +++ Makefile.inc 4 Jun 2018 11:47:06 -0000
> @@ -82,7 +82,7 @@ CONFIGURE_ARGS+= --with-gettext=${LOCALB
> --with-iconv=${LOCALBASE} \
> --with-onig=${LOCALBASE} \
> --with-openssl \
> - --with-pcre-regex \
> + --with-pcre-regex=${LOCALBASE} \
> --with-zlib \
> --enable-bcmath \
> --enable-calendar \
> @@ -146,9 +146,10 @@ COMMENT-dbg= interactive php debugger
> CONFIGURE_ARGS+= --enable-phpdbg
>
> .for i in ${SAPI}
> -WANTLIB$i += c crypto curses iconv intl lzma m onig
> +WANTLIB$i += c crypto curses iconv intl lzma m onig pcre
> WANTLIB$i += pthread readline ssl xml2 z
> LIB_DEPENDS$i += devel/gettext \
> + devel/pcre \
> textproc/libxml \
> textproc/oniguruma
> .endfor
> Index: 5.6/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/php/5.6/Makefile,v
> retrieving revision 1.74
> diff -u -p -r1.74 Makefile
> --- 5.6/Makefile 1 Jun 2018 18:01:13 -0000 1.74
> +++ 5.6/Makefile 4 Jun 2018 11:47:06 -0000
> @@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
> PV= 5.6
> V= ${PV}.36
> -REVISION= 6
> +REVISION= 7
It just needs REVISION-main bumped rather than all the sub's.
Please kill the BROKEN-alpha line while there. Then it's OK.
>
> MASTER_SITES0= https://download.suhosin.org/
>
> Index: 5.6/pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/lang/php/5.6/pkg/PLIST-main,v
> retrieving revision 1.17
> diff -u -p -r1.17 PLIST-main
> --- 5.6/pkg/PLIST-main 27 May 2018 20:23:19 -0000 1.17
> +++ 5.6/pkg/PLIST-main 4 Jun 2018 11:47:06 -0000
> @@ -241,12 +241,6 @@ share/php-${PV}/include/ext/mysqlnd/mysq
> share/php-${PV}/include/ext/mysqlnd/mysqlnd_wireprotocol.h
> share/php-${PV}/include/ext/mysqlnd/php_mysqlnd.h
> share/php-${PV}/include/ext/pcre/
> -share/php-${PV}/include/ext/pcre/pcrelib/
> -share/php-${PV}/include/ext/pcre/pcrelib/config.h
> -share/php-${PV}/include/ext/pcre/pcrelib/pcre.h
> -share/php-${PV}/include/ext/pcre/pcrelib/pcre_internal.h
> -share/php-${PV}/include/ext/pcre/pcrelib/pcreposix.h
> -share/php-${PV}/include/ext/pcre/pcrelib/ucp.h
> share/php-${PV}/include/ext/pcre/php_pcre.h
> share/php-${PV}/include/ext/pdo/
> share/php-${PV}/include/ext/pdo/php_pdo.h
> Index: 7.0/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/php/7.0/Makefile,v
> retrieving revision 1.57
> diff -u -p -r1.57 Makefile
> --- 7.0/Makefile 1 Jun 2018 18:01:13 -0000 1.57
> +++ 7.0/Makefile 4 Jun 2018 11:47:06 -0000
> @@ -2,7 +2,7 @@
>
> PV= 7.0
> V= ${PV}.30
> -REVISION= 6
> +REVISION= 7
>
> BUILD_DEPENDS+= devel/bison
>
> Index: 7.0/pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/lang/php/7.0/pkg/PLIST-main,v
> retrieving revision 1.13
> diff -u -p -r1.13 PLIST-main
> --- 7.0/pkg/PLIST-main 27 May 2018 20:23:19 -0000 1.13
> +++ 7.0/pkg/PLIST-main 4 Jun 2018 11:47:06 -0000
> @@ -238,12 +238,6 @@ share/php-${PV}/include/ext/mysqlnd/mysq
> share/php-${PV}/include/ext/mysqlnd/mysqlnd_wireprotocol.h
> share/php-${PV}/include/ext/mysqlnd/php_mysqlnd.h
> share/php-${PV}/include/ext/pcre/
> -share/php-${PV}/include/ext/pcre/pcrelib/
> -share/php-${PV}/include/ext/pcre/pcrelib/config.h
> -share/php-${PV}/include/ext/pcre/pcrelib/pcre.h
> -share/php-${PV}/include/ext/pcre/pcrelib/pcre_internal.h
> -share/php-${PV}/include/ext/pcre/pcrelib/pcreposix.h
> -share/php-${PV}/include/ext/pcre/pcrelib/ucp.h
> share/php-${PV}/include/ext/pcre/php_pcre.h
> share/php-${PV}/include/ext/pdo/
> share/php-${PV}/include/ext/pdo/php_pdo.h
>
