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

- add missing conflict markers between g95 and (lib)gfortran.

Browse Source 
ok steven@
This commit is contained in:
jasper 2010-11-28 21:30:37 +00:00
parent 70a1c41618
commit 3f398591c9
11 changed files with 61 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/gcc/4.0/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.30 2010/11/17 08:05:17 espie Exp $
# $OpenBSD: Makefile,v 1.31 2010/11/28 21:30:37 jasper Exp $
ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc vax
BROKEN=adjust for types changes
@ -8,7 +8,7 @@ FULL_VERSION=4.0-20060105
FULL_PKGVERSION=4.0.20060105
PKGNAME-f95= g95-${FULL_PKGVERSION}
REVISION-f95 = 0
REVISION-f95 = 1
MAINTAINER= Marc Espie <espie@openbsd.org>
SHARED_LIBS= mudflap 0.0 \

4
lang/gcc/4.0/pkg/PLIST-f95
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-f95,v 1.3 2006/01/09 21:38:01 espie Exp $
@comment $OpenBSD: PLIST-f95,v 1.4 2010/11/28 21:30:37 jasper Exp $
@conflict gfortran-*
@conflict libgfortran-*
bin/egfortran
bin/${CONFIG}-egfortran
@info info/gfortran.info

27
lang/gcc/4.1/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2010/10/18 19:20:41 espie Exp $
# $OpenBSD: Makefile,v 1.21 2010/11/28 21:30:37 jasper Exp $
ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc vax
#BROKEN=adjust for types changes
@ -8,14 +8,14 @@ DATE=20060303
FULL_VERSION=4.1-${DATE}
FULL_PKGVERSION=4.1.${DATE}
PKGNAME= gcc-${FULL_PKGVERSION}p1
PKGNAME-c++ = g++-${FULL_PKGVERSION}p0
PKGNAME-estdc= libstdc++-${FULL_PKGVERSION}p0
PKGNAME-g77= g77-${FULL_PKGVERSION}p0
PKGNAME-f95= g95-${FULL_PKGVERSION}p0
PKGNAME-java= gcj-${FULL_PKGVERSION}p0
PKGNAME-objc= gobjc-${FULL_PKGVERSION}p0
PKGNAME-ada= gnat-${FULL_PKGVERSION}p0
PKGNAME-main= gcc-${FULL_PKGVERSION}
PKGNAME-c++ = g++-${FULL_PKGVERSION}
PKGNAME-estdc= libstdc++-${FULL_PKGVERSION}
PKGNAME-g77= g77-${FULL_PKGVERSION}
PKGNAME-f95= g95-${FULL_PKGVERSION}
PKGNAME-java= gcj-${FULL_PKGVERSION}
PKGNAME-objc= gobjc-${FULL_PKGVERSION}
PKGNAME-ada= gnat-${FULL_PKGVERSION}
SHARED_LIBS= estdc++ 7.0 \
gfortran 2.0 \
-org-w3c-dom 1.0 \
@ -25,6 +25,15 @@ SHARED_LIBS= estdc++ 7.0 \
objc_gc 2.0 \
ssp 0.0
REVISION-main= 1
REVISION-c++= 0
REVISION-estdc= 0
REVISION-g77= 0
REVISION-f95= 1
REVISION-java= 0
REVISION-objc= 0
REVISION-ada= 0
MAINTAINER= Marc Espie <espie@openbsd.org>
USE_GROFF = Yes

4
lang/gcc/4.1/pkg/PLIST-f95
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-f95,v 1.3 2006/03/05 22:11:15 espie Exp $
@comment $OpenBSD: PLIST-f95,v 1.4 2010/11/28 21:30:37 jasper Exp $
@conflict gfortran-*
@conflict libgfortran-*
bin/egfortran
bin/${CONFIG}-egfortran
@info info/gfortran.info

4
lang/gcc/4.2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.57 2010/11/26 14:17:17 espie Exp $
# $OpenBSD: Makefile,v 1.58 2010/11/28 21:30:37 jasper Exp $
ONLY_FOR_ARCHS = alpha i386 m68k sparc sparc64 powerpc vax amd64
#BROKEN=adjust for types changes
@ -20,7 +20,7 @@ PKGNAME-ada = gnat-${FULL_PKGVERSION}
REVISION-main = 1
REVISION-c++ = 3
REVISION-f95 = 2
REVISION-f95 = 3
REVISION-java = 2
REVISION-objc = 2
REVISION-ada = 2

