From fcd0c10e6e9c36de6f5fb4c0845b9a6e374f5e71 Mon Sep 17 00:00:00 2001
From: Dugan Chen <dugan (underscore) c (at) fastmail (dot) fm>
Date: Tue, 11 May 2010 22:22:20 +0200
Subject: development/astyle: Updated for version 1.22

---
 development/astyle/astyle.SlackBuild | 12 ++++++++----
 development/astyle/astyle.info       | 10 +++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'development')

diff --git a/development/astyle/astyle.SlackBuild b/development/astyle/astyle.SlackBuild
index eb7de7fe9a410..6747b155ddedc 100644
--- a/development/astyle/astyle.SlackBuild
+++ b/development/astyle/astyle.SlackBuild
@@ -7,11 +7,12 @@
 set -e
 
 PRGNAM=astyle
-SRCPK=astyle_1.21__linux.tar.gz
-VERSION=1.21
+VERSION=1.22
+SRCPK=astyle_$VERSION\_linux.tar.gz
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -21,6 +22,8 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 rm -rf $PKG
@@ -32,17 +35,18 @@ cd $PRGNAM
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-cd build
+cd buildgcc
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
   make release shared static
+
 mkdir -p $PKG/usr/bin
 cp -a ../bin/astyle $PKG/usr/bin
 mkdir -p $PKG/usr/lib
 cp -a ../bin/libastyle.* $PKG/usr/lib
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | 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
 )
 
diff --git a/development/astyle/astyle.info b/development/astyle/astyle.info
index c8a6f4effb6db..cc59109992f37 100644
--- a/development/astyle/astyle.info
+++ b/development/astyle/astyle.info
@@ -1,8 +1,8 @@
 PRGNAM="astyle"
-VERSION="1.21"
+VERSION="1.22"
 HOMEPAGE="http://astyle.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/astyle/astyle_1.21__linux.tar.gz"
-MD5SUM="c3e2068e9bf64bcad3e1d69628c4d241"
+DOWNLOAD="http://downloads.sourceforge.net/astyle/astyle_1.22_linux.tar.gz"
+MD5SUM="f319ee4e2538f5e6255211975b4e36cc"
 MAINTAINER="Dugan Chen"
-EMAIL="dugan_c@fastmail.fm"
-APPROVED="rworkman"
+EMAIL="dugan (underscore) c (at) fastmail (dot) fm"
+APPROVED="David Somero"
\ No newline at end of file
-- 
cgit v1.2.3