aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/lhs2TeX/Makefile5
-rw-r--r--devel/lhs2TeX/distinfo6
-rw-r--r--devel/lhs2TeX/files/patch-FileNameUtils.lhs40
-rw-r--r--devel/lhs2TeX/files/patch-configure42
-rw-r--r--textproc/hs-lhs2tex/Makefile5
-rw-r--r--textproc/hs-lhs2tex/distinfo6
-rw-r--r--textproc/hs-lhs2tex/files/patch-FileNameUtils.lhs40
-rw-r--r--textproc/hs-lhs2tex/files/patch-configure42
8 files changed, 54 insertions, 132 deletions
diff --git a/devel/lhs2TeX/Makefile b/devel/lhs2TeX/Makefile
index 5742dbaeae70..0501153610b7 100644
--- a/devel/lhs2TeX/Makefile
+++ b/devel/lhs2TeX/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= lhs2tex
-PORTVERSION= 1.14
-PORTREVISION= 3
+PORTVERSION= 1.15
CATEGORIES= devel haskell
MASTER_SITES= http://people.cs.uu.nl/andres/${PORTNAME}/
@@ -19,6 +18,8 @@ BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \
mktexlsr:${PORTSDIR}/print/teTeX-base \
hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc
+RUN_DEPENDS= mktexlsr:${PORTSDIR}/print/teTeX-base
+
USE_GMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
diff --git a/devel/lhs2TeX/distinfo b/devel/lhs2TeX/distinfo
index f23f6d0923d3..0910f9c2ae69 100644
--- a/devel/lhs2TeX/distinfo
+++ b/devel/lhs2TeX/distinfo
@@ -1,3 +1,3 @@
-MD5 (lhs2tex-1.14.tar.gz) = 80f9cf57e9f8bbad0058eaad93be6f39
-SHA256 (lhs2tex-1.14.tar.gz) = 1667acce394a0d4852f8ad07fa85397e43873fd98a219db794e4773883288687
-SIZE (lhs2tex-1.14.tar.gz) = 581254
+MD5 (lhs2tex-1.15.tar.gz) = 13c886a829e71e895fa172c617f31bd0
+SHA256 (lhs2tex-1.15.tar.gz) = 77f25c1f22823587ceca6eead133a403540319a0ae3bf03a369b3e8c86baf124
+SIZE (lhs2tex-1.15.tar.gz) = 580361
diff --git a/devel/lhs2TeX/files/patch-FileNameUtils.lhs b/devel/lhs2TeX/files/patch-FileNameUtils.lhs
deleted file mode 100644
index a910c6b10ae9..000000000000
--- a/devel/lhs2TeX/files/patch-FileNameUtils.lhs
+++ /dev/null
@@ -1,40 +0,0 @@
---- ./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/devel/lhs2TeX/files/patch-configure b/devel/lhs2TeX/files/patch-configure
index b541e5b857f2..f4c2b4ae0a39 100644
--- a/devel/lhs2TeX/files/patch-configure
+++ b/devel/lhs2TeX/files/patch-configure
@@ -1,32 +1,32 @@
---- configure.orig 2008-02-19 01:11:52.000000000 -0500
-+++ configure 2008-02-19 01:42:57.000000000 -0500
-@@ -2637,54 +2637,6 @@
+--- ./configure.orig 2009-12-18 13:21:18.000000000 +0100
++++ ./configure 2010-01-07 19:34:38.000000000 +0100
+@@ -2745,54 +2745,6 @@
POLYTABLE_INSTALL=yes
fi
-if test "z$POLYTABLE_INSTALL" = "zyes"; then
-
--{ echo "$as_me:$LINENO: checking for the polytable package" >&5
--echo $ECHO_N "checking for the polytable package... $ECHO_C" >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for the polytable package" >&5
+-$as_echo_n "checking for the polytable package... " >&6; }
-if test -x "$KPSEWHICH"; then
- POLYTABLE="`$KPSEWHICH polytable.sty`"
-fi
-if test -f "$POLYTABLE"; then
-- { echo "$as_me:$LINENO: result: $POLYTABLE" >&5
--echo "${ECHO_T}$POLYTABLE" >&6; }
-- { echo "$as_me:$LINENO: checking for version of polytable" >&5
--echo $ECHO_N "checking for version of polytable... $ECHO_C" >&6; }
+- { $as_echo "$as_me:$LINENO: result: $POLYTABLE" >&5
+-$as_echo "$POLYTABLE" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for version of polytable" >&5
+-$as_echo_n "checking for version of polytable... " >&6; }
- POLYTABLE_VERSION=`$GREP " v.* .polytable. package" $POLYTABLE | $SED -e "s/^.*v\(.*\) .polytable. package.*$/\1/"`
-- { echo "$as_me:$LINENO: result: $POLYTABLE_VERSION" >&5
--echo "${ECHO_T}$POLYTABLE_VERSION" >&6; }
+- { $as_echo "$as_me:$LINENO: result: $POLYTABLE_VERSION" >&5
+-$as_echo "$POLYTABLE_VERSION" >&6; }
-else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
-fi
-
- # does polytable need to be installed?
-- { echo "$as_me:$LINENO: checking whether polytable needs to be installed" >&5
--echo $ECHO_N "checking whether polytable needs to be installed... $ECHO_C" >&6; }
+- { $as_echo "$as_me:$LINENO: checking whether polytable needs to be installed" >&5
+-$as_echo_n "checking whether polytable needs to be installed... " >&6; }
- POLYTABLE_INSTALL=no
- if test -n $POLYTABLE; then
- if ( IFS=".";
@@ -48,19 +48,19 @@
- else
- POLYTABLE_INSTALL=yes
- fi
-- { echo "$as_me:$LINENO: result: $POLYTABLE_INSTALL" >&5
--echo "${ECHO_T}$POLYTABLE_INSTALL" >&6; }
+- { $as_echo "$as_me:$LINENO: result: $POLYTABLE_INSTALL" >&5
+-$as_echo "$POLYTABLE_INSTALL" >&6; }
-fi
-
# Extract the first word of "mktexlsr", so it can be a program name with args.
set dummy mktexlsr; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -2727,7 +2679,7 @@
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -2834,8 +2786,6 @@
- # docdir and expansion
+
+-# docdir and expansion
-docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION"
-+#docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION"
stydir="$datadir/$PACKAGE_TARNAME-$PACKAGE_VERSION"
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index 5742dbaeae70..0501153610b7 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= lhs2tex
-PORTVERSION= 1.14
-PORTREVISION= 3
+PORTVERSION= 1.15
CATEGORIES= devel haskell
MASTER_SITES= http://people.cs.uu.nl/andres/${PORTNAME}/
@@ -19,6 +18,8 @@ BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \
mktexlsr:${PORTSDIR}/print/teTeX-base \
hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc
+RUN_DEPENDS= mktexlsr:${PORTSDIR}/print/teTeX-base
+
USE_GMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
diff --git a/textproc/hs-lhs2tex/distinfo b/textproc/hs-lhs2tex/distinfo
index f23f6d0923d3..0910f9c2ae69 100644
--- a/textproc/hs-lhs2tex/distinfo
+++ b/textproc/hs-lhs2tex/distinfo
@@ -1,3 +1,3 @@
-MD5 (lhs2tex-1.14.tar.gz) = 80f9cf57e9f8bbad0058eaad93be6f39
-SHA256 (lhs2tex-1.14.tar.gz) = 1667acce394a0d4852f8ad07fa85397e43873fd98a219db794e4773883288687
-SIZE (lhs2tex-1.14.tar.gz) = 581254
+MD5 (lhs2tex-1.15.tar.gz) = 13c886a829e71e895fa172c617f31bd0
+SHA256 (lhs2tex-1.15.tar.gz) = 77f25c1f22823587ceca6eead133a403540319a0ae3bf03a369b3e8c86baf124
+SIZE (lhs2tex-1.15.tar.gz) = 580361
diff --git a/textproc/hs-lhs2tex/files/patch-FileNameUtils.lhs b/textproc/hs-lhs2tex/files/patch-FileNameUtils.lhs
deleted file mode 100644
index a910c6b10ae9..000000000000
--- a/textproc/hs-lhs2tex/files/patch-FileNameUtils.lhs
+++ /dev/null
@@ -1,40 +0,0 @@
---- ./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/files/patch-configure b/textproc/hs-lhs2tex/files/patch-configure
index b541e5b857f2..f4c2b4ae0a39 100644
--- a/textproc/hs-lhs2tex/files/patch-configure
+++ b/textproc/hs-lhs2tex/files/patch-configure
@@ -1,32 +1,32 @@
---- configure.orig 2008-02-19 01:11:52.000000000 -0500
-+++ configure 2008-02-19 01:42:57.000000000 -0500
-@@ -2637,54 +2637,6 @@
+--- ./configure.orig 2009-12-18 13:21:18.000000000 +0100
++++ ./configure 2010-01-07 19:34:38.000000000 +0100
+@@ -2745,54 +2745,6 @@
POLYTABLE_INSTALL=yes
fi
-if test "z$POLYTABLE_INSTALL" = "zyes"; then
-
--{ echo "$as_me:$LINENO: checking for the polytable package" >&5
--echo $ECHO_N "checking for the polytable package... $ECHO_C" >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for the polytable package" >&5
+-$as_echo_n "checking for the polytable package... " >&6; }
-if test -x "$KPSEWHICH"; then
- POLYTABLE="`$KPSEWHICH polytable.sty`"
-fi
-if test -f "$POLYTABLE"; then
-- { echo "$as_me:$LINENO: result: $POLYTABLE" >&5
--echo "${ECHO_T}$POLYTABLE" >&6; }
-- { echo "$as_me:$LINENO: checking for version of polytable" >&5
--echo $ECHO_N "checking for version of polytable... $ECHO_C" >&6; }
+- { $as_echo "$as_me:$LINENO: result: $POLYTABLE" >&5
+-$as_echo "$POLYTABLE" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for version of polytable" >&5
+-$as_echo_n "checking for version of polytable... " >&6; }
- POLYTABLE_VERSION=`$GREP " v.* .polytable. package" $POLYTABLE | $SED -e "s/^.*v\(.*\) .polytable. package.*$/\1/"`
-- { echo "$as_me:$LINENO: result: $POLYTABLE_VERSION" >&5
--echo "${ECHO_T}$POLYTABLE_VERSION" >&6; }
+- { $as_echo "$as_me:$LINENO: result: $POLYTABLE_VERSION" >&5
+-$as_echo "$POLYTABLE_VERSION" >&6; }
-else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
-fi
-
- # does polytable need to be installed?
-- { echo "$as_me:$LINENO: checking whether polytable needs to be installed" >&5
--echo $ECHO_N "checking whether polytable needs to be installed... $ECHO_C" >&6; }
+- { $as_echo "$as_me:$LINENO: checking whether polytable needs to be installed" >&5
+-$as_echo_n "checking whether polytable needs to be installed... " >&6; }
- POLYTABLE_INSTALL=no
- if test -n $POLYTABLE; then
- if ( IFS=".";
@@ -48,19 +48,19 @@
- else
- POLYTABLE_INSTALL=yes
- fi
-- { echo "$as_me:$LINENO: result: $POLYTABLE_INSTALL" >&5
--echo "${ECHO_T}$POLYTABLE_INSTALL" >&6; }
+- { $as_echo "$as_me:$LINENO: result: $POLYTABLE_INSTALL" >&5
+-$as_echo "$POLYTABLE_INSTALL" >&6; }
-fi
-
# Extract the first word of "mktexlsr", so it can be a program name with args.
set dummy mktexlsr; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -2727,7 +2679,7 @@
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -2834,8 +2786,6 @@
- # docdir and expansion
+
+-# docdir and expansion
-docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION"
-+#docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION"
stydir="$datadir/$PACKAGE_TARNAME-$PACKAGE_VERSION"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 01:45:42 +0000