pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/libusb1 Mark conflict with libusbx.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb7892afee05
branches:  trunk
changeset: 604432:cb7892afee05
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed May 30 15:28:59 2012 +0000

description:
Mark conflict with libusbx.

diffstat:

 devel/libusb1/Makefile |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (16 lines):

diff -r 87b8fb4497ec -r cb7892afee05 devel/libusb1/Makefile
--- a/devel/libusb1/Makefile    Wed May 30 15:28:29 2012 +0000
+++ b/devel/libusb1/Makefile    Wed May 30 15:28:59 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2012/05/30 14:10:23 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2012/05/30 15:28:59 wiz Exp $
 #
 
 DISTNAME=      libusb-1.0.9
@@ -20,4 +20,6 @@
 
 PKGCONFIG_OVERRIDE+=   libusb-1.0.pc.in
 
+CONFLICTS=     libusbx-[0-9]*
+
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index