odbc-drivers/myodbc: updated to 5.1.6; changed spell files to accomodate for newer version

7 files changed, 37 insertions, 17 deletions

diff --git a/odbc-drivers/myodbc/BUILD b/odbc-drivers/myodbc/BUILD
index 2d643be908..88c73decde 100755
--- a/odbc-drivers/myodbc/BUILD
+++ b/odbc-drivers/myodbc/BUILD
@@ -1,4 +1,11 @@
-./configure  --prefix=/usr                 \
-             --with-unixODBC=/usr/include  \
-             $OPTS                         &&
-make
+OPTS="$OPTS --with-mysql-path=/usr" &&
+
+if is_depends_enabled $SPELL libiodbc; then
+    OPTS="$OPTS --with-iODBC=/usr"
+fi &&
+
+if is_depends_enabled $SPELL unixodbc; then
+    OPTS="$OPTS --with-unixODBC=/usr"
+fi &&
+
+default_build
diff --git a/odbc-drivers/myodbc/DEPENDS b/odbc-drivers/myodbc/DEPENDS
index 9467604088..3ee2f1acc8 100755
--- a/odbc-drivers/myodbc/DEPENDS
+++ b/odbc-drivers/myodbc/DEPENDS
@@ -1,3 +1,3 @@
-depends  MYSQL     &&
-depends  ODBC-MGR  &&
-optional_depends qt-x11 "" "" "graphical interface"
+depends MYSQL &&
+depends ODBC-MGR &&
+optional_depends qt-x11 "--enable-gui" "--disable-gui" "graphical interface"
diff --git a/odbc-drivers/myodbc/DETAILS b/odbc-drivers/myodbc/DETAILS
index a80187c449..addcb37b30 100755
--- a/odbc-drivers/myodbc/DETAILS
+++ b/odbc-drivers/myodbc/DETAILS
@@ -1,15 +1,22 @@
            SPELL=myodbc
           SPELLX=mysql-connector-odbc
-         VERSION=3.51.23r998
-     SOURCE_HASH=sha512:db39b88a1cc492ffd96040481ae6f54262eaf679d4ddf65e7c63af87f2c7f10387df7ec92fd169ddde388b046f15bdb799a114917df6a1adcaf92bfa4f63e691
-          SOURCE=$SPELLX-$VERSION.tar.gz
-        FTP_NAME=Downloads/Connector-ODBC/3.51/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
-   SOURCE_URL[0]=ftp://mirrors.dotsrc.org/pub/mysql/$FTP_NAME
+         VERSION=5.1.6
+          SOURCE="$SPELLX-$VERSION.tar.gz"
+  MIRROR_DL_PATH="Downloads/Connector-ODBC/${VERSION:0:3}/${SOURCE}"
+   SOURCE_URL[0]=ftp://mirrors.dotsrc.org/mysql/$MIRROR_DL_PATH
+   SOURCE_URL[1]=http://mysql.he.net/$MIRROR_DL_PATH
+   SOURCE_URL[2]=http://www.mirrorservice.org/sites/ftp.mysql.com/$MIRROR_DL_PATH
+         SOURCE2="$SPELLX-$VERSION.tar.gz.asc"
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+  SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
+  SOURCE2_URL[2]=${SOURCE_URL[2]}.asc
+  SOURCE2_IGNORE=signature
+      SOURCE_GPG="mysql.gpg:$SOURCE2:UPSTREAM_KEY"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
         WEB_SITE=http://www.mysql.com
          ENTERED=20030401
       LICENSE[0]=GPL
-        KEYWORDS="mysql database libs"
+        KEYWORDS="mysql database libs odbc"
            SHORT="Connect to a MySQL database server using the ODBC database API"
 cat << EOF
 MySQL Connector/ODBC (also known as MyODBC) allows you to connect to a MySQL
diff --git a/odbc-drivers/myodbc/FINAL b/odbc-drivers/myodbc/FINAL
index ab483e5287..e435cc4fc3 100755
--- a/odbc-drivers/myodbc/FINAL
+++ b/odbc-drivers/myodbc/FINAL
@@ -1 +1 @@
-myodbc3i -a -d -t"MySQL ODBC 3.51 Driver;DRIVER=/usr/lib/libmyodbc3.so;SETUP=/usr/lib/libmyodbc3S.so"
+myodbc-installer -d -a -n "MySQL ODBC 5.1.6 Driver" -t "DRIVER=/usr/lib/libmyodbc5.so;SETUP=/usr/lib/libmyodbc5S.so"
diff --git a/odbc-drivers/myodbc/HISTORY b/odbc-drivers/myodbc/HISTORY
index a8cded73fc..e2d7729d94 100644
--- a/odbc-drivers/myodbc/HISTORY
+++ b/odbc-drivers/myodbc/HISTORY
@@ -1,3 +1,9 @@
+2010-04-12 Elisamuel Resto <ryuji@sourcemage.org>
+	* DETAILS: updated version to 5.1.6; made use of upstream GPG key; new SOURCE_URLs
+	* DEPENDS: changed the qt-x11 option (gui is enabled by default otherwise)
+	* PRE_REMOVE, FINAL, POST_RESURRECT: changed to reflect new binary for
+	  registering drivers and option changes
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster@sourcemage.org>
 	* DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/odbc-drivers/myodbc/POST_RESURRECT b/odbc-drivers/myodbc/POST_RESURRECT
index ab483e5287..e435cc4fc3 100755
--- a/odbc-drivers/myodbc/POST_RESURRECT
+++ b/odbc-drivers/myodbc/POST_RESURRECT
@@ -1 +1 @@
-myodbc3i -a -d -t"MySQL ODBC 3.51 Driver;DRIVER=/usr/lib/libmyodbc3.so;SETUP=/usr/lib/libmyodbc3S.so"
+myodbc-installer -d -a -n "MySQL ODBC 5.1.6 Driver" -t "DRIVER=/usr/lib/libmyodbc5.so;SETUP=/usr/lib/libmyodbc5S.so"
diff --git a/odbc-drivers/myodbc/PRE_REMOVE b/odbc-drivers/myodbc/PRE_REMOVE
index 8552902a15..6004f1cde0 100755
--- a/odbc-drivers/myodbc/PRE_REMOVE
+++ b/odbc-drivers/myodbc/PRE_REMOVE
@@ -1 +1 @@
-myodbc3i -r -d -t"MySQL ODBC 3.51 Driver"
+myodbc-installer -d -r -n "MySQL ODBC 5.1.6 Driver"