svn commit: r305198 - head/x11-toolkits/fox14

[Pietro Cerutti]

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