more php71 cleanup

This commit is contained in:
sthen 2019-12-11 16:08:29 +00:00
parent d0ce11bc87
commit bce949ff98
27 changed files with 63 additions and 59 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.22 2019/07/12 20:43:29 sthen Exp $
# $OpenBSD: Makefile,v 1.23 2019/12/11 16:08:29 sthen Exp $
COMMENT = PHP support for LZF de/compression
DISTNAME = LZF-1.6.7
CATEGORIES = archivers
REVISION = 0
MAINTAINER = Johan Huldtgren <jhuldtgren@gmail.com>
# PHP

View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.5 2018/12/11 12:33:26 sthen Exp $
@comment $OpenBSD: PLIST,v 1.6 2019/12/11 16:08:29 sthen Exp $
@conflict pecl-lzf-*
${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf
${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf,php56
${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf,php70
${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf,php71
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.28 2019/07/12 20:43:29 sthen Exp $
# $OpenBSD: Makefile,v 1.29 2019/12/11 16:08:29 sthen Exp $
COMMENT= PHP support for rar archives
DISTNAME= rar-4.0.0
REVISION= 2
REVISION= 3
CATEGORIES= archivers
# PHP

View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.5 2018/12/11 12:33:26 sthen Exp $
@comment $OpenBSD: PLIST,v 1.6 2019/12/11 16:08:29 sthen Exp $
@conflict pecl-rar-*
${MODPECL_DEFAULTV}@pkgpath archivers/pecl-rar
${MODPECL_DEFAULTV}@pkgpath archivers/pecl-rar,php56
${MODPECL_DEFAULTV}@pkgpath archivers/pecl-rar,php70
${MODPECL_DEFAULTV}@pkgpath archivers/pecl-rar,php71
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2019/08/31 15:19:43 sthen Exp $
# $OpenBSD: Makefile,v 1.14 2019/12/11 16:08:29 sthen Exp $
COMMENT= PHP interface to redis
DISTNAME= redis-5.0.2
REVISION= 0
CATEGORIES= databases

View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.4 2018/12/11 12:33:26 sthen Exp $
@comment $OpenBSD: PLIST,v 1.5 2019/12/11 16:08:29 sthen Exp $
@conflict pecl-redis-*
${MODPECL_DEFAULTV}@pkgpath databases/pecl-redis
${MODPECL_DEFAULTV}@pkgpath databases/pecl-redis,php56
${MODPECL_DEFAULTV}@pkgpath databases/pecl-redis,php70
${MODPECL_DEFAULTV}@pkgpath databases/pecl-redis,php71
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.38 2019/07/12 20:47:07 sthen Exp $
# $OpenBSD: Makefile,v 1.39 2019/12/11 16:08:29 sthen Exp $
COMMENT= PHP support for the ImageMagick library
DISTNAME= imagick-3.4.4
REVISION= 0
CATEGORIES= graphics
# PHP

View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.12 2018/12/11 12:33:26 sthen Exp $
@comment $OpenBSD: PLIST,v 1.13 2019/12/11 16:08:29 sthen Exp $
@conflict pecl-imagick-*
${MODPECL_DEFAULTV}@pkgpath graphics/pecl-imagick
${MODPECL_DEFAULTV}@pkgpath graphics/pecl-imagick,php56
${MODPECL_DEFAULTV}@pkgpath graphics/pecl-imagick,php70
${MODPECL_DEFAULTV}@pkgpath graphics/pecl-imagick,php71
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
@sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.144 2019/11/21 23:35:57 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.145 2019/12/11 16:08:29 sthen Exp $
BROKEN-hppa= no __sync_bool_compare_and_swap support nor asm fallback
@ -109,9 +109,6 @@ PHP_EXTENSIONS+= -bz2 -curl -dba -gd -gmp -intl -imap -ldap \
-mysqli -odbc -pcntl -pdo_mysql -pdo_odbc -pdo_pgsql \
-pdo_sqlite -pgsql -pspell -shmop -soap -snmp \
-sqlite3 -pdo_dblib -tidy -xmlrpc -xsl -zip
.if ${PV} == "7.1"
PHP_EXTENSIONS+= -mcrypt
.endif
SAPI+= -main -apache -cgi -dbg
MULTI_PACKAGES= ${SAPI} ${PHP_EXTENSIONS}
@ -151,16 +148,13 @@ COMMENT-dbg= interactive php debugger
CONFIGURE_ARGS+= --enable-phpdbg
.for i in ${SAPI}
WANTLIB$i += c crypto curses iconv intl lzma m onig
WANTLIB$i += pthread readline ssl xml2 z
WANTLIB$i += argon2 c crypto curses iconv intl lzma m onig
WANTLIB$i += pthread readline sodium ssl xml2 z
LIB_DEPENDS$i += devel/gettext,-runtime \
security/argon2 \
security/libsodium \
textproc/libxml \
textproc/oniguruma
.if ${PV} != "7.1"
WANTLIB$i += argon2 sodium
LIB_DEPENDS$i += security/argon2 \
security/libsodium
.endif
.endfor
#
@ -419,9 +413,7 @@ pre-configure:
.for i in ${MULTI_PACKAGES:N-main:S/-//g}
DESCR-${i}= ${.CURDIR}/../files/DESCR-${i}
PKGNAME-${i}= php-${i}-${V}
.if ${V:M7.1*}
PKGSPEC-${i}= php-${i}->=7.1,<7.2
.elif ${V:M7.2*}
.if ${V:M7.2*}
PKGSPEC-${i}= php-${i}->=7.2,<7.3
.elif ${V:M7.3*}
PKGSPEC-${i}= php-${i}->=7.3,<7.4

View File

@ -1,24 +1,21 @@
# $OpenBSD: pecl.port.mk,v 1.14 2019/03/08 17:02:44 sthen Exp $
# $OpenBSD: pecl.port.mk,v 1.15 2019/12/11 16:08:29 sthen Exp $
# PHP PECL module
MODULES += lang/php
FLAVORS ?= php71 php72 php73
FLAVOR ?= php71
FLAVORS ?= php72 php73
FLAVOR ?= php73
# MODPECL_DEFAULTV is used in PLISTs so that @pkgpath markers are only
# applied for packages built against the "ports default" version of PHP,
# this allows updates from old removed versions without additional per-
# flavour PFRAG files.
.if ${FLAVOR} == php71
MODPHP_VERSION = 7.1
MODPECL_DEFAULTV = ""
.elif ${FLAVOR} == php72
.if ${FLAVOR} == php72
MODPHP_VERSION = 7.2
MODPECL_DEFAULTV = "@comment "
.elif ${FLAVOR} == php73
MODPHP_VERSION = 7.3
MODPECL_DEFAULTV = "@comment "
MODPECL_DEFAULTV = ""
.endif
CATEGORIES += www

View File

@ -1,13 +1,10 @@
# $OpenBSD: php.port.mk,v 1.27 2019/09/26 21:55:58 sthen Exp $
# $OpenBSD: php.port.mk,v 1.28 2019/12/11 16:08:29 sthen Exp $
CATEGORIES+= lang/php
MODPHP_VERSION?= 7.3
.if ${MODPHP_VERSION} == 7.1
MODPHP_FLAVOR = ,php71
MODPHP_VSPEC = >=7.1,<7.2
.elif ${MODPHP_VERSION} == 7.2
.if ${MODPHP_VERSION} == 7.2
MODPHP_FLAVOR = ,php72
MODPHP_VSPEC = >=7.2,<7.3
.elif ${MODPHP_VERSION} == 7.3

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.26 2019/06/07 20:17:55 sthen Exp $
# $OpenBSD: Makefile,v 1.27 2019/12/11 16:08:29 sthen Exp $
COMMENT = PHP extension for parsing and working with rfc822/MIME mail
DISTNAME = mailparse-3.0.3
REVISION= 0
CATEGORIES = mail
MAINTAINER = Stuart Henderson <sthen@openbsd.org>

View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.5 2018/12/11 12:33:26 sthen Exp $
@comment $OpenBSD: PLIST,v 1.6 2019/12/11 16:08:29 sthen Exp $
@conflict pecl-mailparse-*
${MODPECL_DEFAULTV}@pkgpath mail/pecl56-mailparse
${MODPECL_DEFAULTV}@pkgpath mail/pecl-mailparse,php70
${MODPECL_DEFAULTV}@pkgpath mail/pecl-mailparse,php71
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.25 2019/07/12 20:50:59 sthen Exp $
# $OpenBSD: Makefile,v 1.26 2019/12/11 16:08:29 sthen Exp $
COMMENT= PHP support for chroot(2)
DISTNAME= pecl-chroot-1.0
REVISION= 13
REVISION= 14
MASTER_SITES= ${MASTER_SITE_BACKUP}

View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.5 2018/12/11 12:33:26 sthen Exp $
@comment $OpenBSD: PLIST,v 1.6 2019/12/11 16:08:29 sthen Exp $
@conflict pecl-chroot-*
${MODPECL_DEFAULTV}@pkgpath www/pecl-chroot
${MODPECL_DEFAULTV}@pkgpath www/pecl-chroot,php56
${MODPECL_DEFAULTV}@pkgpath www/pecl-chroot,php70
${MODPECL_DEFAULTV}@pkgpath www/pecl-chroot,php71
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2019/07/12 20:50:59 sthen Exp $
# $OpenBSD: Makefile,v 1.13 2019/12/11 16:08:29 sthen Exp $
COMMENT= PHP interface to memcached via libmemcached
DISTNAME= memcached-3.1.3
REVISION= 0
# PHP
PERMIT_PACKAGE= Yes

View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.4 2018/12/11 12:33:26 sthen Exp $
@comment $OpenBSD: PLIST,v 1.5 2019/12/11 16:08:29 sthen Exp $
@conflict pecl-memcached-*
${MODPECL_DEFAULTV}@pkgpath www/pecl56-memcached
${MODPECL_DEFAULTV}@pkgpath www/pecl-memcached,php70
${MODPECL_DEFAULTV}@pkgpath www/pecl-memcached,php71
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.9 2019/07/12 20:50:59 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2019/12/11 16:08:29 sthen Exp $
BROKEN= builds, but has problems picking up libcurl
COMMENT= extended HTTP support
DISTNAME= pecl_http-3.2.0
REVISION= 0
REVISION= 1
HOMEPAGE= http://pecl.php.net/package/pecl_http

View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2019/03/08 17:02:44 sthen Exp $
@comment $OpenBSD: PLIST,v 1.4 2019/12/11 16:08:29 sthen Exp $
${MODPECL_DEFAULTV}@pkgpath www/pecl56-${MODULE_NAME}
${MODPECL_DEFAULTV}@pkgpath www/pecl-${MODULE_NAME},php70
${MODPECL_DEFAULTV}@pkgpath www/pecl-${MODULE_NAME},php71
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/http.ini
lib/php-${MODPHP_VERSION}/modules/http.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.19 2019/07/12 20:50:59 sthen Exp $
# $OpenBSD: Makefile,v 1.20 2019/12/11 16:08:29 sthen Exp $
COMMENT= PHP support for setproctitle
DISTNAME= proctitle-0.1.2
REVISION= 4
REVISION= 5
# PHP
PERMIT_PACKAGE= Yes

View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.5 2018/12/11 12:33:26 sthen Exp $
@comment $OpenBSD: PLIST,v 1.6 2019/12/11 16:08:30 sthen Exp $
@conflict pecl-proctitle-*
${MODPECL_DEFAULTV}@pkgpath www/pecl-proctitle
${MODPECL_DEFAULTV}@pkgpath www/pecl-proctitle,php56
${MODPECL_DEFAULTV}@pkgpath www/pecl-proctitle,php70
${MODPECL_DEFAULTV}@pkgpath www/pecl-proctitle,php71
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2019/07/12 20:50:59 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2019/12/11 16:08:30 sthen Exp $
COMMENT= reusable split of pecl_http's property proxy API#'
DISTNAME= propro-2.1.0
REVISION= 0
REVISION= 1
# PHP
PERMIT_PACKAGE= Yes

View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.6 2018/12/11 12:33:26 sthen Exp $
@comment $OpenBSD: PLIST,v 1.7 2019/12/11 16:08:30 sthen Exp $
@conflict pecl-propro-*
${MODPECL_DEFAULTV}@pkgpath www/pecl56-propro
${MODPECL_DEFAULTV}@pkgpath www/pecl-propro,php70
${MODPECL_DEFAULTV}@pkgpath www/pecl-propro,php71
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2019/07/12 20:51:00 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2019/12/11 16:08:30 sthen Exp $
COMMENT= persistent handle and resource factory API
DISTNAME= raphf-2.0.0
REVISION= 0
REVISION= 1
# PHP
PERMIT_PACKAGE= Yes

View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.6 2018/12/11 12:33:26 sthen Exp $
@comment $OpenBSD: PLIST,v 1.7 2019/12/11 16:08:30 sthen Exp $
@conflict pecl-raphf-*
${MODPECL_DEFAULTV}@pkgpath www/pecl56-raphf
${MODPECL_DEFAULTV}@pkgpath www/pecl-raphf,php70
${MODPECL_DEFAULTV}@pkgpath www/pecl-raphf,php71
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.24 2019/09/25 12:07:55 sthen Exp $
# $OpenBSD: Makefile,v 1.25 2019/12/11 16:08:30 sthen Exp $
COMMENT= PHP bindings for the libssh2 library
COMMENT= PHP bindings for the libssh2 library
DISTNAME= ssh2-1.2
DISTNAME= ssh2-1.2
REVISION= 0
# PHP
PERMIT_PACKAGE= Yes

View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.5 2018/12/11 12:33:26 sthen Exp $
@comment $OpenBSD: PLIST,v 1.6 2019/12/11 16:08:30 sthen Exp $
@conflict pecl-ssh2-*
${MODPECL_DEFAULTV}@pkgpath www/pecl56-ssh2
${MODPECL_DEFAULTV}@pkgpath www/pecl-ssh2,php70
${MODPECL_DEFAULTV}@pkgpath www/pecl-ssh2,php71
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini