CVS commit: pkgsrc/devel/hs-lukko

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Sep 16 17:48:41 UTC 2020

Modified Files:
        pkgsrc/devel/hs-lukko: distinfo
Added Files:
        pkgsrc/devel/hs-lukko/patches: patch-lukko.cabal

Log Message:
hs-lukko: Support flock(3C) on illumos.

While this "breaks" older SunOS releases, they were broken anyway as there's no
PLIST support for not having it.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/hs-lukko/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/hs-lukko/patches/patch-lukko.cabal

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

Modified files:

Index: pkgsrc/devel/hs-lukko/distinfo
diff -u pkgsrc/devel/hs-lukko/distinfo:1.1 pkgsrc/devel/hs-lukko/distinfo:1.2
--- pkgsrc/devel/hs-lukko/distinfo:1.1  Sun Jan 19 01:11:35 2020
+++ pkgsrc/devel/hs-lukko/distinfo      Wed Sep 16 17:48:41 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2020/01/19 01:11:35 pho Exp $
+$NetBSD: distinfo,v 1.2 2020/09/16 17:48:41 jperkin Exp $
 
 SHA1 (lukko-0.1.1.1.tar.gz) = 54cc499574239d41d5e9cf8d7e83ac4171e39055
 RMD160 (lukko-0.1.1.1.tar.gz) = 9b1e7a4806566de0fb1021f759d634f573ce5507
 SHA512 (lukko-0.1.1.1.tar.gz) = 2a307eef1ceb421a6b46854c99b50fd64da02df2e74e662f67fbd179db0880599d40d8b5b8bb8d117e4c52ad114e45d9b1434ecba984f4dea314ff1f840ec37f
 Size (lukko-0.1.1.1.tar.gz) = 28312 bytes
+SHA1 (patch-lukko.cabal) = 3df851f7dcb1b75f1c84ada7daeb54d16311dd53

Added files:

Index: pkgsrc/devel/hs-lukko/patches/patch-lukko.cabal
diff -u /dev/null pkgsrc/devel/hs-lukko/patches/patch-lukko.cabal:1.1
--- /dev/null   Wed Sep 16 17:48:41 2020
+++ pkgsrc/devel/hs-lukko/patches/patch-lukko.cabal     Wed Sep 16 17:48:41 2020
@@ -0,0 +1,49 @@
+$NetBSD: patch-lukko.cabal,v 1.1 2020/09/16 17:48:41 jperkin Exp $
+
+Newer Solaris/illumos have flock(3C).
+
+--- lukko.cabal.orig   2001-09-09 01:46:40.000000000 +0000
++++ lukko.cabal
+@@ -32,7 +32,7 @@ description:
+   \  cpp-options: -DHAS_OFD_LOCKING
+   \  cpp-options: -DHAS_FLOCK
+   .
+-  elif !(os(solaris) || os(aix))
++  elif !(os(aix))
+   \  cpp-options: -DHAS_FLOCK
+   @
+   .
+@@ -88,7 +88,7 @@ library
+     cpp-options:     -DUSE_OFD_LOCKING
+     exposed-modules: Lukko.OFD
+ 
+-  elif !(os(solaris) || os(aix))
++  elif !(os(aix))
+     hs-source-dirs: src-flock
+     hs-source-dirs: src-unix
+     cpp-options:    -DUSE_FLOCK
+@@ -98,7 +98,7 @@ library
+     cpp-options:    -DUSE_NOOP
+ 
+   -- Cabal check is silly
+-  if (!os(windows) && !(os(solaris) || os(aix)))
++  if (!os(windows) && !(os(aix)))
+     exposed-modules: Lukko.FLock
+ 
+   other-modules:
+@@ -134,7 +134,7 @@ test-suite test-thread
+     cpp-options: -DHAS_OFD_LOCKING
+     cpp-options: -DHAS_FLOCK
+ 
+-  elif !(os(solaris) || os(aix))
++  elif !(os(aix))
+     cpp-options: -DHAS_FLOCK
+ 
+ test-suite test-process
+@@ -155,5 +155,5 @@ test-suite test-process
+     cpp-options: -DHAS_OFD_LOCKING
+     cpp-options: -DHAS_FLOCK
+ 
+-  elif !(os(solaris) || os(aix))
++  elif !(os(aix))
+     cpp-options: -DHAS_FLOCK