From 690e5c4b75b2b43698aa1bc025ed4db6920427bd Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Tue, 18 May 2010 16:35:06 -0500
Subject: desktop/thunar-archive-plugin: Miscellaneous cleanups.

---
 desktop/thunar-archive-plugin/slack-desc           |  2 +-
 .../thunar-archive-plugin.SlackBuild               | 26 ++++++++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'desktop')

diff --git a/desktop/thunar-archive-plugin/slack-desc b/desktop/thunar-archive-plugin/slack-desc
index 4373fb8147..56c3ad5318 100644
--- a/desktop/thunar-archive-plugin/slack-desc
+++ b/desktop/thunar-archive-plugin/slack-desc
@@ -7,7 +7,7 @@
 
                      |-----handy-ruler------------------------------------------------------|
 thunar-archive-plugin: thunar-archive-plugin (Thunar Archive Plugin)
-thunar-archive-plugin: 
+thunar-archive-plugin:
 thunar-archive-plugin: The thunar-archive-plugin is a plugin for the Thunar 
 thunar-archive-plugin: File Manager, which adds archive operations to the 
 thunar-archive-plugin: file context menus. Using this plugin you will be able
diff --git a/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild b/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild
index c99a6257a3..1fd207a519 100644
--- a/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild
+++ b/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for thunar-archive-plugin
 
-# Copyright 2006-2009  Robby Workman, Northport, Alabama, USA
+# Copyright 2006,2007,2008,2009,2010  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,19 @@
 
 PRGNAM=thunar-archive-plugin
 VERSION=0.2.4
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -50,7 +62,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -73,12 +85,8 @@ CXXFLAGS="$SLKCFLAGS" \
 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
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-- 
cgit v1.2.3