From owner-cvs-all@FreeBSD.ORG  Tue Aug  9 05:48:29 2011
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 DF0DA106566C;
	Tue,  9 Aug 2011 05:48:29 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B69578FC1B;
	Tue,  9 Aug 2011 05:48:29 +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 p795mT5p025848;
	Tue, 9 Aug 2011 05:48:29 GMT
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p795mTmS025847;
	Tue, 9 Aug 2011 05:48:29 GMT (envelope-from dougb)
Message-Id: <201108090548.p795mTmS025847@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 9 Aug 2011 05:48:29 +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/net-p2p/libtorrent-rasterbar-14 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, 09 Aug 2011 05:48:30 -0000

dougb       2011-08-09 05:48:29 UTC

  FreeBSD ports repository

  Modified files:
    net-p2p/libtorrent-rasterbar-14 Makefile 
  Log:
  Apply the same solution for COMPILETIME_OPTIONS+= as in -15
  
  Future-proof CONFLICTS
  
  Revision  Changes    Path
  1.45      +5 -1      ports/net-p2p/libtorrent-rasterbar-14/Makefile