summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2007-12-15 18:32:33 +0000
committerPav Lucistnik <pav@FreeBSD.org>2007-12-15 18:32:33 +0000
commit6ea69d24264871c2ad3ea75f13eb4ace88a96375 (patch)
tree2633aeeda5934ac11adcf90e6195c38a2f0ca70f /java
parent- Update to 1.13 (diff)
- Register conflicts against sablevm-classpath
Notes
Notes: svn path=/head/; revision=203768
Diffstat (limited to 'java')
-rw-r--r--java/classpath/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index 58ebd6fdd021..8acb1d21c8d8 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -32,4 +32,6 @@ USE_GMAKE= yes
INFO= hacking tools vmintegration
+CONFLICTS= sablevm-classpath-*
+
.include <bsd.port.mk>