kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to lukko-0.1.1.3

Browse source 
0.1.1.3
* Use CApiFFI to call varargs C functions.
* Define let alignment only when needed.

0.1.1.2
* Make Win32 code more idiomatic
This commit is contained in:
pho 2021-04-23 10:38:26 +00:00
parent 1b8dcbc5ef
commit 779d07cd81
6 changed files with 71 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
devel/hs-lukko/Makefile
View file

@ -1,12 +1,11 @@
# $NetBSD: Makefile,v 1.3 2021/02/18 15:07:28 mef Exp $ # $NetBSD: Makefile,v 1.4 2021/04/23 10:38:26 pho Exp $
DISTNAME= lukko-0.1.1.1 DISTNAME= lukko-0.1.1.3
CATEGORIES= devel CATEGORIES= devel
MAINTAINER= pho@cielonegro.org MAINTAINER= pho@cielonegro.org
COMMENT= File locking COMMENT= File locking
LICENSE= gnu-gpl-v2 AND modified-bsd LICENSE= gnu-gpl-v2 AND modified-bsd
BUILDLINK_API_DEPENDS.ghc+= ghc<8.10
.include "../../mk/haskell.mk" .include "../../mk/haskell.mk"
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"

80
devel/hs-lukko/PLIST
View file

@ -1,41 +1,41 @@
@comment $NetBSD: PLIST,v 1.1 2020/05/11 17:52:04 rillig Exp $ @comment $NetBSD: PLIST,v 1.2 2021/04/23 10:38:26 pho Exp $
${HS_INTF}/package-description lib/lukko-${PKGVERSION}/${HS_VERSION}/package-description
${HS_INTF}/package-id lib/lukko-${PKGVERSION}/${HS_VERSION}/package-id
lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
${HS_IMPL}/Lukko.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko.dyn_hi
${HS_IMPL}/Lukko.hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko.hi
${HS_IMPL}/Lukko.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko.p_hi
${HS_IMPL}/Lukko/FLock.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/FLock.dyn_hi
${HS_IMPL}/Lukko/FLock.hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/FLock.hi
${HS_IMPL}/Lukko/FLock.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/FLock.p_hi
${HS_IMPL}/Lukko/Internal/FD.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/Internal/FD.dyn_hi
${HS_IMPL}/Lukko/Internal/FD.hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/Internal/FD.hi
${HS_IMPL}/Lukko/Internal/FD.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/Internal/FD.p_hi
${HS_IMPL}/Lukko/Internal/FillBytes.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/Internal/FillBytes.dyn_hi
${HS_IMPL}/Lukko/Internal/FillBytes.hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/Internal/FillBytes.hi
${HS_IMPL}/Lukko/Internal/FillBytes.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/Internal/FillBytes.p_hi
${HS_IMPL}/Lukko/Internal/HandleToFD.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/Internal/HandleToFD.dyn_hi
${HS_IMPL}/Lukko/Internal/HandleToFD.hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/Internal/HandleToFD.hi
${HS_IMPL}/Lukko/Internal/HandleToFD.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/Internal/HandleToFD.p_hi
${HS_IMPL}/Lukko/Internal/Types.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/Internal/Types.dyn_hi
${HS_IMPL}/Lukko/Internal/Types.hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/Internal/Types.hi
${HS_IMPL}/Lukko/Internal/Types.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/Internal/Types.p_hi
${HS_IMPL}/Lukko/NoOp.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/NoOp.dyn_hi
${HS_IMPL}/Lukko/NoOp.hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/NoOp.hi
${HS_IMPL}/Lukko/NoOp.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/NoOp.p_hi
${HS_IMPL}/libHS${HS_PKGID}.a lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
${HS_IMPL}/libHS${HS_PKGID}_p.a lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
${HS_DOCS}/LICENSE share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/LICENSE
${HS_DOCS}/LICENSE.GPLv2 share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/LICENSE.GPLv2
${HS_DOCS}/LICENSE.GPLv3 share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/LICENSE.GPLv3
${HS_DOCS}/html/Lukko-FLock.html share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/html/Lukko-FLock.html
${HS_DOCS}/html/Lukko-NoOp.html share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/html/Lukko-NoOp.html
${HS_DOCS}/html/Lukko.html share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/html/Lukko.html
${HS_DOCS}/html/doc-index.html share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/html/doc-index.html
${HS_DOCS}/html/haddock-bundle.min.js share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/html/haddock-bundle.min.js
${HS_DOCS}/html/index.html share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/html/index.html
${HS_DOCS}/html/linuwial.css share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/html/linuwial.css
${HS_DOCS}/html/lukko.haddock share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/html/lukko.haddock
${HS_DOCS}/html/meta.json share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/html/meta.json
${HS_DOCS}/html/quick-jump.css share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/html/quick-jump.css
${HS_DOCS}/html/synopsis.png share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/html/synopsis.png

