summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorWen Heping <wen@FreeBSD.org>2015-11-30 07:39:49 +0000
committerWen Heping <wen@FreeBSD.org>2015-11-30 07:39:49 +0000
commitacffffc8ab23abfd5a377542621fed4bd268746b (patch)
tree4231d0ab31c328add31d28db0203c720f954b69b /www
parent- Repocopy mediawiki125 --> mediawiki126 and update (diff)
- Update CONFLICTS after import mediawiki126
Notes
Notes: svn path=/head/; revision=402651
Diffstat (limited to 'www')
-rw-r--r--www/mediawiki123/Makefile2
-rw-r--r--www/mediawiki124/Makefile2
-rw-r--r--www/mediawiki125/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/www/mediawiki123/Makefile b/www/mediawiki123/Makefile
index 37d768777fbf..14be1727d631 100644
--- a/www/mediawiki123/Makefile
+++ b/www/mediawiki123/Makefile
@@ -12,7 +12,7 @@ COMMENT= Wiki engine used by Wikipedia
LICENSE= GPLv2
-CONFLICTS= mediawiki119-[0-9]* mediawiki12[45]-[0-9]*
+CONFLICTS= mediawiki12[456]-[0-9]*
USES= shebangfix
SHEBANG_FILES= maintenance/dev/*.sh \
diff --git a/www/mediawiki124/Makefile b/www/mediawiki124/Makefile
index c3c58fdbc124..ab69702e3e9a 100644
--- a/www/mediawiki124/Makefile
+++ b/www/mediawiki124/Makefile
@@ -12,7 +12,7 @@ COMMENT= Wiki engine used by Wikipedia
LICENSE= GPLv2
-CONFLICTS= mediawiki119-[0-9]* mediawiki12[35]-[0-9]*
+CONFLICTS= mediawiki12[356]-[0-9]*
USES= shebangfix
SHEBANG_FILES= maintenance/dev/*.sh \
diff --git a/www/mediawiki125/Makefile b/www/mediawiki125/Makefile
index eb2614ce5f10..6cf8aa143878 100644
--- a/www/mediawiki125/Makefile
+++ b/www/mediawiki125/Makefile
@@ -12,7 +12,7 @@ COMMENT= Wiki engine used by Wikipedia
LICENSE= GPLv2
-CONFLICTS= mediawiki119-[0-9]* mediawiki12[34]-[0-9]*
+CONFLICTS= mediawiki12[346]-[0-9]*
USES= shebangfix
SHEBANG_FILES= maintenance/dev/*.sh \