network/pidgin-otr: Updated for version 3.2.0

4 files changed, 34 insertions, 28 deletions

diff --git a/network/pidgin-otr/README b/network/pidgin-otr/README
index bd8a5e51afc0..df95a7214c13 100644
--- a/network/pidgin-otr/README
+++ b/network/pidgin-otr/README
@@ -9,5 +9,4 @@ talking on Pidgin by providing:
 - Perfect forward secrecy: If you lose control of your private keys,
   no previous conversation is compromised.
 
-In order to use this plugin, you need libotr, which is also available 
-at SlackBuilds.org.
+This requires libotr.
diff --git a/network/pidgin-otr/pidgin-otr.SlackBuild b/network/pidgin-otr/pidgin-otr.SlackBuild
index b5a9490e7518..1cded875ff61 100644
--- a/network/pidgin-otr/pidgin-otr.SlackBuild
+++ b/network/pidgin-otr/pidgin-otr.SlackBuild
@@ -23,21 +23,22 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pidgin-otr
-VERSION=3.1.0	
+VERSION=3.2.0	
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PKGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-PKG_NAME=$(echo $PRGNAM | tr - _)
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e
@@ -57,24 +58,30 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --enable-static=no
+  --enable-static=no \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
-mkdir -p $PKG/usr/doc/$PKG_NAME-$VERSION/po
-cp -a README AUTHORS COPYING ChangeLog INSTALL NEWS \
-  $PKG/usr/doc/$PKG_NAME-$VERSION
-cp -a po/README po/ChangeLog $PKG/usr/doc/$PKG_NAME-$VERSION/po
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PKG_NAME-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/po
+cp -a \
+  README AUTHORS COPYING ChangeLog INSTALL NEWS \
+    $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  po/README po/ChangeLog \
+    $PKG/usr/doc/$PRGNAM-$VERSION/po
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKG_NAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/network/pidgin-otr/pidgin-otr.info b/network/pidgin-otr/pidgin-otr.info
index d5e2b9a4b761..227ac9bd3a2d 100644
--- a/network/pidgin-otr/pidgin-otr.info
+++ b/network/pidgin-otr/pidgin-otr.info
@@ -1,8 +1,8 @@
 PRGNAM="pidgin-otr"
-VERSION="3.1.0"
+VERSION="3.2.0"
 HOMEPAGE="http://www.cypherpunks.ca/otr/"
-DOWNLOAD="http://www.cypherpunks.ca/otr/pidgin-otr-3.1.0.tar.gz"
-MD5SUM="f4ca8bc228069616d4c8fa9288af6bb5"
+DOWNLOAD="http://www.cypherpunks.ca/otr/pidgin-otr-3.2.0.tar.gz"
+MD5SUM="8af70b654b7d7c5a5b7785699ff562f9"
 MAINTAINER="Guillermo Bonvehi"
 EMAIL="gbonvehi@gmail.com"
 APPROVED="rworkman"
diff --git a/network/pidgin-otr/slack-desc b/network/pidgin-otr/slack-desc
index 910c70f58646..de7aa082265b 100644
--- a/network/pidgin-otr/slack-desc
+++ b/network/pidgin-otr/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
-pidgin_otr: pidgin_otr (Off-the-Record (OTR) Messaging for Pidgin)
-pidgin_otr:
-pidgin_otr: Allows you to have private conversations over instant messaging
-pidgin_otr: when talking on Pidgin by providing:
-pidgin_otr: - Encryption: No one else can read your instant messages.
-pidgin_otr: - Authentication: You are assured the correspondent is who you
-pidgin_otr:   think it is.
-pidgin_otr: - Deniability: The messages you send do not have digital
-pidgin_otr:   signatures that are checkable by a third party.
-pidgin_otr: - Perfect forward secrecy: If you lose control of your private
-pidgin_otr:   keys, no previous conversation is compromised.
+pidgin-otr: pidgin-otr (Off-the-Record (OTR) Messaging for Pidgin)
+pidgin-otr:
+pidgin-otr: Allows you to have private conversations over instant messaging
+pidgin-otr: when talking on Pidgin by providing:
+pidgin-otr: - Encryption: No one else can read your instant messages.
+pidgin-otr: - Authentication: You are assured the correspondent is who you
+pidgin-otr:   think it is.
+pidgin-otr: - Deniability: The messages you send do not have digital
+pidgin-otr:   signatures that are checkable by a third party.
+pidgin-otr: - Perfect forward secrecy: If you lose control of your private
+pidgin-otr:   keys, no previous conversation is compromised.