From owner-svn-ports-all@FreeBSD.ORG  Sun Jun  8 05:09:46 2014
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 ESMTPS id 6A7383F3;
 Sun,  8 Jun 2014 05:09:46 +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 4D7D9235D;
 Sun,  8 Jun 2014 05:09:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5859jRI044359;
 Sun, 8 Jun 2014 05:09:45 GMT (envelope-from wen@svn.freebsd.org)
Received: (from wen@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5859jTm044357;
 Sun, 8 Jun 2014 05:09:45 GMT (envelope-from wen@svn.freebsd.org)
Message-Id: <201406080509.s5859jTm044357@svn.freebsd.org>
From: Wen Heping <wen@FreeBSD.org>
Date: Sun, 8 Jun 2014 05:09:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356976 - in head/www: moodle25 moodle26
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.18
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: Sun, 08 Jun 2014 05:09:46 -0000

Author: wen
Date: Sun Jun  8 05:09:44 2014
New Revision: 356976
URL: http://svnweb.freebsd.org/changeset/ports/356976
QAT: https://qat.redports.org/buildarchive/r356976/

Log:
  - Adjust CONFLICTS to welcome moodle-2.7

Modified:
  head/www/moodle25/Makefile
  head/www/moodle26/Makefile

Modified: head/www/moodle25/Makefile
==============================================================================
--- head/www/moodle25/Makefile	Sun Jun  8 04:06:19 2014	(r356975)
+++ head/www/moodle25/Makefile	Sun Jun  8 05:09:44 2014	(r356976)
@@ -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=	moodle-1.*.* moodle24-2.4.* moodle26-2.6.[0-9]*
+CONFLICTS=	moodle-1.*.* moodle24-2.4.* moodle26-2.6.[0-9]* moodle27-2.7
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}
 
 USE_PHP=	session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \

Modified: head/www/moodle26/Makefile
==============================================================================
--- head/www/moodle26/Makefile	Sun Jun  8 04:06:19 2014	(r356975)
+++ head/www/moodle26/Makefile	Sun Jun  8 05:09:44 2014	(r356976)
@@ -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=	moodle-1.*.* moodle24-2.4.* moodle25-2.5.[0-9]*
+CONFLICTS=	moodle-1.*.* moodle24-2.4.* moodle25-2.5.[0-9]* moodle27-2.7
 
 USE_PHP=	session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \
 		soap openssl simplexml spl dom json zip zlib hash