sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 1.15

Browse source 
- Add print/teTeX-base as a run-time dependency

PR:		ports/142139
Submitted by:	Jacula Modyun <jacula(at)gmail.com>
This commit is contained in:
Gabor Pali 2010-01-08 10:32:07 +00:00
parent 1fca54f119
commit ebdbc782d8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=247391
8 changed files with 54 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
devel/lhs2TeX/Makefile
View file

@ -7,8 +7,7 @@
# #
PORTNAME= lhs2tex PORTNAME= lhs2tex
PORTVERSION= 1.14 PORTVERSION= 1.15
PORTREVISION= 3
CATEGORIES= devel haskell CATEGORIES= devel haskell
MASTER_SITES= http://people.cs.uu.nl/andres/${PORTNAME}/ 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 \ mktexlsr:${PORTSDIR}/print/teTeX-base \
hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc
RUN_DEPENDS= mktexlsr:${PORTSDIR}/print/teTeX-base
USE_GMAKE= yes USE_GMAKE= yes
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \ CONFIGURE_ARGS= --prefix=${PREFIX} \

6
devel/lhs2TeX/distinfo
View file

@ -1,3 +1,3 @@
MD5 (lhs2tex-1.14.tar.gz) = 80f9cf57e9f8bbad0058eaad93be6f39 MD5 (lhs2tex-1.15.tar.gz) = 13c886a829e71e895fa172c617f31bd0
SHA256 (lhs2tex-1.14.tar.gz) = 1667acce394a0d4852f8ad07fa85397e43873fd98a219db794e4773883288687 SHA256 (lhs2tex-1.15.tar.gz) = 77f25c1f22823587ceca6eead133a403540319a0ae3bf03a369b3e8c86baf124
SIZE (lhs2tex-1.14.tar.gz) = 581254 SIZE (lhs2tex-1.15.tar.gz) = 580361

40
devel/lhs2TeX/files/patch-FileNameUtils.lhs
View file

@ -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

42
devel/lhs2TeX/files/patch-configure
View file

