Date: Wed, 26 Jan 2022 00:38:31 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 16510abbadad - main - Remove references to defunct php73 Message-ID: <202201260038.20Q0cVD5099967@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=16510abbadad0623526e19a9d64ce4bab479d870 commit 16510abbadad0623526e19a9d64ce4bab479d870 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2022-01-26 00:36:09 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2022-01-26 00:36:09 +0000 Remove references to defunct php73 - Add regex in CONFLICTS* [1] Reported by: se [1] Approved by: portmgr (blanket infrastructure sweep) Sponsored by: Bounce Experts Differential Revision: https://reviews.freebsd.org/D33983 [1] --- archivers/arc/Makefile | 2 +- audio/ampache/Makefile | 1 - lang/php74-extensions/Makefile | 2 +- lang/php74/Makefile | 4 ++-- lang/php80-extensions/Makefile | 2 +- lang/php80/Makefile | 2 +- lang/php81-extensions/Makefile | 2 +- lang/php81/Makefile | 2 +- net/pecl-xmlrpc/Makefile | 2 +- security/pecl-pkcs11/Makefile | 2 +- www/phalcon/Makefile | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile index 42eafe903187..62ee9cf77d13 100644 --- a/archivers/arc/Makefile +++ b/archivers/arc/Makefile @@ -10,7 +10,7 @@ COMMENT= Create & extract files from DOS .ARC files LICENSE= GPLv2 -CONFLICTS_INSTALL= arcanist-php73 arcanist-php74 arcanist-php80 +CONFLICTS_INSTALL= arcanist-php[0-9][0-9] OPTIONS_DEFINE= DOCS diff --git a/audio/ampache/Makefile b/audio/ampache/Makefile index 5c64920cb9ca..251f36692829 100644 --- a/audio/ampache/Makefile +++ b/audio/ampache/Makefile @@ -14,7 +14,6 @@ LICENSE= AGPLv3+ USES= cpe zip gettext php:flavors mysql USE_PHP= pdo pdo_mysql hash session json intl simplexml curl dom xml -IGNORE_WITH_PHP=73 CONFLICTS_INSTALL= ampache-php* # etc/periodic/daily/500.ampache-cron man/man1/ampache.1.gz diff --git a/lang/php74-extensions/Makefile b/lang/php74-extensions/Makefile index aa7398d7e0f7..1cd79b6ed989 100644 --- a/lang/php74-extensions/Makefile +++ b/lang/php74-extensions/Makefile @@ -8,7 +8,7 @@ COMMENT= "meta-port" to install PHP extensions USES= metaport php PHP_VER= 74 -IGNORE_WITH_PHP= 73 +IGNORE_WITH_PHP= 80 81 OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \ DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \ diff --git a/lang/php74/Makefile b/lang/php74/Makefile index 998034541d9c..da1e373bc6d2 100644 --- a/lang/php74/Makefile +++ b/lang/php74/Makefile @@ -33,6 +33,8 @@ USE_GNOME= libxml2 # PR230207 Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-z,notext +CONFLICTS_INSTALL= php[0-9][0-9]${PKGNAMESUFFIX} + OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQLND LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE OPTIONS_EXCLUDE_DragonFly= DTRACE @@ -80,8 +82,6 @@ PHPDBG_VARS= PHP_SAPI+=phpdbg ZTS_CONFIGURE_ENV= pthreads_working="yes" ZTS_CONFIGURE_ON=--enable-maintainer-zts -CONFLICTS= php73 php80 - DESTDIRNAME= INSTALL_ROOT .include <bsd.port.pre.mk> diff --git a/lang/php80-extensions/Makefile b/lang/php80-extensions/Makefile index 758537bf8be0..242066b11c9b 100644 --- a/lang/php80-extensions/Makefile +++ b/lang/php80-extensions/Makefile @@ -8,7 +8,7 @@ COMMENT= "meta-port" to install PHP extensions USES= metaport php PHP_VER= 80 -IGNORE_WITH_PHP= 73 74 +IGNORE_WITH_PHP= 74 81 OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \ DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \ diff --git a/lang/php80/Makefile b/lang/php80/Makefile index eddbbdf53617..1e7c99b06cdf 100644 --- a/lang/php80/Makefile +++ b/lang/php80/Makefile @@ -32,7 +32,7 @@ CPPFLAGS= -I${LOCALBASE}/include # PR230207 Allow relocations against read-only segments (override lld default) LDFLAGS_i386= -Wl,-z,notext -CONFLICTS= php73 php74 +CONFLICTS_INSTALL= php[0-9][0-9]${PKGNAMESUFFIX} OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQLND MYSQL80 LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE diff --git a/lang/php81-extensions/Makefile b/lang/php81-extensions/Makefile index 1390330ea4d6..65db31e854fb 100644 --- a/lang/php81-extensions/Makefile +++ b/lang/php81-extensions/Makefile @@ -9,7 +9,7 @@ COMMENT= "meta-port" to install PHP extensions USES= metaport php PHP_VER= 81 -IGNORE_WITH_PHP= 73 74 80 +IGNORE_WITH_PHP= 74 80 OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA DOM ENCHANT EXIF FFI \ FILEINFO FILTER FTP GD GETTEXT GMP ICONV IMAP INTL LDAP \ diff --git a/lang/php81/Makefile b/lang/php81/Makefile index 741609d1e3d6..57d88cc1f4e9 100644 --- a/lang/php81/Makefile +++ b/lang/php81/Makefile @@ -176,7 +176,7 @@ COMMENT= The ${PHP_MODNAME} shared extension for php USES+= php:ext,noflavors PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_VER= 81 -IGNORE_WITH_PHP= 73 74 80 +IGNORE_WITH_PHP= 74 80 EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} WRKSRC= ${WRKDIR}/${EXTSUBDIR} diff --git a/net/pecl-xmlrpc/Makefile b/net/pecl-xmlrpc/Makefile index e622ffc18226..549b22947afa 100644 --- a/net/pecl-xmlrpc/Makefile +++ b/net/pecl-xmlrpc/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= iconv:translit gnome php:pecl pkgconfig USE_PHP= xml:build USE_GNOME= libxml2 -IGNORE_WITH_PHP= 73 74 81 +IGNORE_WITH_PHP= 74 81 CONFIGURE_ARGS+= --with-iconv-dir=${LOCALBASE} diff --git a/security/pecl-pkcs11/Makefile b/security/pecl-pkcs11/Makefile index 2e9f3dda8d8d..fd82b25a97d7 100644 --- a/security/pecl-pkcs11/Makefile +++ b/security/pecl-pkcs11/Makefile @@ -12,6 +12,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= localbase php:pecl -IGNORE_WITH_PHP=73 81 +IGNORE_WITH_PHP=81 .include <bsd.port.mk> diff --git a/www/phalcon/Makefile b/www/phalcon/Makefile index df568a9f3013..7d99f170e05d 100644 --- a/www/phalcon/Makefile +++ b/www/phalcon/Makefile @@ -17,7 +17,7 @@ USES= localbase php:ext USE_GITHUB= yes GH_PROJECT= c${PORTNAME} USE_PHP= json:build pdo:build session:build -IGNORE_WITH_PHP= 73 81 +IGNORE_WITH_PHP= 81 CONFIGURE_ARGS= --enable-phalcon
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201260038.20Q0cVD5099967>