[pkgsrc/trunk]: pkgsrc/x11/xscreensaver Remove conflict with barcode package ...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ebc6e5c85257
branches:  trunk
changeset: 520094:ebc6e5c85257
user:      markd <markd%pkgsrc.org@localhost>
date:      Sun Oct 15 11:44:20 2006 +0000

description:
Remove conflict with barcode package as manual pages are now in section 6.

diffstat:

 x11/xscreensaver/Makefile |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (15 lines):

diff -r 8de6468abd6c -r ebc6e5c85257 x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile Sun Oct 15 11:25:19 2006 +0000
+++ b/x11/xscreensaver/Makefile Sun Oct 15 11:44:20 2006 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2006/07/18 18:40:36 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2006/10/15 11:44:20 markd Exp $
 
 COMMENT=       Screen saver and locker for the X window system
 
 CONFLICTS+=    xscreensaver-gnome<4.14
-# man/man1/barcode.1
-CONFLICTS+=    barcode-[0-9]*
 
 .include "Makefile.common"