aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorwen <wen@FreeBSD.org>2013-09-07 16:01:09 +0800
committerwen <wen@FreeBSD.org>2013-09-07 16:01:09 +0800
commit20e24f11b4009fa84a0f2f7d703ca41f062806ad (patch)
treec74d64c668273dc7a8efba9c5158a32df092a494 /www
parent434b31a6d1304a96b2432728117dfa7ee0b7e22d (diff)
downloadfreebsd-ports-gnome-20e24f11b4009fa84a0f2f7d703ca41f062806ad.tar.gz
freebsd-ports-gnome-20e24f11b4009fa84a0f2f7d703ca41f062806ad.tar.zst
freebsd-ports-gnome-20e24f11b4009fa84a0f2f7d703ca41f062806ad.zip
- Adjust CONFLICTS to welcome mediawiki-1.21
Diffstat (limited to 'www')
-rw-r--r--www/mediawiki119/Makefile2
-rw-r--r--www/mediawiki120/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/www/mediawiki119/Makefile b/www/mediawiki119/Makefile
index 85a04ed4f3d4..f5244c4b31a8 100644
--- a/www/mediawiki119/Makefile
+++ b/www/mediawiki119/Makefile
@@ -11,7 +11,7 @@ COMMENT= The wiki engine used by Wikipedia
LICENSE= GPLv2
-CONFLICTS= mediawiki-1.1[0-8].* mediawiki-1.2[0-9].*
+CONFLICTS= mediawiki-1.2[0-9].*
FETCH_ARGS= -pr
NO_LATEST_LINK= yes
diff --git a/www/mediawiki120/Makefile b/www/mediawiki120/Makefile
index 1e1180211f85..03e5e415d2e3 100644
--- a/www/mediawiki120/Makefile
+++ b/www/mediawiki120/Makefile
@@ -11,7 +11,7 @@ COMMENT= The wiki engine used by Wikipedia
LICENSE= GPLv2
-CONFLICTS= mediawiki-1.1[0-9].*
+CONFLICTS= mediawiki-1.1[0-9].* mediawiki-1.21.*
FETCH_ARGS= -pr
USE_PHP= ctype iconv mbstring pcre session xml zlib readline dom