aboutsummaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorEugene Wissner <eugen@flevum.de>2011-06-05 23:05:02 -0500
committerRobby Workman <rworkman@slackbuilds.org>2011-06-05 23:05:02 -0500
commit457fdf28dd47e63a56a6e696c6ea95a4666a6d7e (patch)
tree33d6a55b5bfcf5d775f3d9ebc6b6500862c96c32 /network
parent81e92856ebfd3bf636e4e498773ec49d167f4ca4 (diff)
network/psi: Misc tweaks plus updated maintainer email
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r--network/psi/psi.SlackBuild28
-rw-r--r--network/psi/psi.info4
2 files changed, 17 insertions, 15 deletions
diff --git a/network/psi/psi.SlackBuild b/network/psi/psi.SlackBuild
index 1bf58ddacc2f9..ee04dfcdb3bfe 100644
--- a/network/psi/psi.SlackBuild
+++ b/network/psi/psi.SlackBuild
@@ -2,11 +2,11 @@
# Slackware build script for psi
-# Written by Eugene Wissner <belka.ew@gmail.com>
+# Written by Eugene Wissner <eugen@flevum.de>
PRGNAM=psi
VERSION=${VERSION:-0.14}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@@ -25,17 +25,13 @@ PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
+ SLKCFLAGS="-march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
+ SLKCFLAGS="-march=i686 -mtune=i686"
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
+ SLKCFLAGS=""
else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
+ SLKCFLAGS=""
fi
set -e
@@ -54,9 +50,13 @@ find . \
-exec chmod 644 {} \;
./configure \
- --prefix=/usr \
- --libdir=/usr/lib$LIBDIRSUFFIX \
- --release
+ --prefix=/usr
+
+# Apply c++ flags
+if [ -n "$SLKCFLAGS" ]; then
+ echo "*-g++*:QMAKE_CFLAGS += $SLKCFLAGS
+*-g++*:QMAKE_CXXFLAGS += $SLKCFLAGS" >> conf.pri
+fi
make
make install INSTALL_ROOT=$PKG
@@ -64,6 +64,8 @@ make install INSTALL_ROOT=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# We don't need it
+rm $PKG/usr/bin/psi.debug
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/network/psi/psi.info b/network/psi/psi.info
index f2e27134aa4c1..a42c394445492 100644
--- a/network/psi/psi.info
+++ b/network/psi/psi.info
@@ -6,5 +6,5 @@ MD5SUM="9d7dcce3bcab53b741a712199bd986be"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Eugene Wissner"
-EMAIL="belka.ew@gmail.com"
-APPROVED="michiel"
+EMAIL="eugen@flevum.de"
+APPROVED="rworkman"