Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Jul 2022 10:25:13 GMT
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7b40038db7d8 - main - www/hs-hjsmin: Fix build after GHC update.
Message-ID:  <202207071025.267APDKo095191@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7b40038db7d89e1783a5c0405e38a5464196274e

commit 7b40038db7d89e1783a5c0405e38a5464196274e
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2022-05-09 13:43:21 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2022-07-07 10:24:31 +0000

    www/hs-hjsmin: Fix build after GHC update.
---
 www/hs-hjsmin/Makefile                 | 20 +++++++-------
 www/hs-hjsmin/distinfo                 | 50 ++++++++++++++++++----------------
 www/hs-hjsmin/files/patch-hjsmin.cabal | 27 ++++++++++++++++++
 3 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index e9695f0d7c5a..64afe7a2fdcc 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -12,15 +12,15 @@ USES=		cabal
 
 USE_LOCALE=	en_US.UTF-8
 
-USE_CABAL=	alex-3.2.5 \
-		ansi-terminal-0.10.3 \
-		ansi-wl-pprint-0.6.9_1 \
-		blaze-builder-0.4.1.0 \
-		colour-2.3.5 \
-		happy-1.19.12 \
-		language-javascript-0.7.0.0 \
-		optparse-applicative-0.15.1.0 \
-		transformers-compat-0.6.5 \
-		utf8-string-1.0.1.1_3
+USE_CABAL=	alex-3.2.7.1 \
+		ansi-terminal-0.11.3 \
+		ansi-wl-pprint-0.6.9_3 \
+		blaze-builder-0.4.2.2_1 \
+		colour-2.3.6 \
+		happy-1.20.0_1 \
+		language-javascript-0.7.1.0 \
+		optparse-applicative-0.17.0.0 \
+		transformers-compat-0.7.1_1 \
+		utf8-string-1.0.2
 
 .include <bsd.port.mk>
diff --git a/www/hs-hjsmin/distinfo b/www/hs-hjsmin/distinfo
index 1dad28b4861d..dab338f7b2a7 100644
--- a/www/hs-hjsmin/distinfo
+++ b/www/hs-hjsmin/distinfo
@@ -1,27 +1,31 @@
-TIMESTAMP = 1584601544
+TIMESTAMP = 1652103779
 SHA256 (cabal/hjsmin-0.2.0.4.tar.gz) = 81b9947714d8d2b73d0aba9e2e02af7e30c13b2cf8144df8904564d9642e57e4
 SIZE (cabal/hjsmin-0.2.0.4.tar.gz) = 5233
