On 2018/02/07 20:39, Martijn van Duren wrote: > This has been lying still since November. > Does anyone want to comment on, or OK this? > > martijn@
Updated against -current. OK sthen Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.564 diff -u -p -r1.564 Makefile --- devel/quirks/Makefile 18 Feb 2018 11:08:30 -0000 1.564 +++ devel/quirks/Makefile 21 Feb 2018 22:43:51 -0000 @@ -5,7 +5,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-2.409 +PKGNAME = quirks-2.410 PKG_ARCH = * MAINTAINER = Marc Espie <es...@openbsd.org> Index: devel/quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.577 diff -u -p -r1.577 Quirks.pm --- devel/quirks/files/Quirks.pm 18 Feb 2018 11:08:30 -0000 1.577 +++ devel/quirks/files/Quirks.pm 21 Feb 2018 22:43:51 -0000 @@ -499,6 +499,7 @@ my $stem_extensions = { 'luabitop' => 'lua-bitop', 'livestreamer' => 'streamlink', 'newsbeuter' => 'newsboat', + 'php-fastcgi' => 'php-cgi', }; my $obsolete_reason = { Index: lang/php/Makefile.inc =================================================================== RCS file: /cvs/ports/lang/php/Makefile.inc,v retrieving revision 1.100 diff -u -p -r1.100 Makefile.inc --- lang/php/Makefile.inc 23 Nov 2017 18:57:13 -0000 1.100 +++ lang/php/Makefile.inc 21 Feb 2018 22:43:51 -0000 @@ -3,10 +3,10 @@ BROKEN-hppa= no __sync_bool_compare_and_swap support nor asm fallback COMMENT-main= server-side HTML-embedded scripting language -COMMENT-fastcgi= stand-alone FastCGI version of PHP +COMMENT-cgi= cgi sapi for php PKGNAME-main?= php-${V} -PKGNAME-fastcgi?= php-fastcgi-${V} +PKGNAME-cgi?= php-cgi-${V} DISTFILES+= php-${V}.tar.bz2 @@ -97,6 +97,7 @@ CONFIGURE_ARGS+= --with-openssl \ --enable-sysvshm \ --enable-mbstring \ --enable-exif \ + --enable-cgi \ --enable-fpm \ --with-fpm-user=www \ --with-fpm-group=www @@ -104,7 +105,7 @@ CONFIGURE_ARGS+= --with-openssl \ TEST_TARGET= test TEST_FLAGS= NO_INTERACTION=1 -MULTI_PACKAGES+= -main -fastcgi +MULTI_PACKAGES+= -main -cgi # # Loadable php extensions by name that are included in all versions @@ -304,12 +305,12 @@ 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} -WANTLIB-fastcgi= ${WANTLIB-main} +WANTLIB-cgi= ${WANTLIB-main} LIB_DEPENDS-main= devel/gettext \ textproc/libxml RUN_DEPENDS-main= mail/femail,-chroot -LIB_DEPENDS-fastcgi= ${LIB_DEPENDS-main} -RUN_DEPENDS-fastcgi= +LIB_DEPENDS-cgi= ${LIB_DEPENDS-main} +RUN_DEPENDS-cgi= php-${V}:lang/php/${PV} pre-fake: ${INSTALL_DATA_DIR} ${PREFIX}/${APACHE_MODULE_SUBDIR}/modules @@ -324,7 +325,7 @@ pre-configure: ${WRKSRC}/scripts/phpize.in \ ${WRKSRC}/scripts/php-config.in -.for i in ${MULTI_PACKAGES:N-main:N-fastcgi:S/-//g} +.for i in ${MULTI_PACKAGES:N-main:N-cgi:S/-//g} MODULE_NAME-${i}= ${i} DESCR-${i}= ${.CURDIR}/../files/DESCR-${i} PKGNAME-${i}= php-${i}-${V} @@ -337,7 +338,7 @@ RUN_DEPENDS-${i}+= php-${V}:lang/php/${P .endfor DESCR-main= ${.CURDIR}/../files/DESCR-main -DESCR-fastcgi= ${.CURDIR}/../files/DESCR-fastcgi +DESCR-cgi= ${.CURDIR}/../files/DESCR-cgi post-install: ${SUBST_DATA} ${.CURDIR}/../files/README-main \ @@ -347,7 +348,9 @@ post-install: ${INSTALL_DATA_DIR} ${WRKINST}/${CHROOT_DIR}/conf/php-${PV}.sample ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php-${PV} ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cli/php ${PREFIX}/bin/php-${PV} - ${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cgi/php-cgi ${PREFIX}/bin/php-fastcgi-${PV} + ${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}/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 \ @@ -362,7 +365,7 @@ post-install: @perl -pi -e "s,!!PREFIX!!,${TRUEPREFIX},g;s,!!PV!!,${PV},g;s,!!MV!!,${PV:R},g" \ ${PREFIX}/share/examples/php-${PV}/php.conf -.for m in ${MULTI_PACKAGES:N-main:N-fastcgi:S/-//g} +.for m in ${MULTI_PACKAGES:N-main:N-cgi:S/-//g} ${INSTALL_DATA} ${WRKBUILD}/modules/${m}.so \ ${PREFIX}/${MODULES_SUBDIR}/${m}.so echo "extension=${m}.so" > \ Index: lang/php/5.6/Makefile =================================================================== RCS file: /cvs/ports/lang/php/5.6/Makefile,v retrieving revision 1.56 diff -u -p -r1.56 Makefile --- lang/php/5.6/Makefile 11 Jan 2018 19:27:02 -0000 1.56 +++ lang/php/5.6/Makefile 21 Feb 2018 22:43:51 -0000 @@ -4,7 +4,7 @@ BROKEN-alpha= pcre_jit_compile.c:65:2: e PV= 5.6 V= ${PV}.31 -REVISION= 1 +REVISION= 2 MASTER_SITES0= https://download.suhosin.org/ Index: lang/php/5.6/pkg/PLIST-cgi =================================================================== RCS file: lang/php/5.6/pkg/PLIST-cgi diff -N lang/php/5.6/pkg/PLIST-cgi --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/php/5.6/pkg/PLIST-cgi 21 Feb 2018 22:43:51 -0000 @@ -0,0 +1,7 @@ +@comment $OpenBSD: PLIST-fastcgi,v 1.2 2016/06/29 16:14:42 espie Exp $ +@option no-default-conflict +@option is-branch +@pkgpath lang/php/5.6,-fastcgi +@conflict php-cgi->=5.6,<5.7 +@bin bin/php-cgi-${PV} +@man man/man1/php-cgi-${PV}.1 Index: lang/php/5.6/pkg/PLIST-fastcgi =================================================================== RCS file: lang/php/5.6/pkg/PLIST-fastcgi diff -N lang/php/5.6/pkg/PLIST-fastcgi --- lang/php/5.6/pkg/PLIST-fastcgi 29 Jun 2016 16:14:42 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,5 +0,0 @@ -@comment $OpenBSD: PLIST-fastcgi,v 1.2 2016/06/29 16:14:42 espie Exp $ -@option no-default-conflict -@option is-branch -@conflict php-fastcgi->=5.6,<5.7 -@bin bin/php-fastcgi-${PV} Index: lang/php/7.0/Makefile =================================================================== RCS file: /cvs/ports/lang/php/7.0/Makefile,v retrieving revision 1.40 diff -u -p -r1.40 Makefile --- lang/php/7.0/Makefile 16 Feb 2018 12:37:23 -0000 1.40 +++ lang/php/7.0/Makefile 21 Feb 2018 22:43:51 -0000 @@ -4,7 +4,7 @@ BROKEN-sparc64= SIGBUS during phar gener PV= 7.0 V= ${PV}.23 -REVISION= 2 +REVISION= 3 BUILD_DEPENDS+= devel/bison Index: lang/php/7.0/pkg/PLIST-cgi =================================================================== RCS file: lang/php/7.0/pkg/PLIST-cgi diff -N lang/php/7.0/pkg/PLIST-cgi --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/php/7.0/pkg/PLIST-cgi 21 Feb 2018 22:43:51 -0000 @@ -0,0 +1,7 @@ +@comment $OpenBSD: PLIST-fastcgi,v 1.2 2016/06/29 16:14:42 espie Exp $ +@option no-default-conflict +@option is-branch +@pkgpath lang/php/7.0,-fastcgi +@conflict php-cgi->=7.0,<7.1 +@bin bin/php-cgi-${PV} +@man man/man1/php-cgi-${PV}.1 Index: lang/php/7.0/pkg/PLIST-fastcgi =================================================================== RCS file: lang/php/7.0/pkg/PLIST-fastcgi diff -N lang/php/7.0/pkg/PLIST-fastcgi --- lang/php/7.0/pkg/PLIST-fastcgi 29 Jun 2016 16:14:42 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,5 +0,0 @@ -@comment $OpenBSD: PLIST-fastcgi,v 1.2 2016/06/29 16:14:42 espie Exp $ -@option no-default-conflict -@option is-branch -@conflict php-fastcgi->=7.0,<7.1 -@bin bin/php-fastcgi-${PV} Index: lang/php/files/DESCR-cgi =================================================================== RCS file: lang/php/files/DESCR-cgi diff -N lang/php/files/DESCR-cgi --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lang/php/files/DESCR-cgi 21 Feb 2018 22:43:51 -0000 @@ -0,0 +1 @@ +PHP's CGI and FastCGI SAPI Index: lang/php/files/DESCR-fastcgi =================================================================== RCS file: lang/php/files/DESCR-fastcgi diff -N lang/php/files/DESCR-fastcgi --- lang/php/files/DESCR-fastcgi 27 Jun 2010 20:28:45 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,4 +0,0 @@ -This is the core PHP binary compiled with FastCGI support -(www.fastcgi.com). FastCGI deployments are generally faster than -using PHP as a CGI, since the processes stay resident in memory -between requests.