diff --git a/lang/egcs/snapshot/pkg/PLIST b/lang/egcs/snapshot/pkg/PLIST index 01bec731e2f..0a49667a146 100644 --- a/lang/egcs/snapshot/pkg/PLIST +++ b/lang/egcs/snapshot/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.9 2003/11/13 19:04:10 espie Exp $ -@pkgcfl egcs-*-core +@comment $OpenBSD: PLIST,v 1.10 2004/09/18 12:52:54 espie Exp $ +@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/cppinternals.info @unexec install-info --delete --info-dir=%D/info %D/info/gcc.info diff --git a/lang/egcs/snapshot/pkg/PLIST-c++ b/lang/egcs/snapshot/pkg/PLIST-c++ index 9c642f1cee7..83092dd7a45 100644 --- a/lang/egcs/snapshot/pkg/PLIST-c++ +++ b/lang/egcs/snapshot/pkg/PLIST-c++ @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST-c++,v 1.5 2003/11/13 19:04:10 espie Exp $ -@pkgcfl egcs-*-core +@comment $OpenBSD: PLIST-c++,v 1.6 2004/09/18 12:52:54 espie Exp $ +@conflict egcs-*-core bin/ec++ bin/eg++ bin/${CONFIG}-ec++ diff --git a/lang/egcs/snapshot/pkg/PLIST-g77 b/lang/egcs/snapshot/pkg/PLIST-g77 index 09014696fb1..320cdfc78d1 100644 --- a/lang/egcs/snapshot/pkg/PLIST-g77 +++ b/lang/egcs/snapshot/pkg/PLIST-g77 @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST-g77,v 1.4 2003/11/13 19:04:10 espie Exp $ -@pkgcfl egcs-*-core +@comment $OpenBSD: PLIST-g77,v 1.5 2004/09/18 12:52:54 espie Exp $ +@conflict egcs-*-core @unexec install-info --delete --info-dir=%D/info %D/info/g77.info bin/eg77 info/g77.info diff --git a/lang/egcs/snapshot/pkg/PLIST-java b/lang/egcs/snapshot/pkg/PLIST-java index a65d1848dc5..2f3d2c0dd9e 100644 --- a/lang/egcs/snapshot/pkg/PLIST-java +++ b/lang/egcs/snapshot/pkg/PLIST-java @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST-java,v 1.4 2003/11/13 19:04:10 espie Exp $ -@pkgcfl egcs-*-core +@comment $OpenBSD: PLIST-java,v 1.5 2004/09/18 12:52:54 espie Exp $ +@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/fastjar.info bin/${CONFIG}-egcj diff --git a/lang/egcs/snapshot/pkg/PLIST-objc b/lang/egcs/snapshot/pkg/PLIST-objc index 6222f473d16..054b87fd56c 100644 --- a/lang/egcs/snapshot/pkg/PLIST-objc +++ b/lang/egcs/snapshot/pkg/PLIST-objc @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST-objc,v 1.5 2003/11/13 19:04:10 espie Exp $ -@pkgcfl egcs-*-core +@comment $OpenBSD: PLIST-objc,v 1.6 2004/09/18 12:52:54 espie Exp $ +@conflict egcs-*-core IFPIC:lib/fpic/libobjc.a IFPIC:lib/fpic/libobjc.la lib/gcc-lib/${CONFIG}/${V}/cc1obj diff --git a/lang/egcs/stable/pkg/PLIST b/lang/egcs/stable/pkg/PLIST index 46cbbcd5656..6d96a559221 100644 --- a/lang/egcs/stable/pkg/PLIST +++ b/lang/egcs/stable/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.21 2004/09/15 19:06:57 espie Exp $ -@pkgcfl egcs-*-core +@comment $OpenBSD: PLIST,v 1.22 2004/09/18 12:52:54 espie Exp $ +@conflict egcs-*-core bin/ecpp bin/egcc bin/egccbug diff --git a/lang/egcs/stable/pkg/PLIST-c++ b/lang/egcs/stable/pkg/PLIST-c++ index b7a755bd97c..3bdbde4084b 100644 --- a/lang/egcs/stable/pkg/PLIST-c++ +++ b/lang/egcs/stable/pkg/PLIST-c++ @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST-c++,v 1.16 2004/09/15 19:06:57 espie Exp $ -@pkgcfl egcs-*-core +@comment $OpenBSD: PLIST-c++,v 1.17 2004/09/18 12:52:54 espie Exp $ +@conflict egcs-*-core bin/ec++ bin/eg++ bin/${CONFIG}-ec++ diff --git a/lang/egcs/stable/pkg/PLIST-g77 b/lang/egcs/stable/pkg/PLIST-g77 index 0baa5250f0a..c28fc432f6a 100644 --- a/lang/egcs/stable/pkg/PLIST-g77 +++ b/lang/egcs/stable/pkg/PLIST-g77 @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST-g77,v 1.13 2004/09/15 19:06:57 espie Exp $ -@pkgcfl egcs-*-core +@comment $OpenBSD: PLIST-g77,v 1.14 2004/09/18 12:52:54 espie Exp $ +@conflict egcs-*-core bin/eg77 @info info/g77.info lib/gcc-lib/${CONFIG}/${V}/f771 diff --git a/lang/egcs/stable/pkg/PLIST-java b/lang/egcs/stable/pkg/PLIST-java index 4a4b9d79d09..d03e7d38646 100644 --- a/lang/egcs/stable/pkg/PLIST-java +++ b/lang/egcs/stable/pkg/PLIST-java @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST-java,v 1.8 2004/09/15 19:06:57 espie Exp $ -@pkgcfl egcs-*-core +@comment $OpenBSD: PLIST-java,v 1.9 2004/09/18 12:52:54 espie Exp $ +@conflict egcs-*-core bin/${CONFIG}-egcj bin/eaddr2name.awk bin/egcj diff --git a/lang/egcs/stable/pkg/PLIST-objc b/lang/egcs/stable/pkg/PLIST-objc index 7e484dfa08d..0d3daa2eb0a 100644 --- a/lang/egcs/stable/pkg/PLIST-objc +++ b/lang/egcs/stable/pkg/PLIST-objc @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST-objc,v 1.13 2004/09/15 19:06:57 espie Exp $ -@pkgcfl egcs-*-core +@comment $OpenBSD: PLIST-objc,v 1.14 2004/09/18 12:52:54 espie Exp $ +@conflict egcs-*-core lib/gcc-lib/${CONFIG}/${V}/cc1obj lib/gcc-lib/${CONFIG}/${V}/include/objc/ lib/gcc-lib/${CONFIG}/${V}/include/objc/NXConstStr.h diff --git a/lang/icon/interp/pkg/PLIST b/lang/icon/interp/pkg/PLIST index de2f40e122e..94ebcc46d27 100644 --- a/lang/icon/interp/pkg/PLIST +++ b/lang/icon/interp/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.6 2004/09/15 19:16:08 espie Exp $ -@pkgcfl unicon-* +@comment $OpenBSD: PLIST,v 1.7 2004/09/18 12:52:54 espie Exp $ +@conflict unicon-* bin/icont bin/iconx bin/rtt diff --git a/lang/icon/lib/pkg/PLIST b/lang/icon/lib/pkg/PLIST index 805e265c527..dade3461108 100644 --- a/lang/icon/lib/pkg/PLIST +++ b/lang/icon/lib/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.6 2004/09/15 19:16:08 espie Exp $ -@pkgcfl unicon-* +@comment $OpenBSD: PLIST,v 1.7 2004/09/18 12:52:54 espie Exp $ +@conflict unicon-* share/ipl/bin/ share/ipl/bin/adlcheck share/ipl/bin/adlcount diff --git a/lang/nhc98/pkg/PLIST b/lang/nhc98/pkg/PLIST index ab7111c7afe..c4bb76cbbff 100644 --- a/lang/nhc98/pkg/PLIST +++ b/lang/nhc98/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.2 2004/09/15 19:16:08 espie Exp $ -@pkgcfl hmake-* +@comment $OpenBSD: PLIST,v 1.3 2004/09/18 12:52:54 espie Exp $ +@conflict hmake-* bin/greencard-nhc98 bin/harch bin/hi diff --git a/lang/python/2.3/pkg/PLIST-bsddb b/lang/python/2.3/pkg/PLIST-bsddb index 573afb00ece..50082cdf310 100644 --- a/lang/python/2.3/pkg/PLIST-bsddb +++ b/lang/python/2.3/pkg/PLIST-bsddb @@ -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 -@pkgcfl python-bsddb->=2.3,<2.4 +@conflict python-bsddb->=2.3,<2.4 lib/python2.3/lib-dynload/_bsddb.so diff --git a/lang/tcl/8.0/pkg/PLIST b/lang/tcl/8.0/pkg/PLIST index 143e25fd427..3d629b38a9a 100644 --- a/lang/tcl/8.0/pkg/PLIST +++ b/lang/tcl/8.0/pkg/PLIST @@ -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 -@pkgcfl tcl-8.0.* +@conflict tcl->=8.0,<8.1 bin/tclsh8.0 include/tcl8.0/ include/tcl8.0/generic/ diff --git a/lang/tcl/8.3/pkg/PLIST b/lang/tcl/8.3/pkg/PLIST index 8d4ad285d92..acd38f4ed0d 100644 --- a/lang/tcl/8.3/pkg/PLIST +++ b/lang/tcl/8.3/pkg/PLIST @@ -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 -@pkgcfl tcl-8.3.* +@conflict tcl->=8.3,<8.4 bin/tclsh8.3 include/tcl8.3/ include/tcl8.3/generic/ diff --git a/lang/tcl/8.4/pkg/PLIST b/lang/tcl/8.4/pkg/PLIST index d17f976091d..44b0813257c 100644 --- a/lang/tcl/8.4/pkg/PLIST +++ b/lang/tcl/8.4/pkg/PLIST @@ -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 -@pkgcfl tcl-8.4.* +@conflict tcl->=8.4,<8.5 bin/tclsh8.4 include/tcl8.4/ include/tcl8.4/generic/ diff --git a/lang/unicon/pkg/PLIST b/lang/unicon/pkg/PLIST index 19aadc70a9f..0770ed632d9 100644 --- a/lang/unicon/pkg/PLIST +++ b/lang/unicon/pkg/PLIST @@ -1,8 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.6 2004/09/15 19:16:09 espie Exp $ -@pkgcfl icon_interp-* -@pkgcfl icon-interp-* -@pkgcfl icon_lib-* -@pkgcfl icon-lib-* +@comment $OpenBSD: PLIST,v 1.7 2004/09/18 12:52:55 espie Exp $ +@conflict icon_interp-* +@conflict icon-interp-* +@conflict icon_lib-* +@conflict icon-lib-* bin/icont bin/iconx bin/ivib