From owner-cvs-all@FreeBSD.ORG  Thu Apr  1 00:41:36 2010
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 70BAB1065672;
	Thu,  1 Apr 2010 00:41:36 +0000 (UTC)
	(envelope-from maho@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5E5B18FC16;
	Thu,  1 Apr 2010 00:41:36 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o310faZA043348;
	Thu, 1 Apr 2010 00:41:36 GMT (envelope-from maho@repoman.freebsd.org)
Received: (from maho@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o310fa4Z043347;
	Thu, 1 Apr 2010 00:41:36 GMT (envelope-from maho)
Message-Id: <201004010041.o310fa4Z043347@repoman.freebsd.org>
From: Maho Nakata <maho@FreeBSD.org>
Date: Thu, 1 Apr 2010 00:41:36 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/editors/openoffice.org-2 Makefile
 ports/editors/openoffice.org-3
 Makefile ports/editors/openoffice.org-3-RC Makefile
 ports/editors/openoffice.org-3-devel Makefile
 ports/editors/openoffice.org-vcltesttool Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the entire tree
	<cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Apr 2010 00:41:36 -0000

maho        2010-04-01 00:41:36 UTC

  FreeBSD ports repository

  Modified files:
    editors/openoffice.org-2 Makefile 
    editors/openoffice.org-3 Makefile 
    editors/openoffice.org-3-RC Makefile 
    editors/openoffice.org-3-devel Makefile 
    editors/openoffice.org-vcltesttool Makefile 
  Log:
  Add CONFLICTS against devel/cppunit.
  
  Submitted by:   jhell <jhell@dataix.net> and many others
  Feature safe:   yes
  
  Revision  Changes    Path
  1.325     +2 -0      ports/editors/openoffice.org-2/Makefile
  1.421     +2 -0      ports/editors/openoffice.org-3-RC/Makefile
  1.472     +2 -0      ports/editors/openoffice.org-3-devel/Makefile
  1.330     +2 -0      ports/editors/openoffice.org-3/Makefile
  1.389     +2 -0      ports/editors/openoffice.org-vcltesttool/Makefile