From nobody Fri Dec 2 13:08:48 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 4NNtYX6CYFz4jQ67; Fri, 2 Dec 2022 13:08:48 +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 4NNtYX5jRNz3FCQ; Fri, 2 Dec 2022 13:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669986528; 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=7nFET+PCJbelBeUxtCjj7+B80lSgDWomEL3PPIBN6Qs=; b=Zd6+t01g0E4vY1HPn0I6f4gEL3qbLXQydjTDFq/90mH4rQAsLp6mtaB3WQeIPlGH8bFAXW Vjiq6+gSvzThSUOyMGaFUNTdl9dYtL+HwQT1T3aEyC+COc5zX2giqNWV5wOy9IRwHkDcNv LnvCaoR3hBv48DJwg1FPd076DuJpVjtXXMi3/s/RDPcySLgYpj0IkmVPIBqj4m0SyDSe4+ n0cF3RRhjIKKGUgX7inPONtQ9jt9nzy8BxeLQqrRMsWR6l2hxqY0fc9A9DFx6Ya0p26xdy rsDEiiOLPbjO4a8MwFjBNj0dOB7aMVGTMoZ1E1S8xOvZtAX6x4oH18/VixA/FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669986528; 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=7nFET+PCJbelBeUxtCjj7+B80lSgDWomEL3PPIBN6Qs=; b=LadvTn7+HdMSuTM0R3O09iOx+ntuXyeee3uE2OyUHvmrQYP0/BrnQJj/QtQ+lVfr9tyx7i WPW4lJfCBYFW8wRhkRDJDgpA5tb0BIt4fQlZ+z8c0me02ulhkNIzAXgkguQqWqLGX9+GKp u55Y8g88HVydPzO2Aq2gW1Az+uohD0IBBWU2IA8BoL9o2Llnd8m39nlFjNO6hG/Hlh7ETz F1wj3QVu5mp5Mn665vLMxvWzH7egvJshFkYwSvTYi5NnkARQGO+vXaDCwug0RA56fWIIaY lHvHGclIktThcz0uxMG0C1E5Sf6h7VFXmUV3n5bboAsvwiivHCY+C8uejca49A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669986528; a=rsa-sha256; cv=none; b=JUsbAI2YeLzcCF4XzPO6uNksQMS6dsGjbgxuSxE+46BRq6s/cY4sbVhnxvCW7prs/AwsvF Cj5uvCAX1R1u6Y8x8sm3l5I+xClyIwT8ITal8aOm5odVhHMBrtuxYYQwTeizYPW4+oceLv Octw2RLrXFZsH8UFEPA1p/9n6gA/lSi77zzb1ovROLpZdEGQwwWvWGYPrzH8/EA5gTPBih ZRQNWy0OqtTKWJ4nL5Y9o0HX6UdiGBtSjvoa5HdJUjwZztf3Y0lBKbE0hbICFSLeOtVXpL ckk/X+YU1/e/mC5RqPlu1iEBCaZxL1B9FcQaWwB4DkKCfWU9QYpnikWQp+1fSQ== 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 4NNtYX4kw6zH72; Fri, 2 Dec 2022 13:08:48 +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 2B2D8mAI009985; Fri, 2 Dec 2022 13:08:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B2D8mpZ009984; Fri, 2 Dec 2022 13:08:48 GMT (envelope-from git) Date: Fri, 2 Dec 2022 13:08:48 GMT Message-Id: <202212021308.2B2D8mpZ009984@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: 830c7772d76d - main - www/mediawiki13*: Update CONFLICTS to welcome mediawiki139 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: wen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 830c7772d76db3dd887a329c6b21e81fe66d63f6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wen: URL: https://cgit.FreeBSD.org/ports/commit/?id=830c7772d76db3dd887a329c6b21e81fe66d63f6 commit 830c7772d76db3dd887a329c6b21e81fe66d63f6 Author: Wen Heping AuthorDate: 2022-12-02 13:04:32 +0000 Commit: Wen Heping CommitDate: 2022-12-02 13:04:32 +0000 www/mediawiki13*: Update CONFLICTS to welcome mediawiki139 --- www/mediawiki135/Makefile | 2 +- www/mediawiki137/Makefile | 2 +- www/mediawiki138/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/mediawiki135/Makefile b/www/mediawiki135/Makefile index 51870fa45c76..4cd16071853e 100644 --- a/www/mediawiki135/Makefile +++ b/www/mediawiki135/Makefile @@ -10,7 +10,7 @@ WWW= https://www.mediawiki.org/ LICENSE= GPLv2 -CONFLICTS= mediawiki13[6-8] +CONFLICTS= mediawiki13[7-9] USES= cpe php:flavors shebangfix SHEBANG_FILES= maintenance/dev/*.sh \ diff --git a/www/mediawiki137/Makefile b/www/mediawiki137/Makefile index f6f09c61f839..fe430420ad04 100644 --- a/www/mediawiki137/Makefile +++ b/www/mediawiki137/Makefile @@ -10,7 +10,7 @@ WWW= https://www.mediawiki.org/ LICENSE= GPLv2 -CONFLICTS= mediawiki13[5-6] mediawiki138 +CONFLICTS= mediawiki135 mediawiki13[8-9] USES= cpe php:flavors shebangfix SHEBANG_FILES= maintenance/dev/*.sh \ diff --git a/www/mediawiki138/Makefile b/www/mediawiki138/Makefile index 29d574dbe2c8..35213d5184c8 100644 --- a/www/mediawiki138/Makefile +++ b/www/mediawiki138/Makefile @@ -10,7 +10,7 @@ WWW= https://www.mediawiki.org/ LICENSE= GPLv2 -CONFLICTS= mediawiki13[5-7] +CONFLICTS= mediawiki13[5-7] mediawiki139 USES= cpe php:flavors shebangfix SHEBANG_FILES= maintenance/dev/*.sh \