4 files changed, 34 insertions, 100 deletions

diff --git a/textproc/hs-lhs2tex/files/patch-Makefile b/textproc/hs-lhs2tex/files/patch-Makefile
deleted file mode 100644
index 08746efe6d38..000000000000
--- a/textproc/hs-lhs2tex/files/patch-Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.orig	2008-10-24 10:50:41.000000000 +0200
-+++ Makefile	2009-03-04 11:19:34.000000000 +0100
-@@ -135,14 +135,9 @@
- print : Lhs2TeX.dvi
- 	$(DVIPS) -D600 -f Lhs2TeX.dvi | lpr -Pa -Zl
- 
--install : bin doc
-+install : bin
- 	$(MKINSTDIR) $(DESTDIR)$(bindir)
- 	$(INSTALL) -m 755 lhs2TeX $(DESTDIR)$(bindir)
--	$(MKINSTDIR) $(DESTDIR)$(stydir)
--	$(INSTALL) -m 644 lhs2TeX.sty lhs2TeX.fmt $(DESTDIR)$(stydir)
--	$(INSTALL) -m 644 Library/*.fmt $(DESTDIR)$(stydir)
--	$(MKINSTDIR) $(DESTDIR)$(docdir)
--	$(INSTALL) -m 644 doc/Guide2.pdf $(DESTDIR)$(docdir)
- 	$(MKINSTDIR) $(DESTDIR)$(mandir)/man1
- 	$(INSTALL) -m 644 lhs2TeX.1 $(DESTDIR)$(mandir)/man1
- ifeq ($(INSTALL_POLYTABLE),yes)
-@@ -158,6 +153,15 @@
- 	echo "Please update the TeX filename database."
- endif
- 
-+install-doc : doc
-+	$(MKINSTDIR) $(DESTDIR)$(docdir)
-+	$(INSTALL) -m 644 doc/Guide2.pdf $(DESTDIR)$(docdir)
-+
-+install-data : bin
-+	$(MKINSTDIR) $(DESTDIR)$(stydir)
-+	$(INSTALL) -m 644 lhs2TeX.sty lhs2TeX.fmt $(DESTDIR)$(stydir)
-+	$(INSTALL) -m 644 Library/*.fmt $(DESTDIR)$(stydir)
-+
- srcdist : INSTALL doc
- 	if test -d $(DISTDIR); then $(RM) -rf $(DISTDIR); fi
- 	$(MKINSTDIR) $(DISTDIR)
diff --git a/textproc/hs-lhs2tex/files/patch-MathPoly.lhs b/textproc/hs-lhs2tex/files/patch-MathPoly.lhs
new file mode 100644
index 000000000000..7c4ca99a1acd
--- /dev/null
+++ b/textproc/hs-lhs2tex/files/patch-MathPoly.lhs
@@ -0,0 +1,11 @@
+--- ./MathPoly.lhs.orig	2010-07-22 12:13:20.000000000 +0200
++++ ./MathPoly.lhs	2011-03-27 01:52:26.469094252 +0100
+@@ -358,7 +358,7 @@
+ >                                      (rn,rc) = findrel (n,c) rstack
+ >                                      -- Schritt 3: Zeile auf Stack legen
+ >                                      fstack  = (c,l) : rstack
+->                                  in mkFromTo fstack rn n rc [fromToken $ TeX False (indent (rn,rc) (n,c))] p ls
++>                                  in mkFromTo fstack rn n rc [fromToken $ (TeX False (indent (rn,rc) (n,c))) :: Token] p ls
+ >                                              
+ >
+ >         | c `elem` z          -> mkFromTo stack n (n ++ "E") c ts rs ls
diff --git a/textproc/hs-lhs2tex/files/patch-Setup.hs b/textproc/hs-lhs2tex/files/patch-Setup.hs
new file mode 100644
index 000000000000..a5ea584380dc
--- /dev/null
+++ b/textproc/hs-lhs2tex/files/patch-Setup.hs
@@ -0,0 +1,23 @@
+--- ./Setup.hs.orig	2010-07-22 12:13:20.000000000 +0200
++++ ./Setup.hs	2011-03-27 01:53:35.109600797 +0100
+@@ -204,7 +204,7 @@
+                        else docdir (absoluteInstallDirs pd lbi cd) `joinFileName` "doc"
+         let manDir = if isWindows
+                        then dataPref `joinFileName` "Documentation"
+-                       else datadir (absoluteInstallDirs pd lbi cd) `joinFileName` ".." `joinFileName` "man" `joinFileName` "man1"
++                       else prefix (absoluteInstallDirs pd lbi cd) `joinFileName` "man" `joinFileName` "man1"
+         createDirectoryIfMissing True docDir
+         copyFileVerbose v (lhs2texDocDir `joinFileName` "Guide2.pdf") (docDir `joinFileName` "Guide2.pdf")
+         when (not isWindows) $
+@@ -291,9 +291,9 @@
+              do  let mProg = lookupProgram (simpleProgram progName) programConf
+                  case mProg of
+                    Just (ConfiguredProgram { programLocation = UserSpecified p,
+-                                             programArgs = args })  -> return (p,args)
++                                             programDefaultArgs = args })  -> return (p,args)
+                    Just (ConfiguredProgram { programLocation = FoundOnSystem p,
+-                                             programArgs = args })  -> return (p,args)
++                                             programDefaultArgs = args })  -> return (p,args)
+                    _ -> (die (progName ++ " command not found"))
+ 
+ -- | Run a command in a specific environment and return the output and errors.
diff --git a/textproc/hs-lhs2tex/files/patch-configure b/textproc/hs-lhs2tex/files/patch-configure
deleted file mode 100644
index f4c2b4ae0a39..000000000000
--- a/textproc/hs-lhs2tex/files/patch-configure
+++ /dev/null
@@ -1,66 +0,0 @@
---- ./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
--
--{ $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
--  { $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/"`
--  { $as_echo "$as_me:$LINENO: result: $POLYTABLE_VERSION" >&5
--$as_echo "$POLYTABLE_VERSION" >&6; }
--else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--  # does polytable need to be installed?
--  { $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=".";
--      a="$POLYTABLE_VERSION";  b="0.8.2";
--      while test -n "$a$b"
--      do
--              set -- $a;  h1="$1";  shift 2>/dev/null;  a="$*"
--              set -- $b;  h2="$1";  shift 2>/dev/null;  b="$*"
--              test -n "$h1" || h1=0;  test -n "$h2" || h2=0
--              test ${h1} -eq ${h2} || break
--      done
--      test ${h1} -lt ${h2}
--    )
--then
--  POLYTABLE_INSTALL=yes
--
--fi
--
--  else
--    POLYTABLE_INSTALL=yes
--  fi
--  { $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
- { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -2834,8 +2786,6 @@
- 
- 
- 
--# docdir and expansion
--docdir="$datadir/doc/$PACKAGE_TARNAME-$PACKAGE_VERSION"
- 
- stydir="$datadir/$PACKAGE_TARNAME-$PACKAGE_VERSION"
-