From nobody Tue Nov 30 11:58:41 2021 X-Original-To: dev-commits-ports-main@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 CE0F618B7F5B; Tue, 30 Nov 2021 11:58:41 +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 4J3LN140gBz4hLV; Tue, 30 Nov 2021 11:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 65ABD15DE1; Tue, 30 Nov 2021 11:58:41 +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 1AUBwfxL080639; Tue, 30 Nov 2021 11:58:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AUBwfdD080638; Tue, 30 Nov 2021 11:58:41 GMT (envelope-from git) Date: Tue, 30 Nov 2021 11:58:41 GMT Message-Id: <202111301158.1AUBwfdD080638@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Wen Heping Subject: git: c2bb71470bb7 - main - www/mediawiki13*: Adjust CONFLICTS to welcome mediawiki137 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2bb71470bb7ae8dacde02b32e8828d8aa85067f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638273521; 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=aa5Dcihnm/QLm5OS5tyefw6rrxeOCjKzfbTKGIvJCmw=; b=Cl61/5zjv1krvt1A3h6n8mhVzkk8pdyROhlU3BlMXMxTIaXwso1UEIvIXRVnGV/P/yolF4 ai0vqMca/58k+E19JmV4fNEFQngbxjRpx9K/bYM3S/Ffi2FHpZuo62tNT2P+lttmDQqtj3 b+u6zCow2TlLAnEkc6MnueAVCYiSzVQY/jvbexgszpJ76GxFpAFAUuIRGmH8Vw+PRFF48y GD2fwPnGoHvM4/1E9D/Pa/KFvSsbVmdlMi7ejCOpBoCOFiflOx7AQmHPJo4aDK53PuMHgs zZ8y9VKfzTv/8Nj9AqLcxU+OqWn/pfeHiVx3PKIGqrQajrrlpKxP03hHxJ54+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638273521; a=rsa-sha256; cv=none; b=n5HLvnUwFCaYC6zi9dVoxEbsQwUvv5LfQvvXxa3tepdy/owyxToCgKWToAX77jcMKPrf7d T9zOHkxYvJN8xx/bC8BGKL6TaeCNIB6JwOer+NHI7YxH+gKLMeug4jtU7DCh39mKfLoqtl gVCJRrN0wdOgXOv7q2mNnO0M+6e/YCnBJ4Jga04gqUuV3QmN5rNoeKVVq/nYHv5coIbXNh 1MKucgeOjUR8ogf7iqx/B+sjaPFu40s23MWpBjGCMl6zGw/OOPxJ2zWqredA9viVpIO/Mr 5RhrZ9xiRkw++Q786LiFarN9Bkt9ejblOPEDKphia/sBNs+KmVQPnYIOuc/8dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wen: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2bb71470bb7ae8dacde02b32e8828d8aa85067f commit c2bb71470bb7ae8dacde02b32e8828d8aa85067f Author: Wen Heping AuthorDate: 2021-11-30 11:57:12 +0000 Commit: Wen Heping CommitDate: 2021-11-30 11:57:12 +0000 www/mediawiki13*: Adjust CONFLICTS to welcome mediawiki137 --- www/mediawiki131/Makefile | 2 +- www/mediawiki135/Makefile | 2 +- www/mediawiki136/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/mediawiki131/Makefile b/www/mediawiki131/Makefile index 60754926a43f..1236f719478c 100644 --- a/www/mediawiki131/Makefile +++ b/www/mediawiki131/Makefile @@ -11,7 +11,7 @@ COMMENT= Wiki engine used by Wikipedia LICENSE= GPLv2 -CONFLICTS= mediawiki13[5-6] +CONFLICTS= mediawiki13[5-7] DEPRECATED= Upstream EOL EXPIRATION_DATE=2021-12-31 diff --git a/www/mediawiki135/Makefile b/www/mediawiki135/Makefile index 1d97648825c2..191ffe0f467f 100644 --- a/www/mediawiki135/Makefile +++ b/www/mediawiki135/Makefile @@ -11,7 +11,7 @@ COMMENT= Wiki engine used by Wikipedia LICENSE= GPLv2 -CONFLICTS= mediawiki131 mediawiki136 +CONFLICTS= mediawiki131 mediawiki136 mediawiki137 USES= cpe php:flavors shebangfix SHEBANG_FILES= maintenance/dev/*.sh \ diff --git a/www/mediawiki136/Makefile b/www/mediawiki136/Makefile index d29004a411b0..22351b61584e 100644 --- a/www/mediawiki136/Makefile +++ b/www/mediawiki136/Makefile @@ -11,7 +11,7 @@ COMMENT= Wiki engine used by Wikipedia LICENSE= GPLv2 -CONFLICTS= mediawiki13[1-5] +CONFLICTS= mediawiki13[1-5] mediawiki137 USES= cpe php:flavors shebangfix SHEBANG_FILES= maintenance/dev/*.sh \