summaryrefslogtreecommitdiff
path: root/x11/xscreensaver
diff options
context:
space:
mode:
authormarkd <markd>2006-10-15 11:44:20 +0000
committermarkd <markd>2006-10-15 11:44:20 +0000
commit87fdef39b763df846b68505bc7721e9683bc6b5e (patch)
treeabc1f1d5e6a168e4fc601f2efc38f6aa50fbf3f2 /x11/xscreensaver
parentc8d9aecf3c7c22d2277dc5aca76b704443ac6a03 (diff)
downloadpkgsrc-87fdef39b763df846b68505bc7721e9683bc6b5e.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/Makefile4
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"