Wed May 30 15:28:59 2012 UTC ()
Mark conflict with libusbx.


(wiz)
diff -r1.1.1.1 -r1.2 pkgsrc/devel/libusb1/Makefile
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/libusb1/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libusb1/Makefile 2012/05/30 14:10:23 1.1.1.1
+++ pkgsrc/devel/libusb1/Makefile 2012/05/30 15:28:59 1.2
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1# $NetBSD: Makefile,v 1.1.1.1 2012/05/30 14:10:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.2 2012/05/30 15:28:59 wiz Exp $
2# 2#
3 3
4DISTNAME= libusb-1.0.9 4DISTNAME= libusb-1.0.9
5PKGNAME= ${DISTNAME:S/libusb/libusb1/} 5PKGNAME= ${DISTNAME:S/libusb/libusb1/}
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libusb/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libusb/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.libusb.org/wiki/libusb-1.0 11HOMEPAGE= http://www.libusb.org/wiki/libusb-1.0
12COMMENT= USB Access Library (version 1) 12COMMENT= USB Access Library (version 1)
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= pkg-config 19USE_TOOLS+= pkg-config
20 20
21PKGCONFIG_OVERRIDE+= libusb-1.0.pc.in 21PKGCONFIG_OVERRIDE+= libusb-1.0.pc.in
22 22
 23CONFLICTS= libusbx-[0-9]*
 24
23.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"