cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- add @conflict marker for libffi with gcj

Browse Source 
ok kurt@
This commit is contained in:
jasper 2009-09-23 20:57:02 +00:00
parent a74ab97c27
commit 86a43482ee
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/gcc/3.3/Makefile
View File

@ -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 \

3
lang/gcc/3.3/pkg/PLIST-java
View File

@ -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

4
lang/gcc/4.2/Makefile
View File

@ -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 \

3
lang/gcc/4.2/pkg/PLIST-java
View File

@ -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