switch the default php version to 8.0

2022-03-23 23:58:28 +00:00 · 2022-03-23 23:58:28 +00:00 · 60a48cf9c2
commit 60a48cf9c2
parent 4986060c47
44 changed files with 50 additions and 53 deletions
--- a/archivers/pecl-lzf/Makefile
+++ b/archivers/pecl-lzf/Makefile
@ -1,7 +1,7 @@
 COMMENT =		PHP support for LZF de/compression

 DISTNAME =		LZF-1.6.8
-REVISION =		2
+REVISION =		3

 CATEGORIES =		archivers

--- a/archivers/pecl-rar/Makefile
+++ b/archivers/pecl-rar/Makefile
@ -2,7 +2,7 @@ COMMENT=	PHP support for rar archives

 DISTNAME=	rar-4.2.0
 CATEGORIES=	archivers
-REVISION=	1
+REVISION=	2

 # PHP
 PERMIT_PACKAGE=	Yes
--- a/databases/pecl-redis/Makefile
+++ b/databases/pecl-redis/Makefile
@ -1,6 +1,7 @@
 COMMENT=	PHP interface to redis

 DISTNAME=	redis-5.3.7
+REVISION=	0

 CATEGORIES=	databases

--- a/devel/pecl-xdebug/Makefile
+++ b/devel/pecl-xdebug/Makefile
@ -3,6 +3,7 @@ COMMENT=	debug and development tools for PHP
 GH_ACCOUNT=	xdebug
 GH_PROJECT=	xdebug
 GH_TAGNAME=	3.1.3
+REVISION=	0

 CATEGORIES=	devel

--- a/graphics/pecl-imagick/Makefile
+++ b/graphics/pecl-imagick/Makefile
@ -2,6 +2,7 @@ COMMENT=	PHP support for the ImageMagick library

 DISTNAME=	imagick-3.7.0
 CATEGORIES=	graphics
+REVISION=	0

 # PHP
 PERMIT_PACKAGE=	Yes
--- a/lang/php/7.4/Makefile
+++ b/lang/php/7.4/Makefile
@ -1,10 +1,9 @@
 PORTROACH=	limit:^7\.4
 PHP_VERSION=	7.4.28

-DEFAULT_PHP=	Yes
 PHP_PKGSPEC=	<7.5
 # keep >= 0 for 7.0->7.1
-REVISION=	0
+REVISION=	1

 DEBUG_PACKAGES=		${BUILD_PACKAGES}

--- a/lang/php/7.4/pkg/PLIST-main
+++ b/lang/php/7.4/pkg/PLIST-main
@ -18,9 +18,7 @@
@group
@sample ${SYSCONFDIR}/php-fpm.d/
@rcscript ${RCDIR}/php${SV}_fpm
-bin/phar
 bin/phar-${PV}
-bin/php
@bin bin/php-${PV}
 bin/php-config-${PV}
 bin/phpize-${PV}
--- a/lang/php/8.0/Makefile
+++ b/lang/php/8.0/Makefile
@ -1,6 +1,9 @@
 PORTROACH=	limit:^8\.0
 PHP_VERSION=	8.0.17
 PHP_PKGSPEC=	>=8.0,<8.1
+REVISION=	0
+
+DEFAULT_PHP=	Yes

 DEBUG_PACKAGES=		${BUILD_PACKAGES}

--- a/lang/php/8.0/pkg/PLIST-main
+++ b/lang/php/8.0/pkg/PLIST-main
@ -12,7 +12,9 @@
@group
@sample ${SYSCONFDIR}/php-fpm.d/
@rcscript ${RCDIR}/php${SV}_fpm
+bin/phar
 bin/phar-${PV}
+bin/php
@bin bin/php-${PV}
 bin/php-config-${PV}
 bin/phpize-${PV}
--- a/lang/php/pecl/pecl.port.mk
+++ b/lang/php/pecl/pecl.port.mk
@ -3,7 +3,7 @@
 MODULES +=	lang/php

 FLAVORS ?= php74 php80 php81