@ -1,32 +1,32 @@
--- configure.orig 2008-02-19 01:11:52.000000000 -0500 --- ./configure.orig 2009-12-18 13:21:18.000000000 +0100
+++ configure 2008-02-19 01:42:57.000000000 -0500 +++ ./configure 2010-01-07 19:34:38.000000000 +0100
@@ -2637,54 +2637,6 @@ @@ -2745,54 +2745,6 @@
POLYTABLE_INSTALL=yes POLYTABLE_INSTALL=yes
fi fi
-if test "z$POLYTABLE_INSTALL" = "zyes"; then -if test "z$POLYTABLE_INSTALL" = "zyes"; then
- -
-{ echo "$as_me:$LINENO: checking for the polytable package" >&5 -{ $as_echo "$as_me:$LINENO: checking for the polytable package" >&5
-echo $ECHO_N "checking for the polytable package... $ECHO_C" >&6; } -$as_echo_n "checking for the polytable package... " >&6; }
-if test -x "$KPSEWHICH"; then -if test -x "$KPSEWHICH"; then
- POLYTABLE="`$KPSEWHICH polytable.sty`" - POLYTABLE="`$KPSEWHICH polytable.sty`"
-fi -fi
-if test -f "$POLYTABLE"; then -if test -f "$POLYTABLE"; then
- { echo "$as_me:$LINENO: result: $POLYTABLE" >&5 - { $as_echo "$as_me:$LINENO: result: $POLYTABLE" >&5
-echo "${ECHO_T}$POLYTABLE" >&6; } -$as_echo "$POLYTABLE" >&6; }
- { echo "$as_me:$LINENO: checking for version of polytable" >&5 - { $as_echo "$as_me:$LINENO: checking for version of polytable" >&5
-echo $ECHO_N "checking for version of polytable... $ECHO_C" >&6; } -$as_echo_n "checking for version of polytable... " >&6; }
- POLYTABLE_VERSION=`$GREP " v.* .polytable. package" $POLYTABLE | $SED -e "s/^.*v\(.*\) .polytable. package.*$/\1/"` - POLYTABLE_VERSION=`$GREP " v.* .polytable. package" $POLYTABLE | $SED -e "s/^.*v\(.*\) .polytable. package.*$/\1/"`
- { echo "$as_me:$LINENO: result: $POLYTABLE_VERSION" >&5 - { $as_echo "$as_me:$LINENO: result: $POLYTABLE_VERSION" >&5
-echo "${ECHO_T}$POLYTABLE_VERSION" >&6; } -$as_echo "$POLYTABLE_VERSION" >&6; }
-else -else
- { echo "$as_me:$LINENO: result: no" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; } -$as_echo "no" >&6; }
-fi -fi
- -
- # does polytable need to be installed? - # does polytable need to be installed?
- { echo "$as_me:$LINENO: checking whether polytable needs to be installed" >&5 - { $as_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_n "checking whether polytable needs to be installed... " >&6; }
- POLYTABLE_INSTALL=no - POLYTABLE_INSTALL=no
- if test -n $POLYTABLE; then - if test -n $POLYTABLE; then
- if ( IFS="."; - if ( IFS=".";
@ -48,19 +48,19 @@
- else - else
- POLYTABLE_INSTALL=yes - POLYTABLE_INSTALL=yes
- fi - fi
- { echo "$as_me:$LINENO: result: $POLYTABLE_INSTALL" >&5 - { $as_echo "$as_me:$LINENO: result: $POLYTABLE_INSTALL" >&5
-echo "${ECHO_T}$POLYTABLE_INSTALL" >&6; } -$as_echo "$POLYTABLE_INSTALL" >&6; }
-fi -fi
- -
# Extract the first word of "mktexlsr", so it can be a program name with args. # Extract the first word of "mktexlsr", so it can be a program name with args.
set dummy mktexlsr; ac_word=$2 set dummy mktexlsr; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -2727,7 +2679,7 @@ @@ -2834,8 +2786,6 @@
# docdir and expansion
-# docdir and expansion
-docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION" -docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION"
+#docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION"
stydir="$datadir/$PACKAGE_TARNAME-$PACKAGE_VERSION" stydir="$datadir/$PACKAGE_TARNAME-$PACKAGE_VERSION"

5
textproc/hs-lhs2tex/Makefile
View file

@ -7,8 +7,7 @@
# #
PORTNAME= lhs2tex PORTNAME= lhs2tex
PORTVERSION= 1.14 PORTVERSION= 1.15
PORTREVISION= 3
CATEGORIES= devel haskell CATEGORIES= devel haskell
MASTER_SITES= http://people.cs.uu.nl/andres/${PORTNAME}/ 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 \ mktexlsr:${PORTSDIR}/print/teTeX-base \
hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc
RUN_DEPENDS= mktexlsr:${PORTSDIR}/print/teTeX-base
USE_GMAKE= yes USE_GMAKE= yes
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \ CONFIGURE_ARGS= --prefix=${PREFIX} \

6
textproc/hs-lhs2tex/distinfo
View file

@ -1,3 +1,3 @@
MD5 (lhs2tex-1.14.tar.gz) = 80f9cf57e9f8bbad0058eaad93be6f39 MD5 (lhs2tex-1.15.tar.gz) = 13c886a829e71e895fa172c617f31bd0
SHA256 (lhs2tex-1.14.tar.gz) = 1667acce394a0d4852f8ad07fa85397e43873fd98a219db794e4773883288687 SHA256 (lhs2tex-1.15.tar.gz) = 77f25c1f22823587ceca6eead133a403540319a0ae3bf03a369b3e8c86baf124
SIZE (lhs2tex-1.14.tar.gz) = 581254 SIZE (lhs2tex-1.15.tar.gz) = 580361

40
textproc/hs-lhs2tex/files/patch-FileNameUtils.lhs
View file

@ -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

42
textproc/hs-lhs2tex/files/patch-configure
View file

@ -1,32 +1,32 @@
--- configure.orig 2008-02-19 01:11:52.000000000 -0500 --- ./configure.orig 2009-12-18 13:21:18.000000000 +0100
+++ configure 2008-02-19 01:42:57.000000000 -0500 +++ ./configure 2010-01-07 19:34:38.000000000 +0100
@@ -2637,54 +2637,6 @@ @@ -2745,54 +2745,6 @@
POLYTABLE_INSTALL=yes POLYTABLE_INSTALL=yes
fi fi
-if test "z$POLYTABLE_INSTALL" = "zyes"; then -if test "z$POLYTABLE_INSTALL" = "zyes"; then
- -
-{ echo "$as_me:$LINENO: checking for the polytable package" >&5 -{ $as_echo "$as_me:$LINENO: checking for the polytable package" >&5
-echo $ECHO_N "checking for the polytable package... $ECHO_C" >&6; } -$as_echo_n "checking for the polytable package... " >&6; }
-if test -x "$KPSEWHICH"; then -if test -x "$KPSEWHICH"; then
- POLYTABLE="`$KPSEWHICH polytable.sty`" - POLYTABLE="`$KPSEWHICH polytable.sty`"
-fi -fi
-if test -f "$POLYTABLE"; then -if test -f "$POLYTABLE"; then
- { echo "$as_me:$LINENO: result: $POLYTABLE" >&5 - { $as_echo "$as_me:$LINENO: result: $POLYTABLE" >&5
-echo "${ECHO_T}$POLYTABLE" >&6; } -$as_echo "$POLYTABLE" >&6; }
- { echo "$as_me:$LINENO: checking for version of polytable" >&5 - { $as_echo "$as_me:$LINENO: checking for version of polytable" >&5
-echo $ECHO_N "checking for version of polytable... $ECHO_C" >&6; } -$as_echo_n "checking for version of polytable... " >&6; }
- POLYTABLE_VERSION=`$GREP " v.* .polytable. package" $POLYTABLE | $SED -e "s/^.*v\(.*\) .polytable. package.*$/\1/"` - POLYTABLE_VERSION=`$GREP " v.* .polytable. package" $POLYTABLE | $SED -e "s/^.*v\(.*\) .polytable. package.*$/\1/"`
- { echo "$as_me:$LINENO: result: $POLYTABLE_VERSION" >&5 - { $as_echo "$as_me:$LINENO: result: $POLYTABLE_VERSION" >&5
-echo "${ECHO_T}$POLYTABLE_VERSION" >&6; } -$as_echo "$POLYTABLE_VERSION" >&6; }
-else -else
- { echo "$as_me:$LINENO: result: no" >&5 - { $as_echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; } -$as_echo "no" >&6; }
-fi -fi
- -
- # does polytable need to be installed? - # does polytable need to be installed?
- { echo "$as_me:$LINENO: checking whether polytable needs to be installed" >&5 - { $as_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_n "checking whether polytable needs to be installed... " >&6; }
- POLYTABLE_INSTALL=no - POLYTABLE_INSTALL=no
- if test -n $POLYTABLE; then - if test -n $POLYTABLE; then
- if ( IFS="."; - if ( IFS=".";
@ -48,19 +48,19 @@
- else - else
- POLYTABLE_INSTALL=yes - POLYTABLE_INSTALL=yes
- fi - fi
- { echo "$as_me:$LINENO: result: $POLYTABLE_INSTALL" >&5 - { $as_echo "$as_me:$LINENO: result: $POLYTABLE_INSTALL" >&5
-echo "${ECHO_T}$POLYTABLE_INSTALL" >&6; } -$as_echo "$POLYTABLE_INSTALL" >&6; }
-fi -fi
- -
# Extract the first word of "mktexlsr", so it can be a program name with args. # Extract the first word of "mktexlsr", so it can be a program name with args.
set dummy mktexlsr; ac_word=$2 set dummy mktexlsr; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -2727,7 +2679,7 @@ @@ -2834,8 +2786,6 @@
# docdir and expansion
-# docdir and expansion
-docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION" -docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION"
+#docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION"
stydir="$datadir/$PACKAGE_TARNAME-$PACKAGE_VERSION" stydir="$datadir/$PACKAGE_TARNAME-$PACKAGE_VERSION"