From 8bbe5f9956922be2c1f56b27f6805485628e36bd Mon Sep 17 00:00:00 2001 From: espie Date: Fri, 31 Dec 2004 12:49:28 +0000 Subject: [PATCH] a few conflicts --- www/netscape/communicator-linux/pkg/PLIST | 5 ++++- www/netscape/navigator-linux/pkg/PLIST | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/www/netscape/communicator-linux/pkg/PLIST b/www/netscape/communicator-linux/pkg/PLIST index 24384bd2693..5abe6feb354 100644 --- a/www/netscape/communicator-linux/pkg/PLIST +++ b/www/netscape/communicator-linux/pkg/PLIST @@ -1,6 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.6 2004/11/09 14:48:26 alek Exp $ +@comment $OpenBSD: PLIST,v 1.7 2004/12/31 12:49:28 espie Exp $ @conflict communicator-* @conflict navigator-* +@conflict communicator-bsdi-* +@conflict navigator-bsdi-* +@conflict navigator-linux-* bin/netscape netscape/ netscape/LICENSE diff --git a/www/netscape/navigator-linux/pkg/PLIST b/www/netscape/navigator-linux/pkg/PLIST index e353e19f62f..417651b92f5 100644 --- a/www/netscape/navigator-linux/pkg/PLIST +++ b/www/netscape/navigator-linux/pkg/PLIST @@ -1,6 +1,10 @@ -@comment $OpenBSD: PLIST,v 1.6 2004/11/09 14:48:27 alek Exp $ +@comment $OpenBSD: PLIST,v 1.7 2004/12/31 12:49:28 espie Exp $ @conflict communicator-* @conflict navigator-* +@conflict communicator-linux-* +@conflict navigator-linux-* +@conflict communicator-bsdi-* +@conflict navigator-bsdi-* bin/netscape netscape/ netscape/LICENSE