From c6fabf3da2bc23cc05fbf082220da5e1fd287865 Mon Sep 17 00:00:00 2001
From: Lorenzo Stramaccia
Date: Thu, 13 May 2010 00:32:27 +0200
Subject: libraries/mysql++: Updated for version 3.0.9

---
 libraries/mysql++/README             | 9 ++++++---
 libraries/mysql++/mysql++.SlackBuild | 6 +++++-
 libraries/mysql++/mysql++.info       | 2 ++
 libraries/mysql++/slack-desc         | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/libraries/mysql++/README b/libraries/mysql++/README
index e32a024b46..5f9f1df856 100644
--- a/libraries/mysql++/README
+++ b/libraries/mysql++/README
@@ -1,4 +1,7 @@
-MySQL++ is a C++ wrapper for MySQL?s C API. It is built around the same principles as the Standard C++ Library, mysql++: to make dealing with the database as easy as dealing with STL containers. In addition, MySQL++ provides facilities that let you avoid the most repetitive sorts of SQL within your own code,
-mysql++: providing native C++ interfaces for these common tasks.
+MySQL++ is a C++ wrapper for MySQL's C API. It is built around the same
+principles as the Standard C++ Library, to make dealing with the database
+as easy as dealing with STL containers. In addition, MySQL++ provides
+facilities that let you avoid the most repetitive sorts of SQL within your
+own code, providing native C++ interfaces for these common tasks.
 
-MySQL++ requires MySQL.
\ No newline at end of file
+MySQL++ requires MySQL.
diff --git a/libraries/mysql++/mysql++.SlackBuild b/libraries/mysql++/mysql++.SlackBuild
index 777d328971..6c8cc1899b 100644
--- a/libraries/mysql++/mysql++.SlackBuild
+++ b/libraries/mysql++/mysql++.SlackBuild
@@ -36,10 +36,13 @@ 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
@@ -61,6 +64,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -87,5 +91,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/libraries/mysql++/mysql++.info b/libraries/mysql++/mysql++.info
index 39cccab587..14574414a1 100644
--- a/libraries/mysql++/mysql++.info
+++ b/libraries/mysql++/mysql++.info
@@ -2,7 +2,9 @@ PRGNAM="mysql++"
 VERSION="3.0.9"
 HOMEPAGE="http://tangentsoft.net/mysql++/"
 DOWNLOAD="http://tangentsoft.net/mysql++/releases/mysql++-3.0.9.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="4acc1603846fe67d36b6243bfb805652"
+MD5SUM_x86_64=""
 MAINTAINER="Lorenzo Stramaccia"
 EMAIL="lorenzost@gmail.com" 
 APPROVED="michiel"
diff --git a/libraries/mysql++/slack-desc b/libraries/mysql++/slack-desc
index 467d81eef9..9106ec71f3 100644
--- a/libraries/mysql++/slack-desc
+++ b/libraries/mysql++/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+       |-----handy-ruler------------------------------------------------------|
 mysql++: mysql++ (A C++ wrapper for the MySQL C API)
 mysql++:
 mysql++: MySQL++ is a C++ wrapper for the MySQLs C API. 
-- 
cgit v1.2.3