-FLAVOR ?= php74
+FLAVOR ?= php80

 # MODPECL_DEFAULTV is used in PLISTs so that @pkgpath markers are only
 # applied for packages built against the "ports default" version of PHP,
@ -11,7 +11,7 @@ FLAVOR ?= php74
 # flavour PFRAG files.
 MODPECL_DEFAULTV ?= "@comment "
 MODPHP_VERSION = ${FLAVOR:C/php([0-9])([0-9])/\1.\2/}
-.if ${FLAVOR} == php74
+.if ${FLAVOR} == php80
 MODPECL_DEFAULTV = ""
 .endif
 MODPHP_BUILDDEP = Yes
--- a/lang/php/php.port.mk
+++ b/lang/php/php.port.mk
@ -1,11 +1,8 @@
 CATEGORIES+=		lang/php

-MODPHP_VERSION?=	7.4
+MODPHP_VERSION?=	8.0

-.if ${MODPHP_VERSION} == 7.3
-MODPHP_FLAVOR = ,php73
-MODPHP_VSPEC = >=7.3,<7.4
-.elif ${MODPHP_VERSION} == 7.4
+.if ${MODPHP_VERSION} == 7.4
 MODPHP_FLAVOR = ,php74
 MODPHP_VSPEC = >=7.4,<7.5
 .elif ${MODPHP_VERSION} == 8.0
--- a/mail/pecl-mailparse/Makefile
+++ b/mail/pecl-mailparse/Makefile
@ -2,6 +2,7 @@ COMMENT=	PHP extension for parsing and working with plain/MIME email

 DISTNAME=	mailparse-3.1.3
 CATEGORIES=	mail
+REVISION=	0

 MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>

--- a/mail/rcube-ldapAliasSync/Makefile
+++ b/mail/rcube-ldapAliasSync/Makefile
@ -23,7 +23,6 @@ TINSTDIR=	${TRUEPREFIX}/roundcubemail/plugins
 SUBST_VARS=	INSTDIR TINSTDIR

 MODULES=	lang/php
-MODPHP_VERSION=	8.0

 RUN_DEPENDS=	mail/roundcubemail>=1.1 \
 		lang/php/${MODPHP_VERSION},-ldap
--- a/mail/rcube-yubikey-plugin/Makefile
+++ b/mail/rcube-yubikey-plugin/Makefile
@ -23,7 +23,6 @@ INSTDIR=	${WRKINST}${TINSTDIR}
 SUBST_VARS=	INSTDIR TINSTDIR

 MODULES=	lang/php
-MODPHP_VERSION=	8.0

 RUN_DEPENDS=	mail/roundcubemail>=0.9 \
 		lang/php/${MODPHP_VERSION},-curl \
--- a/mail/roundcubemail/Makefile
+++ b/mail/roundcubemail/Makefile
@ -29,7 +29,6 @@ TINSTDIR=	${TRUEPREFIX}/roundcubemail
 SUBST_VARS=	INSTDIR TINSTDIR MODPHP_BIN

 MODULES=	lang/php
-MODPHP_VERSION=	8.0

 RUN_DEPENDS=	${MODPHP_PDO_DEPENDS} \
 		lang/php/${MODPHP_VERSION},-intl \
--- a/net/icinga/icinga-php-library/Makefile
+++ b/net/icinga/icinga-php-library/Makefile
@ -2,7 +2,7 @@ COMMENT=	Icinga PHP Library

 GH_PROJECT=	icinga-php-library
 GH_TAGNAME=	v0.7.0
-REVISION=	0
+REVISION=	1

 MODULE_DEST=	${PREFIX}/icinga-php/ipl

--- a/net/icinga/icinga-php-thirdparty/Makefile
+++ b/net/icinga/icinga-php-thirdparty/Makefile
@ -2,7 +2,7 @@ COMMENT=	bundle of 3rd party PHP libraries used by Icinga Web

 GH_PROJECT=	icinga-php-thirdparty
 GH_TAGNAME=	v0.10.0
