cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename php-fastcgi to php-cgi. This is the more logical name, since this

Browse Source 
is the actual name and role of the binary.

OK sthen@
This commit is contained in:
martijn 2018-02-23 18:51:44 +00:00
parent bcea48ec2d
commit e88c3e1498
11 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.564 2018/02/18 11:08:30 bket Exp $
# $OpenBSD: Makefile,v 1.565 2018/02/23 18:51:44 martijn Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-2.409
PKGNAME = quirks-2.410
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

3
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.577 2018/02/18 11:08:30 bket Exp $
# $OpenBSD: Quirks.pm,v 1.578 2018/02/23 18:51:44 martijn Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -499,6 +499,7 @@ my $stem_extensions = {
'luabitop' => 'lua-bitop',
'livestreamer' => 'streamlink',
'newsbeuter' => 'newsboat',
'php-fastcgi' => 'php-cgi',
};
my $obsolete_reason = {

4
lang/php/5.6/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.56 2018/01/11 19:27:02 rpe Exp $
# $OpenBSD: Makefile,v 1.57 2018/02/23 18:51:44 martijn Exp $
BROKEN-alpha= pcre_jit_compile.c:65:2: error: #error Unsupported architecture
PV= 5.6
V= ${PV}.31
REVISION= 1
REVISION= 2
MASTER_SITES0= https://download.suhosin.org/

7
lang/php/5.6/pkg/PLIST-cgi Normal file
View File

@ -0,0 +1,7 @@
@comment $OpenBSD: PLIST-cgi,v 1.1 2018/02/23 18:51:44 martijn 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

5
lang/php/5.6/pkg/PLIST-fastcgi
View File

@ -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}

4
lang/php/7.0/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.40 2018/02/16 12:37:23 sthen Exp $
# $OpenBSD: Makefile,v 1.41 2018/02/23 18:51:44 martijn Exp $
BROKEN-sparc64= SIGBUS during phar generation
PV= 7.0
V= ${PV}.23
REVISION= 2
REVISION= 3
BUILD_DEPENDS+= devel/bison

7
lang/php/7.0/pkg/PLIST-cgi Normal file
View File

@ -0,0 +1,7 @@
@comment $OpenBSD: PLIST-cgi,v 1.1 2018/02/23 18:51:44 martijn 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

5
lang/php/7.0/pkg/PLIST-fastcgi
View File

@ -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}

25
lang/php/Makefile.inc
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile.inc,v 1.100 2017/11/23 18:57:13 martijn Exp $
# $OpenBSD: Makefile.inc,v 1.101 2018/02/23 18:51:44 martijn Exp $
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/${PV}
.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" > \

1
lang/php/files/DESCR-cgi Normal file
View File

@ -0,0 +1 @@
PHP's CGI and FastCGI SAPI

4
lang/php/files/DESCR-fastcgi
View File

@ -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.