summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElvio Basello (HelLViS69) <hellvis69@slackware.it>2010-05-12 17:43:40 +0200
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-12 17:43:40 +0200
commitee53559a0d0b532894fd68d5399ac49848ca6c5f (patch)
tree9a66bf0fb73194c02b37ba1af654c4005288e24b
parent4988ad5a9167c1498709dac16fbc44246ec78788 (diff)
downloadslackbuilds-ee53559a0d0b532894fd68d5399ac49848ca6c5f.tar.gz
network/kvirc: Updated for version 3.4.2
-rw-r--r--network/kvirc/doinst.sh14
-rw-r--r--network/kvirc/kvirc.SlackBuild31
-rw-r--r--network/kvirc/kvirc.info2
3 files changed, 36 insertions, 11 deletions
diff --git a/network/kvirc/doinst.sh b/network/kvirc/doinst.sh
new file mode 100644
index 0000000000..9830478e8c
--- /dev/null
+++ b/network/kvirc/doinst.sh
@@ -0,0 +1,14 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+ /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
+
diff --git a/network/kvirc/kvirc.SlackBuild b/network/kvirc/kvirc.SlackBuild
index 3ec1009e30..923e1bd919 100644
--- a/network/kvirc/kvirc.SlackBuild
+++ b/network/kvirc/kvirc.SlackBuild
@@ -25,7 +25,7 @@
PRGNAM=kvirc
VERSION=${VERSION:-3.4.2}
ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -35,18 +35,24 @@ 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
+# Exit on errors
+set -e
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
rm -rf $PRGNAM-$VERSION
-tar jxvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar jxvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -58,20 +64,24 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --build=$ARCH-slackware-linux \
--with-big-channels \
- --with-x \
- || exit 1
+ --with-x
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
# Strip binaries and libraries
( cd $PKG
- 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
+ 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
)
# Compress man pages
@@ -87,6 +97,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
# Make the package; be sure to leave it in $OUTPUT
cd $PKG
diff --git a/network/kvirc/kvirc.info b/network/kvirc/kvirc.info
index fd1bce9cc5..6a616a93bf 100644
--- a/network/kvirc/kvirc.info
+++ b/network/kvirc/kvirc.info
@@ -5,4 +5,4 @@ DOWNLOAD="ftp://ftp.kvirc.de/pub/kvirc/3.4.2/source/kvirc-3.4.2.tar.bz2"
MD5SUM="cc1839c54f6c1bf9a15e169f3213a0a7"
MAINTAINER="Elvio Basello (HelLViS69)"
EMAIL="hellvis69@slackware.it"
-APPROVED="David Somero"
+APPROVED="dsomero"