Sun Nov 6 17:16:07 2022 UTC ()
libslirp: Fix building on FreeBSD

pkgsrc changes:
---------------
  * Add patch to include sys/socket.h on FreeBSD.
  * Fix alignment in buildlink3.mk (thanks to pkglint).
  * Bump revision.


(triaxx)
diff -r1.5 -r1.6 pkgsrc/net/libslirp/Makefile
diff -r1.5 -r1.6 pkgsrc/net/libslirp/distinfo
diff -r1.2 -r1.3 pkgsrc/net/libslirp/buildlink3.mk
cvs diff -r1.5 -r1.6 pkgsrc/net/libslirp/Makefile (switch to unified diff)

--- pkgsrc/net/libslirp/Makefile 2022/04/27 09:42:52 1.5
+++ pkgsrc/net/libslirp/Makefile 2022/11/06 17:16:07 1.6
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile,v 1.5 2022/04/27 09:42:52 nia Exp $ 1# $NetBSD: Makefile,v 1.6 2022/11/06 17:16:07 triaxx Exp $
2 2
3DISTNAME= libslirp-4.7.0 3DISTNAME= libslirp-4.7.0
 4PKGREVISION= 1
4CATEGORIES= net 5CATEGORIES= net
5MASTER_SITES= https://gitlab.freedesktop.org/slirp/libslirp/uploads/60113f60cfd6abe2c16dde9f6c81b631/ 6MASTER_SITES= https://gitlab.freedesktop.org/slirp/libslirp/uploads/60113f60cfd6abe2c16dde9f6c81b631/
6EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://gitlab.freedesktop.org/slirp/libslirp 10HOMEPAGE= https://gitlab.freedesktop.org/slirp/libslirp
10COMMENT= User-mode networking library 11COMMENT= User-mode networking library
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
14 15
15PYTHON_FOR_BUILD_ONLY= tool 16PYTHON_FOR_BUILD_ONLY= tool
16 17
17PKGCONFIG_OVERRIDE_STAGE= pre-install 18PKGCONFIG_OVERRIDE_STAGE= pre-install
18PKGCONFIG_OVERRIDE+= output/meson-private/slirp.pc 19PKGCONFIG_OVERRIDE+= output/meson-private/slirp.pc
19 20
20LDFLAGS.SunOS+= -lsocket 21LDFLAGS.SunOS+= -lsocket
21 22
22.include "../../devel/meson/build.mk" 23.include "../../devel/meson/build.mk"
23.include "../../devel/glib2/buildlink3.mk" 24.include "../../devel/glib2/buildlink3.mk"
24.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/net/libslirp/distinfo (switch to unified diff)

--- pkgsrc/net/libslirp/distinfo 2022/04/27 09:42:52 1.5
+++ pkgsrc/net/libslirp/distinfo 2022/11/06 17:16:07 1.6
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.5 2022/04/27 09:42:52 nia Exp $ 1$NetBSD: distinfo,v 1.6 2022/11/06 17:16:07 triaxx Exp $
2 2
3BLAKE2s (libslirp-4.7.0.tar.xz) = ef73fb0de29a83b0c5f5e3d02f7bcd5257e1787ce5217afd34065856a92df973 3BLAKE2s (libslirp-4.7.0.tar.xz) = ef73fb0de29a83b0c5f5e3d02f7bcd5257e1787ce5217afd34065856a92df973
4SHA512 (libslirp-4.7.0.tar.xz) = 00b943ec758d7c2d3213a239b1cb7376d2d06d851afd9d5a808c787a76dfdd442570253ca509085c6c3ef528472aec9216587dbfc3348d7eb325b92b8f8b1ac3 4SHA512 (libslirp-4.7.0.tar.xz) = 00b943ec758d7c2d3213a239b1cb7376d2d06d851afd9d5a808c787a76dfdd442570253ca509085c6c3ef528472aec9216587dbfc3348d7eb325b92b8f8b1ac3
5Size (libslirp-4.7.0.tar.xz) = 110840 bytes 5Size (libslirp-4.7.0.tar.xz) = 110840 bytes
 6SHA1 (patch-src_libslirp.h) = 5a23abb6866b2f431626c68bc483c51d2c189e1b
cvs diff -r1.2 -r1.3 pkgsrc/net/libslirp/buildlink3.mk (switch to unified diff)

--- pkgsrc/net/libslirp/buildlink3.mk 2021/12/08 16:02:29 1.2
+++ pkgsrc/net/libslirp/buildlink3.mk 2022/11/06 17:16:07 1.3
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.2 2021/12/08 16:02:29 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2022/11/06 17:16:07 triaxx Exp $
2 2
3BUILDLINK_TREE+= libslirp 3BUILDLINK_TREE+= libslirp
4 4
5.if !defined(LIBSLIRP_BUILDLINK3_MK) 5.if !defined(LIBSLIRP_BUILDLINK3_MK)
6LIBSLIRP_BUILDLINK3_MK:= 6LIBSLIRP_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libslirp+= libslirp>=4.3.1 8BUILDLINK_API_DEPENDS.libslirp+= libslirp>=4.3.1
9BUILDLINK_ABI_DEPENDS.libslirp?= libslirp>=4.3.1 9BUILDLINK_ABI_DEPENDS.libslirp?= libslirp>=4.3.1
10BUILDLINK_PKGSRCDIR.libslirp?= ../../net/libslirp 10BUILDLINK_PKGSRCDIR.libslirp?= ../../net/libslirp
11 11
12.include "../../devel/glib2/buildlink3.mk" 12.include "../../devel/glib2/buildlink3.mk"
13.endif # LIBSLIRP_BUILDLINK3_MK 13.endif # LIBSLIRP_BUILDLINK3_MK
14 14
15BUILDLINK_TREE+= -libslirp 15BUILDLINK_TREE+= -libslirp