-REVISION=	0
+REVISION=	1

 MODULE_DEST=	${PREFIX}/icinga-php/vendor

--- a/net/icinga/web2-module-director/Makefile
+++ b/net/icinga/web2-module-director/Makefile
@ -1,4 +1,5 @@
 COMMENT=	web-based config deployment tool for Icinga 2
+REVISION=	0

 MODULE_NAME=	director
 MODULE_VERSION=	v1.9.0
--- a/net/icinga/web2-module-incubator/Makefile
+++ b/net/icinga/web2-module-incubator/Makefile
@ -1,4 +1,5 @@
 COMMENT=	libraries useful for Icinga Web 2 modules
+REVISION=	0

 MODULE_NAME=	incubator
 MODULE_VERSION=	v0.13.0
--- a/net/icinga/web2/Makefile
+++ b/net/icinga/web2/Makefile
@ -4,6 +4,7 @@ GH_ACCOUNT =	Icinga
 GH_PROJECT =	icingaweb2
 GH_TAGNAME =	v2.9.6
 PKGNAME =	icinga-web2-${GH_TAGNAME:S/v//}
+REVISION =	0

 MODULES=	lang/php

--- a/net/librenms/Makefile
+++ b/net/librenms/Makefile
@ -4,6 +4,7 @@ COMMENT=	auto-discovering network management/monitoring system
 GH_ACCOUNT=	librenms
 GH_PROJECT=	librenms
 GH_TAGNAME=	22.3.0
+REVISION=	0

 DISTFILES=	${GH_DISTFILE} \
 		${PKGNAME}-vendor.tar.xz:0
--- a/productivity/baikal/Makefile
+++ b/productivity/baikal/Makefile
@ -5,6 +5,7 @@ DISTNAME=	baikal-${VERSION}
 MASTER_SITES=	https://github.com/sabre-io/Baikal/releases/download/${VERSION}/
 DISTFILES=	${DISTNAME}.zip
 CATEGORIES=	productivity www
+REVISION=	0

 HOMEPAGE=	http://sabre.io/baikal/

--- a/security/pecl-mcrypt/Makefile
+++ b/security/pecl-mcrypt/Makefile
@ -2,7 +2,7 @@ COMMENT=	PHP bindings for the libmcrypt library

 DISTNAME=	mcrypt-1.0.4
 DIST_SUBDIR=	pecl
-REVISION=	2
+REVISION=	3

 CATEGORIES=	security

--- a/textproc/pecl-yaml/Makefile
+++ b/textproc/pecl-yaml/Makefile
@ -2,6 +2,7 @@ COMMENT=	YAML-1.1 parser and emitter for PHP

 DISTNAME=	yaml-2.2.2
 DIST_SUBDIR=	pecl
+REVISION=	0

 CATEGORIES=	textproc

--- a/textproc/tcpdf/Makefile
+++ b/textproc/tcpdf/Makefile
@ -3,7 +3,10 @@ COMMENT=	PHP class for generating PDF documents
 GH_ACCOUNT=	tecnickcom
 GH_PROJECT=	TCPDF
 GH_TAGNAME=	6.4.4
+REVISION=	0
+
 PKGNAME=	${DISTNAME:L}
+
 CATEGORIES=	textproc

 HOMEPAGE=	https://tcpdf.org/
--- a/www/composer/Makefile
+++ b/www/composer/Makefile
@ -11,6 +11,7 @@ DISTNAME=	composer-$V
 DISTFILES=	composer-$V{composer}.phar
 EXTRACT_SUFX=	.phar
 EXTRACT_ONLY=
+REVISION=	0

 HOMEPAGE=	https://getcomposer.org/

--- a/www/nextcloud/21/Makefile
+++ b/www/nextcloud/21/Makefile
@ -1,3 +1,4 @@
 NC_VERSION=	21.0.8
+REVISION=	0

 .include <bsd.port.mk>
--- a/www/nextcloud/22/Makefile
+++ b/www/nextcloud/22/Makefile
@ -1,3 +1,4 @@
 NC_VERSION=	22.2.4
+REVISION=	0

 .include <bsd.port.mk>
--- a/www/nextcloud/23/Makefile
+++ b/www/nextcloud/23/Makefile
@ -1,3 +1,4 @@
 NC_VERSION=	23.0.2
+REVISION=	0

 .include <bsd.port.mk>
--- a/www/pear/Makefile
+++ b/www/pear/Makefile
@ -4,7 +4,7 @@ COMMENT-utils=	utilities for managing pear extensions
 # XXX beware! update-plist will try to get rid of a required .lock file!

 VERSION=	1.10.19
-REVISION=	1
+REVISION=	2
 DISTNAME=	go-pear-${VERSION}
 PKGNAME=	pear-${VERSION}
 DISTFILES=	go-pear-${VERSION}{go-pear}.phar
--- a/www/pecl-chroot/Makefile
+++ b/www/pecl-chroot/Makefile
@ -1,7 +1,7 @@
 COMMENT=	PHP support for chroot(2)

 DISTNAME=	pecl-chroot-1.0
-REVISION=	17
+REVISION=	18

 MASTER_SITES=	${MASTER_SITE_BACKUP}

@ -12,7 +12,8 @@ WANTLIB=	c

 # not really PECL but close enough
 MODULES=	lang/php/pecl
-FLAVORS=	php73 php74
+FLAVORS=	php74
+FLAVOR=		php74
 CONFIGURE_STYLE= gnu

 .include <bsd.port.mk>
--- a/www/pecl-chroot/pkg/PLIST
+++ b/www/pecl-chroot/pkg/PLIST
@ -1,10 +1,4 @@
@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
-${MODPECL_DEFAULTV}@pkgpath www/pecl-chroot,php72
-${MODPECL_DEFAULTV}@pkgpath www/pecl-chroot,php73
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini 
 lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
 share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
--- a/www/pecl-memcached/Makefile
+++ b/www/pecl-memcached/Makefile
@ -1,7 +1,7 @@
 COMMENT=	PHP interface to memcached via libmemcached

 DISTNAME=	memcached-3.1.5
-REVISION=	2
+REVISION=	3

 # PHP
 PERMIT_PACKAGE=	Yes
--- a/www/pecl-pecl_http/Makefile
+++ b/www/pecl-pecl_http/Makefile
@ -17,7 +17,8 @@ WANTLIB += iconv icudata icui18n icuuc idn intl m z
 COMPILER=	base-clang ports-gcc base-gcc

 MODULES=	lang/php/pecl
-FLAVORS=	php73 php74
+FLAVOR=		php74
+FLAVORS=	php74

 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	 --with-http-libcurl-dir=${LOCALBASE}
--- a/www/pecl-pecl_http/pkg/PLIST
+++ b/www/pecl-pecl_http/pkg/PLIST
@ -1,8 +1,3 @@
-${MODPECL_DEFAULTV}@pkgpath www/pecl56-${MODULE_NAME}
-${MODPECL_DEFAULTV}@pkgpath www/pecl-${MODULE_NAME},php70
-${MODPECL_DEFAULTV}@pkgpath www/pecl-${MODULE_NAME},php71
-${MODPECL_DEFAULTV}@pkgpath www/pecl-${MODULE_NAME},php72
-${MODPECL_DEFAULTV}@pkgpath www/pecl-${MODULE_NAME},php73
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/http.ini 
 lib/php-${MODPHP_VERSION}/modules/http.so
 share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
--- a/www/pecl-pledge/Makefile
+++ b/www/pecl-pledge/Makefile
@ -1,7 +1,7 @@
 COMMENT=		PHP wrapper for pledge(2) and unveil(2)

 DISTNAME=		pledge-2.0.2
-REVISION=		3
+REVISION=		4

 CATEGORIES=		www

--- a/www/pecl-proctitle/Makefile
+++ b/www/pecl-proctitle/Makefile
@ -1,7 +1,7 @@
 COMMENT=	PHP support for setproctitle

 DISTNAME=	proctitle-0.1.2
-REVISION=	8
+REVISION=	9

 # PHP
 PERMIT_PACKAGE=	Yes
@ -9,7 +9,8 @@ PERMIT_PACKAGE=	Yes
 WANTLIB=	c

 MODULES=	lang/php/pecl
-FLAVORS=	php73 php74
+FLAVORS=	php74
+FLAVOR=		php74
 CONFIGURE_STYLE= gnu

 .include <bsd.port.mk>
--- a/www/pecl-proctitle/pkg/PLIST
+++ b/www/pecl-proctitle/pkg/PLIST
@ -1,10 +1,4 @@
@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
-${MODPECL_DEFAULTV}@pkgpath www/pecl-proctitle,php72
-${MODPECL_DEFAULTV}@pkgpath www/pecl-proctitle,php73
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini 
 lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
 share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
--- a/www/pecl-propro/Makefile
+++ b/www/pecl-propro/Makefile
@ -1,7 +1,7 @@
 COMMENT=	reusable split of pecl_http's property proxy API

 DISTNAME=	propro-2.1.0
-REVISION=	4
+REVISION=	5

 # PHP
 PERMIT_PACKAGE=	Yes
@ -9,7 +9,8 @@ PERMIT_PACKAGE=	Yes
 WANTLIB=	c

 MODULES=	lang/php/pecl
-FLAVORS=	php73 php74
+FLAVORS=	php74
+FLAVOR=		php74

 CONFIGURE_STYLE= gnu

--- a/www/pecl-propro/pkg/PLIST
+++ b/www/pecl-propro/pkg/PLIST
@ -1,9 +1,4 @@
@conflict pecl-propro-*
-${MODPECL_DEFAULTV}@pkgpath www/pecl56-propro
-${MODPECL_DEFAULTV}@pkgpath www/pecl-propro,php70
-${MODPECL_DEFAULTV}@pkgpath www/pecl-propro,php71
-${MODPECL_DEFAULTV}@pkgpath www/pecl-propro,php72
-${MODPECL_DEFAULTV}@pkgpath www/pecl-propro,php73
@extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini 
 lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
 share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
--- a/www/pecl-raphf/Makefile
+++ b/www/pecl-raphf/Makefile
@ -1,7 +1,7 @@
 COMMENT=	persistent handle and resource factory API

 DISTNAME=	raphf-2.0.0
-REVISION=	4
+REVISION=	5

 # PHP
 PERMIT_PACKAGE=	Yes
--- a/www/pecl-ssh2/Makefile
+++ b/www/pecl-ssh2/Makefile
@ -1,7 +1,7 @@
 COMMENT=	PHP bindings for the libssh2 library

 DISTNAME=	ssh2-1.3
-REVISION=	1
+REVISION=	2

 # PHP
 PERMIT_PACKAGE=	Yes
--- a/www/phpmyadmin/Makefile
+++ b/www/phpmyadmin/Makefile
@ -6,6 +6,7 @@ PKGNAME=	phpMyAdmin-$V
 DISTNAME=	phpMyAdmin-$V-all-languages
 CATEGORIES=	www
 HOMEPAGE=	http://www.phpmyadmin.net/
+REVISION=	0

 PORTROACH=	site:https://www.phpmyadmin.net/files/

--- a/www/wp-cli/Makefile
+++ b/www/wp-cli/Makefile
@ -2,6 +2,7 @@ COMMENT =	command line tool for wordpress

 V =		2.6.0
 DISTNAME =	wp-cli-${V}
+REVISION =	0

 EXTRACT_ONLY =
 EXTRACT_SUFX =	.phar