Re: php-5.6.21-no_suhosin build failure

[Stuart Henderson]

Oops sorry: also rename patch-ext_suhosin_execute_c to 
suhosin-ext_suhosin_execute_c.

On 3 June 2016 09:58:55 BST, Stuart Henderson  wrote:
>On 2016/06/02 23:22, Devin Ceartas wrote:
>> I have a amd64 VM running 5.9-stable.
>> 
>> The command given was: /usr/ports/lang/php/5.6# env FLAVOR=no_suhosin
>> SUBPACKAGE="-main" FETCH_PACKAGES=Yes make install
>> 
>> The output stalled at a prompt asking what file to patch. I entered
>return,
>> then "y", and it died. Here's the last screen of the output:
>
>This fixes it, diff is for current but easy to apply to -stable.
>
>Index: Makefile.inc
>===
>RCS file: /cvs/ports/lang/php/Makefile.inc,v
>retrieving revision 1.84
>diff -u -p -u -1 -0 -r1.84 Makefile.inc
>--- Makefile.inc   28 Apr 2016 18:19:23 -  1.84
>+++ Makefile.inc   3 Jun 2016 08:56:59 -
>@@ -345,20 +345,21 @@ LIB_DEPENDS-main=devel/gettext \
>   textproc/libxml
> 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
> 
> INSTALL_TARGET=   install-headers install-build install-programs

Re: php-5.6.21-no_suhosin build failure

[Stuart Henderson]

On 2016/06/02 23:22, Devin Ceartas wrote:
> I have a amd64 VM running 5.9-stable.
> 
> The command given was: /usr/ports/lang/php/5.6# env FLAVOR=no_suhosin
> SUBPACKAGE="-main" FETCH_PACKAGES=Yes make install
> 
> The output stalled at a prompt asking what file to patch. I entered return,
> then "y", and it died. Here's the last screen of the output:

This fixes it, diff is for current but easy to apply to -stable.

Index: Makefile.inc
===
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.84
diff -u -p -u -1 -0 -r1.84 Makefile.inc
--- Makefile.inc28 Apr 2016 18:19:23 -  1.84
+++ Makefile.inc3 Jun 2016 08:56:59 -
@@ -345,20 +345,21 @@ LIB_DEPENDS-main= devel/gettext \
textproc/libxml
 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
 
 INSTALL_TARGET=install-headers install-build install-programs