summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorHerve Quiroz <hq@FreeBSD.org>2004-12-24 15:24:14 +0000
committerHerve Quiroz <hq@FreeBSD.org>2004-12-24 15:24:14 +0000
commite4b8a8ca7a1be733656a4f94b2756ed1279802aa (patch)
treee5f1c38a3cae8f035e2fff30a438e72267c0912d /java
parentUnbreak the build with recent GCC. (diff)
Take into account the '-devel' package name suffix when registering CONFLICTS
with java/kaffe-devel Pointy hat to: me
Notes
Notes: svn path=/head/; revision=125077
Diffstat (limited to 'java')
-rw-r--r--java/javavmwrapper/Makefile2
-rw-r--r--java/kaffe/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile
index 6a7fcf03ac34..d007fb3b2ab9 100644
--- a/java/javavmwrapper/Makefile
+++ b/java/javavmwrapper/Makefile
@@ -17,7 +17,7 @@ DISTFILES= # none
MAINTAINER= glewis@FreeBSD.org
COMMENT= Wrapper script for various Java Virtual Machines
-CONFLICTS= kaffe-1.*
+CONFLICTS= kaffe-1.* kaffe-devel-1.*
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index 070f85f3352c..c772098e6c2c 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
ungif.5:${PORTSDIR}/graphics/libungif \
png.5:${PORTSDIR}/graphics/png
-CONFLICTS= kaffe-1.[!0].* javavmwrapper-2.*
+CONFLICTS= kaffe-devel-1.* javavmwrapper-2.*
NOT_FOR_ARCHS= amd64