A couple of patches are obsolete now. I built ghc on amd64 and i386. I rebuilt the majority of haskell ports on amd64.
OK? https://downloads.haskell.org/~ghc/8.10.6/docs/html/users_guide/8.10.6-notes.html --- lang/ghc/Makefile | 15 +++++------ lang/ghc/distinfo | 8 +++--- .../patches/patch-docs_users_guide_conf_py | 17 ------------ ...tch-libraries_process_include_runProcess_h | 26 ------------------- lang/ghc/pkg/PFRAG.no_i386 | 6 +++-- 5 files changed, 15 insertions(+), 57 deletions(-) delete mode 100644 lang/ghc/patches/patch-docs_users_guide_conf_py delete mode 100644 lang/ghc/patches/patch-libraries_process_include_runProcess_h diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 18154271f33..a5c0bee96e3 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -14,11 +14,10 @@ COMMENT = compiler for the functional language Haskell # ghc hardcodes ${WRKDIR}/bin/gcc when the package is compiled with ccache NO_CCACHE = Yes -GHC_VERSION = 8.10.5 +GHC_VERSION = 8.10.6 DISTNAME = ghc-${GHC_VERSION} CATEGORIES = lang devel HOMEPAGE = https://www.haskell.org/ghc/ -REVISION = 0 # Version of the precompiled binaries BIN_VER = 8.10.3.20210429 @@ -73,24 +72,24 @@ SUPDISTFILES += ${BINDISTFILE-$m} GHC_ITEMS = \ CABAL 3.2.1.0 \ ARRAY 0.5.4.0 \ - BASE 4.14.2.0 \ + BASE 4.14.3.0 \ BINARY 0.8.8.0 \ BYTESTRING 0.10.12.0 \ - CONTAINERS 0.6.4.1 \ + 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 8.10.5 \ + GHC 8.10.6 \ GHC_COMPACT 0.1.0.0 \ GHC_PRIM 0.6.1 \ - HASKELINE 0.8.0.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.9.0 \ + PROCESS 1.6.13.2 \ STM 2.5.0.1 \ TEMPLATE-HASKELL 2.16.0.0 \ TERMINFO 0.4.1.4 \ @@ -108,7 +107,7 @@ SUBST_VARS += ${_i}_VER USE_GMAKE = Yes USE_GROFF = Yes -AUTOCONF_VERSION = 2.69 +AUTOCONF_VERSION = 2.71 CONFIGURE_STYLE = gnu autoconf no-autoheader CONFIGURE_ARGS += --with-ffi-includes=${LOCALBASE}/include \ --with-ffi-libraries=${LOCALBASE}/lib \ diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo index 0175fe6c8ec..b8ccc7a99c1 100644 --- a/lang/ghc/distinfo +++ b/lang/ghc/distinfo @@ -2,11 +2,11 @@ SHA256 (ghc/ghc-8.10.3.20210429-amd64-unknown-openbsd.tar.xz) = GR5pHBh8PWUn12UK SHA256 (ghc/ghc-8.10.3.20210429-i386-unknown-openbsd.tar.xz) = T1OMZYN2sr+E88g88qElX6RYZbPdqANXGhWgCfKdFiY= SHA256 (ghc/ghc-8.10.3.20210429-shlibs-amd64.tar.gz) = M+B6p7cC4v3f1BrArX1DW6sie+HX3itEW5cTftI9yZE= SHA256 (ghc/ghc-8.10.3.20210429-shlibs-i386.tar.gz) = A/paDCY65gLRxas7/mNGUg0W7lR9XWJcJmnAJkcf5C4= -SHA256 (ghc/ghc-8.10.5-src.tar.xz) = 8QlB8W5PvZhYCrUkG5JxuwhRMEVgxNXKEn47DiDjB28= -SHA256 (ghc/ghc-8.10.5-testsuite.tar.xz) = ppkkqER2FLzgE3WJZm5EX2FxO2XlHmj1Rtgsl8k5mG0= +SHA256 (ghc/ghc-8.10.6-src.tar.xz) = Q6+6cqUzQItCwUkr0Ee1435fcgTkGlzt0xgsyEFhDOk= +SHA256 (ghc/ghc-8.10.6-testsuite.tar.xz) = 6yX1PAvNC/Sae0ndofh95GH9kzs/a1FitvidSE298rk= SIZE (ghc/ghc-8.10.3.20210429-amd64-unknown-openbsd.tar.xz) = 48779544 SIZE (ghc/ghc-8.10.3.20210429-i386-unknown-openbsd.tar.xz) = 49505820 SIZE (ghc/ghc-8.10.3.20210429-shlibs-amd64.tar.gz) = 2910620 SIZE (ghc/ghc-8.10.3.20210429-shlibs-i386.tar.gz) = 2759631 -SIZE (ghc/ghc-8.10.5-src.tar.xz) = 19920148 -SIZE (ghc/ghc-8.10.5-testsuite.tar.xz) = 2270504 +SIZE (ghc/ghc-8.10.6-src.tar.xz) = 19932832 +SIZE (ghc/ghc-8.10.6-testsuite.tar.xz) = 2265044 diff --git a/lang/ghc/patches/patch-docs_users_guide_conf_py b/lang/ghc/patches/patch-docs_users_guide_conf_py deleted file mode 100644 index ae2529f9664..00000000000 --- a/lang/ghc/patches/patch-docs_users_guide_conf_py +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-docs_users_guide_conf_py,v 1.1 2021/07/06 16:55:33 daniel Exp $ - -sphinx 4.0.2 build-time fix; part of upstream commit -83407ffc - -Index: docs/users_guide/conf.py ---- docs/users_guide/conf.py.orig -+++ docs/users_guide/conf.py -@@ -100,7 +100,7 @@ htmlhelp_basename = 'GHCUsersGuide' - latex_elements = { - 'inputenc': '', - 'utf8extra': '', -- 'preamble': ''' -+ 'preamble': r''' - \usepackage{fontspec} - \usepackage{makeidx} - \setsansfont{DejaVu Sans} diff --git a/lang/ghc/patches/patch-libraries_process_include_runProcess_h b/lang/ghc/patches/patch-libraries_process_include_runProcess_h deleted file mode 100644 index 32b6f4a8427..00000000000 --- a/lang/ghc/patches/patch-libraries_process_include_runProcess_h +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-libraries_process_include_runProcess_h,v 1.5 2021/03/10 01:33:40 gnezdo Exp $ - -vfork is for terrorists - -Index: libraries/process/include/runProcess.h ---- libraries/process/include/runProcess.h.orig -+++ libraries/process/include/runProcess.h -@@ -30,18 +30,7 @@ - #include <fcntl.h> - #endif - --#ifdef HAVE_VFORK_H --#include <vfork.h> --#endif -- --#if defined(HAVE_WORKING_VFORK) --#define myfork vfork --#elif defined(HAVE_WORKING_FORK) - #define myfork fork --// We don't need a fork command on Windows --#elif !(defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)) --#error Cannot find a working fork command --#endif - - #ifdef HAVE_SIGNAL_H - #include <signal.h> diff --git a/lang/ghc/pkg/PFRAG.no_i386 b/lang/ghc/pkg/PFRAG.no_i386 index 19863827169..acdbc0ce78c 100644 --- a/lang/ghc/pkg/PFRAG.no_i386 +++ b/lang/ghc/pkg/PFRAG.no_i386 @@ -2368,14 +2368,16 @@ share/doc/ghc/html/users_guide/8.10.1-notes.html share/doc/ghc/html/users_guide/8.10.2-notes.html share/doc/ghc/html/users_guide/8.10.3-notes.html share/doc/ghc/html/users_guide/8.10.4-notes.html -share/doc/ghc/html/users_guide/_sources/8.10.3-notes.rst.txt -share/doc/ghc/html/users_guide/_sources/8.10.4-notes.rst.txt +share/doc/ghc/html/users_guide/8.10.5-notes.html share/doc/ghc/html/users_guide/${GHC_VER}-notes.html share/doc/ghc/html/users_guide/_images/ share/doc/ghc/html/users_guide/_images/prof_scc.svg share/doc/ghc/html/users_guide/_sources/ share/doc/ghc/html/users_guide/_sources/8.10.1-notes.rst.txt share/doc/ghc/html/users_guide/_sources/8.10.2-notes.rst.txt +share/doc/ghc/html/users_guide/_sources/8.10.3-notes.rst.txt +share/doc/ghc/html/users_guide/_sources/8.10.4-notes.rst.txt +share/doc/ghc/html/users_guide/_sources/8.10.5-notes.rst.txt share/doc/ghc/html/users_guide/_sources/${GHC_VER}-notes.rst.txt share/doc/ghc/html/users_guide/_sources/bugs.rst.txt share/doc/ghc/html/users_guide/_sources/codegens.rst.txt -- 2.32.0
