svn commit: r326578 - in head/www: mediawiki119 mediawiki120

[Wen Heping]

Author: wen
Date: Sat Sep  7 08:01:09 2013
New Revision: 326578
URL: http://svnweb.freebsd.org/changeset/ports/326578

Log:
  - Adjust CONFLICTS to welcome mediawiki-1.21

Modified:
  head/www/mediawiki119/Makefile
  head/www/mediawiki120/Makefile

Modified: head/www/mediawiki119/Makefile
==============================================================================
--- head/www/mediawiki119/Makefile	Sat Sep  7 07:54:25 2013	(r326577)
+++ head/www/mediawiki119/Makefile	Sat Sep  7 08:01:09 2013	(r326578)
@@ -11,7 +11,7 @@ COMMENT=	The wiki engine used by Wikiped
 
 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

Modified: head/www/mediawiki120/Makefile
==============================================================================
--- head/www/mediawiki120/Makefile	Sat Sep  7 07:54:25 2013	(r326577)
+++ head/www/mediawiki120/Makefile	Sat Sep  7 08:01:09 2013	(r326578)
@@ -11,7 +11,7 @@ COMMENT=	The wiki engine used by Wikiped
 
 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