From owner-svn-ports-all@FreeBSD.ORG  Wed Oct  3 12:21:21 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4B3F810656E2;
	Wed,  3 Oct 2012 12:21:21 +0000 (UTC)
	(envelope-from gahr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 308118FC19;
	Wed,  3 Oct 2012 12:21:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q93CLLYZ026399;
	Wed, 3 Oct 2012 12:21:21 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q93CLKGV026397;
	Wed, 3 Oct 2012 12:21:20 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201210031221.q93CLKGV026397@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Wed, 3 Oct 2012 12:21:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r305198 - head/x11-toolkits/fox14
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Wed, 03 Oct 2012 12:21:21 -0000

Author: gahr
Date: Wed Oct  3 12:21:20 2012
New Revision: 305198
URL: http://svn.freebsd.org/changeset/ports/305198

Log:
  - Restore CONFLICTS, which had been commented out to test r305197

Modified:
  head/x11-toolkits/fox14/Makefile

Modified: head/x11-toolkits/fox14/Makefile
==============================================================================
--- head/x11-toolkits/fox14/Makefile	Wed Oct  3 12:14:18 2012	(r305197)
+++ head/x11-toolkits/fox14/Makefile	Wed Oct  3 12:21:20 2012	(r305198)
@@ -17,7 +17,7 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphic
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft
 
-#CONFLICTS=	fox-1.6.* fox-1.7.*
+CONFLICTS=	fox-1.6.* fox-1.7.*
 
 LATEST_LINK=	fox14