Index: devel/hs-c2hs/Makefile =================================================================== --- devel/hs-c2hs/Makefile +++ devel/hs-c2hs/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= c2hs -PORTVERSION= 0.28.2 -PORTREVISION= 1 +PORTVERSION= 0.28.3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ LICENSE= GPLv2 -USE_CABAL= dlist language-c>=0.5.0 shelly>=1.0 text yaml>=0.8 +USE_CABAL= dlist language-c>=0.7.1 shelly>=1.0 text yaml>=0.8 XMLDOCS= doc/users_guide:html Index: devel/hs-c2hs/distinfo =================================================================== --- devel/hs-c2hs/distinfo +++ devel/hs-c2hs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627824 -SHA256 (cabal/c2hs-0.28.2.tar.gz) = f4171478cafe9f4906735763c2e0bc1ca0a9f56b50e9d59aac07520434920f9e -SIZE (cabal/c2hs-0.28.2.tar.gz) = 205916 +TIMESTAMP = 1513181196 +SHA256 (cabal/c2hs-0.28.3.tar.gz) = 80cc6db945ee7c0328043b4e69213b2a1cb0806fb35c8362f9dea4a2c312f1cc +SIZE (cabal/c2hs-0.28.3.tar.gz) = 253559 Index: devel/hs-c2hs/files/patch-src_C2HS_Config.hs =================================================================== --- devel/hs-c2hs/files/patch-src_C2HS_Config.hs +++ devel/hs-c2hs/files/patch-src_C2HS_Config.hs @@ -23,8 +23,8 @@ ("openbsd","cpp") -> ["-xc"] - (_,"cpp") -> ["-x", "c"] - (_,"gcc") -> ["-E", "-x", "c"] -+ (_,"cpp") -> ["-x", "c", "-std=c99"] -+ (_,"gcc") -> ["-E", "-x", "c", "-std=c99"] ++ (_,"cpp") -> ["-x", "c"] ++ (_,"gcc") -> ["-E", "-x", "c"] _ -> [] -- | C2HS Library file name Index: devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs =================================================================== --- devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs +++ devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs @@ -13,8 +13,8 @@ ("openbsd","cpp") -> ["-xc", "-w"] - (_,"cpp") -> ["-x", "c", "-w"] - (_,"gcc") -> ["-E", "-x", "c", "-w"] -+ (_,"cpp") -> ["-x", "c", "-w", "-std=c99"] -+ (_,"gcc") -> ["-E", "-x", "c", "-w", "-std=c99"] ++ (_,"cpp") -> ["-x", "c", "-w", "-std=c99", "-D_Nullable=", "-D_Nonnull="] ++ (_,"gcc") -> ["-E", "-x", "c", "-w", "-std=c99", "-D_Nullable", "-D_Nonnull="] _ -> [] -- C preprocessor option for including only definitions (EXPORTED) Index: devel/hs-language-c/Makefile =================================================================== --- devel/hs-language-c/Makefile +++ devel/hs-language-c/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= language-c -PORTVERSION= 0.6.1 +PORTVERSION= 0.7.1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org Index: devel/hs-language-c/distinfo =================================================================== --- devel/hs-language-c/distinfo +++ devel/hs-language-c/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499627847 -SHA256 (cabal/language-c-0.6.1.tar.gz) = 23cadc9d04e46490ec57f56b79ecdc2a709ebf57571345905e6e30db29fa37e8 -SIZE (cabal/language-c-0.6.1.tar.gz) = 179625 +TIMESTAMP = 1513181967 +SHA256 (cabal/language-c-0.7.1.tar.gz) = a7447123f9b3bec9319ee2a22b22d97f03acd6566b4f6caf5b9a1f71e4f7a9ca +SIZE (cabal/language-c-0.7.1.tar.gz) = 181648 Index: devel/hs-ncurses/files/patch-lib_UI_NCurses.chs =================================================================== --- /dev/null +++ devel/hs-ncurses/files/patch-lib_UI_NCurses.chs @@ -0,0 +1,26 @@ +--- lib/UI/NCurses.chs.orig 2016-08-29 01:09:37 UTC ++++ lib/UI/NCurses.chs +@@ -435,12 +435,12 @@ setColor (ColorID pair) = withWindow_ "s + -- | Add some text to the window, at the current cursor position. + drawString :: String -> Update () + drawString str = withWindow_ "drawString" $ \win -> +- withCWString str ({# call waddwstr #} win) ++ withCWString str $ \s -> ({# call waddwstr #} win) (castPtr s) + + -- | Add some text to the window, at the current cursor position. + drawText :: T.Text -> Update () + drawText txt = withWindow_ "drawText" $ \win -> +- withCWString (T.unpack txt) ({# call waddwstr #} win) ++ withCWString (T.unpack txt) $ \s -> ({# call waddwstr #} win) (castPtr s) + + drawGlyph :: Glyph -> Update () + drawGlyph glyph = withWindow_ "drawGlyph" $ \win -> +@@ -718,7 +718,7 @@ withGlyph (Glyph char attrs) io = + let cAttrs = foldl' (\acc a -> acc .|. attrToInt a) 0 attrs in + withCWStringLen [char] $ \(cChars, cCharsLen) -> + allocaBytes {# sizeof cchar_t #} $ \pBuf -> do +- {# call hsncurses_init_cchar_t #} (CCharT pBuf) cAttrs cChars (fromIntegral cCharsLen) ++ {# call hsncurses_init_cchar_t #} (CCharT pBuf) cAttrs (castPtr cChars) (fromIntegral cCharsLen) + io (CCharT pBuf) + + -- | Upper left corner Index: lang/ghc/Makefile =================================================================== --- lang/ghc/Makefile +++ lang/ghc/Makefile @@ -93,13 +93,6 @@ DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot .endif # MBOOT -# LLVM is still not properly supported, further it does not make sense to have -# to depend on old llvm ports that will be removed from the ports soon. -# So for now, stick to GCC. -# https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing -# We should however investigate whether base's clang is enough to build ghc&co. -# This will likely require some modifications to compiler/main/*hs -USE_GCC= yes CONFIGURE_ARGS+= -with-gcc=${CC} .if empty(PORT_OPTIONS:MBOOT) CONFIGURE_ARGS_BOOT+= --with-gcc=${CC} Index: lang/ghc/bsd.cabal.mk =================================================================== --- lang/ghc/bsd.cabal.mk +++ lang/ghc/bsd.cabal.mk @@ -96,13 +96,6 @@ BUILD_DEPENDS+= ghc>=${GHC_VERSION}:lang/ghc .endif -# LLVM is still not properly supported, further it does not make sense to have -# to depend on old llvm ports that will be removed from the ports soon. -# So for now, stick to GCC -- this might change with ghc-8.4. -# https://ghc.haskell.org/trac/ghc/wiki/Commentary/Compiler/Backends/LLVM/Installing -# We should however investigate whether base's clang is enough to build ghc&co. -USE_GCC= yes - CONFIGURE_ARGS+= --with-gcc=${CC} --with-ld=${LD} --with-ar=${AR} Index: lang/ghc/files/patch-compiler_main_SysTools.hs =================================================================== --- /dev/null +++ lang/ghc/files/patch-compiler_main_SysTools.hs @@ -0,0 +1,12 @@ +--- compiler/main/SysTools.hs.orig 2017-08-12 09:25:57 UTC ++++ compiler/main/SysTools.hs +@@ -907,6 +907,9 @@ getCompilerInfo' dflags = do + -- Regular clang + | any ("clang version" `isInfixOf`) stde = + return Clang ++ -- FreeBSD clang ++ | any ("FreeBSD clang version" `isInfixOf`) stde = ++ return Clang + -- XCode 5.1 clang + | any ("Apple LLVM version 5.1" `isPrefixOf`) stde = + return AppleClang51 Index: lang/ghc/files/patch-rts_Linker.c =================================================================== --- /dev/null +++ lang/ghc/files/patch-rts_Linker.c @@ -0,0 +1,11 @@ +--- rts/Linker.c.orig 2017-08-12 09:22:13 UTC ++++ rts/Linker.c +@@ -797,7 +797,7 @@ initLinker_ (int retain_cafs) + # endif /* RTLD_DEFAULT */ + + compileResult = regcomp(&re_invalid, +- "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short)", ++ "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short|invalid file format)", + REG_EXTENDED); + if (compileResult != 0) { + barf("Compiling re_invalid failed");