diff options
| author | hq <hq@FreeBSD.org> | 2004-12-24 23:24:14 +0800 |
|---|---|---|
| committer | hq <hq@FreeBSD.org> | 2004-12-24 23:24:14 +0800 |
| commit | 6f766531fb0e17ee5fa03b5540f1837bd4f7bf6c (patch) | |
| tree | ecd51c50bb857f1bcfd13e9e88a50cbe4fca615e /java | |
| parent | 97c8e28ed3159fcb5d5ba2ff08d49546100017c5 (diff) | |
| download | freebsd-ports-gnome-6f766531fb0e17ee5fa03b5540f1837bd4f7bf6c.tar.gz freebsd-ports-gnome-6f766531fb0e17ee5fa03b5540f1837bd4f7bf6c.tar.zst freebsd-ports-gnome-6f766531fb0e17ee5fa03b5540f1837bd4f7bf6c.zip | |
Take into account the '-devel' package name suffix when registering CONFLICTS
with java/kaffe-devel
Pointy hat to: me
Diffstat (limited to 'java')
| -rw-r--r-- | java/javavmwrapper/Makefile | 2 | ||||
| -rw-r--r-- | java/kaffe/Makefile | 2 |
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 |