New release, needed changes to the 'configure' parameters. Also, some

other minor changes to the SlackBuild.

1 files changed, 15 insertions, 9 deletions

diff --git a/mcabber/build/mcabber.SlackBuild b/mcabber/build/mcabber.SlackBuild
index 177def67..c322e8cd 100755
--- a/mcabber/build/mcabber.SlackBuild
+++ b/mcabber/build/mcabber.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Copyright (c) 2006 Eric Hameleers <alien@sox.homeip.net>
+# Copyright (c) 2005,2006 Eric Hameleers <alien@slackware.com>
 # Distributed under the terms of the GNU General Public License, Version 2
-#
+# $Id$
 # -----------------------------------------------------------------------------
 #
 # Slackware SlackBuild script 
@@ -9,7 +9,7 @@
 # By:        Eric Hameleers <alien@sox.homeip.net>
 # For:       mcabber
 # URL:       http://www.lilotux.net/~mikael/mcabber/
-# Needs:     
+# Needs:     openssl, ncurses
 # Changelog:
 # 0.6.5-1:   17/Aug/2005 by Eric Hameleers <alien@sox.homeip.net>
 #            * Initial build.
@@ -23,6 +23,8 @@
 #            * New release.
 # 0.7.6-1:   19/apr/2006 by Eric Hameleers <alien@slackware.com>
 #            * Bugfix release.
+# 0.7.8-1:   28/jun/2006 by Eric Hameleers <alien@slackware.com>
+#            * New release. 
 # 
 # Run 'sh SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -38,7 +40,7 @@ if [ "$TMP" = "" ]; then
 fi
 
 PRGNAM=mcabber
-VERSION=0.7.6
+VERSION=0.7.8
 ARCH=${ARCH:-i486}
 BUILD=1
 
@@ -84,13 +86,17 @@ if [ ! -f $CWD/${PRGNAM}-${VERSION}.tar.bz2 ]; then
   echo "Retrieving missing source archive first..."
   wget -nv -O $CWD/${PRGNAM}-${VERSION}.tar.bz2 \
     http://www.lilotux.net/~mikael/${PRGNAM}/files/${PRGNAM}-${VERSION}.tar.bz2
-  if [ $? -ne 0 ]; then echo "Download failed! Aborting"; exit 1; fi
+  if [ $? -ne 0 ]; then
+    echo "Download failed! Aborting"
+    mv $CWD/${PRGNAM}-${VERSION}.tar.bz2 $CWD/${PRGNAM}-${VERSION}.tar.bz2.FAIL
+    exit 1
+  fi
 fi
 
 # --- TARBALL EXTRACTION,PATCH,MODIFY ---
 
 echo "Extracting the source archive for $PRGNAM..."
-tar -xjvf $CWD/${PRGNAM}-${VERSION}.tar.bz2
+tar -xjvf $CWD/${PRGNAM}-${VERSION}.tar.bz2 || exit 1
 
 cd ${PRGNAM}-${VERSION}
 
@@ -106,6 +112,8 @@ CFLAGS="$SLKCFLAGS" \
 ./configure --prefix=/usr \
             --localstatedir=/var \
             --sysconfdir=/etc \
+            --datarootdir=/usr \
+            --datadir=/usr/share \
             2>&1 | tee $CWD/configure-${PRGNAM}.log
 make 2>&1 | tee $CWD/make-${PRGNAM}.log
 
@@ -225,8 +233,6 @@ gzip -9f $PKG/usr/man/*/*
 # --- OWNERSHIP, RIGHTS ---
 
 chmod -R o-w $PKG
-chown root:bin $PKG/usr/bin/* $PKG/usr/sbin/* $PKG/bin/* $PKG/sbin/* \
-               $PKG/usr/X11R6/bin/* $PKG/opt/kde/bin/* 2>/dev/null
 
 
 # --- PACKAGE DESCRIPTION ---
@@ -245,7 +251,7 @@ cd $PKG
 makepkg --linkadd y --chown n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz \
   2>&1 | tee $CWD/makepkg-${PRGNAM}.log
 (cd $TMP && md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5)
-cat $CWD/slack-desc | grep "^${PRGNAM}" > $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
 
 
 # --- CLEANUP ---