From nobody Tue Nov 05 20:28:23 2024 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 4Xjfzq428yz5bYwX; Tue, 05 Nov 2024 20:28:23 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xjfzq3X0xz4Wns; Tue, 5 Nov 2024 20:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730838503; 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=ci4/YBcPXRmNYIv/NcX1pcNVUP3e+/rPNJ4Cp32OSG4=; b=B4LIxIdh3wdJO4rNwb0Mhwf2xknrr5ncMjl2ySMRZg8br6pK17XMws22OC/E6Mi8YXaZKd Ih0jjQunZ8TXpvdGRLMG1orZZo7VPNDhhlobXj9hjHk3cUMXYkqzzLBrZUXreTpXNo9wj+ 9ywEXkYhApsstct9xz3qp27kW4NkyIuaIL82/gYnRNy9gvDpE3l9GF62IQye5IWxFGr5R+ 55f2emLNgK0v2oslc2M0XIsatULaIu9Zr4LX/+35ts1cV8HarpBsy4TjGov7Nu3xKaKYif /Wa2QexZf7Xgc9qDvYNQ3qybpUwQEMOaLwqHpXAZDSjodIIWoaksXrAatO2g3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730838503; 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=ci4/YBcPXRmNYIv/NcX1pcNVUP3e+/rPNJ4Cp32OSG4=; b=ojVVY8Up48oipvyLkKnlOQImnSWIws5DIfNW8989W9Wg4We53UTKhsPY/ejona+FEYDo75 UCUN9NgB00OkuEbhC5MhbEe172BKTORbZOyCx28J/eUJiwjH9YLIjuueRk7S+sgdwDOog3 5D7GR2jkKQrmHH9RorpPVbp9+NfacCeVEMkO5w9b1MG9q2VZSiilKVq69cShaSsmjD7g6s Gza67zlQ5wQt50ihnDcNAF/+uzySIlvssZta0Uj0adrCpeUmUgDt3nAEAlZnfTFKmYEI6e Wek5WyChLbKNnuSXzVTdQoMN52hgRc2SWHeROCVohjaIlvlb3tVpxdh/+QJ4kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730838503; a=rsa-sha256; cv=none; b=xEo5PIRXeesZQZFjfnRJwLhx8RwgHU6deRRZKnzKi2P6x4v1+XhMeiGnEeDznBt0rA0h2G W3Bir+rrCxd6RvB+BSACfRJ6PCgsHtqFHPGYQRzkRhsVm0AXouLL5Yjda4wUOa5RArftTL u4i4p/UgHIARnmGldXI1uZDmS8IkdW1UZR9HuqKWWcmbEvJgW1bSXKlYNo3rT0fZ92hMVb OIjSNY8wEr8iqwfoaDwaTRbHJRVpi08eAvY6S2AjtWo81/ZdM6ydgDFg1m26D6DyznPovR dKR3cPDKgXjXPYyw5MJxGepi0QuewfYilv7SOZbFiLPu+DlxGRQkzDL8zRDqYw== 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 4Xjfzq37QWzXmQ; Tue, 5 Nov 2024 20:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A5KSNtD047971; Tue, 5 Nov 2024 20:28:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A5KSNIt047968; Tue, 5 Nov 2024 20:28:23 GMT (envelope-from git) Date: Tue, 5 Nov 2024 20:28:23 GMT Message-Id: <202411052028.4A5KSNIt047968@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 193fac2c4b5d - main - devel/libosinfo: Improve port 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 193fac2c4b5d71ada9cc1cfc2a95cf869e7d26a9 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=193fac2c4b5d71ada9cc1cfc2a95cf869e7d26a9 commit 193fac2c4b5d71ada9cc1cfc2a95cf869e7d26a9 Author: Daniel Engberg AuthorDate: 2024-11-05 20:27:10 +0000 Commit: Daniel Engberg CommitDate: 2024-11-05 20:27:16 +0000 devel/libosinfo: Improve port * Switch to DISTVERSION * Define LICENSE * Adjust dependencies * Remove INSTALL_TARGET * Replace CONFIGURE_ARGS with MESON_ARGS * Remove GTKDOC_DESC * Fix .pc file install PR: 282509 Reviewed by: novel (maintainer) --- devel/libosinfo/Makefile | 27 +++++++++++++++------------ devel/libosinfo/files/patch-meson.build | 20 ++++++++++++++++++++ 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/devel/libosinfo/Makefile b/devel/libosinfo/Makefile index 8793cf2d0b65..6bbd2087adaa 100644 --- a/devel/libosinfo/Makefile +++ b/devel/libosinfo/Makefile @@ -1,37 +1,40 @@ PORTNAME= libosinfo -PORTVERSION= 1.12.0 +DISTVERSION= 1.12.0 +PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= https://releases.pagure.org/libosinfo/ +MASTER_SITES= https://releases.pagure.org/${PORTNAME}/ MAINTAINER= novel@FreeBSD.org COMMENT= Library for managing OS information for virtualization WWW= https://libosinfo.org/ +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libsoup-2.4.so:devel/libsoup BUILD_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:misc/pciids \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids -RUN_DEPENDS:= ${BUILD_DEPENDS} \ +RUN_DEPENDS= ${BUILD_DEPENDS} \ osinfo-db-import:sysutils/osinfo-db-tools \ ${LOCALBASE}/share/osinfo/VERSION:misc/osinfo-db -USES= compiler:c11 cpe gettext gmake gnome pathfix \ - pkgconfig tar:xz meson -USE_GNOME= glib20 libxml2 libxslt introspection:build intlhack +USES= gettext gnome meson perl5 pkgconfig tar:xz +USE_GNOME= glib20 introspection:build libxml2 libxslt introspection:build +USE_PERL5= build USE_LDCONFIG= yes -INSTALL_TARGET= install-strip -CONFIGURE_ARGS+= -Denable-vala=disabled \ - -Dwith-usb-ids-path=${LOCALBASE}/share/usbids/usb.ids \ - -Dwith-pci-ids-path=${LOCALBASE}/share/pciids/pci.ids +MESON_ARGS= -Dlibsoup-abi=2.4 \ + -Denable-vala=disabled \ + -Dwith-usb-ids-path=${LOCALBASE}/share/usbids/usb.ids \ + -Dwith-pci-ids-path=${LOCALBASE}/share/pciids/pci.ids SHLIB_VER= 0.1012.0 PLIST_SUB= SHLIB_VER=${SHLIB_VER} OPTIONS_DEFINE= GTKDOC -OPTIONS_DEFAULT= GTKDOC +OPTIONS_DEFAULT=GTKDOC OPTIONS_SUB= yes -GTKDOC_DESC= Build gtk-doc documentation GTKDOC_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc GTKDOC_MESON_TRUE= enable-gtk-doc diff --git a/devel/libosinfo/files/patch-meson.build b/devel/libosinfo/files/patch-meson.build new file mode 100644 index 000000000000..8849be652d64 --- /dev/null +++ b/devel/libosinfo/files/patch-meson.build @@ -0,0 +1,20 @@ +--- meson.build.orig 2024-10-29 17:28:59 UTC ++++ meson.build +@@ -25,7 +25,7 @@ libosinfo_mandir = join_paths(libosinfo_prefix, get_op + libosinfo_libdir = join_paths(libosinfo_prefix, get_option('libdir')) + libosinfo_licensedir = join_paths(libosinfo_datadir, 'license', meson.project_name()) + libosinfo_mandir = join_paths(libosinfo_prefix, get_option('mandir')) +-libosinfo_pkgconfdir = join_paths(libosinfo_libdir, 'pkgconfig') ++libosinfo_pkgconfdir = libosinfo_prefix / 'libdata' / 'pkgconfig' + + # gobject introspection + gir = find_program('g-ir-scanner', required: get_option('enable-introspection')) +@@ -43,7 +43,7 @@ libosinfo_typelibdir = join_paths(libosinfo_libdir, 'g + + libosinfo_girdir = join_paths(libosinfo_datadir, 'gir-1.0') + libosinfo_typelibdir = join_paths(libosinfo_libdir, 'girepository-1.0') +-libosinfo_pkgconfdir = join_paths(libosinfo_libdir, 'pkgconfig') ++#libosinfo_pkgconfdir = join_paths(libosinfo_libdir, 'pkgconfig') + + # spec files + libosinfo_spec_data = configuration_data()