pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc graphics/barcode and x11/xscreensaver conflict (becaus...
details: https://anonhg.NetBSD.org/pkgsrc/rev/bd8cd302741f
branches: trunk
changeset: 490710:bd8cd302741f
user: wiz <wiz%pkgsrc.org@localhost>
date: Fri Mar 18 14:44:58 2005 +0000
description:
graphics/barcode and x11/xscreensaver conflict (because of
man/man1/barcode.1). Noted by kleink in PR 29585.
diffstat:
graphics/barcode/Makefile | 5 ++++-
x11/xscreensaver/Makefile | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diffs (32 lines):
diff -r ba9de04f5c0a -r bd8cd302741f graphics/barcode/Makefile
--- a/graphics/barcode/Makefile Fri Mar 18 13:18:00 2005 +0000
+++ b/graphics/barcode/Makefile Fri Mar 18 14:44:58 2005 +0000
@@ -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 @@
INFO_FILES= barcode.info
+# man/man1/barcode.1
+CONFLICTS+= xscreensaver-[0-9]*
+
.include "../../mk/bsd.pkg.mk"
diff -r ba9de04f5c0a -r bd8cd302741f x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile Fri Mar 18 13:18:00 2005 +0000
+++ b/x11/xscreensaver/Makefile Fri Mar 18 14:44:58 2005 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index