From e014c6647c23d8db4ec5f23cb4de9d055f4eacff Mon Sep 17 00:00:00 2001
From: Kristaps Esterlins <esterlins@gmail.com>
Date: Thu, 13 May 2010 00:31:25 +0200
Subject: libraries/libnxml: Updated for version 0.18.3

---
 libraries/libnxml/libnxml.SlackBuild | 18 ++++++++++++------
 libraries/libnxml/libnxml.info       |  2 ++
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'libraries/libnxml')

diff --git a/libraries/libnxml/libnxml.SlackBuild b/libraries/libnxml/libnxml.SlackBuild
index 9b2726e84b..1ea7b92bdb 100644
--- a/libraries/libnxml/libnxml.SlackBuild
+++ b/libraries/libnxml/libnxml.SlackBuild
@@ -3,11 +3,11 @@
 # Slackware build script for libnxml
 # Written by Kristaps Esterlins <esterlinsh[at]gmail.com>
 
-PRGNAM=libnxml			
+PRGNAM=libnxml
 VERSION=0.18.3
-ARCH=${ARCH:-i486}		
+ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}	
+TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -16,10 +16,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e 
@@ -41,6 +44,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -52,8 +56,10 @@ make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -65,4 +71,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libnxml/libnxml.info b/libraries/libnxml/libnxml.info
index 1c38edc8d3..044b1a158d 100644
--- a/libraries/libnxml/libnxml.info
+++ b/libraries/libnxml/libnxml.info
@@ -2,7 +2,9 @@ PRGNAM="libnxml"
 VERSION="0.18.3"
 HOMEPAGE="http://www.autistici.org/bakunin/libnxml/doc/"
 DOWNLOAD="http://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="857f43970e7f0724d28f4ddc87085daf"
+MD5SUM_x86_64=""
 MAINTAINER="Kristaps Esterlins"
 EMAIL="esterlins@gmail.com"
 APPROVED="rworkman"
-- 
cgit v1.2.3