From 86a43482ee7e7dd4ec5aefa2bec512cce2de0cea Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Wed, 23 Sep 2009 20:57:02 +0000
Subject: [PATCH] - add @conflict marker for libffi with gcj

ok kurt@
---
 lang/gcc/3.3/Makefile       | 4 ++--
 lang/gcc/3.3/pkg/PLIST-java | 3 ++-
 lang/gcc/4.2/Makefile       | 4 ++--
 lang/gcc/4.2/pkg/PLIST-java | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lang/gcc/3.3/Makefile b/lang/gcc/3.3/Makefile
index 785ac930e6f..338be514f28 100644
--- a/lang/gcc/3.3/Makefile
+++ b/lang/gcc/3.3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2009/06/22 17:00:23 naddy Exp $
+# $OpenBSD: Makefile,v 1.38 2009/09/23 20:57:02 jasper Exp $
 
 ONLY_FOR_ARCHS=	alpha amd64 i386 m68k sparc sparc64 powerpc vax
 
@@ -12,7 +12,7 @@ PKGNAME-main=	gcc-${FULL_PKGVERSION}p14
 PKGNAME-c++ =	g++-${FULL_PKGVERSION}p12
 PKGNAME-estdc=	libstdc++-${FULL_PKGVERSION}p3
 PKGNAME-g77=	g77-${FULL_PKGVERSION}p11
-PKGNAME-java=	gcj-${FULL_PKGVERSION}p8
+PKGNAME-java=	gcj-${FULL_PKGVERSION}p9
 PKGNAME-objc=	gobjc-${FULL_PKGVERSION}p12
 PKGNAME-ada=	gnat-${FULL_PKGVERSION}p10
 SHARED_LIBS=	estdc++		6.0 \
diff --git a/lang/gcc/3.3/pkg/PLIST-java b/lang/gcc/3.3/pkg/PLIST-java
index febf94581a4..405b6995cab 100644
--- a/lang/gcc/3.3/pkg/PLIST-java
+++ b/lang/gcc/3.3/pkg/PLIST-java
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST-java,v 1.2 2005/09/14 10:41:02 espie Exp $
+@comment $OpenBSD: PLIST-java,v 1.3 2009/09/23 20:57:02 jasper Exp $
 @conflict egcs-*-core
+@conflict libffi-*
 @pkgpath lang/egcs/stable,-java
 bin/${CONFIG}-egcj
 bin/eaddr2name.awk
diff --git a/lang/gcc/4.2/Makefile b/lang/gcc/4.2/Makefile
index f0dc32670da..4f873955501 100644
--- a/lang/gcc/4.2/Makefile
+++ b/lang/gcc/4.2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2009/07/13 23:13:34 jsg Exp $
+# $OpenBSD: Makefile,v 1.38 2009/09/23 20:57:02 jasper Exp $
 
 ONLY_FOR_ARCHS = alpha i386 m68k sparc sparc64 powerpc vax amd64
 #BROKEN=adjust for types changes
@@ -14,7 +14,7 @@ PKGNAME-c++ =   g++-${FULL_PKGVERSION}p5
 PKGNAME-estdc = libstdc++-${FULL_PKGVERSION}p3
 PKGNAME-g77 =   g77-${FULL_PKGVERSION}p0
 PKGNAME-f95 =   g95-${FULL_PKGVERSION}p2
-PKGNAME-java =  gcj-${FULL_PKGVERSION}p1
+PKGNAME-java =  gcj-${FULL_PKGVERSION}p2
 PKGNAME-objc =  gobjc-${FULL_PKGVERSION}p2
 PKGNAME-ada =   gnat-${FULL_PKGVERSION}p1
 SHARED_LIBS =	estdc++		11.0 \
diff --git a/lang/gcc/4.2/pkg/PLIST-java b/lang/gcc/4.2/pkg/PLIST-java
index e1ad24e23ef..f8fb8469274 100644
--- a/lang/gcc/4.2/pkg/PLIST-java
+++ b/lang/gcc/4.2/pkg/PLIST-java
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST-java,v 1.1 2009/06/04 18:24:20 kurt Exp $
+@comment $OpenBSD: PLIST-java,v 1.2 2009/09/23 20:57:02 jasper Exp $
+@conflict libffi-*
 %%SHARED%%
 bin/eaddr2name.awk
 @bin bin/egappletviewer