summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--academic/calcoo/README9
-rw-r--r--academic/calcoo/calcoo.SlackBuild29
-rw-r--r--academic/calcoo/calcoo.info4
-rw-r--r--academic/calcoo/slack-desc8
4 files changed, 28 insertions, 22 deletions
diff --git a/academic/calcoo/README b/academic/calcoo/README
index 7a0834cde6..5c4e7ef8c3 100644
--- a/academic/calcoo/README
+++ b/academic/calcoo/README
@@ -1,5 +1,4 @@
-Calcoo is an RPN and scientific calculator that uses the GTK
-library. It features both RPN and algebraic modes, bitmapped
-button labels and display glyths, undo/redo options, copy/paste
-interaction with the X clipboard, two memory registers with
-displays, and displays for Y, Z, and T registers.
+Calcoo is an RPN and scientific calculator that uses the GTK library. It
+features both RPN and algebraic modes, bitmapped button labels and display
+glyths, undo/redo options, copy/paste interaction with the X clipboard, two
+memory registers with displays, and displays for Y, Z, and T registers.
diff --git a/academic/calcoo/calcoo.SlackBuild b/academic/calcoo/calcoo.SlackBuild
index 399b6daff0..1ef26210a3 100644
--- a/academic/calcoo/calcoo.SlackBuild
+++ b/academic/calcoo/calcoo.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for calcoo
-# Copyright 2006-2007 Robby Workman (http://rlworkman.net)
+# Copyright 2006-2009 Robby Workman (http://rlworkman.net)
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,13 +22,12 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# Modified by the SlackBuilds.org project
-
PRGNAM=calcoo
VERSION=1.3.16
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -36,16 +35,23 @@ 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
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R a-s,u+w,go+r-w .
@@ -53,14 +59,13 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--localstatedir=/var \
--mandir=/usr/man \
- --program-prefix="" \
- --program-suffix="" \
- || exit 1
+ --build=$ARCH-slackware-linux
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
@@ -76,4 +81,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/academic/calcoo/calcoo.info b/academic/calcoo/calcoo.info
index 08d7a99d59..42a7c657a8 100644
--- a/academic/calcoo/calcoo.info
+++ b/academic/calcoo/calcoo.info
@@ -2,7 +2,9 @@ PRGNAM="calcoo"
VERSION="1.3.16"
HOMEPAGE="http://calcoo.sourceforge.net/"
DOWNLOAD="http://downloads.sourceforge.net/calcoo/calcoo-1.3.16.tar.gz"
+DOWNLOAD_x86_64=""
MD5SUM="7e8eccf8bdf78c99d38825a540b8dead"
+MD5SUM_x86_64=""
MAINTAINER="Robby Workman"
EMAIL="rw@rlworkman.net"
-APPROVED="BP{k},rworkman"
+APPROVED="BP{k}"
diff --git a/academic/calcoo/slack-desc b/academic/calcoo/slack-desc
index 80104b2a21..24067c401a 100644
--- a/academic/calcoo/slack-desc
+++ b/academic/calcoo/slack-desc
@@ -7,13 +7,13 @@
|-----handy-ruler------------------------------------------------------|
calcoo: Calcoo (RPN and Scientific Calculator)
-calcoo:
+calcoo:
calcoo: Calcoo is an RPN and scientific calculator that uses the GTK
calcoo: library. It features both RPN and algebraic modes, bitmapped
calcoo: button labels and display glyths, undo/redo options, copy/paste
calcoo: interaction with the X clipboard, two memory registers with
calcoo: displays, and displays for Y, Z, and T registers.
-calcoo:
+calcoo:
calcoo: Homepage: http://calcoo.sourceforge.net/
-calcoo:
-calcoo:
+calcoo:
+calcoo: