2 files changed, 20 insertions, 10 deletions
diff --git a/development/omniORB/omniORB.SlackBuild b/development/omniORB/omniORB.SlackBuild
index 18d91058a5..6e39429914 100644
--- a/development/omniORB/omniORB.SlackBuild
+++ b/development/omniORB/omniORB.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for omniORB
 
@@ -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=omniORB
-VERSION=${VERSION:-4.2.0}
+VERSION=${VERSION:-4.3.0}
 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"
@@ -101,4 +111,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/development/omniORB/omniORB.info b/development/omniORB/omniORB.info
index fd8b1f4142..3e7d821b28 100644
--- a/development/omniORB/omniORB.info
+++ b/development/omniORB/omniORB.info
@@ -1,8 +1,8 @@
 PRGNAM="omniORB"
-VERSION="4.2.0"
+VERSION="4.3.0"
 HOMEPAGE="http://omniorb.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-4.2.0/omniORB-4.2.0.tar.bz2"
-MD5SUM="f1e104d0a2df92829c1b37a853f4805d"
+DOWNLOAD="http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-4.3.0/omniORB-4.3.0.tar.bz2"
+MD5SUM="8889ab13b444b495ca2c2b48ea6a6bd7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""