10
devel/hs-lukko/PLIST.Linux
View file

@ -1,5 +1,5 @@
@comment $NetBSD: PLIST.Linux,v 1.1 2020/10/04 21:14:32 mcf Exp $ @comment $NetBSD: PLIST.Linux,v 1.2 2021/04/23 10:38:26 pho Exp $
${HS_IMPL}/Lukko/OFD.dyn_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/OFD.dyn_hi
${HS_IMPL}/Lukko/OFD.hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/OFD.hi
${HS_IMPL}/Lukko/OFD.p_hi lib/${HS_PLATFORM}/${HS_PKGID}/Lukko/OFD.p_hi
${HS_DOCS}/html/Lukko-OFD.html share/doc/${HS_PLATFORM}/lukko-${PKGVERSION}/html/Lukko-OFD.html

4
devel/hs-lukko/buildlink3.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.1 2020/01/19 01:11:35 pho Exp $ # $NetBSD: buildlink3.mk,v 1.2 2021/04/23 10:38:26 pho Exp $
BUILDLINK_TREE+= hs-lukko BUILDLINK_TREE+= hs-lukko
@ -6,7 +6,7 @@ BUILDLINK_TREE+= hs-lukko
HS_LUKKO_BUILDLINK3_MK:= HS_LUKKO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.hs-lukko+= hs-lukko>=0.1.1 BUILDLINK_API_DEPENDS.hs-lukko+= hs-lukko>=0.1.1
BUILDLINK_ABI_DEPENDS.hs-lukko+= hs-lukko>=0.1.1.1 BUILDLINK_ABI_DEPENDS.hs-lukko+= hs-lukko>=0.1.1.3
BUILDLINK_PKGSRCDIR.hs-lukko?= ../../devel/hs-lukko BUILDLINK_PKGSRCDIR.hs-lukko?= ../../devel/hs-lukko
.endif # HS_LUKKO_BUILDLINK3_MK .endif # HS_LUKKO_BUILDLINK3_MK

12
devel/hs-lukko/distinfo
View file

@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.2 2020/09/16 17:48:41 jperkin Exp $ $NetBSD: distinfo,v 1.3 2021/04/23 10:38:26 pho Exp $
SHA1 (lukko-0.1.1.1.tar.gz) = 54cc499574239d41d5e9cf8d7e83ac4171e39055 SHA1 (lukko-0.1.1.3.tar.gz) = 27a7cf77bda5c6655123dd1060293d7aa1fb50fa
RMD160 (lukko-0.1.1.1.tar.gz) = 9b1e7a4806566de0fb1021f759d634f573ce5507 RMD160 (lukko-0.1.1.3.tar.gz) = 370f05eac2e41c835ec34feb49b79e0fa50d33ec
SHA512 (lukko-0.1.1.1.tar.gz) = 2a307eef1ceb421a6b46854c99b50fd64da02df2e74e662f67fbd179db0880599d40d8b5b8bb8d117e4c52ad114e45d9b1434ecba984f4dea314ff1f840ec37f SHA512 (lukko-0.1.1.3.tar.gz) = 8bed8b88a101883f642bb9d9d41512436f5c80db5ea1ad0cddb069c6d09257d21b56a60e0f70b57453e91126065fbfdeeb721064763e64de1975dcb51b1a484a
Size (lukko-0.1.1.1.tar.gz) = 28312 bytes Size (lukko-0.1.1.3.tar.gz) = 28575 bytes
SHA1 (patch-lukko.cabal) = 3df851f7dcb1b75f1c84ada7daeb54d16311dd53 SHA1 (patch-lukko.cabal) = 180f9a85ee79038d41ad7d2b1f36dc3334cfa7a9

