From owner-cvs-all@FreeBSD.ORG  Tue Jun  5 10:09:20 2012
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B4B821065678;
	Tue,  5 Jun 2012 10:09:20 +0000 (UTC)
	(envelope-from crees@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 10E888FC16;
	Tue,  5 Jun 2012 10:09:20 +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 q55A9JUi042865;
	Tue, 5 Jun 2012 10:09:19 GMT
	(envelope-from crees@repoman.freebsd.org)
Received: (from crees@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q55A9JjA042864;
	Tue, 5 Jun 2012 10:09:19 GMT (envelope-from crees)
Message-Id: <201206051009.q55A9JjA042864@repoman.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Tue, 5 Jun 2012 10:09:19 +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/databases/p5-Search-Xapian10 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, 05 Jun 2012 10:09:20 -0000

crees       2012-06-05 10:09:19 UTC

  FreeBSD ports repository

  Modified files:
    databases/p5-Search-Xapian10 Makefile 
  Log:
  Register CONFLICT on p5-Search-Xapian-1.2
  
  Submitted by:   Sulev-Madis "ketas" Silber
  
  Revision  Changes    Path
  1.36      +2 -0      ports/databases/p5-Search-Xapian10/Makefile