From owner-cvs-all@FreeBSD.ORG  Tue Feb 21 06:19:05 2012
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 8C00A106566B;
	Tue, 21 Feb 2012 06:19:05 +0000 (UTC) (envelope-from wen@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 60B248FC0C;
	Tue, 21 Feb 2012 06:19:05 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id q1L6J537051096;
	Tue, 21 Feb 2012 06:19:05 GMT (envelope-from wen@repoman.freebsd.org)
Received: (from wen@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q1L6J5Tp051095;
	Tue, 21 Feb 2012 06:19:05 GMT (envelope-from wen)
Message-Id: <201202210619.q1L6J5Tp051095@repoman.freebsd.org>
From: Wen Heping <wen@FreeBSD.org>
Date: Tue, 21 Feb 2012 06:19:05 +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/www/joomla 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: Tue, 21 Feb 2012 06:19:05 -0000

wen         2012-02-21 06:19:05 UTC

  FreeBSD ports repository

  Modified files:
    www/joomla           Makefile 
  Log:
  - Add CONFLICTS with www/joomla25
  
  Revision  Changes    Path
  1.25      +2 -0      ports/www/joomla/Makefile