From owner-svn-ports-all@FreeBSD.ORG  Wed Jan  1 19:46:14 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DC669D88;
 Wed,  1 Jan 2014 19:46:14 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C8AD91F7A;
 Wed,  1 Jan 2014 19:46:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s01JkE7B002345;
 Wed, 1 Jan 2014 19:46:14 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s01JkEAt002343;
 Wed, 1 Jan 2014 19:46:14 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201401011946.s01JkEAt002343@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Wed, 1 Jan 2014 19:46:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338391 - in head/www: moodle24 moodle25
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.17
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: Wed, 01 Jan 2014 19:46:14 -0000

Author: jgh
Date: Wed Jan  1 19:46:14 2014
New Revision: 338391
URL: http://svnweb.freebsd.org/changeset/ports/338391

Log:
  - update conflicts
  
  Reported by:	mat@
  Approved by:	wen@ (implicit )

Modified:
  head/www/moodle24/Makefile
  head/www/moodle25/Makefile

Modified: head/www/moodle24/Makefile
==============================================================================
--- head/www/moodle24/Makefile	Wed Jan  1 19:45:41 2014	(r338390)
+++ head/www/moodle24/Makefile	Wed Jan  1 19:46:14 2014	(r338391)
@@ -13,7 +13,7 @@ COMMENT=	Course management system based 
 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.*.* moodle-2.5.*
+CONFLICTS=	moodle-1.*.* moodle25-2.5.*
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}
 
 USE_PHP=	session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \

Modified: head/www/moodle25/Makefile
==============================================================================
--- head/www/moodle25/Makefile	Wed Jan  1 19:45:41 2014	(r338390)
+++ head/www/moodle25/Makefile	Wed Jan  1 19:46:14 2014	(r338391)
@@ -13,7 +13,7 @@ COMMENT=	Course management system based 
 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.*.* moodle-2.4.*
+CONFLICTS=	moodle-1.*.* moodle24-2.4.*
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}
 
 USE_PHP=	session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \