On 11/11/17 15:40, Stuart Henderson wrote:>> As for the php-fpm.conf, I only
>> enabled the 7.0 (and 7.1) config for 5.6, this would make future updates
>> easier instead of harder.
>
> If the fpm config in a 5.6 or 7.0 update is changed upstream, the whole
> file will have to be re-merged.
>
> Why would a user want to have the same fpm config on 5.6 as 7.0 anyway?
> Surely if the two are installed alongside each other at all, they would be
> used for different sites?
Let's save that one until when we get there.
>
>> You mist a few old (5.3-era) references and if we move suhosin out I
>> would like to move -mysql, -sybase-ct, and -mssql to 5.6/Makefile while
>> we're at it.
>>
>> OK for my version?
>
> Sorry. I'm not going to be pushed here. I am trying to help get this
> processed but I will only deal with manageable chunks, this already
> turns my ~130 line diff into a ~300 line one. There's no advantage to
> stacking up too much in one go.
>
I'm no trying to push you, just trying to make the move more consistent,
but if you feel strongly about it. Sure, go ahead with your patch.
Just one request though (see below):
> Index: Makefile.inc
> ===================================================================
> RCS file: /cvs/ports/lang/php/Makefile.inc,v
> retrieving revision 1.96
> diff -u -p -r1.96 Makefile.inc
> --- Makefile.inc 24 Aug 2017 10:03:25 -0000 1.96
> +++ Makefile.inc 11 Nov 2017 13:16:04 -0000
> @@ -8,7 +8,7 @@ COMMENT-fastcgi= stand-alone FastCGI ver
> PKGNAME-main?= php-${V}
> PKGNAME-fastcgi?= php-fastcgi-${V}
>
> -DISTFILES?= php-${V}.tar.bz2
> +DISTFILES+= php-${V}.tar.bz2
>
> DISTNAME?= php-${V}
> CATEGORIES= lang www
> @@ -20,7 +20,6 @@ MASTER_SITES= http://se.php.net/distrib
> http://us.php.net/distributions/ \
> http://no.php.net/distributions/ \
> http://uk.php.net/distributions/
> -MASTER_SITES0= https://download.suhosin.org/
>
> # UPGRADERS: please read BOTH the PHP and Zend licenses
> # and make sure they are safe before an upgrade
> @@ -48,11 +47,6 @@ INI_TEMPLATES?= development production
> # don't have.
> USE_LIBTOOL?= No
>
> -.if ${PV} != "7.0"
> -FLAVORS= no_suhosin
> -.endif
> -FLAVOR?=
> -
> PATCHORIG= .orig.port
> CONFIGURE_STYLE= autoconf
> AUTOCONF_VERSION?= 2.69
> @@ -355,18 +349,6 @@ RUN_DEPENDS-main= mail/femail,-chroot
> LIB_DEPENDS-fastcgi= ${LIB_DEPENDS-main}
> RUN_DEPENDS-fastcgi=
>
> -SUHOSIN_V= 0.9.38
> -.if ${FLAVOR:Mno_suhosin} || ${PV} == "7.0"
> -SUPDISTFILES= suhosin-${SUHOSIN_V}.tar.gz:0
> -.else
> -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
> -
> pre-fake:
> ${INSTALL_DATA_DIR} ${PREFIX}/${APACHE_MODULE_SUBDIR}/modules
>
> @@ -384,11 +366,7 @@ pre-configure:
> MODULE_NAME-${i}= ${i}
> DESCR-${i}= ${.CURDIR}/../files/DESCR-${i}
> PKGNAME-${i}= php-${i}-${V}
> -.if ${V:M5.4*}
> -PKGSPEC-${i}= php-${i}->=5.4,<5.5
> -.elif ${V:M5.5*}
> -PKGSPEC-${i}= php-${i}->=5.5,<5.6
> -.elif ${V:M5.6*}
> +.if ${V:M5.6*}
> PKGSPEC-${i}= php-${i}->=5.6,<5.7
> .elif ${V:M7.0*}
> PKGSPEC-${i}= php-${i}->=7.0,<7.1
> Index: php.port.mk
> ===================================================================
> RCS file: /cvs/ports/lang/php/php.port.mk,v
> retrieving revision 1.16
> diff -u -p -r1.16 php.port.mk
> --- php.port.mk 25 Apr 2017 11:26:43 -0000 1.16
> +++ php.port.mk 11 Nov 2017 13:16:04 -0000
> @@ -3,9 +3,7 @@
> CATEGORIES+= lang/php
>
> MODPHP_VERSION?= 5.6
> -.if ${MODPHP_VERSION} == 5.5
> -MODPHP_VSPEC = >=${MODPHP_VERSION},<5.6
> -.elif ${MODPHP_VERSION} == 5.6
> +.if ${MODPHP_VERSION} == 5.6
> MODPHP_VSPEC = >=${MODPHP_VERSION},<5.7
> .elif ${MODPHP_VERSION} == 7.0
> MODPHP_VSPEC = >=${MODPHP_VERSION},<7.1
> Index: 5.6/Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/php/5.6/Makefile,v
> retrieving revision 1.51
> diff -u -p -r1.51 Makefile
> --- 5.6/Makefile 24 Aug 2017 10:52:41 -0000 1.51
> +++ 5.6/Makefile 11 Nov 2017 13:16:04 -0000
> @@ -5,6 +5,24 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
> PV= 5.6
> V= ${PV}.31
>
> -WANTLIB-main+= ${COMPILER_LIBCXX} ncurses readline
> +MASTER_SITES0= https://download.suhosin.org/
> +
> +WANTLIB-main+= ${COMPILER_LIBCXX} ncurses readline
> +
> +FLAVORS= no_suhosin
> +FLAVOR?=
> +
> +SUHOSIN_V= 0.9.38
> +
> +.if ${FLAVOR:Mno_suhosin}
> +SUPDISTFILES= suhosin-${SUHOSIN_V}.tar.gz:0
> +.else
> +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
Would you be willing to change this bit to:
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
pre-patch:
@mv ${WRKDIR}/suhosin-${SUHOSIN_V} ${WRKSRC}/ext/suhosin
.endif
Imho it reads a bit easier than an if/else and saves a line.
>
> .include <bsd.port.mk>
> Index: 7.0/distinfo
> ===================================================================
> RCS file: /cvs/ports/lang/php/7.0/distinfo,v
> retrieving revision 1.18
> diff -u -p -r1.18 distinfo
> --- 7.0/distinfo 1 Sep 2017 08:25:02 -0000 1.18
> +++ 7.0/distinfo 11 Nov 2017 13:16:04 -0000
> @@ -1,4 +1,2 @@
> SHA256 (php-7.0.23.tar.bz2) = b+lM78fSxg7iwWSLl3vu11atnNCn5OqLuM9SHZNVoJw=
> -SHA256 (suhosin-0.9.38.tar.gz) = wC12xOfOd3kQo3wYGBy2f9npDv4BB/6rPeMTG1+JvOo=
> SIZE (php-7.0.23.tar.bz2) = 14630426
> -SIZE (suhosin-0.9.38.tar.gz) = 122800
>
