2 files changed, 17 insertions, 7 deletions
diff --git a/desktop/compiz-boxmenu/compiz-boxmenu.SlackBuild b/desktop/compiz-boxmenu/compiz-boxmenu.SlackBuild
index d1173a9106..b98b7ec922 100644
--- a/desktop/compiz-boxmenu/compiz-boxmenu.SlackBuild
+++ b/desktop/compiz-boxmenu/compiz-boxmenu.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for compiz-boxmenu
 
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=compiz-boxmenu
 VERSION=${VERSION:-1.1.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   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}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -91,4 +101,4 @@ 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/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/desktop/compiz-boxmenu/compiz-boxmenu.info b/desktop/compiz-boxmenu/compiz-boxmenu.info
index 74a113d340..4e3e6cb10c 100644
--- a/desktop/compiz-boxmenu/compiz-boxmenu.info
+++ b/desktop/compiz-boxmenu/compiz-boxmenu.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://downloads.sourceforge.net/project/compizboxmenu/source%20snaps
 MD5SUM="02962333d8cded154cd9511c51819470"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lxml"
+REQUIRES="python2-lxml"
 MAINTAINER="Dugan Chen"
 EMAIL="thedoogster [at] gmail [dot] com"