summaryrefslogtreecommitdiff
path: root/development/astyle
diff options
context:
space:
mode:
Diffstat (limited to 'development/astyle')
-rw-r--r--development/astyle/README2
-rw-r--r--development/astyle/astyle.SlackBuild22
-rw-r--r--development/astyle/astyle.info10
3 files changed, 19 insertions, 15 deletions
diff --git a/development/astyle/README b/development/astyle/README
index 2bd1e94e4b..89f3686397 100644
--- a/development/astyle/README
+++ b/development/astyle/README
@@ -2,4 +2,4 @@ astyle (Artistic Style code beautifier)
Artistic Style is a code indenter, beautifier and formatter for C, C++, C#,
and Java. It can be used from the command-line or linked into other programs.
-Complete documentation is included.
+Complete documentation is included.
diff --git a/development/astyle/astyle.SlackBuild b/development/astyle/astyle.SlackBuild
index d80d106355..2411307b75 100644
--- a/development/astyle/astyle.SlackBuild
+++ b/development/astyle/astyle.SlackBuild
@@ -2,6 +2,8 @@
# Slackware build script for Artistic Style
+# Nate Bargmann <n0nb@arrl.net>
+
# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
# Maintained by Daniel Jordan, daniel.budd.j@gmail.com
@@ -31,7 +33,7 @@
# not, see <http://www.gnu.org/licenses/>.
PRGNAM=${PRGNAM:-astyle}
-VERSION=${VERSION:-2.05.1}
+VERSION=${VERSION:-2.06}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -39,7 +41,7 @@ SRCPK=astyle_$VERSION\_linux.tar.gz
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -50,8 +52,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -84,15 +86,17 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
make release shared
-make install prefix=$PKG/usr/
+inst_pfx=$PKG/usr
+make install prefix=$inst_pfx SYSCONF_PATH=$inst_pfx/doc/$PRGNAM-$VERSION
find $PKG -print0 | xargs -0 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
-mv $PKG/usr/share/doc/$PRGNAM/html/* $PKG/usr/doc/$PRGNAM-$VERSION
-## clean out directory as it is now empty
-rm -rf $PKG/usr/share/
+cd $TMP/$PRGNAM
+for file in *.txt
+do
+ cat $file > $PKG/usr/doc/$PRGNAM-$VERSION/$file
+done
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/development/astyle/astyle.info b/development/astyle/astyle.info
index b3cb08db4b..ffd17f5b6d 100644
--- a/development/astyle/astyle.info
+++ b/development/astyle/astyle.info
@@ -1,10 +1,10 @@
PRGNAM="astyle"
-VERSION="2.05.1"
+VERSION="2.06"
HOMEPAGE="http://astyle.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/astyle/astyle_2.05.1_linux.tar.gz"
-MD5SUM="4142d178047d7040da3e0e2f1b030a1a"
+DOWNLOAD="http://downloads.sourceforge.net/astyle/astyle_2.06_linux.tar.gz"
+MD5SUM="ff588e7fcede824591cf5b9085df109d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+MAINTAINER="Nate Bargmann"
+EMAIL="n0nb@arrl.net"