From b2bee810682c0813bccaa56d37a86ada61e2f0a4 Mon Sep 17 00:00:00 2001
From: G Edward Whiteside <gedwardwhiteside@gmail.com>
Date: Thu, 13 May 2010 00:22:55 +0200
Subject: desktop/nitrogen: Updated for version 1.4

---
 desktop/nitrogen/nitrogen.SlackBuild | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'desktop/nitrogen/nitrogen.SlackBuild')

diff --git a/desktop/nitrogen/nitrogen.SlackBuild b/desktop/nitrogen/nitrogen.SlackBuild
index d611f17d92..b2021e9ec2 100644
--- a/desktop/nitrogen/nitrogen.SlackBuild
+++ b/desktop/nitrogen/nitrogen.SlackBuild
@@ -1,14 +1,18 @@
 #!/bin/sh
 
 # Slackware build script for nitrogen
-# Written by Kristaps Esterlins <esterlinsh[at]gmail.com>
+# Written by G Edward Whiteside <gedwardwhiteside@gmail.com>
+
+# Based on the slackbuilds.org template
 
 PRGNAM=nitrogen			
-VERSION=1.3
+VERSION=1.4
 ARCH=${ARCH:-i486}		
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}	
 
+DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README"
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -16,10 +20,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 
@@ -37,11 +44,15 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/Thumbview.patch
+
+./bootstrap 
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./bootstrap 
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -59,11 +70,11 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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}
-- 
cgit v1.2.3