From owner-cvs-all@FreeBSD.ORG  Sat Jan 23 19:45:54 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 7D73B1065676;
	Sat, 23 Jan 2010 19:45:54 +0000 (UTC)
	(envelope-from marcus@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 543B38FC13;
	Sat, 23 Jan 2010 19:45:54 +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 o0NJjsww004699;
	Sat, 23 Jan 2010 19:45:54 GMT
	(envelope-from marcus@repoman.freebsd.org)
Received: (from marcus@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0NJjsgi004698;
	Sat, 23 Jan 2010 19:45:54 GMT (envelope-from marcus)
Message-Id: <201001231945.o0NJjsgi004698@repoman.freebsd.org>
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Sat, 23 Jan 2010 19:45:54 +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/devel/libmonetra Makefile ports/net/libproxy
 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: Sat, 23 Jan 2010 19:45:54 -0000

marcus      2010-01-23 19:45:54 UTC

  FreeBSD ports repository

  Modified files:
    devel/libmonetra     Makefile 
    net/libproxy         Makefile 
  Log:
  Remove the CONFLICTS between libproxy and libmonetra.
  
  PR:             143039
  Submitted by:   Mark Schleifer <freebsd@schleifer.org>
  
  Revision  Changes    Path
  1.20      +0 -2      ports/devel/libmonetra/Makefile
  1.2       +0 -1      ports/net/libproxy/Makefile