From owner-svn-ports-head@FreeBSD.ORG  Sat Nov 29 10:51:59 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7A460772;
 Sat, 29 Nov 2014 10:51:59 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 66E378CA;
 Sat, 29 Nov 2014 10:51:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sATApxw5019039;
 Sat, 29 Nov 2014 10:51:59 GMT (envelope-from wen@FreeBSD.org)
Received: (from wen@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sATApxAZ019038;
 Sat, 29 Nov 2014 10:51:59 GMT (envelope-from wen@FreeBSD.org)
Message-Id: <201411291051.sATApxAZ019038@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: wen set sender to wen@FreeBSD.org
 using -f
From: Wen Heping <wen@FreeBSD.org>
Date: Sat, 29 Nov 2014 10:51:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r373613 - head/www/mediawiki123
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Nov 2014 10:51:59 -0000

Author: wen
Date: Sat Nov 29 10:51:58 2014
New Revision: 373613
URL: https://svnweb.freebsd.org/changeset/ports/373613
QAT: https://qat.redports.org/buildarchive/r373613/

Log:
  - Adjust CONFLICTS
  - Pet portlint

Modified:
  head/www/mediawiki123/Makefile

Modified: head/www/mediawiki123/Makefile
==============================================================================
--- head/www/mediawiki123/Makefile	Sat Nov 29 10:49:12 2014	(r373612)
+++ head/www/mediawiki123/Makefile	Sat Nov 29 10:51:58 2014	(r373613)
@@ -8,11 +8,11 @@ MASTER_SITES=	http://releases.wikimedia.
 PKGNAMESUFFIX=	123
 
 MAINTAINER=	wen@FreeBSD.org
-COMMENT=	The wiki engine used by Wikipedia
+COMMENT=	Wiki engine used by Wikipedia
 
 LICENSE=	GPLv2
 
-CONFLICTS=	mediawiki119-[0-9]* mediawiki12[12]-[0-9]*
+CONFLICTS=	mediawiki119-[0-9]* mediawiki12[24]-[0-9]*
 
 USE_PHP=	ctype iconv mbstring pcre session xml zlib readline dom json
 WANT_PHP_WEB=	yes