summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorwiz <wiz>2005-03-18 14:44:58 +0000
committerwiz <wiz>2005-03-18 14:44:58 +0000
commit06a2f04554546c377eae9072af08a849682e77cc (patch)
tree4ae8f180069d4fdddbd172b5d0e716528ccd5dc9 /graphics
parent8c0f95acaf0c30fb9b6badd5af9415c61572e719 (diff)
downloadpkgsrc-06a2f04554546c377eae9072af08a849682e77cc.tar.gz
graphics/barcode and x11/xscreensaver conflict (because of
man/man1/barcode.1). Noted by kleink in PR 29585.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/barcode/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/graphics/barcode/Makefile b/graphics/barcode/Makefile
index b65ed54452f..c53600a0fef 100644
--- a/graphics/barcode/Makefile
+++ b/graphics/barcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/06/27 08:50:03 seb Exp $
+# $NetBSD: Makefile,v 1.8 2005/03/18 14:44:58 wiz Exp $
#
DISTNAME= barcode-0.98
@@ -14,4 +14,7 @@ MAKE_ENV+= AWK="${AWK}"
INFO_FILES= barcode.info
+# man/man1/barcode.1
+CONFLICTS+= xscreensaver-[0-9]*
+
.include "../../mk/bsd.pkg.mk"