git: 193fac2c4b5d - main - devel/libosinfo: Improve port

The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=193fac2c4b5d71ada9cc1cfc2a95cf869e7d26a9

commit 193fac2c4b5d71ada9cc1cfc2a95cf869e7d26a9
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2024-11-05 20:27:10 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
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()