summaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2012-10-03 12:21:20 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2012-10-03 12:21:20 +0000
commit560b1a6b6a19327a0842a506e02d914abc40ec9e (patch)
treef5e203839a2330e7bf650b063a6e3ec9a1e02aba /x11-toolkits
parent- Convert to OptionsNG (diff)
- Restore CONFLICTS, which had been commented out to test r305197
Notes
Notes: svn path=/head/; revision=305198
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/fox14/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index 3c2ca59f8f8c..5442655d3983 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
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