summaryrefslogtreecommitdiff
path: root/devel/libusb1
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2012-05-30 15:28:59 +0000
committerwiz <wiz@pkgsrc.org>2012-05-30 15:28:59 +0000
commit7e9341673a765b0051f01206743bd79e94f51957 (patch)
treeeb6915416cf4f994dc1a95ae893b7637682296e3 /devel/libusb1
parentbeedafa2dfcb77baa406717dd80448d29bdc8809 (diff)
downloadpkgsrc-7e9341673a765b0051f01206743bd79e94f51957.tar.gz
Mark conflict with libusbx.
Diffstat (limited to 'devel/libusb1')
-rw-r--r--devel/libusb1/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/devel/libusb1/Makefile b/devel/libusb1/Makefile
index 82f30894c18..657a17c7266 100644
--- a/devel/libusb1/Makefile
+++ b/devel/libusb1/Makefile
@@ -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 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= libusb-1.0.pc.in
+CONFLICTS= libusbx-[0-9]*
+
.include "../../mk/bsd.pkg.mk"