Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 May 2021 01:50:19 GMT
From:      Wen Heping <wen@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b352f822b304 - main - www/moodle39 and www/moodle310: - Update CONFLICTS to welcome moodle311 - Fix a typo in pkg-message
Message-ID:  <202105170150.14H1oJG1098188@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by wen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b352f822b304541ff2b30e74b0f0e47ca8405a06

commit b352f822b304541ff2b30e74b0f0e47ca8405a06
Author:     Wen Heping <wen@FreeBSD.org>
AuthorDate: 2021-05-17 01:48:22 +0000
Commit:     Wen Heping <wen@FreeBSD.org>
CommitDate: 2021-05-17 01:48:22 +0000

    www/moodle39 and www/moodle310:
    - Update CONFLICTS to welcome moodle311
    - Fix a typo in pkg-message
---
 www/moodle310/Makefile             | 2 +-
 www/moodle310/files/pkg-message.in | 2 +-
 www/moodle39/Makefile              | 2 +-
 www/moodle39/files/pkg-message.in  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/moodle310/Makefile b/www/moodle310/Makefile
index bedd8ff37ff3..157ad48b69b7 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]*
+CONFLICTS=	moodle39-3.9.[0-9]* moodle311-3.11
 
 USES=		cpe php:flavors tar:tgz
 USE_PHP=	ctype curl dom fileinfo filter gd hash iconv intl json mbstring \
diff --git a/www/moodle310/files/pkg-message.in b/www/moodle310/files/pkg-message.in
index b17b53d32fdb..37df4d2c6272 100644
--- a/www/moodle310/files/pkg-message.in
+++ b/www/moodle310/files/pkg-message.in
@@ -50,7 +50,7 @@ EOM
 If you are upgrading from an earlier version of Moodle, check out
 possible additional steps at:
 
-   https://docs.moodle.org/37/en/Upgrading
+   https://docs.moodle.org/310/en/Upgrading
 
 If you have real trouble, please visit the Moodle course
 "Using Moodle" on moodle.org.
diff --git a/www/moodle39/Makefile b/www/moodle39/Makefile
index 115cc0de3908..b29b9127c4a8 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]*
+CONFLICTS=	moodle310-3.10.[0-9]* moodle311-3.11
 
 USES=		cpe php:flavors tar:tgz
 USE_PHP=	ctype curl dom fileinfo filter gd hash iconv intl json mbstring \
diff --git a/www/moodle39/files/pkg-message.in b/www/moodle39/files/pkg-message.in
index b17b53d32fdb..cbacf4046c5e 100644
--- a/www/moodle39/files/pkg-message.in
+++ b/www/moodle39/files/pkg-message.in
@@ -50,7 +50,7 @@ EOM
 If you are upgrading from an earlier version of Moodle, check out
 possible additional steps at:
 
-   https://docs.moodle.org/37/en/Upgrading
+   https://docs.moodle.org/39/en/Upgrading
 
 If you have real trouble, please visit the Moodle course
 "Using Moodle" on moodle.org.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105170150.14H1oJG1098188>