-SHA256 (cabal/alex-3.2.5/alex-3.2.5.tar.gz) = b77c8a1270767c64e2adb21a6e91ee7cd904ba17edae17bc20fd03da5256e0e3
-SIZE (cabal/alex-3.2.5/alex-3.2.5.tar.gz) = 108531
-SHA256 (cabal/ansi-terminal-0.10.3/ansi-terminal-0.10.3.tar.gz) = fa2e2e32dfad29835aa7fd442bbe233e07d97e933223a001fe5efa562535b57c
-SIZE (cabal/ansi-terminal-0.10.3/ansi-terminal-0.10.3.tar.gz) = 35863
+SHA256 (cabal/alex-3.2.7.1/alex-3.2.7.1.tar.gz) = 9bd2f1a27e8f1b2ffdb5b2fbd3ed82b6f0e85191459a1b24ffcbef4e68a81bec
+SIZE (cabal/alex-3.2.7.1/alex-3.2.7.1.tar.gz) = 108229
+SHA256 (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = f4d563ecf71fb1d304bcdcad478d97efd9f61f6d9d4797a5d56e7722a92a9e6b
+SIZE (cabal/ansi-terminal-0.11.3/ansi-terminal-0.11.3.tar.gz) = 37868
 SHA256 (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = a7b2e8e7cd3f02f2954e8b17dc60a0ccd889f49e2068ebb15abfa1d42f7a4eac
 SIZE (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = 16723
-SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/1.cabal) = f6fd6dbd4adcad0432bf75e5f5b19bb1deda00a1d8056faf18090026e577652d
-SIZE (cabal/ansi-wl-pprint-0.6.9/revision/1.cabal) = 2388
-SHA256 (cabal/blaze-builder-0.4.1.0/blaze-builder-0.4.1.0.tar.gz) = 91fc8b966f3e9dc9461e1675c7566b881740f99abc906495491a3501630bc814
-SIZE (cabal/blaze-builder-0.4.1.0/blaze-builder-0.4.1.0.tar.gz) = 61365
-SHA256 (cabal/colour-2.3.5/colour-2.3.5.tar.gz) = 3b8d471979617dce7c193523743c9782df63433d8e87e3ef6d97922e0da104e7
-SIZE (cabal/colour-2.3.5/colour-2.3.5.tar.gz) = 20485
-SHA256 (cabal/happy-1.19.12/happy-1.19.12.tar.gz) = fb9a23e41401711a3b288f93cf0a66db9f97da1ce32ec4fffea4b78a0daeb40f
-SIZE (cabal/happy-1.19.12/happy-1.19.12.tar.gz) = 183254
-SHA256 (cabal/language-javascript-0.7.0.0/language-javascript-0.7.0.0.tar.gz) = d39e80675c40529574ee93c2bdec1a86497da7a53f39c7d174c30b27e7c57795
-SIZE (cabal/language-javascript-0.7.0.0/language-javascript-0.7.0.0.tar.gz) = 75987
-SHA256 (cabal/optparse-applicative-0.15.1.0/optparse-applicative-0.15.1.0.tar.gz) = 4db3675fd1e0594afdf079db46f4cd412d483835d703e7c07e1a1a37d6f046f3
-SIZE (cabal/optparse-applicative-0.15.1.0/optparse-applicative-0.15.1.0.tar.gz) = 56203
-SHA256 (cabal/transformers-compat-0.6.5/transformers-compat-0.6.5.tar.gz) = da67cf11515da751b32a8ce6e96549f7268f7c435769ad19dc9766b69774620b
-SIZE (cabal/transformers-compat-0.6.5/transformers-compat-0.6.5.tar.gz) = 40421
-SHA256 (cabal/utf8-string-1.0.1.1/utf8-string-1.0.1.1.tar.gz) = fb0b9e3acbe0605bcd1c63e51f290a7bbbe6628dfa3294ff453e4235fbaef140
-SIZE (cabal/utf8-string-1.0.1.1/utf8-string-1.0.1.1.tar.gz) = 8667
-SHA256 (cabal/utf8-string-1.0.1.1/revision/3.cabal) = 68cc6cf665e7212334a51b63d6936daeaca023b2cfe8637d130acfe95f91700b
-SIZE (cabal/utf8-string-1.0.1.1/revision/3.cabal) = 1151
+SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 212144ea0623b1170807a4162db05d87f26cf10b334aeadd0edb377aba06a1ce
+SIZE (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 2425
+SHA256 (cabal/blaze-builder-0.4.2.2/blaze-builder-0.4.2.2.tar.gz) = 2cdc998c021d3a5f2a66a95138b93386271c26a117e7676d78264a90e536af67
+SIZE (cabal/blaze-builder-0.4.2.2/blaze-builder-0.4.2.2.tar.gz) = 60707
+SHA256 (cabal/blaze-builder-0.4.2.2/revision/1.cabal) = f0017df374c330de0ebe0eb15eae8c48427bddefa1d81a3cb31c0a4812ecdb08
+SIZE (cabal/blaze-builder-0.4.2.2/revision/1.cabal) = 3685
+SHA256 (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 2cd35dcd6944a5abc9f108a5eb5ee564b6b1fa98a9ec79cefcc20b588991f871
+SIZE (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 20675
+SHA256 (cabal/happy-1.20.0/happy-1.20.0.tar.gz) = 3b1d3a8f93a2723b554d9f07b2cd136be1a7b2fcab1855b12b7aab5cbac8868c
+SIZE (cabal/happy-1.20.0/happy-1.20.0.tar.gz) = 184515
+SHA256 (cabal/happy-1.20.0/revision/1.cabal) = 5d47dc221a9fe964e36aaaa2e1ab7e8f085a225fd6528d6eff310b92360bbe99
+SIZE (cabal/happy-1.20.0/revision/1.cabal) = 5732
+SHA256 (cabal/language-javascript-0.7.1.0/language-javascript-0.7.1.0.tar.gz) = d1a036aa4c747fa7a347e78dc6d3609a3d51dc28580ff6b897a27646ca7ad168
+SIZE (cabal/language-javascript-0.7.1.0/language-javascript-0.7.1.0.tar.gz) = 76438
+SHA256 (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 825b2e4d3dafe0ba64a073366a88062b3712b81f851793d9ce2327bee70af724
+SIZE (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 59409
+SHA256 (cabal/transformers-compat-0.7.1/transformers-compat-0.7.1.tar.gz) = ac0b861534c14d3cfd61534f474674e3b634b8decea072ffd4d21f8b59f35080
+SIZE (cabal/transformers-compat-0.7.1/transformers-compat-0.7.1.tar.gz) = 44363
+SHA256 (cabal/transformers-compat-0.7.1/revision/1.cabal) = 873ef500790cae136d14b2e890da1fe4df963e372f21b1671fa3c6cdfb23b10f
+SIZE (cabal/transformers-compat-0.7.1/revision/1.cabal) = 5807
+SHA256 (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = ee48deada7600370728c4156cb002441de770d0121ae33a68139a9ed9c19b09a
+SIZE (cabal/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = 10726
diff --git a/www/hs-hjsmin/files/patch-hjsmin.cabal b/www/hs-hjsmin/files/patch-hjsmin.cabal
new file mode 100644
index 000000000000..ff696287318c
--- /dev/null
+++ b/www/hs-hjsmin/files/patch-hjsmin.cabal
@@ -0,0 +1,27 @@
+--- hjsmin.cabal.orig	2001-09-09 01:46:40 UTC
++++ hjsmin.cabal
+@@ -1,5 +1,6 @@ version:         0.2.0.4
+ name:            hjsmin
+ version:         0.2.0.4
++x-revision: 2
+ license:         BSD3
+ license-file:    LICENSE
+ author:          Alan Zimmerman <alan.zimm@gmail.com>
+@@ -30,7 +31,7 @@ library
+   exposed-modules:      Text.Jasmine
+ 
+   build-depends:        base                    >= 4.8          && < 5
+-                      , bytestring              == 0.10.*
++                      , bytestring              >= 0.10         && < 0.12
+                       , language-javascript     >= 0.6          && < 0.8
+                       , text                    == 1.2.*
+ 
+@@ -45,7 +46,7 @@ executable hjsmin
+   other-modules:        Text.Jasmine
+ 
+   build-depends:        base                    >= 4.8          && < 5
+-                      , bytestring              == 0.10.*
++                      , bytestring
+                       , language-javascript
+                       , optparse-applicative    >= 0.7
+                       , text



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207071025.267APDKo095191>