From nobody Sat Sep 17 16:17:29 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MVGLL2WHJz2kyBf; Sat, 17 Sep 2022 16:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MVGLL1y6Tz3VKC; Sat, 17 Sep 2022 16:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663431450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uEqw0d7CHi5oLf5nF3I67DDRpA0OjV0woc/T1uqCT2w=; b=NLZWiNOlckIwGQ5Dy60HldhaEY1v8VbUNKRN6/38zFcZ0GreNMxZQ2iK4zVaDbxBa4bfxV RBsWGfOTECTgKX/P2FTsOpwbuyHol/YAvya4ueH3tKqf6Kuxdeg30j+9OK6Tfh/CiDIh/T MOSYNsnN1cBES3itvRVNn6B8cFk3SwqIAtxcv9a62a7mmBdLVmxMGBChjWu2W7Pi3l1ToS V0PktQ4s+xauhXSeXsM7/YDdvi13bZZt2NiuVUt+lundkCRNvDB6Z3LjFYEh43tf/vrXw5 HM+8HDVYZn/8bYWiBjWrtIlD8cmZnSFZMDCaOyjgoLL0QUNBlfJDE6GJenBLIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MVGLL0nNGzlTX; Sat, 17 Sep 2022 16:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28HGHTNu015011; Sat, 17 Sep 2022 16:17:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28HGHTFO015010; Sat, 17 Sep 2022 16:17:29 GMT (envelope-from git) Date: Sat, 17 Sep 2022 16:17:29 GMT Message-Id: <202209171617.28HGHTFO015010@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 4ba7d06e469d - main - misc/hwdata: install pkg-config file List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ba7d06e469de19281ebb21665602a60ea8b9145 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663431450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uEqw0d7CHi5oLf5nF3I67DDRpA0OjV0woc/T1uqCT2w=; b=LonIRdg/qEWu0oY4EvHel9R7Vx++/DDyVTuesTylpl/7J53qiLB1+OKDW9nz/8DokOCe/4 0UPw2NrTUJ01mbwbwIOEjYEDynTLZvC5dut66pB7deFV4NIBI2c2MLeZffsy1OwFIDrUgr ARDGN0jXH9CbRcxFTYzgGCUyJs8nz7FVq2WP0L5buR2QV91/3Y2YxLfFKQ/W1R4GwAUFSV JZFWCe8ZOSGeW7tKlnBnaRVLxrIJRLaHsuAVFg05Yk2A1LSV0xiNPbML19Sd4Bwg/vmTjC TRtF7mH9Ouzca63EWZ4XYyqRO/D23ejmKzP3ZNzOIAosvNBFkX3SKjPOtkXlLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663431450; a=rsa-sha256; cv=none; b=obOMWo+JxUp30y6MgETZ1QJbWngIAfu8Rv4ih2o3Vzf/NhBAit32A/kDpExPOtxoBjcn2I EiyfeOpQqxF6fu2SQNLYMqKbhkivE5A0HTChS4FTzbIOp5j08z5eQRq5RbZTW/LmxFrRhg eTQI/ihVcgX6ytw7FFfs0YwuAZoyukfMxd1d3nAhPiExlYDO8NGxbuw3hCpT2b+bV8FRHL pUNIbHcwrPR87J3okKMOqhvPLhLjHjTiz9TJcQekdNxwG9F1h4tiyIbdvPWSV72FhkV9Ot MxPoAk2qAOqYP9p1GsiV2omc0FdWSBkHqwbXdJ0eGCWn7KosiH3fyA8fWpCgiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ba7d06e469de19281ebb21665602a60ea8b9145 commit 4ba7d06e469de19281ebb21665602a60ea8b9145 Author: Tobias C. Berner AuthorDate: 2022-09-17 16:12:07 +0000 Commit: Tobias C. Berner CommitDate: 2022-09-17 16:16:11 +0000 misc/hwdata: install pkg-config file Reported by: Jan Beich PR: 266367 --- misc/hwdata/Makefile | 18 ++++++++---------- misc/hwdata/files/patch-Makefile | 20 ++++++++++++++++++++ misc/hwdata/pkg-plist | 6 ++++++ 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/misc/hwdata/Makefile b/misc/hwdata/Makefile index 9240d9952ac6..1daf4dafa9c8 100644 --- a/misc/hwdata/Makefile +++ b/misc/hwdata/Makefile @@ -11,19 +11,17 @@ WWW= https://github.com/vcrhonek/hwdata LICENSE= GPLv2+ MIT LICENSE_COMB= dual +BUILD_DEPENDS= ginstall:sysutils/coreutils + +USES= gmake USE_GITHUB= yes GH_ACCOUNT= vcrhonek +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix=${PREFIX} \ + --datadir=${DATADIR} -NO_ARCH= yes -NO_BUILD= yes - -_ID_FILES= pci.ids pnp.ids usb.ids -PLIST_FILES= ${_ID_FILES:C,^,${DATADIR}/,} +BINARY_ALIAS= install=ginstall -do-install: - ${MKDIR} ${STAGEDIR}${DATADIR}/ -.for _id_file in ${_ID_FILES} - ${INSTALL_DATA} ${WRKSRC}/${_id_file} ${STAGEDIR}${DATADIR}/ -.endfor +NO_ARCH= yes .include diff --git a/misc/hwdata/files/patch-Makefile b/misc/hwdata/files/patch-Makefile new file mode 100644 index 000000000000..3bfb69f6c27d --- /dev/null +++ b/misc/hwdata/files/patch-Makefile @@ -0,0 +1,20 @@ +--- Makefile.orig 2022-09-07 07:07:17 UTC ++++ Makefile +@@ -48,10 +48,8 @@ install: Makefile.inc hwdata.pc + for foo in $(IDFILES) ; do \ + install -m 644 $$foo $(DESTDIR)$(datadir)/$(NAME) ;\ + done +- mkdir -p -m 755 $(DESTDIR)$(libdir)/modprobe.d +- install -m 644 -T blacklist.conf $(DESTDIR)$(libdir)/modprobe.d/dist-blacklist.conf +- mkdir -p -m 755 $(DESTDIR)$(datadir)/pkgconfig +- install -m 644 hwdata.pc $(DESTDIR)$(datadir)/pkgconfig/ ++ mkdir -p -m 755 $(DESTDIR)$(prefix)/libdata/pkgconfig ++ install -m 644 hwdata.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/ + + commit: + git commit -vas ||: +@@ -159,4 +157,3 @@ pnp.ids: pnp.ids.orig pnp.ids.patch + else \ + cat $?; \ + fi | sed 's/\s\+$$//' >$@ +- diff --git a/misc/hwdata/pkg-plist b/misc/hwdata/pkg-plist new file mode 100644 index 000000000000..f5beb7f70d2e --- /dev/null +++ b/misc/hwdata/pkg-plist @@ -0,0 +1,6 @@ +libdata/pkgconfig/hwdata.pc +%%DATADIR%%/hwdata/iab.txt +%%DATADIR%%/hwdata/oui.txt +%%DATADIR%%/hwdata/pci.ids +%%DATADIR%%/hwdata/pnp.ids +%%DATADIR%%/hwdata/usb.ids