From owner-svn-ports-head@FreeBSD.ORG  Mon Oct 21 09:07:38 2013
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 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2DD51434;
 Mon, 21 Oct 2013 09:07:38 +0000 (UTC)
 (envelope-from sunpoet@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 1B46B2720;
 Mon, 21 Oct 2013 09:07:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9L97bUN063172;
 Mon, 21 Oct 2013 09:07:37 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9L97b1r063171;
 Mon, 21 Oct 2013 09:07:37 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201310210907.r9L97b1r063171@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Mon, 21 Oct 2013 09:07:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331109 - head/www/tinymce
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.14
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: Mon, 21 Oct 2013 09:07:38 -0000

Author: sunpoet
Date: Mon Oct 21 09:07:37 2013
New Revision: 331109
URL: http://svnweb.freebsd.org/changeset/ports/331109

Log:
  - Update CONFLICTS_INSTALL

Modified:
  head/www/tinymce/Makefile

Modified: head/www/tinymce/Makefile
==============================================================================
--- head/www/tinymce/Makefile	Mon Oct 21 08:59:56 2013	(r331108)
+++ head/www/tinymce/Makefile	Mon Oct 21 09:07:37 2013	(r331109)
@@ -13,7 +13,7 @@ COMMENT=	Open source JavaScript HTML WYS
 
 LICENSE=	LGPL21
 
-CONFLICTS_INSTALL=	tinymce-[0-35-9]*
+CONFLICTS_INSTALL=	tinymce-[0-35-9]* tinymce3-[0-9]*
 
 NO_BUILD=	yes
 USE_ZIP=	yes