CVS commit: pkgsrc/devel/libusb1

["Iain Hibbert" <plunky%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   plunky
Date:           Mon May 25 06:47:40 UTC 2020

Modified Files:
        pkgsrc/devel/libusb1: buildlink3.mk builtin.mk

Log Message:
revert previous addition of BUILDLINK_TRANSFORM as it causes
problem with libusb-compat which includes this file but provides
libusb-0.1


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libusb1/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libusb1/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libusb1/buildlink3.mk
diff -u pkgsrc/devel/libusb1/buildlink3.mk:1.2 pkgsrc/devel/libusb1/buildlink3.mk:1.3
--- pkgsrc/devel/libusb1/buildlink3.mk:1.2      Fri May 22 08:31:39 2020
+++ pkgsrc/devel/libusb1/buildlink3.mk  Mon May 25 06:47:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/05/22 08:31:39 plunky Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2020/05/25 06:47:40 plunky Exp $
 
 BUILDLINK_TREE+=       libusb1
 
@@ -7,9 +7,6 @@ LIBUSB1_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libusb1+=        libusb1>=1.0.9
 BUILDLINK_PKGSRCDIR.libusb1?=  ../../devel/libusb1
-
-BUILDLINK_INCDIRS.libusb1+=    include/libusb-1.0
-BUILDLINK_TRANSFORM+=          l:usb:usb-1.0
 .endif # LIBUSB1_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libusb1

Index: pkgsrc/devel/libusb1/builtin.mk
diff -u pkgsrc/devel/libusb1/builtin.mk:1.3 pkgsrc/devel/libusb1/builtin.mk:1.4
--- pkgsrc/devel/libusb1/builtin.mk:1.3 Sun Nov  3 10:39:18 2019
+++ pkgsrc/devel/libusb1/builtin.mk     Mon May 25 06:47:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2019/11/03 10:39:18 rillig Exp $
+# $NetBSD: builtin.mk,v 1.4 2020/05/25 06:47:40 plunky Exp $
 
 BUILTIN_PKG:=  libusb1
 
@@ -42,7 +42,7 @@ override-libusb-pkgconfig:
        ${ECHO} "Name: libusb-1.0";                             \
        ${ECHO} "Description: library for USB access";  \
        ${ECHO} "Version: ${BUILTIN_VERSION.libusb1}";  \
-       ${ECHO} "Libs: -Wl,-R\$${libdir} -L\$${libdir} -lusb";  \
+       ${ECHO} "Libs: ${COMPILER_RPATH_FLAG}\$${libdir} -L\$${libdir} -lusb";  \
        ${ECHO} "Cflags: -I\$${includedir}";            \
        } >> ${BLKDIR_PKGCFG}/${LIBUSB_PKGCFGF};
 .  endif