On 05/09/18 15:05, Stuart Henderson wrote:
> On 2018/05/09 14:55, Martijn van Duren wrote:
>> On 05/08/18 18:49, Stuart Henderson wrote:
>>> Better to just fix phar on sparc64...does anyone have more information
>>> on the problem?
>>>
>> I agree, but right now sparc64 has nothing. We can always remove the
>> subpackage broken for arch scaffolding after sparc64 is fixed.
>
> It has 5.6.
>
> And this change to move all the multipackages before including
> bsd.port.arch.mk is pretty nasty.
>
>> Also, there's other aspects of to this patch that haven't been
>> addressed, namely installing phar(1) and moving the phar extension
>> into a separate package.
>
> yes, more splitting up of extensions that don't need to be split up...
>
Then what about just enabling the phar executable.
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.103
diff -u -p -r1.103 Makefile.inc
--- Makefile.inc 8 May 2018 12:04:55 -0000 1.103
+++ Makefile.inc 22 May 2018 17:51:57 -0000
@@ -104,7 +104,8 @@ CONFIGURE_ARGS+= --with-openssl \
--enable-sysvsem \
--enable-sysvshm \
--enable-mbstring \
- --enable-exif
+ --enable-exif \
+ --enable-phar
TEST_TARGET= test
TEST_FLAGS= NO_INTERACTION=1
@@ -357,6 +358,8 @@ post-install:
${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cgi/php-cgi
${PREFIX}/bin/php-cgi-${PV}
# Make sure that php-cgi.1 still just sources php.1 when importing a new major
version.
${INSTALL_MAN} ${WRKSRC}/sapi/cli/php.1
${PREFIX}/man/man1/php-cgi-${PV}.1
+ ${INSTALL_PROGRAM} ${WRKBUILD}/ext/phar/phar.phar
${PREFIX}/bin/phar-${PV}
+ ${INSTALL_MAN} ${WRKBUILD}/ext/phar/phar.1
${PREFIX}/man/man1/phar-${PV}.1
${INSTALL_PROGRAM} ${WRKBUILD}/sapi/fpm/php-fpm
${PREFIX}/sbin/php-fpm-${PV}
${INSTALL_MAN} ${WRKBUILD}/sapi/fpm/php-fpm.8
${PREFIX}/man/man8/php-fpm-${PV}.8
${INSTALL_DATA} ${WRKBUILD}/sapi/fpm/php-fpm.conf \
Index: 5.6/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.6/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- 5.6/Makefile 9 May 2018 05:24:50 -0000 1.63
+++ 5.6/Makefile 22 May 2018 17:51:57 -0000
@@ -5,6 +5,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e
PV= 5.6
V= ${PV}.35
REVISION= 1
+REVISION-main= 2
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.10
diff -u -p -r1.10 PLIST-main
--- 5.6/pkg/PLIST-main 29 Jun 2016 16:14:42 -0000 1.10
+++ 5.6/pkg/PLIST-main 22 May 2018 17:51:57 -0000
@@ -21,6 +21,7 @@
@bin bin/php-${PV}
bin/php-config-${PV}
bin/phpize-${PV}
+bin/phar-${PV}
lib/php-${PV}/
lib/php-${PV}/libphp5.so
lib/php-${PV}/modules/
@@ -28,6 +29,7 @@ lib/php-${PV}/modules/opcache.so
@man man/man1/php-${PV}.1
@man man/man1/php-config-${PV}.1
@man man/man1/phpize-${PV}.1
+@man man/man1/phar-${PV}.1
@man man/man8/php-fpm-${PV}.8
@bin sbin/php-fpm-${PV}
share/doc/pkg-readmes/${FULLPKGNAME}
Index: 7.0/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/7.0/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- 7.0/Makefile 8 May 2018 12:17:32 -0000 1.46
+++ 7.0/Makefile 22 May 2018 17:51:57 -0000
@@ -5,6 +5,7 @@ BROKEN-sparc64= SIGBUS during phar gener
PV= 7.0
V= ${PV}.29
REVISION= 1
+REVISION-main= 2
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.6
diff -u -p -r1.6 PLIST-main
--- 7.0/pkg/PLIST-main 25 Apr 2017 11:21:14 -0000 1.6
+++ 7.0/pkg/PLIST-main 22 May 2018 17:51:57 -0000
@@ -20,6 +20,7 @@
@bin bin/php-${PV}
bin/php-config-${PV}
bin/phpize-${PV}
+bin/phar-${PV}
lib/php-${PV}/
lib/php-${PV}/libphp7.so
lib/php-${PV}/modules/
@@ -27,6 +28,7 @@ lib/php-${PV}/modules/opcache.so
@man man/man1/php-${PV}.1
@man man/man1/php-config-${PV}.1
@man man/man1/phpize-${PV}.1
+@man man/man1/phar-${PV}.1
@man man/man8/php-fpm-${PV}.8
@bin sbin/php-fpm-${PV}
share/doc/pkg-readmes/${FULLPKGNAME}
