CVS commit: pkgsrc/devel/hs-setlocale

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Apr 23 12:40:46 UTC 2021

Modified Files:
        pkgsrc/devel/hs-setlocale: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/devel/hs-setlocale/patches: patch-System_Locale_SetLocale.hsc

Log Message:
Update to setlocale-1.0.0.10

No change logs are provided by the upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/hs-setlocale/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/hs-setlocale/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/hs-setlocale/buildlink3.mk \
    pkgsrc/devel/hs-setlocale/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/hs-setlocale/patches/patch-System_Locale_SetLocale.hsc

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-setlocale/Makefile
diff -u pkgsrc/devel/hs-setlocale/Makefile:1.4 pkgsrc/devel/hs-setlocale/Makefile:1.5
--- pkgsrc/devel/hs-setlocale/Makefile:1.4      Thu Feb 18 15:07:27 2021
+++ pkgsrc/devel/hs-setlocale/Makefile  Fri Apr 23 12:40:46 2021
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2021/02/18 15:07:27 mef Exp $
+# $NetBSD: Makefile,v 1.5 2021/04/23 12:40:46 pho Exp $
 
-DISTNAME=      setlocale-1.0.0.9
+DISTNAME=      setlocale-1.0.0.10
 CATEGORIES=    devel
 
 MAINTAINER=    szptvlfn%NetBSD.org@localhost
 COMMENT=       Haskell bindings to setlocale
 LICENSE=       modified-bsd
 
-BUILDLINK_API_DEPENDS.ghc+=    ghc<8.10
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/hs-setlocale/PLIST
diff -u pkgsrc/devel/hs-setlocale/PLIST:1.3 pkgsrc/devel/hs-setlocale/PLIST:1.4
--- pkgsrc/devel/hs-setlocale/PLIST:1.3 Mon May 11 17:52:06 2020
+++ pkgsrc/devel/hs-setlocale/PLIST     Fri Apr 23 12:40:46 2021
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST,v 1.3 2020/05/11 17:52:06 rillig Exp $
-${HS_INTF}/package-description
-${HS_INTF}/package-id
+@comment $NetBSD: PLIST,v 1.4 2021/04/23 12:40:46 pho Exp $
+lib/setlocale-${PKGVERSION}/${HS_VERSION}/package-description
+lib/setlocale-${PKGVERSION}/${HS_VERSION}/package-id
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
-${HS_IMPL}/System/Locale/SetLocale.dyn_hi
-${HS_IMPL}/System/Locale/SetLocale.hi
-${HS_IMPL}/System/Locale/SetLocale.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
-${HS_DOCS}/LICENSE
-${HS_DOCS}/html/System-Locale-SetLocale.html
-${HS_DOCS}/html/doc-index.html
-${HS_DOCS}/html/haddock-bundle.min.js
-${HS_DOCS}/html/index.html
-${HS_DOCS}/html/linuwial.css
-${HS_DOCS}/html/meta.json
-${HS_DOCS}/html/quick-jump.css
-${HS_DOCS}/html/setlocale.haddock
-${HS_DOCS}/html/synopsis.png
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Locale/SetLocale.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Locale/SetLocale.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/System/Locale/SetLocale.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+share/doc/${HS_PLATFORM}/setlocale-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/setlocale-${PKGVERSION}/html/System-Locale-SetLocale.html
+share/doc/${HS_PLATFORM}/setlocale-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/setlocale-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/setlocale-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/setlocale-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/setlocale-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/setlocale-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/setlocale-${PKGVERSION}/html/setlocale.haddock
+share/doc/${HS_PLATFORM}/setlocale-${PKGVERSION}/html/synopsis.png

Index: pkgsrc/devel/hs-setlocale/buildlink3.mk
diff -u pkgsrc/devel/hs-setlocale/buildlink3.mk:1.2 pkgsrc/devel/hs-setlocale/buildlink3.mk:1.3
--- pkgsrc/devel/hs-setlocale/buildlink3.mk:1.2 Thu Jan  2 09:07:04 2020
+++ pkgsrc/devel/hs-setlocale/buildlink3.mk     Fri Apr 23 12:40:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2020/01/02 09:07:04 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2021/04/23 12:40:46 pho Exp $
 
 BUILDLINK_TREE+=       hs-setlocale
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        hs-setlocale
 HS_SETLOCALE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.hs-setlocale+=   hs-setlocale>=1.0.0
