1 files changed, 32 insertions, 25 deletions
diff --git a/development/edb-debugger/edb-debugger.SlackBuild b/development/edb-debugger/edb-debugger.SlackBuild
index 4cc1125676..738e0027cd 100644
--- a/development/edb-debugger/edb-debugger.SlackBuild
+++ b/development/edb-debugger/edb-debugger.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for Evan's Debugger (edb-debugger)
 
@@ -22,11 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAMPREFIX=edb
-PRGNAM=debugger
-VERSION=${VERSION:-0.9.20}
+cd $(dirname $0) ; CWD=$(pwd)
+
+PRGNAM=edb-debugger
+VERSION=${VERSION:-1.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+PRGNAMPREFIX=edb
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +40,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -60,7 +71,7 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM-$VERSION.tgz
 cd $PRGNAM
 chown -R root:root .
@@ -70,32 +81,28 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-qmake
-make
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_DATAROOTDIR=/usr/share \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 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/bin
-cp -a edb $PKG/usr/bin
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAMPREFIX
-cp -a lib*.so $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAMPREFIX
-
-mkdir -p $PKG/usr/man/man1
-gzip -9 edb.1 edb.1.gz
-cp -a edb.1.gz $PKG/usr/man/man1
-
-mkdir -p $PKG/usr/include/$PRGNAMPREFIX
-cp -a include/. $PKG/usr/include/$PRGNAMPREFIX
-
-mkdir -p $PKG/usr/doc/$PRGNAMPREFIX-$PRGNAM-$VERSION
-cp -a doc/. BUGS CHANGELOG COPYING README README.plugins TODO $PKG/usr/doc/$PRGNAMPREFIX-$PRGNAM-$VERSION
-cat $CWD/$PRGNAMPREFIX-$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAMPREFIX-$PRGNAM-$VERSION/$PRGNAMPREFIX-$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a BUGS CHANGELOG COPYING README* TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAMPREFIX-$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE