CVS commit: pkgsrc/sysutils/xentools415

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Mon Mar 31 11:32:05 UTC 2025

Modified Files:
        pkgsrc/sysutils/xentools415: distinfo
Added Files:
        pkgsrc/sysutils/xentools415/patches: patch-config_FreeBSD.mk
            patch-tools_libs_call_libxencall.map

Log Message:
xentools415: Patch for FreeBSD

Fix build of xenstoretools on FreeBSD (uses patches in xentools415).


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/xentools415/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xentools415/patches/patch-config_FreeBSD.mk \
    pkgsrc/sysutils/xentools415/patches/patch-tools_libs_call_libxencall.map

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

Modified files:

Index: pkgsrc/sysutils/xentools415/distinfo
diff -u pkgsrc/sysutils/xentools415/distinfo:1.15 pkgsrc/sysutils/xentools415/distinfo:1.16
--- pkgsrc/sysutils/xentools415/distinfo:1.15   Tue Apr  2 22:01:23 2024
+++ pkgsrc/sysutils/xentools415/distinfo        Mon Mar 31 11:32:05 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2024/04/02 22:01:23 bouyer Exp $
+$NetBSD: distinfo,v 1.16 2025/03/31 11:32:05 sborrill Exp $
 
 BLAKE2s (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = 67ded947316100f4f66fa61fe156baf1620db575450f4dc0dd8dcb323e57970b
 SHA512 (xen415/ipxe-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz) = d888e0e653727ee9895fa866d8895e6d23a568b4e9e8439db4c4d790996700c60b0655e3a3129e599736ec2b4f7b987ce79d625ba208f06665fced8bddf94403
@@ -14,6 +14,7 @@ SHA1 (patch-Config.mk) = d108a1743b5b531
 SHA1 (patch-Makefile) = 6c580cbea532d08a38cf5e54228bd0210a98da21
 SHA1 (patch-XSA440) = 92c21a9caab0292082799e357725345ac676db9e
 SHA1 (patch-XSA443) = 53ea19eb131c3a83b9ab586fc6632fa3704e4fc0
+SHA1 (patch-config_FreeBSD.mk) = 334f1453da6f091854a6aacd3def4073bbf63672
 SHA1 (patch-docs_man_xl.1.pod.in) = 280a3717b9f15578d90f85392249ef97844b6765
 SHA1 (patch-docs_man_xl.cfg.5.pod.in) = 5970961552f29c4536a884161a208a27a20dccf4
 SHA1 (patch-docs_man_xlcpupool.cfg.5.pod) = ab3a2529cd10458948557fd7ab032e80df8b1d81
@@ -30,6 +31,7 @@ SHA1 (patch-tools_hotplug_NetBSD_block) 
 SHA1 (patch-tools_hotplug_common_Makefile) = 590186dfb31713e8d9ee675186f826bcbcba3c15
 SHA1 (patch-tools_include_xen-sys_NetBSD_evtchn.h) = cac834bdddfab8bb76be3b4766f084f6fc2a7bc2
 SHA1 (patch-tools_include_xen-sys_NetBSD_privcmd.h) = b47ef90b0e823b270c491b9206ae10b9f230971d
+SHA1 (patch-tools_libs_call_libxencall.map) = 774cf224ea7213f5afe7d80c0654f52491708328
 SHA1 (patch-tools_libs_ctrl_Makefile) = e377e34e6f719b7433888eee94dba2ec264120bf
 SHA1 (patch-tools_libs_libs.mk) = 29b0faa8293d3579d67205505ea251edff1bd688
 SHA1 (patch-tools_libs_light_libxl.c) = 354079709784ea8534929e65c61c3dcf54f2cce9

Added files:

Index: pkgsrc/sysutils/xentools415/patches/patch-config_FreeBSD.mk
diff -u /dev/null pkgsrc/sysutils/xentools415/patches/patch-config_FreeBSD.mk:1.1
--- /dev/null   Mon Mar 31 11:32:05 2025
+++ pkgsrc/sysutils/xentools415/patches/patch-config_FreeBSD.mk Mon Mar 31 11:32:05 2025
@@ -0,0 +1,18 @@
+$NetBSD: patch-config_FreeBSD.mk,v 1.1 2025/03/31 11:32:05 sborrill Exp $
+
+Align paths on FreeBSD with pkgsrc
+
+--- config/FreeBSD.mk.orig     2025-03-28 08:57:55.905441000 +0000
++++ config/FreeBSD.mk  2025-03-28 08:58:37.291735000 +0000
+@@ -2,8 +2,8 @@
+ 
+ # No wget on FreeBSD base system
+ WGET = ftp
+-PKG_INSTALLDIR = ${prefix}/libdata/pkgconfig
++PKG_INSTALLDIR = ${prefix}/lib/pkgconfig
+ 
+ # Add the default pkg install path
+-APPEND_LIB += /usr/local/lib
+-APPEND_INCLUDES += /usr/local/include
++#APPEND_LIB += /usr/local/lib
++#APPEND_INCLUDES += /usr/local/include
Index: pkgsrc/sysutils/xentools415/patches/patch-tools_libs_call_libxencall.map
diff -u /dev/null pkgsrc/sysutils/xentools415/patches/patch-tools_libs_call_libxencall.map:1.1
--- /dev/null   Mon Mar 31 11:32:05 2025
+++ pkgsrc/sysutils/xentools415/patches/patch-tools_libs_call_libxencall.map    Mon Mar 31 11:32:05 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-tools_libs_call_libxencall.map,v 1.1 2025/03/31 11:32:05 sborrill Exp $
+
+Fix build on FreeBSD
+
+--- tools/libs/call/libxencall.map.orig        2023-08-07 13:08:26.000000000 +0100
++++ tools/libs/call/libxencall.map     2025-03-28 08:34:13.697578000 +0000
+@@ -9,7 +9,6 @@
+               xencall3;
+               xencall4;
+               xencall5;
+-              xencall6;
+ 
+               xencall_alloc_buffer;
+               xencall_free_buffer;