From bce949ff986b60492453d2ddaa03f35b05e3ecaf Mon Sep 17 00:00:00 2001 From: sthen Date: Wed, 11 Dec 2019 16:08:29 +0000 Subject: [PATCH] more php71 cleanup --- archivers/pecl-lzf/Makefile | 3 ++- archivers/pecl-lzf/pkg/PLIST | 3 ++- archivers/pecl-rar/Makefile | 4 ++-- archivers/pecl-rar/pkg/PLIST | 3 ++- databases/pecl-redis/Makefile | 3 ++- databases/pecl-redis/pkg/PLIST | 3 ++- graphics/pecl-imagick/Makefile | 3 ++- graphics/pecl-imagick/pkg/PLIST | 3 ++- lang/php/Makefile.inc | 20 ++++++-------------- lang/php/pecl/pecl.port.mk | 13 +++++-------- lang/php/php.port.mk | 7 ++----- mail/pecl-mailparse/Makefile | 3 ++- mail/pecl-mailparse/pkg/PLIST | 3 ++- www/pecl-chroot/Makefile | 4 ++-- www/pecl-chroot/pkg/PLIST | 3 ++- www/pecl-memcached/Makefile | 3 ++- www/pecl-memcached/pkg/PLIST | 3 ++- www/pecl-pecl_http/Makefile | 4 ++-- www/pecl-pecl_http/pkg/PLIST | 3 ++- www/pecl-proctitle/Makefile | 4 ++-- www/pecl-proctitle/pkg/PLIST | 3 ++- www/pecl-propro/Makefile | 4 ++-- www/pecl-propro/pkg/PLIST | 3 ++- www/pecl-raphf/Makefile | 4 ++-- www/pecl-raphf/pkg/PLIST | 3 ++- www/pecl-ssh2/Makefile | 7 ++++--- www/pecl-ssh2/pkg/PLIST | 3 ++- 27 files changed, 63 insertions(+), 59 deletions(-) diff --git a/archivers/pecl-lzf/Makefile b/archivers/pecl-lzf/Makefile index 5ba8911335c..c8b299d9253 100644 --- a/archivers/pecl-lzf/Makefile +++ b/archivers/pecl-lzf/Makefile @@ -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 # PHP diff --git a/archivers/pecl-lzf/pkg/PLIST b/archivers/pecl-lzf/pkg/PLIST index 9e16e9932e5..87ab0cb5e41 100644 --- a/archivers/pecl-lzf/pkg/PLIST +++ b/archivers/pecl-lzf/pkg/PLIST @@ -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 diff --git a/archivers/pecl-rar/Makefile b/archivers/pecl-rar/Makefile index 9e9327e2ed2..61929932d0f 100644 --- a/archivers/pecl-rar/Makefile +++ b/archivers/pecl-rar/Makefile @@ -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 diff --git a/archivers/pecl-rar/pkg/PLIST b/archivers/pecl-rar/pkg/PLIST index 9b90a070d4f..bd5c6e35eb4 100644 --- a/archivers/pecl-rar/pkg/PLIST +++ b/archivers/pecl-rar/pkg/PLIST @@ -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 diff --git a/databases/pecl-redis/Makefile b/databases/pecl-redis/Makefile index 2f5dcc57306..6daae0292c3 100644 --- a/databases/pecl-redis/Makefile +++ b/databases/pecl-redis/Makefile @@ -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 diff --git a/databases/pecl-redis/pkg/PLIST b/databases/pecl-redis/pkg/PLIST index 0904c0a8906..df9d35deaa9 100644 --- a/databases/pecl-redis/pkg/PLIST +++ b/databases/pecl-redis/pkg/PLIST @@ -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 diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile index 6bcd99f71fc..57130b0ff70 100644 --- a/graphics/pecl-imagick/Makefile +++ b/graphics/pecl-imagick/Makefile @@ -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 diff --git a/graphics/pecl-imagick/pkg/PLIST b/graphics/pecl-imagick/pkg/PLIST index 80d3f7f3428..7be9deb47ce 100644 --- a/graphics/pecl-imagick/pkg/PLIST +++ b/graphics/pecl-imagick/pkg/PLIST @@ -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 diff --git a/lang/php/Makefile.inc b/lang/php/Makefile.inc index de4ec3464ce..34207121411 100644 --- a/lang/php/Makefile.inc +++ b/lang/php/Makefile.inc @@ -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 diff --git a/lang/php/pecl/pecl.port.mk b/lang/php/pecl/pecl.port.mk index 8f80954483b..e60fbfb60a0 100644 --- a/lang/php/pecl/pecl.port.mk +++ b/lang/php/pecl/pecl.port.mk @@ -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 diff --git a/lang/php/php.port.mk b/lang/php/php.port.mk index ab4afde36c1..4434f6c3022 100644 --- a/lang/php/php.port.mk +++ b/lang/php/php.port.mk @@ -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 diff --git a/mail/pecl-mailparse/Makefile b/mail/pecl-mailparse/Makefile index 30e653c1dc0..7816ae6c920 100644 --- a/mail/pecl-mailparse/Makefile +++ b/mail/pecl-mailparse/Makefile @@ -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 diff --git a/mail/pecl-mailparse/pkg/PLIST b/mail/pecl-mailparse/pkg/PLIST index bc020c0bdee..656425569fd 100644 --- a/mail/pecl-mailparse/pkg/PLIST +++ b/mail/pecl-mailparse/pkg/PLIST @@ -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 diff --git a/www/pecl-chroot/Makefile b/www/pecl-chroot/Makefile index d1c367b866a..e1dc75f1f77 100644 --- a/www/pecl-chroot/Makefile +++ b/www/pecl-chroot/Makefile @@ -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} diff --git a/www/pecl-chroot/pkg/PLIST b/www/pecl-chroot/pkg/PLIST index 90346846531..299ce7d191d 100644 --- a/www/pecl-chroot/pkg/PLIST +++ b/www/pecl-chroot/pkg/PLIST @@ -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 diff --git a/www/pecl-memcached/Makefile b/www/pecl-memcached/Makefile index e269d7d377e..bb71e465d64 100644 --- a/www/pecl-memcached/Makefile +++ b/www/pecl-memcached/Makefile @@ -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 diff --git a/www/pecl-memcached/pkg/PLIST b/www/pecl-memcached/pkg/PLIST index 9a6f65b2ee4..55e6df5e0b3 100644 --- a/www/pecl-memcached/pkg/PLIST +++ b/www/pecl-memcached/pkg/PLIST @@ -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 diff --git a/www/pecl-pecl_http/Makefile b/www/pecl-pecl_http/Makefile index f81f4508311..e504457ce7a 100644 --- a/www/pecl-pecl_http/Makefile +++ b/www/pecl-pecl_http/Makefile @@ -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 diff --git a/www/pecl-pecl_http/pkg/PLIST b/www/pecl-pecl_http/pkg/PLIST index f2d2edd7468..364d5280b7b 100644 --- a/www/pecl-pecl_http/pkg/PLIST +++ b/www/pecl-pecl_http/pkg/PLIST @@ -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 diff --git a/www/pecl-proctitle/Makefile b/www/pecl-proctitle/Makefile index ae6142b8f87..e894f8abd16 100644 --- a/www/pecl-proctitle/Makefile +++ b/www/pecl-proctitle/Makefile @@ -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 diff --git a/www/pecl-proctitle/pkg/PLIST b/www/pecl-proctitle/pkg/PLIST index 3286a66cc37..73a0edcc75e 100644 --- a/www/pecl-proctitle/pkg/PLIST +++ b/www/pecl-proctitle/pkg/PLIST @@ -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 diff --git a/www/pecl-propro/Makefile b/www/pecl-propro/Makefile index 98f58d0fcfb..43ae3d99c69 100644 --- a/www/pecl-propro/Makefile +++ b/www/pecl-propro/Makefile @@ -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 diff --git a/www/pecl-propro/pkg/PLIST b/www/pecl-propro/pkg/PLIST index a5af0e88f20..e4e8f54e9d2 100644 --- a/www/pecl-propro/pkg/PLIST +++ b/www/pecl-propro/pkg/PLIST @@ -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 diff --git a/www/pecl-raphf/Makefile b/www/pecl-raphf/Makefile index 1f195efe1e4..56f8fe0c6d1 100644 --- a/www/pecl-raphf/Makefile +++ b/www/pecl-raphf/Makefile @@ -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 diff --git a/www/pecl-raphf/pkg/PLIST b/www/pecl-raphf/pkg/PLIST index 45029cb0d63..bfe2bbf07d7 100644 --- a/www/pecl-raphf/pkg/PLIST +++ b/www/pecl-raphf/pkg/PLIST @@ -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 diff --git a/www/pecl-ssh2/Makefile b/www/pecl-ssh2/Makefile index 83323977abb..7f91820280a 100644 --- a/www/pecl-ssh2/Makefile +++ b/www/pecl-ssh2/Makefile @@ -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 diff --git a/www/pecl-ssh2/pkg/PLIST b/www/pecl-ssh2/pkg/PLIST index d92b58ad5da..d92e7f64bf5 100644 --- a/www/pecl-ssh2/pkg/PLIST +++ b/www/pecl-ssh2/pkg/PLIST @@ -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