new style conflicts

This commit is contained in:
espie 2004-09-18 12:52:54 +00:00
parent 18874d2495
commit ee6b38872c
18 changed files with 39 additions and 39 deletions

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.9 2003/11/13 19:04:10 espie Exp $ @comment $OpenBSD: PLIST,v 1.10 2004/09/18 12:52:54 espie Exp $
@pkgcfl egcs-*-core @conflict egcs-*-core
@unexec install-info --delete --info-dir=%D/info %D/info/cpp.info @unexec install-info --delete --info-dir=%D/info %D/info/cpp.info
@unexec install-info --delete --info-dir=%D/info %D/info/cppinternals.info @unexec install-info --delete --info-dir=%D/info %D/info/cppinternals.info
@unexec install-info --delete --info-dir=%D/info %D/info/gcc.info @unexec install-info --delete --info-dir=%D/info %D/info/gcc.info

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-c++,v 1.5 2003/11/13 19:04:10 espie Exp $ @comment $OpenBSD: PLIST-c++,v 1.6 2004/09/18 12:52:54 espie Exp $
@pkgcfl egcs-*-core @conflict egcs-*-core
bin/ec++ bin/ec++
bin/eg++ bin/eg++
bin/${CONFIG}-ec++ bin/${CONFIG}-ec++

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-g77,v 1.4 2003/11/13 19:04:10 espie Exp $ @comment $OpenBSD: PLIST-g77,v 1.5 2004/09/18 12:52:54 espie Exp $
@pkgcfl egcs-*-core @conflict egcs-*-core
@unexec install-info --delete --info-dir=%D/info %D/info/g77.info @unexec install-info --delete --info-dir=%D/info %D/info/g77.info
bin/eg77 bin/eg77
info/g77.info info/g77.info

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-java,v 1.4 2003/11/13 19:04:10 espie Exp $ @comment $OpenBSD: PLIST-java,v 1.5 2004/09/18 12:52:54 espie Exp $
@pkgcfl egcs-*-core @conflict egcs-*-core
@unexec install-info --delete --info-dir=%D/info %D/info/gcj.info @unexec install-info --delete --info-dir=%D/info %D/info/gcj.info
@unexec install-info --delete --info-dir=%D/info %D/info/fastjar.info @unexec install-info --delete --info-dir=%D/info %D/info/fastjar.info
bin/${CONFIG}-egcj bin/${CONFIG}-egcj

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-objc,v 1.5 2003/11/13 19:04:10 espie Exp $ @comment $OpenBSD: PLIST-objc,v 1.6 2004/09/18 12:52:54 espie Exp $
@pkgcfl egcs-*-core @conflict egcs-*-core
IFPIC:lib/fpic/libobjc.a IFPIC:lib/fpic/libobjc.a
IFPIC:lib/fpic/libobjc.la IFPIC:lib/fpic/libobjc.la
lib/gcc-lib/${CONFIG}/${V}/cc1obj lib/gcc-lib/${CONFIG}/${V}/cc1obj

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.21 2004/09/15 19:06:57 espie Exp $ @comment $OpenBSD: PLIST,v 1.22 2004/09/18 12:52:54 espie Exp $
@pkgcfl egcs-*-core @conflict egcs-*-core
bin/ecpp bin/ecpp
bin/egcc bin/egcc
bin/egccbug bin/egccbug

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-c++,v 1.16 2004/09/15 19:06:57 espie Exp $ @comment $OpenBSD: PLIST-c++,v 1.17 2004/09/18 12:52:54 espie Exp $
@pkgcfl egcs-*-core @conflict egcs-*-core
bin/ec++ bin/ec++
bin/eg++ bin/eg++
bin/${CONFIG}-ec++ bin/${CONFIG}-ec++

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-g77,v 1.13 2004/09/15 19:06:57 espie Exp $ @comment $OpenBSD: PLIST-g77,v 1.14 2004/09/18 12:52:54 espie Exp $
@pkgcfl egcs-*-core @conflict egcs-*-core
bin/eg77 bin/eg77
@info info/g77.info @info info/g77.info
lib/gcc-lib/${CONFIG}/${V}/f771 lib/gcc-lib/${CONFIG}/${V}/f771

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-java,v 1.8 2004/09/15 19:06:57 espie Exp $ @comment $OpenBSD: PLIST-java,v 1.9 2004/09/18 12:52:54 espie Exp $
@pkgcfl egcs-*-core @conflict egcs-*-core
bin/${CONFIG}-egcj bin/${CONFIG}-egcj
bin/eaddr2name.awk bin/eaddr2name.awk
bin/egcj bin/egcj

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-objc,v 1.13 2004/09/15 19:06:57 espie Exp $ @comment $OpenBSD: PLIST-objc,v 1.14 2004/09/18 12:52:54 espie Exp $
@pkgcfl egcs-*-core @conflict egcs-*-core
lib/gcc-lib/${CONFIG}/${V}/cc1obj lib/gcc-lib/${CONFIG}/${V}/cc1obj
lib/gcc-lib/${CONFIG}/${V}/include/objc/ lib/gcc-lib/${CONFIG}/${V}/include/objc/
lib/gcc-lib/${CONFIG}/${V}/include/objc/NXConstStr.h lib/gcc-lib/${CONFIG}/${V}/include/objc/NXConstStr.h

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.6 2004/09/15 19:16:08 espie Exp $ @comment $OpenBSD: PLIST,v 1.7 2004/09/18 12:52:54 espie Exp $
@pkgcfl unicon-* @conflict unicon-*
bin/icont bin/icont
bin/iconx bin/iconx
bin/rtt bin/rtt

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.6 2004/09/15 19:16:08 espie Exp $ @comment $OpenBSD: PLIST,v 1.7 2004/09/18 12:52:54 espie Exp $
@pkgcfl unicon-* @conflict unicon-*
share/ipl/bin/ share/ipl/bin/
share/ipl/bin/adlcheck share/ipl/bin/adlcheck
share/ipl/bin/adlcount share/ipl/bin/adlcount

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 19:16:08 espie Exp $ @comment $OpenBSD: PLIST,v 1.3 2004/09/18 12:52:54 espie Exp $
@pkgcfl hmake-* @conflict hmake-*
bin/greencard-nhc98 bin/greencard-nhc98
bin/harch bin/harch
bin/hi bin/hi

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-bsddb,v 1.2 2004/09/18 10:11:57 espie Exp $ @comment $OpenBSD: PLIST-bsddb,v 1.3 2004/09/18 12:52:55 espie Exp $
@option no-default-conflict @option no-default-conflict
@pkgcfl python-bsddb->=2.3,<2.4 @conflict python-bsddb->=2.3,<2.4
lib/python2.3/lib-dynload/_bsddb.so lib/python2.3/lib-dynload/_bsddb.so

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.5 2004/08/10 12:07:38 espie Exp $ @comment $OpenBSD: PLIST,v 1.6 2004/09/18 12:52:55 espie Exp $
@option no-default-conflict @option no-default-conflict
@pkgcfl tcl-8.0.* @conflict tcl->=8.0,<8.1
bin/tclsh8.0 bin/tclsh8.0
include/tcl8.0/ include/tcl8.0/
include/tcl8.0/generic/ include/tcl8.0/generic/

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.12 2004/08/10 12:07:38 espie Exp $ @comment $OpenBSD: PLIST,v 1.13 2004/09/18 12:52:55 espie Exp $
@option no-default-conflict @option no-default-conflict
@pkgcfl tcl-8.3.* @conflict tcl->=8.3,<8.4
bin/tclsh8.3 bin/tclsh8.3
include/tcl8.3/ include/tcl8.3/
include/tcl8.3/generic/ include/tcl8.3/generic/

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.5 2004/08/10 12:07:38 espie Exp $ @comment $OpenBSD: PLIST,v 1.6 2004/09/18 12:52:55 espie Exp $
@option no-default-conflict @option no-default-conflict
@pkgcfl tcl-8.4.* @conflict tcl->=8.4,<8.5
bin/tclsh8.4 bin/tclsh8.4
include/tcl8.4/ include/tcl8.4/
include/tcl8.4/generic/ include/tcl8.4/generic/

View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.6 2004/09/15 19:16:09 espie Exp $ @comment $OpenBSD: PLIST,v 1.7 2004/09/18 12:52:55 espie Exp $
@pkgcfl icon_interp-* @conflict icon_interp-*
@pkgcfl icon-interp-* @conflict icon-interp-*
@pkgcfl icon_lib-* @conflict icon_lib-*
@pkgcfl icon-lib-* @conflict icon-lib-*
bin/icont bin/icont
bin/iconx bin/iconx
bin/ivib bin/ivib