From owner-svn-ports-all@FreeBSD.ORG  Sun Nov 17 14:45:22 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A388CD3A;
 Sun, 17 Nov 2013 14:45:22 +0000 (UTC)
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 937302155;
 Sun, 17 Nov 2013 14:45:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAHEjMWq028121;
 Sun, 17 Nov 2013 14:45:22 GMT (envelope-from crees@svn.freebsd.org)
Received: (from crees@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAHEjM7T028120;
 Sun, 17 Nov 2013 14:45:22 GMT (envelope-from crees@svn.freebsd.org)
Message-Id: <201311171445.rAHEjM7T028120@svn.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Sun, 17 Nov 2013 14:45:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334085 - head/databases/postgresql-libpqxx
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Nov 2013 14:45:22 -0000

Author: crees
Date: Sun Nov 17 14:45:22 2013
New Revision: 334085
URL: http://svnweb.freebsd.org/changeset/ports/334085

Log:
  Update CONFLICTS given the PKGNAME change of pqxx-3

Modified:
  head/databases/postgresql-libpqxx/Makefile

Modified: head/databases/postgresql-libpqxx/Makefile
==============================================================================
--- head/databases/postgresql-libpqxx/Makefile	Sun Nov 17 14:44:00 2013	(r334084)
+++ head/databases/postgresql-libpqxx/Makefile	Sun Nov 17 14:45:22 2013	(r334085)
@@ -11,7 +11,7 @@ DIST_SUBDIR=	postgresql
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	New C++ interface for PostgreSQL
 
-CONFLICTS=	postgresql-libpqxx-3.*
+CONFLICTS=	postgresql-libpqxx-3.* postgresql-libpqxx3-3.*
 PORTSCOUT=	limit:^2\.
 
 USE_PGSQL=	yes