From nobody Mon Apr 18 01:20:55 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 5AA7F5D7BF6; Mon, 18 Apr 2022 01:20:55 +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 4KhTdz1hppz3J02; Mon, 18 Apr 2022 01:20:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650244855; 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=QGmz6eD/t1V3zXOoj5yTk7jeJOT3wpxCkyOYFvu/JKE=; b=M7wNgnV3hE0/XHRhpxwP3i8/6WT5+nuYQd9jmCxIwFzqBl8bkibBfYy2Xlzc3M9iWKRKBf HUakbFycwSWO50vjLmVUGuDhW1XDoHrtAn5/MKOkyJbNZNPulvw0TNRZYeKi1JEM90gJHN s3Z+rUEpP6WB42jy2i5qLoZNc9go2hnEPWUxtvPTfCWd8BW/coq5EBBn2SEu8oRf/bZBxB dTHtIW0iG2FqfxgGNKXt6UfiDYk9cW2mBk3qaoeWgEHoib0nPxFMpf6TwC4Fjoy/X5WLWI TrfzSO03Uw2xy4B/Ym1krbwRvjaQTI/Lf8U6Ai7KhyvgeBlLKKW/nq91Dxup8w== 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 19ACAE71; Mon, 18 Apr 2022 01:20:55 +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 23I1KtfP055371; Mon, 18 Apr 2022 01:20:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23I1KtBQ055370; Mon, 18 Apr 2022 01:20:55 GMT (envelope-from git) Date: Mon, 18 Apr 2022 01:20:55 GMT Message-Id: <202204180120.23I1KtBQ055370@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: b2e748404272 - main - www/moodle3[0-9]*: Adjust CONFLICTS to welcome moodle40 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: b2e748404272dc825eb7d19509e55fee3ffdeabe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650244855; 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=QGmz6eD/t1V3zXOoj5yTk7jeJOT3wpxCkyOYFvu/JKE=; b=PNRptTbIrMd3EqFktliDBKN0CW7mJmC801mMKYIgFr/gcm2ulXGkBWvS1fy8FagmwV78gW zu4pqHCJ6oPwLAHUdm9eZr+5IkitJ29HXq8gWCsnSnquMxKJtuuxuWPHUC1t4MapfwQnA6 5yErUXYURsU1xik3b3qsMfWtpLZnZNHPu10sJkeT38Q0RAUcnFMCJZxAXSiMby+YJKcvaz TKLhyj2Hd6F/oplGEgpagRIZoKBZ3Ed0RefHmD6eCWWft8+wprkH19EFlX40ons2HGi3BB QHLMlxDivq5QFIFx3W+lBy4GhoClBMSWW9mI4vBTPeh09xAlWBuO9Q5p9KIgFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650244855; a=rsa-sha256; cv=none; b=KTWJEe4W89m1HKkFRfbkWlri4jVVBKEHfMVmzJuVABuuw+s67lkNUXTJtgM6quDaPP9BdH MWb/6gfq2eiQY1f1uncYjaOYfkLua6yETEW5QtGKlbgmw/k15uVPGePf528F81FbB79oMc fp2m+eGXjpc7O2iLirIAxKIROS5ks7pfoCJWhRmIfwgRQ6KFoSS1uwrVtYq+uwonh10BfF mW1YG3r9/Rcl7D/IgVPp3H6VPG976NNxiBmSZ//Btqq9nP7a4Wv15/VvkWSHl496LNebDG zM8oesV113q9CBq/nKthveRfJzz71zPN/7KKb7p8cqAGTTzdA8mbbtnqgL6RCA== 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=b2e748404272dc825eb7d19509e55fee3ffdeabe commit b2e748404272dc825eb7d19509e55fee3ffdeabe Author: Wen Heping AuthorDate: 2022-04-18 01:19:21 +0000 Commit: Wen Heping CommitDate: 2022-04-18 01:19:21 +0000 www/moodle3[0-9]*: Adjust CONFLICTS to welcome moodle40 --- www/moodle310/Makefile | 2 +- www/moodle311/Makefile | 2 +- www/moodle39/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/moodle310/Makefile b/www/moodle310/Makefile index bb6441386648..d37e42cbc7a8 100644 --- a/www/moodle310/Makefile +++ b/www/moodle310/Makefile @@ -11,7 +11,7 @@ COMMENT= Course management system based on social constructionism LICENSE= GPLv3 -CONFLICTS= moodle39-3.9.[0-9]* moodle311-3.11.[0-9]* +CONFLICTS= moodle39-3.9.[0-9]* moodle311-3.11.[0-9]* moodle40-4.0 USES= cpe php:flavors tar:tgz USE_PHP= ctype curl dom fileinfo filter gd hash iconv intl json mbstring \ diff --git a/www/moodle311/Makefile b/www/moodle311/Makefile index 8a8fd06be5e0..7ae92dde2c5b 100644 --- a/www/moodle311/Makefile +++ b/www/moodle311/Makefile @@ -11,7 +11,7 @@ COMMENT= Course management system based on social constructionism LICENSE= GPLv3 -CONFLICTS= moodle39-3.9.[0-9]* moodle310-3.10.[0-9]* +CONFLICTS= moodle39-3.9.[0-9]* moodle310-3.10.[0-9]* moodle40-4.0 USES= cpe php:flavors tar:tgz USE_PHP= ctype curl dom fileinfo filter gd hash iconv intl json mbstring \ diff --git a/www/moodle39/Makefile b/www/moodle39/Makefile index dacd311d7617..be01333d89c8 100644 --- a/www/moodle39/Makefile +++ b/www/moodle39/Makefile @@ -11,7 +11,7 @@ COMMENT= Course management system based on social constructionism LICENSE= GPLv3 -CONFLICTS= moodle310-3.10.[0-9]* moodle311-3.11.[0-9]* +CONFLICTS= moodle310-3.10.[0-9]* moodle311-3.11.[0-9]* moodle40-4.0 USES= cpe php:flavors tar:tgz USE_PHP= ctype curl dom fileinfo filter gd hash iconv intl json mbstring \