From owner-svn-ports-all@FreeBSD.ORG  Sat Sep  7 08:01:10 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4469E3BC;
 Sat,  7 Sep 2013 08:01:10 +0000 (UTC) (envelope-from wen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 32C30219C;
 Sat,  7 Sep 2013 08:01:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8781ALe086001;
 Sat, 7 Sep 2013 08:01:10 GMT (envelope-from wen@svn.freebsd.org)
Received: (from wen@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r87819dw085999;
 Sat, 7 Sep 2013 08:01:09 GMT (envelope-from wen@svn.freebsd.org)
Message-Id: <201309070801.r87819dw085999@svn.freebsd.org>
From: Wen Heping <wen@FreeBSD.org>
Date: Sat, 7 Sep 2013 08:01:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r326578 - in head/www: mediawiki119 mediawiki120
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Sep 2013 08:01:10 -0000

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