From nobody Wed Jan 26 00:38:31 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E10611970D04; Wed, 26 Jan 2022 00:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jk4Zv5nJWz3lMP; Wed, 26 Jan 2022 00:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643157511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9MR53TnSc8wvoILrZreD+gHzcL0FUB66yZjMfdfZU1E=; b=QCr9RcwDQ7kbQPwEUEXfaSwrkb8qWPc/pDKp9xxSYFqpaNgIvgIZHGHQAM1muz8DLFtbsn PM37XWtMXMVdeYSmhowKwMhwMQkNDT/1L1XDUhrIMBgvEsvp3Mo4iKUQFllYpBRN1txEAm +/RgIgrK8QW4nIHKi1cREnGCd8ZQOaQ4ZHTEmtRU5j2TPTmre1s4G/Ld8n/98TSH1iDpu0 JkMFND6kS3PmeeOeHGdtfUO+PWizXpIWNI3dIW02WnKVqYhy+s5Ut3rMgTHWGqYbjjvl3v 5WjfUvZm/nHOsUofg3nuHN48pCOLOHFXukcwqa0fwfjFe9ZFfxN6rgFDuxEx+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A2BBE13C92; Wed, 26 Jan 2022 00:38:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20Q0cVNi099968; Wed, 26 Jan 2022 00:38:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20Q0cVD5099967; Wed, 26 Jan 2022 00:38:31 GMT (envelope-from git) Date: Wed, 26 Jan 2022 00:38:31 GMT Message-Id: <202201260038.20Q0cVD5099967@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 16510abbadad - main - Remove references to defunct php73 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16510abbadad0623526e19a9d64ce4bab479d870 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643157511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9MR53TnSc8wvoILrZreD+gHzcL0FUB66yZjMfdfZU1E=; b=G62fA355XZwRF8GXPdjTUCZ8q/IKSodL0YglojsmBYEnGE0ETaZRpxaQQr9n1iBNvygQ2L SJZYXLbP515LbHs6nWrr2HYH9PO3nom61gU+0isf12a62ToVXkt4AoGMlLTShJ1ozTqgzA trZFKEhvk/+oY+02GLJOV0MXzhtQ5VBduGFmTcGl96r+zi8cvoIsIS80Wxk5vVk2P8U5hk KOhuDIHe8u5DffgS13/x8dqsPYsY8w95j2jBskd6Xa1561t6Rkl+6W1/PGy/qSv3GIgVHL PLn1XXSBq+hH/yj3SpohR7gM8eisT6xu51xCZ6KdzR2fqDzIgtQOXPtDzuRk5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643157511; a=rsa-sha256; cv=none; b=Xb6UHQsXsXnhkweBzVg5SK7wPeOmUX9WnHQvGBbsAagjP0hM/q3D0/RU0KFw3MLEvJDOtP zn1C2bQ73FmZ34PdYnpcAZrHJMtfBxuWvgMJl20IOAMK2Gk/vblw/2BTvlB6OKhuLY/xlG SMmQa5/SPbQfOWtyw+RGVHy9qDZmCh/OFW8PG5vbsFE3T8HqMJRaxpOhpbbAn+KlsUvI3a 59ZvRGCciyZyjjz9/cw1MfbptRiDloGM++RRmULTtv4Yl1NPdJei+VYmJqvmi83t+NJBwk WPNsnJpZKuUVjs+b2D/FqKHHIkMtZhHXmh2URuwsLVR8080CMARJG+raNRUVgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=16510abbadad0623526e19a9d64ce4bab479d870 commit 16510abbadad0623526e19a9d64ce4bab479d870 Author: Muhammad Moinur Rahman AuthorDate: 2022-01-26 00:36:09 +0000 Commit: Muhammad Moinur Rahman 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 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 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