From 723a93b8e91b7e1629552e1bc77f11f10fa57618 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Sun, 25 Dec 2011 23:39:27 -0600
Subject: office/mupdf: Fixed packaging on x86_64

Thanks to ponce for the sed line :)

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 office/mupdf/README           |  2 +-
 office/mupdf/mupdf.SlackBuild | 16 +++++++---------
 office/mupdf/mupdf.info       |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'office')

diff --git a/office/mupdf/README b/office/mupdf/README
index 2a67b703c7..4737e9ddea 100644
--- a/office/mupdf/README
+++ b/office/mupdf/README
@@ -1,4 +1,4 @@
-mupdf is a lightweight PDF viewer and toolkit
+mupdf is a lightweight PDF viewer and toolkit.
 
 The renderer in MuPDF is tailored for high quality anti-aliased graphics.
 MuPDF renders text with metrics and spacing accurate to within fractions of
diff --git a/office/mupdf/mupdf.SlackBuild b/office/mupdf/mupdf.SlackBuild
index 2e372e2de5..f69a5b8095 100644
--- a/office/mupdf/mupdf.SlackBuild
+++ b/office/mupdf/mupdf.SlackBuild
@@ -6,7 +6,7 @@
 
 PRGNAM=mupdf
 VERSION=${VERSION:-0.8.165}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -50,12 +50,12 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-verbose=no \
-  make build=release prefix=$PKG/usr
+sed -i "s,(prefix)/lib,(prefix)/lib$LIBDIRSUFFIX," Makefile
+
+CFLAGS="$SLKCFLAGS" make build=release prefix=/usr
 make build=release prefix=$PKG/usr install
 
-#don't overwrite poppler's pdfinfo
+# don't overwrite poppler's pdfinfo
 mv $PKG/usr/bin/pdfinfo $PKG/usr/bin/pdfinfo-mupdf
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -63,15 +63,13 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/man
 mv $PKG/usr/share/man/man1 $PKG/usr/man/man1
-rm $PKG/usr/share/man -r
+rm -rf $PKG/usr/share
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README COPYING \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/office/mupdf/mupdf.info b/office/mupdf/mupdf.info
index a7e643b6e4..541ce266ee 100644
--- a/office/mupdf/mupdf.info
+++ b/office/mupdf/mupdf.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Hubert Hesse"
 EMAIL="slackbuilds@hubertscorner.de"
-APPROVED="Niels Horn"
+APPROVED="Niels Horn,rworkman"
-- 
cgit v1.2.3