Sun May 5 12:39:47 2024 UTC (18d)
sysutils/hs-disk-free-space: Use the correct symbol for statvfs(2) on NetBSD


(pho)
diff -r1.2 -r1.3 pkgsrc/sysutils/hs-disk-free-space/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/hs-disk-free-space/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/sysutils/hs-disk-free-space/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/hs-disk-free-space/patches/patch-System_DiskSpace.hsc
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/hs-disk-free-space/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/hs-disk-free-space/Makefile 2023/11/02 06:37:23 1.2
+++ pkgsrc/sysutils/hs-disk-free-space/Makefile 2024/05/05 12:39:47 1.3
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: Makefile,v 1.2 2023/11/02 06:37:23 pho Exp $ 1# $NetBSD: Makefile,v 1.3 2024/05/05 12:39:47 pho Exp $
2 2
3DISTNAME= disk-free-space-0.1.0.1 3DISTNAME= disk-free-space-0.1.0.1
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Retrieve information about disk space usage 8COMMENT= Retrieve information about disk space usage
9LICENSE= modified-bsd 9LICENSE= modified-bsd
10 10
11.include "../../mk/haskell.mk" 11.include "../../mk/haskell.mk"
12.include "../../mk/bsd.pkg.mk" 12.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/hs-disk-free-space/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/hs-disk-free-space/buildlink3.mk 2023/11/02 06:37:23 1.2
+++ pkgsrc/sysutils/hs-disk-free-space/buildlink3.mk 2024/05/05 12:39:47 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.2 2023/11/02 06:37:23 pho Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2024/05/05 12:39:47 pho Exp $
2 2
3BUILDLINK_TREE+= hs-disk-free-space 3BUILDLINK_TREE+= hs-disk-free-space
4 4
5.if !defined(HS_DISK_FREE_SPACE_BUILDLINK3_MK) 5.if !defined(HS_DISK_FREE_SPACE_BUILDLINK3_MK)
6HS_DISK_FREE_SPACE_BUILDLINK3_MK:= 6HS_DISK_FREE_SPACE_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.hs-disk-free-space+= hs-disk-free-space>=0.1.0 8BUILDLINK_API_DEPENDS.hs-disk-free-space+= hs-disk-free-space>=0.1.0
9BUILDLINK_ABI_DEPENDS.hs-disk-free-space+= hs-disk-free-space>=0.1.0.1nb1 9BUILDLINK_ABI_DEPENDS.hs-disk-free-space+= hs-disk-free-space>=0.1.0.1nb2
10BUILDLINK_PKGSRCDIR.hs-disk-free-space?= ../../sysutils/hs-disk-free-space 10BUILDLINK_PKGSRCDIR.hs-disk-free-space?= ../../sysutils/hs-disk-free-space
11.endif # HS_DISK_FREE_SPACE_BUILDLINK3_MK 11.endif # HS_DISK_FREE_SPACE_BUILDLINK3_MK
12 12
13BUILDLINK_TREE+= -hs-disk-free-space 13BUILDLINK_TREE+= -hs-disk-free-space
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/hs-disk-free-space/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/hs-disk-free-space/distinfo 2023/10/24 08:22:12 1.1
+++ pkgsrc/sysutils/hs-disk-free-space/distinfo 2024/05/05 12:39:47 1.2
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.1 2023/10/24 08:22:12 pho Exp $ 1$NetBSD: distinfo,v 1.2 2024/05/05 12:39:47 pho Exp $
2 2
3BLAKE2s (disk-free-space-0.1.0.1.tar.gz) = d783289857c3dec5b75d4763f5d2171fecceb095715bb14837a8deec5ac9e0b9 3BLAKE2s (disk-free-space-0.1.0.1.tar.gz) = d783289857c3dec5b75d4763f5d2171fecceb095715bb14837a8deec5ac9e0b9
4SHA512 (disk-free-space-0.1.0.1.tar.gz) = 7e798e5428a8ee1a226c28172aca93940dae7aeec5f6fc0a7500da0299074a007f3b5a1d53d7282def245e4b829f86ff9f18ee1f8e824fa259052d5f2434729a 4SHA512 (disk-free-space-0.1.0.1.tar.gz) = 7e798e5428a8ee1a226c28172aca93940dae7aeec5f6fc0a7500da0299074a007f3b5a1d53d7282def245e4b829f86ff9f18ee1f8e824fa259052d5f2434729a
5Size (disk-free-space-0.1.0.1.tar.gz) = 2771 bytes 5Size (disk-free-space-0.1.0.1.tar.gz) = 2771 bytes
 6SHA1 (patch-System_DiskSpace.hsc) = dbedd9eee01c069828029b7609a318d6c13260ba
File Added: pkgsrc/sysutils/hs-disk-free-space/patches/patch-System_DiskSpace.hsc
$NetBSD: patch-System_DiskSpace.hsc,v 1.1 2024/05/05 12:39:47 pho Exp $

Use capi calling convention. On NetBSD statvfs(2) isn't a regular symbol in
libc.

--- System/DiskSpace.hsc.orig	2024-05-05 12:36:08.046949584 +0000
+++ System/DiskSpace.hsc
@@ -1,3 +1,4 @@
+{-# LANGUAGE CApiFFI #-}
 {-# LANGUAGE CPP #-}
 
 {- |
@@ -20,7 +21,7 @@ import Foreign.C
 
 #include <sys/statvfs.h>
 
-foreign import ccall safe statvfs :: CString -> Ptr a -> IO CInt
+foreign import capi safe "sys/statvfs.h statvfs" statvfs :: CString -> Ptr a -> IO CInt
 
 type FsBlkCnt = #type fsblkcnt_t