diff options
author | markd <markd> | 2006-10-15 11:44:20 +0000 |
---|---|---|
committer | markd <markd> | 2006-10-15 11:44:20 +0000 |
commit | 58d541494efe83ad64c6c58bb6d8a544ef077736 (patch) | |
tree | abc1f1d5e6a168e4fc601f2efc38f6aa50fbf3f2 /x11/xscreensaver | |
parent | c1a2bbd949e3889bb194ef843566e6528e71245b (diff) | |
download | pkgsrc-58d541494efe83ad64c6c58bb6d8a544ef077736.tar.gz |
Remove conflict with barcode package as manual pages are now in section 6.
Diffstat (limited to 'x11/xscreensaver')
-rw-r--r-- | x11/xscreensaver/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index e886497b54d..ee77d225745 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -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" |