diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile index aa1ed7e47bdf..53ec3ffcd5a3 100644 --- a/devel/hs-cabal-install/Makefile +++ b/devel/hs-cabal-install/Makefile @@ -1,63 +1,64 @@ PORTNAME= cabal-install PORTVERSION= 3.6.2.0 +PORTREVISION= 1 CATEGORIES= devel haskell EXTRACT_ONLY= ${DISTNAME_DEFAULT}${_GITHUB_EXTRACT_SUFX} MAINTAINER= haskell@FreeBSD.org COMMENT= Command-line interface for Cabal and Hackage LICENSE= BSD3CLAUSE USES= cabal:nodefault compiler:c11 python:build USE_GITHUB= yes GH_ACCOUNT= haskell GH_PROJECT= cabal GH_TAGNAME= ${PORTNAME}-v${PORTVERSION} USE_CABAL= async-2.2.4 \ base16-bytestring-1.0.2.0 \ base64-bytestring-1.2.1.0 \ cryptohash-sha256-0.11.102.1 \ echo-0.1.4 \ ed25519-0.0.5.0_5 \ edit-distance-0.2.2.1_1 \ hackage-security-0.6.1.0 \ hashable-1.3.3.0 \ HTTP-4000.3.16_1 \ lukko-0.1.1.3_2 \ network-3.1.2.2 \ network-uri-2.6.4.1 \ random-1.2.1 \ regex-base-0.94.0.1_1 \ regex-posix-0.96.0.1 \ resolv-0.1.2.0_4 \ splitmix-0.1.0.4 \ tar-0.5.1.1_5 \ th-compat-0.1.3 \ zlib-0.6.2.3_1 EXECUTABLES= cabal SKIP_CABAL_EXTRACT= yes 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}/_build/tarballs/ . if ${package:C/[^_]*//:S/_//} != "" ${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}/_build/tarballs/${package:C/[0-9._]*$//:S/-$//}.cabal . endif .endfor do-build: cd ${WRKSRC} && \ ${PYTHON_CMD} bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json do-install: ${INSTALL_PROGRAM} ${WRKSRC}/_build/bin/cabal ${STAGEDIR}${PREFIX}/bin/ .include diff --git a/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.7.json b/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.7.json index 74f99dd26bbe..194b14e5bc9d 100644 --- a/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.7.json +++ b/devel/hs-cabal-install/files/patch-bootstrap_linux-8.10.7.json @@ -1,225 +1,225 @@ --- bootstrap/linux-8.10.7.json.orig 2021-10-09 16:09:15 UTC +++ bootstrap/linux-8.10.7.json @@ -70,21 +70,21 @@ { "source": "hackage", "package": "async", - "version": "2.2.3", + "version": "2.2.4", "flags": [ "-bench" ], - "cabal_sha256": "0cbefb8247308b38e397e675f832b9bd5317ff1872001d5358f213654423c55b", - "src_sha256": "467af3a0037947a5232ecf5f4efbd4cf2118aaa2310566d7f40ac82b0e32935c", + "cabal_sha256": null, + "src_sha256": "484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725", "revision": 0 }, { "source": "hackage", "package": "base16-bytestring", - "version": "1.0.1.0", + "version": "1.0.2.0", "flags": [], - "cabal_sha256": "33b9d57afa334d06485033e930c6b13fc760baf88fd8f715ae2f9a4b46e19a54", - "src_sha256": "c0c70a4b58be53d36971bd7361ba300f82a5d5ebf7f50e1a2d7bfc8838bdd6fa", + "cabal_sha256": null, + "src_sha256": "1d5a91143ef0e22157536093ec8e59d226a68220ec89378d5dcaeea86472c784", "revision": 0 }, { @@ -99,14 +99,14 @@ { "source": "hackage", "package": "cryptohash-sha256", - "version": "0.11.102.0", + "version": "0.11.102.1", "flags": [ "-exe", "+use-cbits" ], - "cabal_sha256": "797a0af7b8a0e654cbddd3df6b9de02d2cbfcb2292cf001399ab53910fbbb76c", - "src_sha256": "8ad6e9875a9128f6cd66d65d80f9f85dd0559c73ac00bb37f71fbee820d10519", - "revision": 1 + "cabal_sha256": null, + "src_sha256": "73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6", + "revision": 0 }, { "source": "hackage", @@ -122,22 +122,22 @@ { "source": "hackage", "package": "splitmix", - "version": "0.1.0.3", + "version": "0.1.0.4", "flags": [ "-optimised-mixer" ], - "cabal_sha256": "fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c", - "src_sha256": "46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35", + "cabal_sha256": null, + "src_sha256": "6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa", "revision": 0 }, { "source": "hackage", "package": "random", - "version": "1.2.0", + "version": "1.2.1", "flags": [], - "cabal_sha256": "195506fedaa7c31c1fa2a747e9b49b4a5d1f0b09dd8f1291f23a771656faeec3", - "src_sha256": "e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de", - "revision": 6 + "cabal_sha256": null, + "src_sha256": "265c768fc5f2ca53cde6a87e706b4448cad474c3deece933c103f24453661457", + "revision": 0 }, { "source": "hackage", @@ -158,9 +158,9 @@ "+test-hlint", "+test-properties" ], - "cabal_sha256": "fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa", + "cabal_sha256": null, "src_sha256": "d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d", - "revision": 3 + "revision": 5 }, { "source": "hackage", @@ -171,7 +171,7 @@ ], "cabal_sha256": "2db49b6cb6632a46ec446fc51870cd0d49e0a66d1c5d2063f46ae52a100eb856", "src_sha256": "a80efb60cfa3dae18682c01980d76d5f7e413e191cd186992e1bf7388d48ab1f", - "revision": 1 + "revision": 2 }, { "source": "hackage", @@ -201,7 +201,7 @@ { "source": "hackage", "package": "hackage-security", - "version": "0.6.0.1", + "version": "0.6.1.0", "flags": [ "+base48", "+lukko", @@ -209,9 +209,9 @@ "-old-directory", "+use-network-uri" ], - "cabal_sha256": "ae6cdda307237c0b7efeebfb0bf23ff8a26c30f5ba295dce5e4f81ef6e63fff6", - "src_sha256": "9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17", - "revision": 8 + "cabal_sha256": null, + "src_sha256": "8bf3ae9fe87f80cf850b322220ba50abfe67d6cfc0fdcc33853cecc0e0017718", + "revision": 0 }, { "source": "hackage", @@ -261,19 +261,19 @@ "builtin": [ { "package": "rts", - "version": "1.0.1" + "version": "1.0.2" }, { "package": "ghc-prim", - "version": "0.6.1" + "version": "0.8.0" }, { "package": "integer-gmp", - "version": "1.0.3.0" + "version": "1.1" }, { "package": "base", - "version": "4.14.3.0" -+ "version": "4.16.2.0" ++ "version": "4.16.3.0" }, { "package": "array", @@ -281,11 +281,11 @@ }, { "package": "deepseq", - "version": "1.4.4.0" + "version": "1.4.6.1" }, { "package": "bytestring", - "version": "0.10.12.0" + "version": "0.11.3.1" }, { "package": "containers", @@ -293,15 +293,15 @@ }, { "package": "binary", - "version": "0.8.8.0" + "version": "0.8.9.0" }, { "package": "filepath", - "version": "1.4.2.1" + "version": "1.4.2.2" }, { "package": "time", - "version": "1.9.3" + "version": "1.11.1.1" }, { "package": "unix", @@ -309,7 +309,7 @@ }, { "package": "directory", - "version": "1.3.6.0" + "version": "1.3.6.2" }, { "package": "transformers", @@ -321,7 +321,7 @@ }, { "package": "ghc-boot-th", - "version": "8.10.7" -+ "version": "9.2.3" ++ "version": "9.2.4" }, { "package": "pretty", @@ -329,15 +329,15 @@ }, { "package": "template-haskell", - "version": "2.16.0.0" + "version": "2.18.0.0" }, { "package": "text", - "version": "1.2.4.1" + "version": "1.2.5.0" }, { "package": "parsec", - "version": "3.1.14.0" + "version": "3.1.15.0" }, { "package": "process", @@ -345,7 +345,7 @@ }, { "package": "stm", - "version": "2.5.0.1" + "version": "2.5.0.2" } ] } diff --git a/devel/hs-haskell-language-server/Makefile b/devel/hs-haskell-language-server/Makefile index 21b129c03950..5ed57b112881 100644 --- a/devel/hs-haskell-language-server/Makefile +++ b/devel/hs-haskell-language-server/Makefile @@ -1,296 +1,298 @@ PORTNAME= haskell-language-server DISTVERSION= 1.7.0.0 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org COMMENT= LSP provider implementation for Haskell language BROKEN_aarch64= Causes compiler to crash LICENSE= APACHE20 USES= cabal USE_GITHUB= yes GH_ACCOUNT= haskell USE_CABAL= Boolean-0.2.4 \ Chart-1.9.4 \ Chart-diagrams-1.9.4 \ Diff-0.4.1 \ Glob-0.10.2_3 \ HsYAML-0.2.1.0_4 \ HsYAML-aeson-0.2.0.1_2 \ JuicyPixels-3.3.7 \ ListLike-4.7.6 \ MemoTrie-0.6.10 \ MonadRandom-0.5.3_2 \ NumInstances-1.4 \ OneTuple-0.3.1_2 \ Only-0.1_1 \ QuickCheck-2.14.2 \ StateVar-1.2.2 \ SVGFonts-1.8.0.1 \ active-0.2.0.15_1 \ adjunctions-4.4_2 \ aeson-2.0.3.0 \ aeson-pretty-0.8.9_1 \ alex-3.2.7.1 \ algebraic-graphs-0.6_1 \ ansi-terminal-0.11.1 \ ansi-wl-pprint-0.6.9_3 \ apply-refact-0.10.0.0 \ assoc-1.0.2_2 \ async-2.2.4_1 \ atomic-primops-0.8.4 \ attoparsec-0.14.4_1 \ base-compat-0.12.1 \ base-compat-batteries-0.12.1_2 \ base-orphans-0.8.6 \ base16-bytestring-1.0.2.0 \ base64-bytestring-1.2.1.0 \ bifunctors-5.5.11_1 \ binary-orphans-1.0.2_1 \ blaze-builder-0.4.2.2_1 \ blaze-markup-0.8.2.8_2 \ blaze-svg-0.3.6.1_1 \ blaze-textual-0.2.2.1 \ brittany-0.14.0.2 \ butcher-1.3.3.2_1 \ bytes-0.17.2 \ cabal-doctest-1.0.9 \ call-stack-0.4.0 \ case-insensitive-1.2.1.0 \ cereal-0.5.8.2 \ cereal-vector-0.2.0.1 \ charset-0.3.9 \ circle-packing-0.1.0.6_4 \ clock-0.8.3 \ cmdargs-0.10.21 \ colour-2.3.6 \ comonad-5.0.8_1 \ conduit-1.3.4.2 \ conduit-extra-1.3.5_1 \ conduit-parse-0.2.1.1_1 \ constraints-0.13.3 \ constraints-extras-0.3.2.1 \ contravariant-1.5.5 \ cpphs-1.20.9.1_1 \ cryptohash-md5-0.11.101.0 \ cryptohash-sha1-0.11.101.0 \ cubicbezier-0.6.0.6_1 \ czipwith-1.0.1.4_1 \ data-default-0.7.1.1 \ data-default-class-0.1.2.0 \ data-default-instances-containers-0.0.1 \ data-default-instances-dlist-0.0.1 \ data-default-instances-old-locale-0.0.1 \ data-fix-0.3.2_2 \ data-tree-print-0.1.0.2_3 \ deferred-folds-0.9.18.1 \ dependent-map-0.4.0.0 \ dependent-sum-0.7.1.0_2 \ deque-0.4.4 \ diagrams-core-1.5.0_3 \ diagrams-contrib-1.4.4_5 \ diagrams-lib-1.4.5.1_2 \ diagrams-postscript-1.5.1_1 \ diagrams-solve-0.1.3_1 \ diagrams-svg-1.4.3.1_3 \ direct-sqlite-2.3.26 \ distributive-0.6.2.1_1 \ dlist-1.0 \ dual-tree-0.2.3.0_2 \ entropy-0.4.1.7 \ enummapset-0.6.0.3 \ extra-1.7.10 \ fail-4.9.0.0 \ fast-math-1.0.2 \ file-embed-0.0.15.0 \ filemanip-0.3.6.3 \ filepattern-0.1.2 \ fingertree-0.1.5.0 \ floskell-0.10.6 \ fmlist-0.9.4 \ focus-1.0.3 \ foldl-1.4.12_3 \ force-layout-0.4.0.6_8 \ fourmolu-0.5.0.1_1 \ free-5.1.7_1 \ fsnotify-0.3.0.1_2 \ fuzzy-0.1.0.1 \ generic-deriving-1.14.1 \ generic-lens-2.2.1.0_1 \ generic-lens-core-2.2.1.0_1 \ ghc-check-0.5.0.6 \ ghc-exactprint-1.5.0_1 \ ghc-lib-9.2.2.20220307 \ ghc-lib-parser-9.2.2.20220307 \ ghc-lib-parser-ex-9.2.0.3 \ ghc-paths-0.1.0.12_3 \ ghc-source-gen-0.4.3.0 \ ghc-trace-events-0.1.2.5 \ githash-0.1.6.2 \ gitrev-1.3.1 \ groups-0.5.3 \ haddock-library-1.10.0_3 \ happy-1.20.0_1 \ hashable-1.4.0.2 \ hashtables-1.3 \ haskell-src-exts-1.23.1 \ heaps-0.4 \ heapsize-0.3.0.1 \ hie-bios-0.9.1 \ hiedb-0.4.1.0_1 \ hlint-3.3.6 \ hsc2hs-0.68.8 \ hscolour-1.24.4 \ hslogger-1.3.1.0_5 \ hyphenation-0.8.2_1 \ implicit-hie-0.1.2.6 \ implicit-hie-cradle-0.5.0.0_1 \ indexed-profunctors-0.1.1 \ indexed-traversable-0.1.2_1 \ indexed-traversable-instances-0.1.1 \ integer-logarithms-1.0.3.1_2 \ integration-0.2.1 \ intervals-0.9.2 \ invariant-0.5.5 \ js-dgtable-0.5.2 \ js-flot-0.8.3 \ js-jquery-3.3.1 \ kan-extensions-5.2.3 \ lens-5.1_1 \ lens-aeson-1.2 \ libyaml-0.1.2 \ linear-1.21.9 \ list-t-1.0.5.1 \ logict-0.7.0.3_1 \ lsp-1.4.0.0_1 \ lsp-test-0.14.0.2_1 \ lsp-types-1.4.0.1 \ lucid-2.11.0_2 \ matrices-0.5.0 \ megaparsec-9.2.0_2 \ mfsolve-0.3.2.1_1 \ microlens-0.4.13.0 \ microlens-mtl-0.2.0.2 \ microlens-th-0.4.3.10 \ mmorph-1.2.0_2 \ mod-0.1.2.2 \ monad-control-1.0.3.1 \ monad-dijkstra-0.1.1.3 \ monad-memo-0.5.4 \ mono-traversable-1.0.15.3 \ monoid-extras-0.6.1_1 \ monoid-subclasses-1.1.3 \ mtl-compat-0.2.2 \ multistate-0.8.0.4 \ network-3.1.2.7 \ network-bsd-2.8.1.0_4 \ network-info-0.2.1 \ network-uri-2.6.4.1 \ newtype-generics-0.6.2 \ old-locale-1.0.0.7_2 \ opentelemetry-0.8.0 \ operational-0.2.4.1 \ optparse-applicative-0.16.1.0_2 \ optparse-simple-0.1.1.4 \ ordered-containers-0.2.2 \ ormolu-0.4.0.0_2 \ parallel-3.2.2.0_4 \ parser-combinators-1.3.0 \ parsers-0.12.11 \ polyparse-1.13_4 \ pretty-simple-4.1.0.0 \ prettyprinter-1.7.1 \ prettyprinter-ansi-terminal-1.1.3 \ primes-0.2.1.0 \ primitive-0.7.3.0_2 \ primitive-extras-0.10.1.4 \ primitive-unlifted-0.1.3.1 \ process-extras-0.7.4 \ profunctors-5.6.2_2 \ psqueues-0.2.7.3 \ random-1.2.1 \ random-shuffle-0.0.4 \ refact-0.3.0.2 \ refinery-0.4.0.0 \ reflection-2.1.6_1 \ regex-base-0.94.0.2 \ regex-tdfa-1.3.1.2 \ resourcet-1.2.4.3_1 \ retrie-1.2.0.1_2 \ rope-utf16-splay-0.3.2.0 \ safe-0.3.19 \ safe-exceptions-0.1.7.2 \ scientific-0.3.7.0_2 \ semialign-1.2.0.1_1 \ semigroupoids-5.3.7 \ semigroups-0.19.2_2 \ semirings-0.6_1 \ shake-0.19.6 \ some-1.0.3_2 \ sorted-list-0.2.1.0 \ split-0.2.3.4_2 \ splitmix-0.1.0.4 \ sqlite-simple-0.4.18.0 \ statestack-0.3.1 \ stm-containers-1.2 \ stm-hamt-1.2.0.7 \ streaming-commons-0.2.2.4 \ strict-0.4.0.1_4 \ strict-list-0.1.7 \ stylish-haskell-0.14.1.0 \ svg-builder-0.1.1_5 \ syb-0.7.2.1 \ tagged-0.8.6.1_2 \ tasty-1.4.2.3 \ tasty-expected-failure-0.12.3 \ tasty-golden-2.3.5 \ tasty-hunit-0.10.0.3 \ tasty-rerun-1.1.18_3 \ temporary-1.3 \ terminal-size-0.3.3 \ text-short-0.1.5 \ th-abstraction-0.4.3.0 \ th-compat-0.1.3_1 \ these-1.1.1.1_5 \ time-compat-1.9.6.1_3 \ transformers-base-0.4.6 \ transformers-compat-0.7.1_1 \ type-equality-1_3 \ typed-process-0.2.8.0_1 \ unagi-chan-0.4.1.4 \ unbounded-delays-0.1.1.1 \ uniplate-1.6.13_1 \ unix-compat-0.5.4_1 \ unliftio-0.2.21.0 \ unliftio-core-0.2.0.1_2 \ unordered-containers-0.2.18.0 \ unsafe-0.0 \ utf8-string-1.0.2 \ uuid-1.3.15_1 \ uuid-types-1.0.5_2 \ vector-0.12.3.1_2 \ vector-algorithms-0.8.0.4_1 \ vector-space-0.16 \ void-0.7.3 \ wcwidth-0.0.2 \ witherable-0.4.2_2 \ xml-1.3.14_2 \ yaml-0.11.8.0 \ zlib-0.6.2.3_1 CABAL_PROJECT= append CABAL_FLAGS= -dynamic EXECUTABLES= ${PORTNAME} \ ${PORTNAME}-wrapper NOT_FOR_ARCHS= i386 post-patch: ${MV} ${WRKSRC}/cabal-ghc92.project ${WRKSRC}/cabal.project.${PORTNAME} + @${REINPLACE_CMD} -e '/with-compiler: ghc-9.2.3/d' \ + ${WRKSRC}/cabal.project.${PORTNAME} || ${TRUE} .include diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 99f6013cc382..5939c5a318d7 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -1,218 +1,218 @@ PORTNAME= ghc PORTVERSION= ${GHC_VERSION} CATEGORIES= lang haskell MASTER_SITES= https://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ LOCAL/arrowd/:boot DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source MAINTAINER= haskell@FreeBSD.org COMMENT= Compiler for the functional language Haskell LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 USES= autoreconf compiler:c11 gmake iconv:patch,translit \ localbase:ldflags ncurses perl5 python:build shebangfix \ tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS+= --docdir=${DOCSDIR} INSTALL_TARGET= install-strip USE_LOCALE= en_US.UTF-8 USE_PERL5= build NO_CCACHE= yes OPTIONS_SUB= yes SHEBANG_FILES= boot OPTIONS_DEFINE?= DYNAMIC GMP PROFILE DOCS OPTIONS_DEFAULT= DYNAMIC PROFILE GMP OPTIONS_GROUP= BOOTSTRAP BOOTSTRAP_DESC= Bootsrap using installed ghc OPTIONS_GROUP_BOOTSTRAP=BOOT BOOT_DESC= Use installed GHC for bootstrapping DOCS_DESC= Install HTML documentation DYNAMIC_DESC= Add support for dynamic linking GMP_DESC= Use GNU Multi-precision Library from Ports PROFILE_DESC= Add support for performance profiling BOOT_CONFIGURE_ENV= GHC=${LOCALBASE}/bin/ghc BOOT_CONFIGURE_ENV_OFF= GHC=${BOOT_GHC} DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx DOCS_VARS= enable_docs=YES DOCS_VARS_OFF= enable_docs=NO DYNAMIC_CONFIGURE_WITH= system-libffi \ ffi-includes=${LOCALBASE}/include \ ffi-libraries=${LOCALBASE}/lib DYNAMIC_LIB_DEPENDS= libffi.so:devel/libffi DYNAMIC_VARS= enable_dynamic=YES DYNAMIC_VARS_OFF= enable_dynamic=NO GMP_CONFIGURE_WITH= gmp-includes=${LOCALBASE}/include \ gmp-libraries=${LOCALBASE}/lib GMP_LIB_DEPENDS= libgmp.so:math/gmp PROFILE_VARS= enable_profile=YES PROFILE_VARS_OFF= enable_profile=NO -GHC_VERSION?= 9.2.3 +GHC_VERSION?= 9.2.4 LLVM_VERSION?= 12 BOOT_GHC_VERSION= 8.10.7 # LLVM version that bootstrap compiler uses BOOT_LLVM_VERSION= 10 -BASE_PACKAGES?= Cabal-3.6.3.0 array-0.5.4.0 base-4.16.2.0 binary-0.8.9.0 \ +BASE_PACKAGES?= Cabal-3.6.3.0 array-0.5.4.0 base-4.16.3.0 binary-0.8.9.0 \ bytestring-0.11.3.1 containers-0.6.5.1 deepseq-1.4.6.1 \ directory-1.3.6.2 exceptions-0.10.4 filepath-1.4.2.2 \ ghc-${GHC_VERSION} ghc-bignum-1.2 ghc-compact-0.1.0.0 \ ghc-prim-0.8.0 haskeline-0.8.2 hpc-0.6.1.0 \ integer-gmp-1.1 mtl-2.2.2 parsec-3.1.15.0 pretty-1.3.3.6 \ process-1.6.13.2 stm-2.5.0.2 template-haskell-2.18.0.0 \ terminfo-0.4.1.5 text-1.2.5.0 time-1.11.1.1 \ transformers-0.5.6.2 unix-2.7.2.2 xhtml-3000.2.2.1 .for pkg in ${BASE_PACKAGES} PLIST_SUB+= ${pkg:C/-([0-9.])+//:tu}_VERSION=${pkg:C/^([^\.]*-)+//} .endfor BUILD_MK= DYNAMIC_GHC_PROGRAMS=${ENABLE_DYNAMIC} \ BUILD_PROF_LIBS=${ENABLE_PROFILE} \ HADDOCK_DOCS=YES \ BUILD_SPHINX_HTML=${ENABLE_DOCS} \ BUILD_SPHINX_PDF=NO \ SRC_HC_OPTS+="-I${NCURSESINC} -L${NCURSESLIB} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \ SRC_CC_OPTS+="${CFLAGS}" \ EXTRA_HSC2HS_OPTS+="-I${LOCALBASE}/include --lflag=-L${LOCALBASE}/lib" \ EXTRA_LD_OPTS+="-L${LOCALBASE}/lib" \ libraries/terminfo_CONFIGURE_OPTS+="--configure-option=--with-curses-libraries=${NCURSESLIB}" \ ${SLAVE_BUILD_MK} \ V=0 .include .if ${SLAVE_PORT} != "yes" PORTDOCS= * .endif GHC_ARCH= ${ARCH:S/amd64/x86_64/:C/armv.*/arm/} CONFIGURE_TARGET= ${GHC_ARCH}-portbld-${OPSYS:tl} BOOT_DIR= ${WRKDIR}/ghc-${BOOT_GHC_VERSION}-boot BOOT_GHC= ${BOOT_DIR}/bin/ghc-${BOOT_GHC_VERSION} # This version of ncurses is needed by bootstrap compiler .if ${OSVERSION} > 1300078 && empty(PORT_OPTIONS:MBOOT) BUILD_DEPENDS+= ${LOCALBASE}/lib/compat/libncursesw.so.8:misc/compat12x .endif .if empty(PORT_OPTIONS:MBOOT) DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot .endif # MBOOT .if ${ARCH} == aarch64 || ${ARCH:Marmv*} # ghc-8.10.x on arm requires devel/llvm10 # CONFIGURE_TARGET must to be the same as the llvm triple CONFIGURE_TARGET= ${ARCH}-unknown-freebsd${"${ARCH:Maarch64}" != "":?:-gnueabihf} CONFIGURE_ARGS+= --host=${CONFIGURE_TARGET} BUILD_DEPENDS+= llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} RUN_DEPENDS+= llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION} # When GHC being compiled and GHC used for bootstrapping support different # LLVM versions, we have to pull in both. Luckily, this is relatively rare. . if ${BOOT_LLVM_VERSION} != ${LLVM_VERSION} BUILD_DEPENDS+= llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION} . endif .endif post-patch: # Generate the build.mk file ${RM} -f ${WRKSRC}/mk/build.mk .for line in ${BUILD_MK} ${ECHO_CMD} ${line} >> ${WRKSRC}/mk/build.mk .endfor # TODO: remove this after rerolling all bootstraps post-patch-BOOT-off: @${REINPLACE_CMD} -e '/^mandir/d' ${BOOT_DIR}/mk/build.mk @${REINPLACE_CMD} -e '/^infodir/d' ${BOOT_DIR}/mk/build.mk @${REINPLACE_CMD} -e '/^docdir/d' ${BOOT_DIR}/mk/build.mk @${REINPLACE_CMD} -e '/^htmldir/d' ${BOOT_DIR}/mk/build.mk pre-configure: # Call the bootstrap script cd ${WRKSRC}/ && ./boot # If we are using bootstrap compiler, configure and install it into ${BOOT_DIR} .if empty(PORT_OPTIONS:MBOOT) cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_CMD} --prefix=${BOOT_DIR} cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install .endif post-install: ${FIND} ${STAGEDIR}${DOCSDIR}/html -name .buildinfo -delete # For some reason, INSTALL_TARGET=install-strip doesn't cause libraries to be stripped # Run strip on them manually ${FIND} ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION} -name '*.so' -exec ${STRIP_CMD} {} + ${RM} ${STAGEDIR}${PREFIX}/bin/haddock .if ${SLAVE_PORT} == "yes" ${MV} ${STAGEDIR}${PREFIX}/bin/hsc2hs ${STAGEDIR}${PREFIX}/bin/hsc2hs-ghc-${GHC_VERSION} ${FIND} ${STAGEDIR}${PREFIX}/bin -not -type d -not -regex '.*-${GHC_VERSION}' -delete ${RM} -r ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION}/html ${RM} -r ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION}/latex .endif post-install-DOCS-off: # Docs for Haskell libraries are generated by Haddock, not sphinx, so we have # to pass WITH_HADDOCK=no to the build.mk to skip their generation. # However, we don't want to do that because this would cause Haddock itself not # to be built. ${RM} -r ${STAGEDIR}${DOCSDIR}/html .if exists(${BOOT_DIR}/bin/runhaskell) RUNHASKELL?= ${BOOT_DIR}/bin/runhaskell .else RUNHASKELL?= ${LOCALBASE}/bin/runhaskell .endif .PHONY: fixup-plist fixup-plist: ${RUNHASKELL} ${PATCHDIR}/fixup-plist.hs ${.CURDIR}/pkg-plist # Create a bootstrap compiler tar ball: run this in an interactive poudriere jail # Set all OPTIONS to OFF when generating bootstraps .PHONY: create-bootstrap create-bootstrap: cd ${WRKSRC} \ && ${ECHO} "BIN_DIST_NAME=ghc-${GHC_VERSION}-boot" >> mk/build.mk \ && ${ECHO} "BIN_DIST_TAR=ghc-${GHC_VERSION}-boot.tar" >> mk/build.mk \ && ${ECHO} "HADDOCK_DOCS=NO" >> mk/build.mk \ && ${GMAKE} binary-dist TAR_COMP=xz \ && ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-boot-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz cd /tmp \ && sha256 ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz \ && ${ECHO} -n "SIZE (ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz) = " \ && ${STAT} -f %z ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz # Much like create-bootstrap, just different naming and output format # Set DYNAMIC, GMP and PROFILE to ON, and DOCS to OFF when generating Stack bindist .PHONY: create-stack-bindist create-stack-bindist: cd ${WRKSRC} \ && ${GMAKE} binary-dist TAR_COMP=xz \ && ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/ cd /tmp \ && ${ECHO} "${GHC_VERSION}:" \ && ${ECHO} "url: \"http://distcache.FreeBSD.org/local-distfiles/arrowd/stack-bindists/ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz\"" \ && ${ECHO} -n "content-length: " \ && ${STAT} -f %z ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz \ && ${ECHO} -n "sha1: " \ && sha1 -q ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz \ && ${ECHO} -n "sha256: " \ && sha256 -q ghc-${GHC_VERSION}-${GHC_ARCH}-portbld-freebsd.tar.xz .include diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo index afa0b3285460..9d56962394b0 100644 --- a/lang/ghc/distinfo +++ b/lang/ghc/distinfo @@ -1,19 +1,19 @@ TIMESTAMP = 1653682073 -SHA256 (ghc-9.2.3-src.tar.xz) = 50ecdc2bef013e518f9a62a15245d7db0e4409d737c43b1cea7306fd82e1669e -SIZE (ghc-9.2.3-src.tar.xz) = 27525456 +SHA256 (ghc-9.2.4-src.tar.xz) = 15213888064a0ec4e7723d075f31b87a678ce0851773d58b44ef7aa3de996458 +SIZE (ghc-9.2.4-src.tar.xz) = 24632968 SHA256 (ghc-8.10.7-src.tar.xz) = e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d SIZE (ghc-8.10.7-src.tar.xz) = 19932668 SHA256 (ghc-8.10.7-boot-amd64-freebsd.tar.xz) = 5adfeceee2c3aa1208da174390cbb8e8c1d0a333b7c4a3a676a63f93beaf3126 SIZE (ghc-8.10.7-boot-amd64-freebsd.tar.xz) = 70607916 SHA256 (ghc-8.10.7-boot-i386-freebsd.tar.xz) = d841a6abf2b97e34feb9c71a85520a78dd667bfb6d6a7f401fa8a92b558928dc SIZE (ghc-8.10.7-boot-i386-freebsd.tar.xz) = 70040192 SHA256 (ghc-8.10.4-boot-armv6-freebsd.tar.xz) = 04b207b787bdff71028b8d4c311a47105d7b098809e8fd21b788b1ab0dccdf22 SIZE (ghc-8.10.4-boot-armv6-freebsd.tar.xz) = 148679080 SHA256 (ghc-8.10.4-boot-armv7-freebsd.tar.xz) = db94e69b83a93fba9c136e890ccb0bf76b6d163ac3979dadb1568e81c3267744 SIZE (ghc-8.10.4-boot-armv7-freebsd.tar.xz) = 149265452 SHA256 (ghc-8.10.7-boot-aarch64-freebsd.tar.xz) = 9bbae471c65a04a9787208d421ac1f3cf251f4e18dc974238172721148da6f49 SIZE (ghc-8.10.7-boot-aarch64-freebsd.tar.xz) = 125236788 SHA256 (ghc-8.10.7-boot-armv7-freebsd.tar.xz) = 15708f4f4324d7e87ddbd6548a6ca72dc8587de5a24c2498453603fa73b5ccfb SIZE (ghc-8.10.7-boot-armv7-freebsd.tar.xz) = 127945844 SHA256 (ghc-8.10.7-boot-armv6-freebsd.tar.xz) = 84010e11f92e0a9fe106b80cbaf027ba342da055c3ad6d89eab0a389c0523e1b SIZE (ghc-8.10.7-boot-armv6-freebsd.tar.xz) = 129190568 diff --git a/lang/ghc/files/patch-utils_llvm-targets_gen-data-layout.sh b/lang/ghc/files/extra-utils_llvm-targets_gen-data-layout.sh similarity index 100% rename from lang/ghc/files/patch-utils_llvm-targets_gen-data-layout.sh rename to lang/ghc/files/extra-utils_llvm-targets_gen-data-layout.sh diff --git a/lang/ghc810/Makefile b/lang/ghc810/Makefile index 85c5eed65b0d..0105166c8178 100644 --- a/lang/ghc810/Makefile +++ b/lang/ghc810/Makefile @@ -1,27 +1,30 @@ PKGNAMESUFFIX= 810 LIB_DEPENDS= ${GMP_LIB_DEPENDS} CONFIGURE_ARGS= ${GMP_CONFIGURE_WITH:C/^/--with-/} OPTIONS_DEFINE= DYNAMIC PROFILE SLAVE_BUILD_MK= BUILD_SPHINX_HTML=NO GHC_VERSION= 8.10.7 LLVM_VERSION= 10 BASE_PACKAGES= Cabal-3.2.1.0 array-0.5.4.0 base-4.14.3.0 binary-0.8.8.0 \ bytestring-0.10.12.0 containers-0.6.5.1 deepseq-1.4.4.0 \ directory-1.3.6.0 exceptions-0.10.4 filepath-1.4.2.1 \ ghc-${GHC_VERSION} ghc-compact-0.1.0.0 \ ghc-prim-0.6.1 haskeline-0.8.2 hpc-0.6.1.0 \ integer-gmp-1.0.3.0 mtl-2.2.2 parsec-3.1.14.0 pretty-1.1.3.6 \ process-1.6.13.2 stm-2.5.0.1 template-haskell-2.16.0.0 \ terminfo-0.4.1.4 text-1.2.4.1 time-1.9.3 \ transformers-0.5.6.2 unix-2.7.2.2 xhtml-3000.2.2.1 +EXTRA_PATCHES= ${MASTERDIR}/files/extra-utils_llvm-targets_gen-data-layout.sh \ + ${MASTERDIR}/files/patch-llvm-targets + MASTERDIR= ${.CURDIR}/../ghc PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/lang/ghc810/files/patch-aclocal.m4 b/lang/ghc810/files/patch-aclocal.m4 new file mode 100644 index 000000000000..96ba0a2b81cb --- /dev/null +++ b/lang/ghc810/files/patch-aclocal.m4 @@ -0,0 +1,20 @@ +--- aclocal.m4.orig 2021-06-29 07:24:51 UTC ++++ aclocal.m4 +@@ -2221,7 +2221,7 @@ AC_DEFUN([XCODE_VERSION],[ + # FIND_LLVM_PROG() + # -------------------------------- + # Find where the llvm tools are. We have a special function to handle when they +-# are installed with a version suffix (e.g., llc-7, llc-7.0) and without (e.g. ++# are installed with a version suffix (e.g., llc-7, llc-7.0, llc70) and without (e.g. + # llc). + # + # $1 = the variable to set +@@ -2231,7 +2231,7 @@ AC_DEFUN([FIND_LLVM_PROG],[ + # + AC_DEFUN([FIND_LLVM_PROG],[ + # Test for program with and without version name. +- PROG_VERSION_CANDIDATES=$(for llvmVersion in `seq $4 -1 $3`; do echo "$2-$llvmVersion $2-$llvmVersion.0"; done) ++ PROG_VERSION_CANDIDATES=$(for llvmVersion in `seq $4 -1 $3`; do echo "$2-$llvmVersion $2-$llvmVersion.0 $2$llvmVersion $2${llvmVersion}0"; done) + AC_CHECK_TOOLS([$1], [$PROG_VERSION_CANDIDATES $2], []) + AS_IF([test x"$$1" != x],[ + PROG_VERSION=`$$1 --version | awk '/.*version [[0-9\.]]+/{for(i=1;i<=NF;i++){ if(\$i ~ /^[[0-9\.]]+$/){print \$i}}}'`