4
lang/gcc/4.2/pkg/PLIST-f95
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-f95,v 1.8 2009/10/15 18:02:33 steven Exp $
@comment $OpenBSD: PLIST-f95,v 1.9 2010/11/28 21:30:37 jasper Exp $
@conflict gfortran-*
@conflict libgfortran-*
@bin bin/egfortran
@bin bin/${CONFIG}-egfortran
@info info/gfortran.info

28
lang/gcc/4.3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2010/10/18 19:20:41 espie Exp $
# $OpenBSD: Makefile,v 1.9 2010/11/28 21:30:37 jasper Exp $
ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc vax amd64
#BROKEN=adjust for types changes
@ -8,14 +8,24 @@ DATE=20070309
FULL_VERSION=4.3-${DATE}
FULL_PKGVERSION=4.3.${DATE}
PKGNAME-main= gcc-${FULL_PKGVERSION}p2
PKGNAME-c++ = g++-${FULL_PKGVERSION}p0
PKGNAME-estdc= libstdc++-${FULL_PKGVERSION}p0
PKGNAME-g77= g77-${FULL_PKGVERSION}p0
PKGNAME-f95= g95-${FULL_PKGVERSION}p0
PKGNAME-java= gcj-${FULL_PKGVERSION}p0
PKGNAME-objc= gobjc-${FULL_PKGVERSION}p0
PKGNAME-ada= gnat-${FULL_PKGVERSION}p0
PKGNAME-main= gcc-${FULL_PKGVERSION}
PKGNAME-c++ = g++-${FULL_PKGVERSION}
PKGNAME-estdc= libstdc++-${FULL_PKGVERSION}
PKGNAME-g77= g77-${FULL_PKGVERSION}
PKGNAME-f95= g95-${FULL_PKGVERSION}
PKGNAME-java= gcj-${FULL_PKGVERSION}
PKGNAME-objc= gobjc-${FULL_PKGVERSION}
PKGNAME-ada= gnat-${FULL_PKGVERSION}
REVISION-main= 2
REVISION-c++= 0
REVISION-estdc= 0
REVISION-g77= 0
REVISION-f95= 1
REVISION-java= 0
REVISION-objc= 0
REVISION-ada= 0
SHARED_LIBS= estdc++ 7.0 \
gfortran 2.0 \
-org-w3c-dom 1.0 \

4
lang/gcc/4.3/pkg/PLIST-f95
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST-f95,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
@comment $OpenBSD: PLIST-f95,v 1.2 2010/11/28 21:30:37 jasper Exp $
@conflict gfortran-*
@conflict libgfortran-*
bin/egfortran
bin/${CONFIG}-egfortran
@info info/gfortran.info

5
lang/gfortran/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2010/11/17 08:05:17 espie Exp $
# $OpenBSD: Makefile,v 1.8 2010/11/28 21:30:37 jasper Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
SYSV = 4.2.1
@ -12,6 +12,9 @@ PKGNAME-main = gfortran-$V
PKGNAME-lib = libgfortran-$V
SHARED_LIBS = gfortran 2.0
REVISION-main = 0
REVISION-lib = 0
CATEGORIES = lang math
PERMIT_PACKAGE_FTP = Yes

3
lang/gfortran/pkg/PLIST-lib
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-lib,v 1.1.1.1 2010/10/10 17:39:06 steven Exp $
@comment $OpenBSD: PLIST-lib,v 1.2 2010/11/28 21:30:37 jasper Exp $
@conflict g95-*
lib/gcc/
lib/gcc/${CONFIG}/
lib/gcc/${CONFIG}/${V}/

3
lang/gfortran/pkg/PLIST-main
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2010/10/10 17:39:06 steven Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2010/11/28 21:30:37 jasper Exp $
@conflict g95-*
@bin bin/${CONFIG}-gfortran
@comment bin/gccbug
@bin bin/gfortran