git: a02bb69d6281 - main - www/mediawiki137: Update CONFLICTS

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Wen Heping <wen_at_FreeBSD.org>
Date: Sun, 05 Jun 2022 00:40:20 UTC

The branch main has been updated by wen:

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

commit a02bb69d6281b3b9486e1bba8e2d1a0ffc9b2769
Author:     Wen Heping <wen@FreeBSD.org>
AuthorDate: 2022-06-04 08:51:59 +0000
Commit:     Wen Heping <wen@FreeBSD.org>
CommitDate: 2022-06-05 00:39:21 +0000

    www/mediawiki137: Update CONFLICTS
    
    Update WWW to https
---
 www/mediawiki137/Makefile  | 2 +-
 www/mediawiki137/pkg-descr | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/mediawiki137/Makefile b/www/mediawiki137/Makefile
index 170614ed3ca7..f7b6ee0b3349 100644
--- a/www/mediawiki137/Makefile
+++ b/www/mediawiki137/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Wiki engine used by Wikipedia
 
 LICENSE=	GPLv2
 
-CONFLICTS=	mediawiki13[1-6]
+CONFLICTS=	mediawiki13[5-6] mediawiki138
 
 USES=		cpe php:flavors shebangfix
 SHEBANG_FILES=	maintenance/dev/*.sh \
diff --git a/www/mediawiki137/pkg-descr b/www/mediawiki137/pkg-descr
index dac83f83ccda..d0a343acde6c 100644
--- a/www/mediawiki137/pkg-descr
+++ b/www/mediawiki137/pkg-descr
@@ -3,4 +3,4 @@ the free encyclopedia, and other projects.
 It's designed to handle a large number of users and pages without imposing
 too rigid a structure or workflow.
 
-WWW: http://www.mediawiki.org/
+WWW: https://www.mediawiki.org/