Received: by mail.netbsd.org (Postfix, from userid 605) id D92BE84E86; Wed, 17 May 2023 13:26:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 14BA984D50 for ; Wed, 17 May 2023 13:26:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id eEMZrMcBgr4e for ; Wed, 17 May 2023 13:26:35 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 64F6D84D3C for ; Wed, 17 May 2023 13:26:35 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 58BBAFA87; Wed, 17 May 2023 13:26:35 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1684329995109960" MIME-Version: 1.0 Date: Wed, 17 May 2023 13:26:35 +0000 From: "nikita" Subject: CVS commit: pkgsrc/comms/libhidapi To: pkgsrc-changes@NetBSD.org Reply-To: nikita@netbsd.org X-Mailer: log_accum Message-Id: <20230517132635.58BBAFA87@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1684329995109960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nikita Date: Wed May 17 13:26:35 UTC 2023 Modified Files: pkgsrc/comms/libhidapi: Makefile PLIST Log Message: libhidapi: hopefully fix build on Linux and Darwin. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/comms/libhidapi/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/comms/libhidapi/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1684329995109960 Content-Disposition: inline Content-Length: 2128 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/comms/libhidapi/Makefile diff -u pkgsrc/comms/libhidapi/Makefile:1.8 pkgsrc/comms/libhidapi/Makefile:1.9 --- pkgsrc/comms/libhidapi/Makefile:1.8 Mon May 15 16:31:38 2023 +++ pkgsrc/comms/libhidapi/Makefile Wed May 17 13:26:35 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2023/05/15 16:31:38 nikita Exp $ +# $NetBSD: Makefile,v 1.9 2023/05/17 13:26:35 nikita Exp $ GITHUB_PROJECT= hidapi GITHUB_TAG= ${GITHUB_PROJECT}-0.13.1 @@ -22,14 +22,20 @@ PKGCONFIG_OVERRIDE+= pc/hidapi-hidraw.pc PKGCONFIG_OVERRIDE+= pc/hidapi-libusb.pc.in PKGCONFIG_OVERRIDE+= pc/hidapi.pc.in -PLIST_VARS+= libusb +PLIST_VARS+= libusb hidraw darwin .include "../../mk/bsd.prefs.mk" .if ${OPSYS} != "Darwin" PLIST.libusb= yes +. if ${OPSYS} == "Linux" +PLIST.hidraw= yes +. endif +.else +PLIST.darwin= yes .endif + .include "../../devel/cmake/build.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libusb1/buildlink3.mk" Index: pkgsrc/comms/libhidapi/PLIST diff -u pkgsrc/comms/libhidapi/PLIST:1.5 pkgsrc/comms/libhidapi/PLIST:1.6 --- pkgsrc/comms/libhidapi/PLIST:1.5 Wed May 10 16:56:38 2023 +++ pkgsrc/comms/libhidapi/PLIST Wed May 17 13:26:35 2023 @@ -1,11 +1,20 @@ -@comment $NetBSD: PLIST,v 1.5 2023/05/10 16:56:38 nikita Exp $ +@comment $NetBSD: PLIST,v 1.6 2023/05/17 13:26:35 nikita Exp $ include/hidapi/hidapi.h +${PLIST.darwin}include/hidapi/hidapi_darwin.h ${PLIST.libusb}include/hidapi/hidapi_libusb.h lib/cmake/hidapi/hidapi-config-version.cmake lib/cmake/hidapi/hidapi-config.cmake lib/cmake/hidapi/libhidapi-release.cmake lib/cmake/hidapi/libhidapi.cmake +${PLIST.hidraw}lib/libhidapi-hidraw.so +${PLIST.hidraw}lib/libhidapi-hidraw.so.0 +${PLIST.hidraw}lib/libhidapi-hidraw.so.0.13.1 lib/libhidapi-libusb.so lib/libhidapi-libusb.so.0 lib/libhidapi-libusb.so.0.13.1 -lib/pkgconfig/hidapi-libusb.pc +${PLIST.darwin}lib/libhidapi.0.13.1dylib +${PLIST.darwin}lib/libhidapi.0.dylib +${PLIST.darwin}lib/libhidapi.dylib +${PLIST.hidraw}lib/pkgconfig/hidapi-hidraw.pc +${PLIST.libusb}lib/pkgconfig/hidapi-libusb.pc +${PLIST.darwin}lib/pkgconfig/hidapi.pc --_----------=_1684329995109960--