From owner-cvs-ports@FreeBSD.ORG  Sun Oct 16 05:21:01 2011
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0B20E106566C;
	Sun, 16 Oct 2011 05:21:01 +0000 (UTC)
	(envelope-from tota@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D6FE68FC14;
	Sun, 16 Oct 2011 05:21:00 +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 p9G5L0fp003468;
	Sun, 16 Oct 2011 05:21:00 GMT
	(envelope-from tota@repoman.freebsd.org)
Received: (from tota@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p9G5L0ub003467;
	Sun, 16 Oct 2011 05:21:00 GMT (envelope-from tota)
Message-Id: <201110160521.p9G5L0ub003467@repoman.freebsd.org>
From: TAKATSU Tomonari <tota@FreeBSD.org>
Date: Sun, 16 Oct 2011 05:21:00 +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/german/wordpress Makefile ports/www/wordpress
 Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Oct 2011 05:21:01 -0000

tota        2011-10-16 05:21:00 UTC

  FreeBSD ports repository

  Modified files:
    german/wordpress     Makefile 
    www/wordpress        Makefile 
  Log:
  - Register CONFLICTS_INSTALL between www/wordpress and german/wordpress [1]
  - Add CONFLICTS_INSTALL with upcoming japanese/wordpress [2]
  
  PR:             ports/160907 [1], ports/160172 [2]
  Submitted by:   tota (myself) [1]
  Approved by:    Yuan-Chung Hsiao (maintainer), miwi@ (timeout > 2 weeks) [1]
  
  Revision  Changes    Path
  1.43      +2 -0      ports/german/wordpress/Makefile
  1.73      +2 -0      ports/www/wordpress/Makefile