Index: head/www/hs-activehs/Makefile =================================================================== --- head/www/hs-activehs/Makefile (revision 409206) +++ head/www/hs-activehs/Makefile (revision 409207) @@ -1,25 +1,25 @@ # $FreeBSD$ PORTNAME= activehs PORTVERSION= 0.3.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Haskell code presentation tool LICENSE= BSD3CLAUSE USE_CABAL= activehs-base>=0.2 blaze-html>=0.5 blaze-markup>=0.5.1.0 \ cmdargs>=0.7 data-pprint>=0.2 dia-base>=0.1 \ dia-functions>=0.2.1.1 exceptions>=0.6 haskell-src-exts>=1.12 \ highlighting-kate>=0.5 hint>=0.3.3.2 hoogle>=4.2.11 mtl>=2.0 \ pandoc>=1.12 pureMD5>=2.1 QuickCheck>=2.4 simple-reflect>=0.2 \ snap-core>=0.6 snap-server>=0.6 split>=0.1 syb>=0.2 \ text>=0.11 utf8-string>=0.3 STANDALONE= yes EXECUTABLE= activehs .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Index: head/www/hs-activehs/files/patch-Converter.hs =================================================================== --- head/www/hs-activehs/files/patch-Converter.hs (revision 409206) +++ head/www/hs-activehs/files/patch-Converter.hs (revision 409207) @@ -1,37 +1,38 @@ --- Converter.hs.orig 2013-02-12 19:23:45 UTC +++ Converter.hs @@ -28,7 +28,7 @@ import System.Directory (getTemporaryDir import Control.Monad import Data.List -import Data.Char +import Data.Char hiding (Format) ---------------------------------- @@ -206,7 +206,7 @@ preprocessForSlides x = case span (not . ------------------------------------ rawHtml :: String -> Block -rawHtml x = RawBlock "html" x +rawHtml x = RawBlock (Format "html") x showBlockSimple :: Language -> String -> String -> Int -> String -> [Block] -@@ -244,13 +244,13 @@ mkImport m d +@@ -244,13 +244,14 @@ mkImport m d , HSyn.importSrc = False , HSyn.importPkg = Nothing , HSyn.importAs = Nothing - , HSyn.importSpecs = Just (True, map (HSyn.IVar . mkName) d) + , HSyn.importSpecs = Just (True, map (HSyn.IVar HSyn.NoNamespace . mkName) d) ++ , HSyn.importSafe = False } mkName :: String -> HSyn.Name mkName n@(c:_) - | isSymbol c = HSyn.Symbol n -mkName n = HSyn.Ident n + | isLetter c = HSyn.Ident n +mkName n = HSyn.Symbol n mkImport_ :: String -> String -> HSyn.ImportDecl mkImport_ magic m