From owner-svn-ports-head@FreeBSD.ORG  Thu May 14 07:49:05 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 01877276;
 Thu, 14 May 2015 07:49:04 +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 E3C0B1AD2;
 Thu, 14 May 2015 07:49:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4E7n4Dp031402;
 Thu, 14 May 2015 07:49:04 GMT (envelope-from wen@FreeBSD.org)
Received: (from wen@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4E7n4KV031395;
 Thu, 14 May 2015 07:49:04 GMT (envelope-from wen@FreeBSD.org)
Message-Id: <201505140749.t4E7n4KV031395@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: Thu, 14 May 2015 07:49:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r386299 - in head/www: moodle27 moodle28
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.20
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: Thu, 14 May 2015 07:49:05 -0000

Author: wen
Date: Thu May 14 07:49:03 2015
New Revision: 386299
URL: https://svnweb.freebsd.org/changeset/ports/386299

Log:
  - Adjust CONFLICTS to welcome moodle29

Modified:
  head/www/moodle27/Makefile
  head/www/moodle28/Makefile

Modified: head/www/moodle27/Makefile
==============================================================================
--- head/www/moodle27/Makefile	Thu May 14 07:36:48 2015	(r386298)
+++ head/www/moodle27/Makefile	Thu May 14 07:49:03 2015	(r386299)
@@ -16,7 +16,7 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl
 RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl
 
-CONFLICTS=	moodle26-2.6.[0-9]* moodle28-2.8.[0-9]*
+CONFLICTS=	moodle28-2.8.[0-9]* moodle29-2.9
 
 USE_PHP=	session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \
 		soap openssl simplexml spl dom json zip zlib hash

Modified: head/www/moodle28/Makefile
==============================================================================
--- head/www/moodle28/Makefile	Thu May 14 07:36:48 2015	(r386298)
+++ head/www/moodle28/Makefile	Thu May 14 07:49:03 2015	(r386299)
@@ -15,7 +15,7 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl
 RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/intl.so:${PORTSDIR}/devel/pecl-intl
 
-CONFLICTS=	moodle26-2.6.[0-9]* moodle27-2.7.[0-9]*
+CONFLICTS=	moodle27-2.7.[0-9]* moodle29-2.9
 
 USES=		tar:tgz
 USE_PHP=	session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \