summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2005-03-18 14:44:58 +0000
committerwiz <wiz@pkgsrc.org>2005-03-18 14:44:58 +0000
commitce62648d51ab9568021f90cfc617930ba70780a1 (patch)
tree4ae8f180069d4fdddbd172b5d0e716528ccd5dc9 /x11
parent3301efb5d32d9347b54358bc02afdd100dad81be (diff)
downloadpkgsrc-ce62648d51ab9568021f90cfc617930ba70780a1.tar.gz
graphics/barcode and x11/xscreensaver conflict (because of
man/man1/barcode.1). Noted by kleink in PR 29585.
Diffstat (limited to 'x11')
-rw-r--r--x11/xscreensaver/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 26d2f478da0..37155a54de8 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.66 2004/05/11 13:34:20 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2005/03/18 14:44:58 wiz Exp $
COMMENT= Screen saver and locker for the X window system
CONFLICTS+= xscreensaver-gnome<4.14
+# man/man1/barcode.1
+CONFLICTS+= barcode-[0-9]*
USE_BUILDLINK3= yes