-BUILDLINK_ABI_DEPENDS.hs-setlocale+=   hs-setlocale>=1.0.0.9
+BUILDLINK_ABI_DEPENDS.hs-setlocale+=   hs-setlocale>=1.0.0.10
 BUILDLINK_PKGSRCDIR.hs-setlocale?=     ../../devel/hs-setlocale
 .endif # HS_SETLOCALE_BUILDLINK3_MK
 
Index: pkgsrc/devel/hs-setlocale/distinfo
diff -u pkgsrc/devel/hs-setlocale/distinfo:1.2 pkgsrc/devel/hs-setlocale/distinfo:1.3
--- pkgsrc/devel/hs-setlocale/distinfo:1.2      Thu Jan  2 09:07:04 2020
+++ pkgsrc/devel/hs-setlocale/distinfo  Fri Apr 23 12:40:46 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2020/01/02 09:07:04 pho Exp $
+$NetBSD: distinfo,v 1.3 2021/04/23 12:40:46 pho Exp $
 
-SHA1 (setlocale-1.0.0.9.tar.gz) = d5d2e75defad288feda2bfd795e777a7aa38612e
-RMD160 (setlocale-1.0.0.9.tar.gz) = d4efcbfd1e06c3b8ac8d9215157017738a476dbd
-SHA512 (setlocale-1.0.0.9.tar.gz) = 32a0722c46b6db15b4566b78f418efe3c8a5d6e25181ebf275a47a68b12e4740479df6ef38070ec978eb109f5b1e2956262dcf4367869bec78dc41d6890632cd
-Size (setlocale-1.0.0.9.tar.gz) = 2098 bytes
+SHA1 (setlocale-1.0.0.10.tar.gz) = 3f91b77b6d717612263dd0611125b90622ae6786
+RMD160 (setlocale-1.0.0.10.tar.gz) = 602fe192ee60d5b4f681c45e836c166eb0bc23cf
+SHA512 (setlocale-1.0.0.10.tar.gz) = ef05da7ed2acfa6f4b7acd988282d545897428272e5d5a9818563afc5138df32268f705946093ba33628ad42de2c19ed9cce139f0e1fa15e4a87c6cd18da02ef
+Size (setlocale-1.0.0.10.tar.gz) = 2096 bytes
+SHA1 (patch-System_Locale_SetLocale.hsc) = b0b9d233b0c1e022d2caaf845799f79a1970b333

Added files:

Index: pkgsrc/devel/hs-setlocale/patches/patch-System_Locale_SetLocale.hsc
diff -u /dev/null pkgsrc/devel/hs-setlocale/patches/patch-System_Locale_SetLocale.hsc:1.1
--- /dev/null   Fri Apr 23 12:40:46 2021
+++ pkgsrc/devel/hs-setlocale/patches/patch-System_Locale_SetLocale.hsc Fri Apr 23 12:40:46 2021
@@ -0,0 +1,23 @@
+$NetBSD: patch-System_Locale_SetLocale.hsc,v 1.1 2021/04/23 12:40:46 pho Exp $
+
+Suppress linker warnings about compatibility symbols by using "capi"
+instead of "ccall".
+
+--- System/Locale/SetLocale.hsc.orig   2021-04-23 12:38:45.139148092 +0000
++++ System/Locale/SetLocale.hsc
+@@ -1,5 +1,6 @@
+ {-# LANGUAGE DeriveDataTypeable
+            , ForeignFunctionInterface #-}
++{-# LANGUAGE CApiFFI #-}
+ 
+ -- Copyright (c) 2014, Sven Bartscher
+ -- Look the file LICENSE.txt in the toplevel directory of the source tree for
+@@ -44,7 +45,7 @@ categoryToCInt LC_MONETARY = #const LC_M
+ categoryToCInt LC_NUMERIC = #const LC_NUMERIC
+ categoryToCInt LC_TIME = #const LC_TIME
+ 
+-foreign import ccall "locale.h setlocale" c_setlocale :: CInt -> CString -> IO CString
++foreign import capi "locale.h setlocale" c_setlocale :: CInt -> CString -> IO CString
+ 
+ setLocale :: Category -> Maybe String -> IO (Maybe String)
+ #ifndef LC_MESSAGES