Update to clock-0.8.2 No change logs are provided by the upstream.diff -r1.1 -r1.2 pkgsrc/time/hs-clock/Makefile
(pho)
@@ -1,11 +1,11 @@ | @@ -1,11 +1,11 @@ | |||
1 | # $NetBSD: Makefile,v 1.1 2020/01/03 05:31:56 pho Exp $ | 1 | # $NetBSD: Makefile,v 1.2 2021/04/24 05:17:54 pho Exp $ | |
2 | 2 | |||
3 | DISTNAME= clock-0.8 | 3 | DISTNAME= clock-0.8.2 | |
4 | CATEGORIES= time | 4 | CATEGORIES= time | |
5 | 5 | |||
6 | MAINTAINER= pho@cielonegro.org | 6 | MAINTAINER= pho@cielonegro.org | |
7 | COMMENT= High-resolution clock functions: monotonic, realtime, cputime | 7 | COMMENT= High-resolution clock functions: monotonic, realtime, cputime | |
8 | LICENSE= modified-bsd | 8 | LICENSE= modified-bsd | |
9 | 9 | |||
10 | .include "../../mk/haskell.mk" | 10 | .include "../../mk/haskell.mk" | |
11 | .include "../../mk/bsd.pkg.mk" | 11 | .include "../../mk/bsd.pkg.mk" |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:19 rillig Exp $ | 1 | @comment $NetBSD: PLIST,v 1.2 2021/04/24 05:17:54 pho Exp $ | |
2 | ${HS_INTF}/package-description | 2 | lib/clock-${PKGVERSION}/${HS_VERSION}/package-description | |
3 | ${HS_INTF}/package-id | 3 | lib/clock-${PKGVERSION}/${HS_VERSION}/package-id | |
4 | ${HS_IMPL}/System/Clock.dyn_hi | 4 | lib/${HS_PLATFORM}/${HS_PKGID}/System/Clock.dyn_hi | |
5 | ${HS_IMPL}/System/Clock.hi | 5 | lib/${HS_PLATFORM}/${HS_PKGID}/System/Clock.hi | |
6 | ${HS_IMPL}/System/Clock.p_hi | 6 | lib/${HS_PLATFORM}/${HS_PKGID}/System/Clock.p_hi | |
7 | ${HS_IMPL}/libHS${HS_PKGID}.a | 7 | lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a | |
8 | ${HS_IMPL}/libHS${HS_PKGID}_p.a | 8 | lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a | |
9 | lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so | 9 | lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so | |
10 | ${HS_DOCS}/LICENSE | 10 | share/doc/${HS_PLATFORM}/clock-${PKGVERSION}/LICENSE | |
11 | ${HS_DOCS}/html/System-Clock.html | 11 | share/doc/${HS_PLATFORM}/clock-${PKGVERSION}/html/System-Clock.html | |
12 | ${HS_DOCS}/html/clock.haddock | 12 | share/doc/${HS_PLATFORM}/clock-${PKGVERSION}/html/clock.haddock | |
13 | ${HS_DOCS}/html/doc-index.html | 13 | share/doc/${HS_PLATFORM}/clock-${PKGVERSION}/html/doc-index.html | |
14 | ${HS_DOCS}/html/haddock-bundle.min.js | 14 | share/doc/${HS_PLATFORM}/clock-${PKGVERSION}/html/haddock-bundle.min.js | |
15 | ${HS_DOCS}/html/index.html | 15 | share/doc/${HS_PLATFORM}/clock-${PKGVERSION}/html/index.html | |
16 | ${HS_DOCS}/html/linuwial.css | 16 | share/doc/${HS_PLATFORM}/clock-${PKGVERSION}/html/linuwial.css | |
17 | ${HS_DOCS}/html/meta.json | 17 | share/doc/${HS_PLATFORM}/clock-${PKGVERSION}/html/meta.json | |
18 | ${HS_DOCS}/html/quick-jump.css | 18 | share/doc/${HS_PLATFORM}/clock-${PKGVERSION}/html/quick-jump.css | |
19 | ${HS_DOCS}/html/synopsis.png | 19 | share/doc/${HS_PLATFORM}/clock-${PKGVERSION}/html/synopsis.png |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.1 2020/01/03 05:31:56 pho Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.2 2021/04/24 05:17:54 pho Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= hs-clock | 3 | BUILDLINK_TREE+= hs-clock | |
4 | 4 | |||
5 | .if !defined(HS_CLOCK_BUILDLINK3_MK) | 5 | .if !defined(HS_CLOCK_BUILDLINK3_MK) | |
6 | HS_CLOCK_BUILDLINK3_MK:= | 6 | HS_CLOCK_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.hs-clock+= hs-clock>=0.8 | 8 | BUILDLINK_API_DEPENDS.hs-clock+= hs-clock>=0.8.2 | |
9 | BUILDLINK_ABI_DEPENDS.hs-clock+= hs-clock>=0.8 | 9 | BUILDLINK_ABI_DEPENDS.hs-clock+= hs-clock>=0.8.2 | |
10 | BUILDLINK_PKGSRCDIR.hs-clock?= ../../time/hs-clock | 10 | BUILDLINK_PKGSRCDIR.hs-clock?= ../../time/hs-clock | |
11 | .endif # HS_CLOCK_BUILDLINK3_MK | 11 | .endif # HS_CLOCK_BUILDLINK3_MK | |
12 | 12 | |||
13 | BUILDLINK_TREE+= -hs-clock | 13 | BUILDLINK_TREE+= -hs-clock |
@@ -1,6 +1,7 @@ | @@ -1,6 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.1 2020/01/03 05:31:56 pho Exp $ | 1 | $NetBSD: distinfo,v 1.2 2021/04/24 05:17:54 pho Exp $ | |
2 | 2 | |||
3 | SHA1 (clock-0.8.tar.gz) = 3422e457dcfb01026ba96e4b982021c231800c3f | 3 | SHA1 (clock-0.8.2.tar.gz) = d71603595142b22abd4817c5dba84713639e42b7 | |
4 | RMD160 (clock-0.8.tar.gz) = 91547340e4f5a65f458d0fd176757094f6afbc26 | 4 | RMD160 (clock-0.8.2.tar.gz) = 55bdfe8cc96d5d924f8e9a58c4e66b187902e5e1 | |
5 | SHA512 (clock-0.8.tar.gz) = c966811e3df10d299a8c5a56f0d9ffeaea1e819516d3efb1f2454254bd828e891e579894ca4783f3249e35793b1721a4a4fae867c8e2e4d2d6519ee9abd752b9 | 5 | SHA512 (clock-0.8.2.tar.gz) = 42a7681ae8f1357c4ae39f51a15d7a00f3d587c8fc787d648308f914702471e6f9b32ee51fa1e8164a77f195600fdab8e27d45aa13a7052a921c4b8c246b891e | |
6 | Size (clock-0.8.tar.gz) = 7916 bytes | 6 | Size (clock-0.8.2.tar.gz) = 7604 bytes | |
7 | SHA1 (patch-System_Clock.hsc) = 4f36a3d3626de93814b028e06ee788f7ce1ba6bb |
$NetBSD: patch-System_Clock.hsc,v 1.1 2021/04/24 05:17:54 pho Exp $
Suppress linker warnings about compatibility symbols by using "capi"
instead of "ccall".
--- System/Clock.hsc.orig 2001-09-09 01:46:40.000000000 +0000
+++ System/Clock.hsc
@@ -2,6 +2,7 @@
-- systems. This module is being developed according to IEEE Std
-- 1003.1-2008: <http://www.opengroup.org/onlinepubs/9699919799/>,
-- <http://www.opengroup.org/onlinepubs/9699919799/functions/clock_getres.html#>
+{-# LANGUAGE CApiFFI #-}
{-# OPTIONS_GHC -fno-warn-type-defaults #-}
-- To allow importing Data.Int and Data.Word indiscriminately on all platforms,
@@ -129,8 +130,8 @@ foreign import ccall unsafe hs_clock_win
foreign import ccall unsafe hs_clock_win32_getres_processtime :: Ptr TimeSpec -> IO ()
foreign import ccall unsafe hs_clock_win32_getres_threadtime :: Ptr TimeSpec -> IO ()
#else
-foreign import ccall unsafe clock_gettime :: #{type clockid_t} -> Ptr TimeSpec -> IO CInt
-foreign import ccall unsafe clock_getres :: #{type clockid_t} -> Ptr TimeSpec -> IO CInt
+foreign import capi unsafe "time.h clock_gettime" clock_gettime :: #{type clockid_t} -> Ptr TimeSpec -> IO CInt
+foreign import capi unsafe "time.h clock_getres" clock_getres :: #{type clockid_t} -> Ptr TimeSpec -> IO CInt
#endif
#if !defined(_WIN32)