Date: Wed, 10 Mar 2021 12:31:25 +0000 (UTC) From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567995 - in head: Mk/Uses devel/hs-cabal-install devel/hs-cabal-install/files Message-ID: <202103101231.12ACVPM0036661@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arrowd Date: Wed Mar 10 12:31:25 2021 New Revision: 567995 URL: https://svnweb.freebsd.org/changeset/ports/567995 Log: devel/hs-cabal-install: Update to 3.4.0.0 and adjust Uses/cabal.mk to its changes. Added: head/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.1.json (contents, props changed) Deleted: head/devel/hs-cabal-install/files/patch-Distribution_Client_Sandbox.hs head/devel/hs-cabal-install/files/patch-bootstrap.sh head/devel/hs-cabal-install/files/patch-cabal-install.cabal head/devel/hs-cabal-install/files/patch-ed25519.cabal.hackage Modified: head/Mk/Uses/cabal.mk head/devel/hs-cabal-install/Makefile head/devel/hs-cabal-install/distinfo Modified: head/Mk/Uses/cabal.mk ============================================================================== --- head/Mk/Uses/cabal.mk Wed Mar 10 12:20:57 2021 (r567994) +++ head/Mk/Uses/cabal.mk Wed Mar 10 12:31:25 2021 (r567995) @@ -160,7 +160,10 @@ make-use-cabal-revs: . if !defined(CABAL_BOOTSTRAP) cabal-post-extract: + @/bin/test ! -f ${WRKSRC}/cabal.project || (echo "cabal.project file already present in WRKSRC!" && false) + echo -n "packages: . " > ${WRKSRC}/cabal.project . for package in ${_use_cabal} + echo -n "${package:C/_[0-9]+//} " >> ${WRKSRC}/cabal.project . if ${package:C/[^_]*//:S/_//} != "" cp ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//}/revision/${package:C/[^_]*//:S/_//}.cabal `find ${WRKDIR}/${package:C/_[0-9]+//} -name '*.cabal' -depth 1` . endif Modified: head/devel/hs-cabal-install/Makefile ============================================================================== --- head/devel/hs-cabal-install/Makefile Wed Mar 10 12:20:57 2021 (r567994) +++ head/devel/hs-cabal-install/Makefile Wed Mar 10 12:31:25 2021 (r567995) @@ -1,10 +1,8 @@ # $FreeBSD$ PORTNAME= cabal-install -DISTVERSION= 3.2.0.0 -PORTREVISION= 1 +DISTVERSION= 3.4.0.0 CATEGORIES= devel haskell -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${CABAL_EXTRACT_SUFX} MAINTAINER= haskell@FreeBSD.org COMMENT= Command-line interface for Cabal and Hackage @@ -13,38 +11,57 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ghc:lang/ghc -USES= cabal compiler:c11 +USES= cabal:nodefault compiler:c11 python:build -USE_CABAL= async-2.2.2_1 base16-bytestring-0.1.1.6 base64-bytestring-1.0.0.1 \ - cryptohash-sha256-0.11.101.0_4 digest-0.0.1.2 echo-0.1.3_1 \ - ed25519-0.0.5.0_2 edit-distance-0.2.2.1_1 hackage-security-0.6.0.1 \ - hashable-1.3.0.0_1 HTTP-4000.3.14_1 lukko-0.1.1.2 mintty-0.1.2 network-2.7.0.0 \ - network-uri-2.6.1.0_1 random-1.1_1 resolv-0.1.2.0 tar-0.5.1.1_2 \ - zip-archive-0.3.3_1 zlib-0.6.2.1_1 +USE_GITHUB= yes +GH_ACCOUNT= haskell +GH_PROJECT= cabal +GH_TAGNAME= ${PORTNAME}-${DISTVERSION} +USE_CABAL= async-2.2.2_1 \ + base16-bytestring-0.1.1.7 \ + base64-bytestring-1.1.0.0 \ + cryptohash-sha256-0.11.101.0_4 \ + digest-0.0.1.2 \ + echo-0.1.3_1 \ + ed25519-0.0.5.0_3 \ + edit-distance-0.2.2.1_1 \ + hackage-security-0.6.0.1_2 \ + hashable-1.3.0.0_1 \ + HTTP-4000.3.14_1 \ + lukko-0.1.1.2 \ + network-3.1.1.1 \ + network-uri-2.6.3.0 \ + random-1.2.0 \ + regex-base-0.94.0.0_1 \ + regex-posix-0.96.0.0_2 \ + resolv-0.1.2.0 \ + splitmix-0.1 \ + tar-0.5.1.1_2 \ + zlib-0.6.2.1_1 + CABAL_BOOTSTRAP= yes PLIST_FILES= bin/cabal post-extract: + ${MKDIR} ${WRKSRC}/_build/tarballs/ .for package in ${USE_CABAL} - ${CP} ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${EXTRACT_SUFX} ${WRKSRC} + ${CP} ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${EXTRACT_SUFX} ${WRKSRC}/_build/tarballs/ . if ${package:C/[^_]*//:S/_//} != "" - ${CP} ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//}/revision/${package:C/[^_]*//:S/_//}.cabal ${WRKSRC}/${package:C/[0-9._]*$//:S/-$//}.cabal.hackage + ${CP} ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//}/revision/${package:C/[^_]*//:S/_//}.cabal ${WRKSRC}/_build/tarballs/${package:C/[0-9._]*$//:S/-$//}.cabal . else tar -C ${WRKDIR} -xf ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${EXTRACT_SUFX} --include='*.cabal' - ${MV} ${WRKDIR}/${package:C/_[0-9]+//}/${package:C/[0-9._]*$//:S/-$//}.cabal ${WRKSRC}/${package:C/[0-9._]*$//:S/-$//}.cabal.hackage + ${MV} ${WRKDIR}/${package:C/_[0-9]+//}/${package:C/[0-9._]*$//:S/-$//}.cabal ${WRKSRC}/_build/tarballs/${package:C/[0-9._]*$//:S/-$//}.cabal . endif .endfor do-build: cd ${WRKSRC} && \ - ${SETENV} -u VERBOSE EXTRA_CONFIGURE_OPTS="--disable-library-profiling" \ - ${MAKE_ENV} HOME=${WRKDIR}/home PREFIX=${WRKDIR}/prefix \ - ${WRKSRC}/bootstrap.sh --no-doc --jobs ${MAKE_JOBS_NUMBER} + ${PYTHON_CMD} bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/prefix/bin/cabal ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/_build/bin/cabal ${STAGEDIR}${PREFIX}/bin/ .include <bsd.port.mk> Modified: head/devel/hs-cabal-install/distinfo ============================================================================== --- head/devel/hs-cabal-install/distinfo Wed Mar 10 12:20:57 2021 (r567994) +++ head/devel/hs-cabal-install/distinfo Wed Mar 10 12:31:25 2021 (r567995) @@ -1,6 +1,4 @@ -TIMESTAMP = 1588689698 -SHA256 (cabal/cabal-install-3.2.0.0.tar.gz) = a0555e895aaf17ca08453fde8b19af96725da8398e027aa43a49c1658a600cb0 -SIZE (cabal/cabal-install-3.2.0.0.tar.gz) = 632084 +TIMESTAMP = 1615034194 SHA256 (cabal/HTTP-4000.3.14/HTTP-4000.3.14.tar.gz) = a602d7f30e917164c6a634f8cb1f5df4849048858db01380a0875e16e5aa687b SIZE (cabal/HTTP-4000.3.14/HTTP-4000.3.14.tar.gz) = 72938 SHA256 (cabal/HTTP-4000.3.14/revision/1.cabal) = 3c19975fdfd8d057eae58847bda6a79514ad882fd6f8ead72ac0247af34bdfc6 @@ -9,10 +7,10 @@ SHA256 (cabal/async-2.2.2/async-2.2.2.tar.gz) = 4b4ab1 SIZE (cabal/async-2.2.2/async-2.2.2.tar.gz) = 12927 SHA256 (cabal/async-2.2.2/revision/1.cabal) = a178c166856da7ff22fe4500337b54812e94fd2059409452187d72e057ede9cd SIZE (cabal/async-2.2.2/revision/1.cabal) = 2934 -SHA256 (cabal/base16-bytestring-0.1.1.6/base16-bytestring-0.1.1.6.tar.gz) = 5afe65a152c5418f5f4e3579a5e0d5ca19c279dc9bf31c1a371ccbe84705c449 -SIZE (cabal/base16-bytestring-0.1.1.6/base16-bytestring-0.1.1.6.tar.gz) = 3694 -SHA256 (cabal/base64-bytestring-1.0.0.1/base64-bytestring-1.0.0.1.tar.gz) = ab25abf4b00a2f52b270bc3ed43f1d59f16c8eec9d7dffb14df1e9265b233b50 -SIZE (cabal/base64-bytestring-1.0.0.1/base64-bytestring-1.0.0.1.tar.gz) = 9080 +SHA256 (cabal/base16-bytestring-0.1.1.7/base16-bytestring-0.1.1.7.tar.gz) = 525689679d5cc80fa532c1d5cfeace0f62bbb54134fad514f1ba00d0e7fe69ba +SIZE (cabal/base16-bytestring-0.1.1.7/base16-bytestring-0.1.1.7.tar.gz) = 5136 +SHA256 (cabal/base64-bytestring-1.1.0.0/base64-bytestring-1.1.0.0.tar.gz) = 210d6c9042241ca52ee5d89cf221dbeb4d0e64b37391345369035ad2d9b4aca9 +SIZE (cabal/base64-bytestring-1.1.0.0/base64-bytestring-1.1.0.0.tar.gz) = 12076 SHA256 (cabal/cryptohash-sha256-0.11.101.0/cryptohash-sha256-0.11.101.0.tar.gz) = 52756435dbea248e344fbcbcc5df5307f60dfacf337dfd11ae30f1c7a4da05dd SIZE (cabal/cryptohash-sha256-0.11.101.0/cryptohash-sha256-0.11.101.0.tar.gz) = 14996 SHA256 (cabal/cryptohash-sha256-0.11.101.0/revision/4.cabal) = b963d6308db096362d73d9c603b331cf188aa69310195f479dfedf6045d7e602 @@ -25,43 +23,47 @@ SHA256 (cabal/echo-0.1.3/revision/1.cabal) = 5490be9cf SIZE (cabal/echo-0.1.3/revision/1.cabal) = 2500 SHA256 (cabal/ed25519-0.0.5.0/ed25519-0.0.5.0.tar.gz) = d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d SIZE (cabal/ed25519-0.0.5.0/ed25519-0.0.5.0.tar.gz) = 80034 -SHA256 (cabal/ed25519-0.0.5.0/revision/2.cabal) = 2e051ab9d98bc22e0c4afe09e763d3e8e0571ea51a3ae952db33ac89e58006b3 -SIZE (cabal/ed25519-0.0.5.0/revision/2.cabal) = 4165 +SHA256 (cabal/ed25519-0.0.5.0/revision/3.cabal) = fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa +SIZE (cabal/ed25519-0.0.5.0/revision/3.cabal) = 4165 SHA256 (cabal/edit-distance-0.2.2.1/edit-distance-0.2.2.1.tar.gz) = 3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a SIZE (cabal/edit-distance-0.2.2.1/edit-distance-0.2.2.1.tar.gz) = 13228 SHA256 (cabal/edit-distance-0.2.2.1/revision/1.cabal) = 4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee SIZE (cabal/edit-distance-0.2.2.1/revision/1.cabal) = 2351 SHA256 (cabal/hackage-security-0.6.0.1/hackage-security-0.6.0.1.tar.gz) = 9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17 SIZE (cabal/hackage-security-0.6.0.1/hackage-security-0.6.0.1.tar.gz) = 86006 +SHA256 (cabal/hackage-security-0.6.0.1/revision/2.cabal) = 692c385c085baa2813046ae58e31df21c250346b81c882431b5ffef76451a18a +SIZE (cabal/hackage-security-0.6.0.1/revision/2.cabal) = 12001 SHA256 (cabal/hashable-1.3.0.0/hashable-1.3.0.0.tar.gz) = 822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4 SIZE (cabal/hashable-1.3.0.0/hashable-1.3.0.0.tar.gz) = 29835 SHA256 (cabal/hashable-1.3.0.0/revision/1.cabal) = 4c70f1407881059e93550d3742191254296b2737b793a742bd901348fb3e1fb1 SIZE (cabal/hashable-1.3.0.0/revision/1.cabal) = 5206 SHA256 (cabal/lukko-0.1.1.2/lukko-0.1.1.2.tar.gz) = 8a79d113dc0ccef16c24d83379cc457485943027e777529c46362fecc06607d2 SIZE (cabal/lukko-0.1.1.2/lukko-0.1.1.2.tar.gz) = 28366 -SHA256 (cabal/mintty-0.1.2/mintty-0.1.2.tar.gz) = 7c8af77bcde4e9b54692e3761f41adf35a50664974ba77f2ba65ea2af9f950da -SIZE (cabal/mintty-0.1.2/mintty-0.1.2.tar.gz) = 6945 -SHA256 (cabal/network-2.7.0.0/network-2.7.0.0.tar.gz) = c10546f4846f53a0b4b65538bc4fd5db6d4b5d3ac69447e6114be0be0f1a0d9f -SIZE (cabal/network-2.7.0.0/network-2.7.0.0.tar.gz) = 123227 -SHA256 (cabal/network-uri-2.6.1.0/network-uri-2.6.1.0.tar.gz) = 423e0a2351236f3fcfd24e39cdbc38050ec2910f82245e69ca72a661f7fc47f0 -SIZE (cabal/network-uri-2.6.1.0/network-uri-2.6.1.0.tar.gz) = 27262 -SHA256 (cabal/network-uri-2.6.1.0/revision/1.cabal) = 62cc45c66023e37ef921d5fb546aca56a9c786615e05925fb193a70bf0913690 -SIZE (cabal/network-uri-2.6.1.0/revision/1.cabal) = 2310 -SHA256 (cabal/random-1.1/random-1.1.tar.gz) = b718a41057e25a3a71df693ab0fe2263d492e759679b3c2fea6ea33b171d3a5a -SIZE (cabal/random-1.1/random-1.1.tar.gz) = 10870 -SHA256 (cabal/random-1.1/revision/1.cabal) = 7b67624fd76ddf97c206de0801dc7e888097e9d572974be9b9ea6551d76965df -SIZE (cabal/random-1.1/revision/1.cabal) = 1777 +SHA256 (cabal/network-3.1.1.1/network-3.1.1.1.tar.gz) = d7ef590173fff2ab522fbc167f3fafb867e4ecfca279eb3ef0d137b51f142c9a +SIZE (cabal/network-3.1.1.1/network-3.1.1.1.tar.gz) = 118478 +SHA256 (cabal/network-uri-2.6.3.0/network-uri-2.6.3.0.tar.gz) = a01c1389f15d2cc2e847914737f706133bb11f0c5f8ee89711a36a25b7afa723 +SIZE (cabal/network-uri-2.6.3.0/network-uri-2.6.3.0.tar.gz) = 31997 +SHA256 (cabal/random-1.2.0/random-1.2.0.tar.gz) = e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de +SIZE (cabal/random-1.2.0/random-1.2.0.tar.gz) = 37889 +SHA256 (cabal/regex-base-0.94.0.0/regex-base-0.94.0.0.tar.gz) = c41f82f5fc1157c961a4cbdc0cd5561e5aa44f339ce6e706d978d97e0ca6b914 +SIZE (cabal/regex-base-0.94.0.0/regex-base-0.94.0.0.tar.gz) = 9679 +SHA256 (cabal/regex-base-0.94.0.0/revision/1.cabal) = 44aa95ca762294ffbb28cf0af9c567d93b5d2c56e4f38ce5385a257d899f968e +SIZE (cabal/regex-base-0.94.0.0/revision/1.cabal) = 2253 +SHA256 (cabal/regex-posix-0.96.0.0/regex-posix-0.96.0.0.tar.gz) = 251300f1a6bb2e91abb8bf513a21981f8fab79c98a65acea2bb6d6a524414521 +SIZE (cabal/regex-posix-0.96.0.0/regex-posix-0.96.0.0.tar.gz) = 12529 +SHA256 (cabal/regex-posix-0.96.0.0/revision/2.cabal) = bd870f983a21bb474bd96449736f011c599981ce70da808a21ec1a28292e5481 +SIZE (cabal/regex-posix-0.96.0.0/revision/2.cabal) = 2861 SHA256 (cabal/resolv-0.1.2.0/resolv-0.1.2.0.tar.gz) = 81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671 SIZE (cabal/resolv-0.1.2.0/resolv-0.1.2.0.tar.gz) = 156710 +SHA256 (cabal/splitmix-0.1/splitmix-0.1.tar.gz) = 1c11c87352ddbb13365380fe163f99bb8f8845ebc96ca1d572e5d3a9bf810bfa +SIZE (cabal/splitmix-0.1/splitmix-0.1.tar.gz) = 18997 SHA256 (cabal/tar-0.5.1.1/tar-0.5.1.1.tar.gz) = b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de SIZE (cabal/tar-0.5.1.1/tar-0.5.1.1.tar.gz) = 39155 SHA256 (cabal/tar-0.5.1.1/revision/2.cabal) = 7a715414c4d494c9048cfb6d7634e07e7732ca154cb8938dc85f6ea192192e8c SIZE (cabal/tar-0.5.1.1/revision/2.cabal) = 5254 -SHA256 (cabal/zip-archive-0.3.3/zip-archive-0.3.3.tar.gz) = 988adee77c806e0b497929b24d5526ea68bd3297427da0d0b30b99c094efc84d -SIZE (cabal/zip-archive-0.3.3/zip-archive-0.3.3.tar.gz) = 18229 -SHA256 (cabal/zip-archive-0.3.3/revision/1.cabal) = 53f871653059f87285f434319598f380d986cd7fd9219de555dcafc496121a7c -SIZE (cabal/zip-archive-0.3.3/revision/1.cabal) = 2688 SHA256 (cabal/zlib-0.6.2.1/zlib-0.6.2.1.tar.gz) = f0f810ff173560b60392db448455c0513b3239f48e43cb494b3733aa559621d0 SIZE (cabal/zlib-0.6.2.1/zlib-0.6.2.1.tar.gz) = 143424 SHA256 (cabal/zlib-0.6.2.1/revision/1.cabal) = d34ddf5fece4d1e9d471b5298f36335bb3cfe12cb5a1b8525c42f0b665382f45 SIZE (cabal/zlib-0.6.2.1/revision/1.cabal) = 4547 +SHA256 (cabal/haskell-cabal-3.4.0.0-cabal-install-3.4.0.0_GH0.tar.gz) = e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c +SIZE (cabal/haskell-cabal-3.4.0.0-cabal-install-3.4.0.0_GH0.tar.gz) = 2072483 Added: head/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.1.json ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.1.json Wed Mar 10 12:31:25 2021 (r567995) @@ -0,0 +1,43 @@ +--- bootstrap/linux-8.10.1.json.orig 2021-03-05 14:30:13 UTC ++++ bootstrap/linux-8.10.1.json +@@ -14,7 +14,7 @@ + }, + { + "package": "base", +- "version": "4.14.0.0" ++ "version": "4.14.1.0" + }, + { + "package": "array", +@@ -26,7 +26,7 @@ + }, + { + "package": "bytestring", +- "version": "0.10.10.0" ++ "version": "0.10.12.0" + }, + { + "package": "containers", +@@ -62,7 +62,7 @@ + }, + { + "package": "text", +- "version": "1.2.3.2" ++ "version": "1.2.4.1" + }, + { + "package": "parsec", +@@ -74,11 +74,11 @@ + }, + { + "package": "process", +- "version": "1.6.8.2" ++ "version": "1.6.9.0" + }, + { + "package": "ghc-boot-th", +- "version": "8.10.1" ++ "version": "8.10.4" + }, + { + "package": "template-haskell",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103101231.12ACVPM0036661>