4 files changed, 57 insertions, 29 deletions
diff --git a/development/openmpi/README b/development/openmpi/README
index b315590fbe..6cf6e38b02 100644
--- a/development/openmpi/README
+++ b/development/openmpi/README
@@ -6,15 +6,13 @@ Computing community in order to build the best MPI library available.
 Open MPI offers advantages for system and software vendors, application
 developers and computer science researchers.
 
-Open MPI represents the merger between three well-known MPI
-implementations:
+Open MPI represents the merger between three well-known MPI implementations:
     * FT-MPI from the University of Tennessee
     * LA-MPI from Los Alamos National Laboratory
     * LAM/MPI from Indiana University
-with contributions from the PACX-MPI team at the University of
-Stuttgart.  These four institutions comprise the founding members of the
-Open MPI development team.  Each of these MPI implementations excelled
-in one or more areas.  The driving motivation behind Open MPI is to
-bring the best ideas and technologies from the individual projects and
-create one world-class open source MPI implementation that excels in all
-areas.
+with contributions from the PACX-MPI team at the University of Stuttgart.  
+These four institutions comprise the founding members of the Open MPI 
+development team.  Each of these MPI implementations excelled in one or more 
+areas.  The driving motivation behind Open MPI is to bring the best ideas 
+and technologies from the individual projects and create one world-class open 
+source MPI implementation that excels in all areas.
diff --git a/development/openmpi/openmpi.SlackBuild b/development/openmpi/openmpi.SlackBuild
index 9b31fdc225..985694cb6c 100644
--- a/development/openmpi/openmpi.SlackBuild
+++ b/development/openmpi/openmpi.SlackBuild
@@ -2,31 +2,52 @@
 
 # Slackware build script for Open MPI
 
-# Written by Aleksandar Samardzic <asamardzic@gmail.com>
+# Copyright 2009  Murat D. Kadirov <banderols@gmail.com> 
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=openmpi
-VERSION=${VERSION:-1.3}
+VERSION=${VERSION:-1.3.3}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
+TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PRGNAM
 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
 
 set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
+mkdir -p $TMP $PKG 
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
@@ -42,35 +63,42 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+( 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 || true
+)
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
-# Let's not clobber config files
+# Don't clobber config files on upgrades
 mv $PKG/etc/openmpi-totalview.tcl $PKG/etc/openmpi-totalview.tcl.new
 mv $PKG/etc/openmpi-mca-params.conf $PKG/etc/openmpi-mca-params.conf.new
 mv $PKG/etc/openmpi-default-hostfile $PKG/etc/openmpi-default-hostfile.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS INSTALL LICENSE NEWS README VERSION examples \
+cp -a \
+   AUTHORS INSTALL LICENSE NEWS README VERSION examples \
   $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/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/openmpi/openmpi.info b/development/openmpi/openmpi.info
index 23698a7227..94276a6e61 100644
--- a/development/openmpi/openmpi.info
+++ b/development/openmpi/openmpi.info
@@ -1,8 +1,10 @@
 PRGNAM="openmpi"
-VERSION="1.3"
-HOMEPAGE="http://www.open-mpi.org/"
-DOWNLOAD="http://www.open-mpi.org/software/ompi/v1.3/downloads/openmpi-1.3.tar.bz2"
-MD5SUM="efbba7d652d1e430d456f65d7a2e339b"
-MAINTAINER="Aleksandar Samardzic"
-EMAIL="asamardzic@gmail.com"
-APPROVED="dsomero"
+VERSION="1.3.3"
+HOMEPAGE="http://www.open-mpi.org"
+DOWNLOAD="http://www.open-mpi.org:80/software/ompi/v1.3/downloads/openmpi-1.3.3.tar.bz2"
+MD5SUM="f6cdc9c195daa8571b2e509e952d6755"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Murat D. Kadirov"
+EMAIL="banderols@gmail.com"
+APPROVED="rworkman"
diff --git a/development/openmpi/slack-desc b/development/openmpi/slack-desc
index 38832dfe81..d4ef35fe1c 100644
--- a/development/openmpi/slack-desc
+++ b/development/openmpi/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-openmpi: Open MPI  (an open source MPI-2 implementation)
+openmpi: openmpi (an open source MPI-2 implementation)
 openmpi:
 openmpi: Open MPI is a project combining technologies and resources from
 openmpi: several other projects (FT-MPI, LA-MPI, LAM/MPI, and PACX-MPI)
@@ -14,6 +14,6 @@ openmpi: in order to build the best Message Passing Interface (MPI)
 openmpi: library available.  MPI is highly specialised computer software
 openmpi: that allows many computers to communicate with one another; it
 openmpi: is exclusively used in computer clusters.
-openmpi: 
+openmpi:
 openmpi: Homepage: http://www.open-mpi.org/
 openmpi: