From 7c9785c929613864611c01556089b3585e5fa0c6 Mon Sep 17 00:00:00 2001
From: Dario Nicodemi <dario.sbo@gmail.com>
Date: Tue, 23 Aug 2016 23:02:44 +0100
Subject: office/hevea: Updated for version 2.29.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 office/hevea/hevea.SlackBuild | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'office/hevea/hevea.SlackBuild')

diff --git a/office/hevea/hevea.SlackBuild b/office/hevea/hevea.SlackBuild
index c9ad851b2a..bc31ce96c0 100644
--- a/office/hevea/hevea.SlackBuild
+++ b/office/hevea/hevea.SlackBuild
@@ -5,13 +5,13 @@
 # Written by Dario Nicodemi dario.sbo@gmail.com
 
 PRGNAM=hevea
-VERSION=${VERSION:-2.09}
+VERSION=${VERSION:-2.29}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,8 +22,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -36,7 +36,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -51,14 +51,10 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Patch the makefile on the fly to override the PREFIX and DESTDIR
-sed -i -e "\
-  s|^PREFIX=.*|PREFIX=/usr|; \
-  s|^LIBDIR=.*|LIBDIR=\$(PREFIX)/lib${LIBDIRSUFFIX}/hevea|; \
-  s|^LATEXLIBDIR=.*|LATEXLIBDIR=/usr/share/texmf/tex/latex/hevea|" \
-  Makefile
-
-make
+make \
+  PREFIX=/usr \
+  LIBDIR=/usr/lib${LIBDIRSUFFIX}/hevea \
+  LATEXLIBDIR=/usr/share/texmf/tex/latex/hevea
 DESTDIR=$PKG make install
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-- 
cgit v1.2.3