diff options
| author | Gabor Pali <pgj@FreeBSD.org> | 2009-11-08 19:46:46 +0000 |
|---|---|---|
| committer | Gabor Pali <pgj@FreeBSD.org> | 2009-11-08 19:46:46 +0000 |
| commit | 893cda6cf7adb63a484ca806c4ec3e20eb2efa7a (patch) | |
| tree | 090428ed9ebb8f10797b5c2a15c37d06263c9109 | |
| parent | aed47063bc009d2c56b1390b51e7ba263608bdac (diff) | |
| download | ports-893cda6cf7adb63a484ca806c4ec3e20eb2efa7a.tar.gz ports-893cda6cf7adb63a484ca806c4ec3e20eb2efa7a.zip | |
Notes
| -rw-r--r-- | devel/lhs2TeX/Makefile | 2 | ||||
| -rw-r--r-- | devel/lhs2TeX/files/patch-FileNameUtils.lhs | 40 | ||||
| -rw-r--r-- | textproc/hs-lhs2tex/Makefile | 2 | ||||
| -rw-r--r-- | textproc/hs-lhs2tex/files/patch-FileNameUtils.lhs | 40 |
4 files changed, 80 insertions, 4 deletions
diff --git a/devel/lhs2TeX/Makefile b/devel/lhs2TeX/Makefile index a7a569363d4d..5742dbaeae70 100644 --- a/devel/lhs2TeX/Makefile +++ b/devel/lhs2TeX/Makefile @@ -31,8 +31,6 @@ PORTDOCS= * DATADIR=${PREFIX}/share/${PORTNAME}-${PORTVERSION} PORTDATA= * -BROKEN= Does not compile with GHC 6.10 - .include <bsd.port.pre.mk> INSTALL_TARGET= install diff --git a/devel/lhs2TeX/files/patch-FileNameUtils.lhs b/devel/lhs2TeX/files/patch-FileNameUtils.lhs new file mode 100644 index 000000000000..a910c6b10ae9 --- /dev/null +++ b/devel/lhs2TeX/files/patch-FileNameUtils.lhs @@ -0,0 +1,40 @@ +--- ./FileNameUtils.lhs.orig 2008-10-24 10:50:41.000000000 +0200 ++++ ./FileNameUtils.lhs 2009-11-08 01:19:19.000000000 +0100 +@@ -13,7 +13,7 @@ + > import System.Environment + > import Data.List + > import Control.Monad (filterM) +-> import Control.Exception ( try, catch ) ++> import Control.Exception ( try, catch, IOException ) + > import System.FilePath + > import System.Info + +@@ -86,7 +86,7 @@ + > d''' <- mapM descendFrom d'' + > return (s : concat d''') + > ) +-> (const $ return [s]) ++> ((const $ return [s])::(IOError -> IO [String])) + + > expandEnvironment :: String -> IO [String] + > expandEnvironment s = case break (=='{') s of +@@ -95,7 +95,7 @@ + > (e,"") -> return [s] + > (e,'}':r') -> findEnvironment e s' r' + > where findEnvironment :: String -> String -> String -> IO [String] +-> findEnvironment e a o = do er <- try (getEnv e) ++> findEnvironment e a o = do er <- (try (getEnv e))::(IO (Either IOException String)) + > return $ either (const []) + > (map (\x -> a ++ x ++ o) . splitOn isSearchPathSeparator) + > er +@@ -116,8 +116,8 @@ + > = cs + > | otherwise = addTrailingPathSeparator cs + > t f = catch (readFile f >>= \x -> return (x,f)) +-> (\_ -> ioError $ userError $ "File `" ++ fn ++ "' not found.\n") ++> ((\_ -> ioError $ userError $ "File `" ++ fn ++ "' not found.\n")::(IOError -> IO (String,FilePath))) + > s [] = ioError + > $ userError $ "File `" ++ fn ++ "' not found in search path:\n" ++ showpath +-> s (x:xs) = catch x (\_ -> s xs) ++> s (x:xs) = catch x ((\_ -> s xs)::(IOError -> IO (String,FilePath))) + > showpath = concatMap (\x -> " " ++ x ++ "\n") p diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile index a7a569363d4d..5742dbaeae70 100644 --- a/textproc/hs-lhs2tex/Makefile +++ b/textproc/hs-lhs2tex/Makefile @@ -31,8 +31,6 @@ PORTDOCS= * DATADIR=${PREFIX}/share/${PORTNAME}-${PORTVERSION} PORTDATA= * -BROKEN= Does not compile with GHC 6.10 - .include <bsd.port.pre.mk> INSTALL_TARGET= install diff --git a/textproc/hs-lhs2tex/files/patch-FileNameUtils.lhs b/textproc/hs-lhs2tex/files/patch-FileNameUtils.lhs new file mode 100644 index 000000000000..a910c6b10ae9 --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-FileNameUtils.lhs @@ -0,0 +1,40 @@ +--- ./FileNameUtils.lhs.orig 2008-10-24 10:50:41.000000000 +0200 ++++ ./FileNameUtils.lhs 2009-11-08 01:19:19.000000000 +0100 +@@ -13,7 +13,7 @@ + > import System.Environment + > import Data.List + > import Control.Monad (filterM) +-> import Control.Exception ( try, catch ) ++> import Control.Exception ( try, catch, IOException ) + > import System.FilePath + > import System.Info + +@@ -86,7 +86,7 @@ + > d''' <- mapM descendFrom d'' + > return (s : concat d''') + > ) +-> (const $ return [s]) ++> ((const $ return [s])::(IOError -> IO [String])) + + > expandEnvironment :: String -> IO [String] + > expandEnvironment s = case break (=='{') s of +@@ -95,7 +95,7 @@ + > (e,"") -> return [s] + > (e,'}':r') -> findEnvironment e s' r' + > where findEnvironment :: String -> String -> String -> IO [String] +-> findEnvironment e a o = do er <- try (getEnv e) ++> findEnvironment e a o = do er <- (try (getEnv e))::(IO (Either IOException String)) + > return $ either (const []) + > (map (\x -> a ++ x ++ o) . splitOn isSearchPathSeparator) + > er +@@ -116,8 +116,8 @@ + > = cs + > | otherwise = addTrailingPathSeparator cs + > t f = catch (readFile f >>= \x -> return (x,f)) +-> (\_ -> ioError $ userError $ "File `" ++ fn ++ "' not found.\n") ++> ((\_ -> ioError $ userError $ "File `" ++ fn ++ "' not found.\n")::(IOError -> IO (String,FilePath))) + > s [] = ioError + > $ userError $ "File `" ++ fn ++ "' not found in search path:\n" ++ showpath +-> s (x:xs) = catch x (\_ -> s xs) ++> s (x:xs) = catch x ((\_ -> s xs)::(IOError -> IO (String,FilePath))) + > showpath = concatMap (\x -> " " ++ x ++ "\n") p |