22
devel/hs-lukko/patches/patch-lukko.cabal
View file

@ -1,6 +1,7 @@
$NetBSD: patch-lukko.cabal,v 1.1 2020/09/16 17:48:41 jperkin Exp $ $NetBSD: patch-lukko.cabal,v 1.2 2021/04/23 10:38:26 pho Exp $
Newer Solaris/illumos have flock(3C). * Fix build with GHC 9.
* Newer Solaris/illumos have flock(3C).
--- lukko.cabal.orig 2001-09-09 01:46:40.000000000 +0000 --- lukko.cabal.orig 2001-09-09 01:46:40.000000000 +0000
+++ lukko.cabal +++ lukko.cabal
@ -13,7 +14,16 @@ Newer Solaris/illumos have flock(3C).
\ cpp-options: -DHAS_FLOCK \ cpp-options: -DHAS_FLOCK
@ @
. .
@@ -88,7 +88,7 @@ library @@ -72,7 +72,7 @@ flag ofd-locking
library
default-language: Haskell2010
hs-source-dirs: src
- build-depends: base >=4.5 && <4.15
+ build-depends: base >=4.5 && <5
build-tool-depends: hsc2hs:hsc2hs >=0.67 && <0.69
-- Main library module
@@ -93,7 +93,7 @@ library
cpp-options: -DUSE_OFD_LOCKING cpp-options: -DUSE_OFD_LOCKING
exposed-modules: Lukko.OFD exposed-modules: Lukko.OFD
@ -22,7 +32,7 @@ Newer Solaris/illumos have flock(3C).
hs-source-dirs: src-flock hs-source-dirs: src-flock
hs-source-dirs: src-unix hs-source-dirs: src-unix
cpp-options: -DUSE_FLOCK cpp-options: -DUSE_FLOCK
@@ -98,7 +98,7 @@ library @@ -103,7 +103,7 @@ library
cpp-options: -DUSE_NOOP cpp-options: -DUSE_NOOP
-- Cabal check is silly -- Cabal check is silly
@ -31,7 +41,7 @@ Newer Solaris/illumos have flock(3C).
exposed-modules: Lukko.FLock exposed-modules: Lukko.FLock
other-modules: other-modules:
@@ -134,7 +134,7 @@ test-suite test-thread @@ -139,7 +139,7 @@ test-suite test-thread
cpp-options: -DHAS_OFD_LOCKING cpp-options: -DHAS_OFD_LOCKING
cpp-options: -DHAS_FLOCK cpp-options: -DHAS_FLOCK
@ -40,7 +50,7 @@ Newer Solaris/illumos have flock(3C).
cpp-options: -DHAS_FLOCK cpp-options: -DHAS_FLOCK
test-suite test-process test-suite test-process
@@ -155,5 +155,5 @@ test-suite test-process @@ -160,5 +160,5 @@ test-suite test-process
cpp-options: -DHAS_OFD_LOCKING cpp-options: -DHAS_OFD_LOCKING
cpp-options: -DHAS_FLOCK cpp-options: -DHAS_FLOCK