summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdatabase/odbcjdbc/FINAL2
-rwxr-xr-xdatabase/odbcjdbc/POST_REMOVE1
-rwxr-xr-xdatabase/odbcjdbc/POST_RESURRECT2
-rwxr-xr-xdatabase/picoodbc/FINAL2
-rwxr-xr-xdatabase/picoodbc/POST_REMOVE1
-rwxr-xr-xdatabase/picoodbc/POST_RESURRECT2
-rwxr-xr-xdatabase/sqliteodbc/FINAL3
-rwxr-xr-xdatabase/sqliteodbc/POST_REMOVE1
-rwxr-xr-xdatabase/sqliteodbc/POST_RESURRECT3
-rwxr-xr-xlibs/myodbc/DEPENDS2
-rwxr-xr-xodbc-drivers/FUNCTIONS39
-rw-r--r--odbc-drivers/HISTORY4
-rwxr-xr-xodbc-drivers/myodbc/BUILD (renamed from libs/myodbc/BUILD)0
-rwxr-xr-xodbc-drivers/myodbc/DEPENDS3
-rwxr-xr-xodbc-drivers/myodbc/DETAILS (renamed from libs/myodbc/DETAILS)11
-rwxr-xr-xodbc-drivers/myodbc/FINAL1
-rw-r--r--odbc-drivers/myodbc/HISTORY (renamed from libs/myodbc/HISTORY)7
-rwxr-xr-xodbc-drivers/myodbc/POST_RESURRECT1
-rwxr-xr-xodbc-drivers/myodbc/PRE_REMOVE1
-rwxr-xr-xodbc-drivers/odbcjdbc/BUILD (renamed from database/odbcjdbc/BUILD)0
-rwxr-xr-xodbc-drivers/odbcjdbc/DEPENDS (renamed from database/odbcjdbc/DEPENDS)0
-rwxr-xr-xodbc-drivers/odbcjdbc/DETAILS (renamed from database/odbcjdbc/DETAILS)4
-rw-r--r--odbc-drivers/odbcjdbc/HISTORY (renamed from database/odbcjdbc/HISTORY)6
-rwxr-xr-xodbc-drivers/odbcjdbc/INSTALL (renamed from database/odbcjdbc/INSTALL)0
-rwxr-xr-xodbc-drivers/odbcjdbc/PRE_BUILD (renamed from database/odbcjdbc/PRE_BUILD)0
-rw-r--r--odbc-drivers/odbcjdbc/odbc.in (renamed from database/odbcjdbc/odbc.fb)0
-rwxr-xr-xodbc-drivers/picoodbc/BUILD (renamed from database/picoodbc/BUILD)0
-rwxr-xr-xodbc-drivers/picoodbc/DEPENDS (renamed from database/picoodbc/DEPENDS)0
-rwxr-xr-xodbc-drivers/picoodbc/DETAILS (renamed from database/picoodbc/DETAILS)2
-rw-r--r--odbc-drivers/picoodbc/HISTORY (renamed from database/picoodbc/HISTORY)4
-rwxr-xr-xodbc-drivers/picoodbc/INSTALL (renamed from database/picoodbc/INSTALL)0
-rwxr-xr-xodbc-drivers/picoodbc/PRE_BUILD (renamed from database/picoodbc/PRE_BUILD)0
-rw-r--r--odbc-drivers/picoodbc/odbc.in (renamed from database/picoodbc/odbc.in)0
-rw-r--r--odbc-drivers/picoodbc/pico.diff (renamed from database/picoodbc/pico.diff)0
-rwxr-xr-xodbc-drivers/sqliteodbc/DEPENDS (renamed from database/sqliteodbc/DEPENDS)0
-rwxr-xr-xodbc-drivers/sqliteodbc/DETAILS (renamed from database/sqliteodbc/DETAILS)2
-rw-r--r--odbc-drivers/sqliteodbc/HISTORY (renamed from database/sqliteodbc/HISTORY)4
-rw-r--r--odbc-drivers/sqliteodbc/odbc.in (renamed from database/sqliteodbc/odbc.in)0
38 files changed, 77 insertions, 31 deletions
diff --git a/database/odbcjdbc/FINAL b/database/odbcjdbc/FINAL
deleted file mode 100755
index 2830b908fb..0000000000
--- a/database/odbcjdbc/FINAL
+++ /dev/null
@@ -1,2 +0,0 @@
-odbcinst -i -d -f $SPELL_DIRECTORY/odbc.fb
-
diff --git a/database/odbcjdbc/POST_REMOVE b/database/odbcjdbc/POST_REMOVE
deleted file mode 100755
index 4d78395853..0000000000
--- a/database/odbcjdbc/POST_REMOVE
+++ /dev/null
@@ -1 +0,0 @@
-odbcinst -u -d -n Firebird
diff --git a/database/odbcjdbc/POST_RESURRECT b/database/odbcjdbc/POST_RESURRECT
deleted file mode 100755
index 2830b908fb..0000000000
--- a/database/odbcjdbc/POST_RESURRECT
+++ /dev/null
@@ -1,2 +0,0 @@
-odbcinst -i -d -f $SPELL_DIRECTORY/odbc.fb
-
diff --git a/database/picoodbc/FINAL b/database/picoodbc/FINAL
deleted file mode 100755
index 5a7d0331da..0000000000
--- a/database/picoodbc/FINAL
+++ /dev/null
@@ -1,2 +0,0 @@
-odbcinst -i -d -f $SPELL_DIRECTORY/odbc.in
-
diff --git a/database/picoodbc/POST_REMOVE b/database/picoodbc/POST_REMOVE
deleted file mode 100755
index 5d778088c6..0000000000
--- a/database/picoodbc/POST_REMOVE
+++ /dev/null
@@ -1 +0,0 @@
-odbcinst -u -d -n picoODBC
diff --git a/database/picoodbc/POST_RESURRECT b/database/picoodbc/POST_RESURRECT
deleted file mode 100755
index 5a7d0331da..0000000000
--- a/database/picoodbc/POST_RESURRECT
+++ /dev/null
@@ -1,2 +0,0 @@
-odbcinst -i -d -f $SPELL_DIRECTORY/odbc.in
-
diff --git a/database/sqliteodbc/FINAL b/database/sqliteodbc/FINAL
deleted file mode 100755
index d21d524999..0000000000
--- a/database/sqliteodbc/FINAL
+++ /dev/null
@@ -1,3 +0,0 @@
-odbcinst -i -d -f $SPELL_DIRECTORY/odbc.in
-#odbcinst -i -d -f ./odbc.in
-
diff --git a/database/sqliteodbc/POST_REMOVE b/database/sqliteodbc/POST_REMOVE
deleted file mode 100755
index b8a45a40c6..0000000000
--- a/database/sqliteodbc/POST_REMOVE
+++ /dev/null
@@ -1 +0,0 @@
-odbcinst -u -d -n SQLite
diff --git a/database/sqliteodbc/POST_RESURRECT b/database/sqliteodbc/POST_RESURRECT
deleted file mode 100755
index d21d524999..0000000000
--- a/database/sqliteodbc/POST_RESURRECT
+++ /dev/null
@@ -1,3 +0,0 @@
-odbcinst -i -d -f $SPELL_DIRECTORY/odbc.in
-#odbcinst -i -d -f ./odbc.in
-
diff --git a/libs/myodbc/DEPENDS b/libs/myodbc/DEPENDS
deleted file mode 100755
index 1cc44fbe4b..0000000000
--- a/libs/myodbc/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends mysql &&
-depends unixodbc
diff --git a/odbc-drivers/FUNCTIONS b/odbc-drivers/FUNCTIONS
new file mode 100755
index 0000000000..71f81883b8
--- /dev/null
+++ b/odbc-drivers/FUNCTIONS
@@ -0,0 +1,39 @@
+#-------------------------------------------------------------------------
+## Section-default odbc configuration scripts
+#-------------------------------------------------------------------------
+# all spells in this section have a file odbc.in which describes the settings for the
+# driver. The functions parse that file and perform the appropriate update to the
+# odbc configuration files.
+
+function odbc_install_cfg() {
+# local ODBC_DRIVER
+#persistent_read ODBC_DRIVER
+ if spell_ok unixodbc;then
+ odbcinst -i -d -f $SPELL_DIRECTORY/odbc.in
+ else
+ message ${SPELL_COLOR}you must configure the $SPELL driver manually.
+ fi
+}
+
+
+function default_post_install() {
+ persistent_add ODBC_DRIVER
+ ODBC_DRIVER=`grep "\[" $SPELL_DIRECTORY/odbc.in|sed "s|\[||;s|\]||"`
+ odbc_install_cfg
+}
+
+function default_post_resurrect() {
+ persistent_read ODBC_DRIVER
+ odbc_install_cfg
+}
+
+
+function default_pre_remove() {
+ persistent_read ODBC_DRIVER
+ if spell_ok unixodbc;then
+ odbcinst -u -d -n $ODBC_DRIVER
+ else
+ message "${SPELL_COLOR}you must manually remove the $ODBC_DRIVER ODBC driver" \
+ "from /etc/odbc.ini${DEFAULT_COLOR}"
+ fi
+}
diff --git a/odbc-drivers/HISTORY b/odbc-drivers/HISTORY
new file mode 100644
index 0000000000..b7fbb6faeb
--- /dev/null
+++ b/odbc-drivers/HISTORY
@@ -0,0 +1,4 @@
+2006-06-22 Treeve Jelbert <treeve01@pi.be>
+ * FUNCTIONS: created
+ these functions provide common processing for FINAL, POST_REMOVE and
+ POST_RESSURRECT actions
diff --git a/libs/myodbc/BUILD b/odbc-drivers/myodbc/BUILD
index 2d643be908..2d643be908 100755
--- a/libs/myodbc/BUILD
+++ b/odbc-drivers/myodbc/BUILD
diff --git a/odbc-drivers/myodbc/DEPENDS b/odbc-drivers/myodbc/DEPENDS
new file mode 100755
index 0000000000..7e80b96880
--- /dev/null
+++ b/odbc-drivers/myodbc/DEPENDS
@@ -0,0 +1,3 @@
+depends mysql &&
+depends ODBC-MGR &&
+optional_depends qt-x11 "" "" "graphical interface"
diff --git a/libs/myodbc/DETAILS b/odbc-drivers/myodbc/DETAILS
index 7e5a804f5e..a50134188e 100755
--- a/libs/myodbc/DETAILS
+++ b/odbc-drivers/myodbc/DETAILS
@@ -1,16 +1,15 @@
SPELL=myodbc
+ SPELLX=mysql-connector-odbc
FTP_NAME=MyODBC3
- VERSION=3.51.06
- SOURCE=MyODBC-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/MyODBC-$VERSION
+ VERSION=3.51.12
+ SOURCE_HASH=sha512:9021e880ff31a4929d62667aa96cbc6ec640d0ca3b2498de394fb357e9675967b5a726f7efe5f2a0c8fbdfb1e003a694f13bf036c030c4332f6e78f4bde9d472
+ SOURCE=$SPELLX-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/$FTP_NAME/$SOURCE
SOURCE_URL[1]=http://mysql.mirror.anlx.net/Downloads/$FTP_NAME/$SOURCE
- SOURCE_HASH=sha512:a7abb1ab6d591d255d800ce851817e88cb1f664d3b22a82964be6bedda5e02b9dc3bfaf9be2f28c9684162e4d4c1e677c5d0a510f6fd8d1934abb397d390bec9
WEB_SITE=http://www.mysql.com
ENTERED=20030401
- UPDATED=20030401
LICENSE[0]=GPL
- BUILD_API=2
KEYWORDS="mysql database libs"
SHORT="Connect to a MySQL database server using the ODBC database API"
cat << EOF
diff --git a/odbc-drivers/myodbc/FINAL b/odbc-drivers/myodbc/FINAL
new file mode 100755
index 0000000000..ab483e5287
--- /dev/null
+++ b/odbc-drivers/myodbc/FINAL
@@ -0,0 +1 @@
+myodbc3i -a -d -t"MySQL ODBC 3.51 Driver;DRIVER=/usr/lib/libmyodbc3.so;SETUP=/usr/lib/libmyodbc3S.so"
diff --git a/libs/myodbc/HISTORY b/odbc-drivers/myodbc/HISTORY
index 491d34a6ec..59d98a7a4b 100644
--- a/libs/myodbc/HISTORY
+++ b/odbc-drivers/myodbc/HISTORY
@@ -1,3 +1,10 @@
+2006-06-23 Treeve Jelbert <treeve01@pi.be>
+ * DETAILS: version 3.51.12
+ new name for tarball, now mysql-connector-odbc
+ * DEPENDS: use generic ODBC-MGR
+ add qt-x11
+ * PRE_REMOVE, FINAL, POST_RESURRECT: added
+
2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
diff --git a/odbc-drivers/myodbc/POST_RESURRECT b/odbc-drivers/myodbc/POST_RESURRECT
new file mode 100755
index 0000000000..ab483e5287
--- /dev/null
+++ b/odbc-drivers/myodbc/POST_RESURRECT
@@ -0,0 +1 @@
+myodbc3i -a -d -t"MySQL ODBC 3.51 Driver;DRIVER=/usr/lib/libmyodbc3.so;SETUP=/usr/lib/libmyodbc3S.so"
diff --git a/odbc-drivers/myodbc/PRE_REMOVE b/odbc-drivers/myodbc/PRE_REMOVE
new file mode 100755
index 0000000000..8552902a15
--- /dev/null
+++ b/odbc-drivers/myodbc/PRE_REMOVE
@@ -0,0 +1 @@
+myodbc3i -r -d -t"MySQL ODBC 3.51 Driver"
diff --git a/database/odbcjdbc/BUILD b/odbc-drivers/odbcjdbc/BUILD
index 95791eca39..95791eca39 100755
--- a/database/odbcjdbc/BUILD
+++ b/odbc-drivers/odbcjdbc/BUILD
diff --git a/database/odbcjdbc/DEPENDS b/odbc-drivers/odbcjdbc/DEPENDS
index 60ac692dd6..60ac692dd6 100755
--- a/database/odbcjdbc/DEPENDS
+++ b/odbc-drivers/odbcjdbc/DEPENDS
diff --git a/database/odbcjdbc/DETAILS b/odbc-drivers/odbcjdbc/DETAILS
index 3bc0de0bd3..905d54ffa5 100755
--- a/database/odbcjdbc/DETAILS
+++ b/odbc-drivers/odbcjdbc/DETAILS
@@ -2,8 +2,8 @@
local SPELLX SFCVS
SPELLX=OdbcJdbc
WEB_SITE=http://www.ibphoenix.com
- VERSION=beta-2.0.0135
- SOURCE_HASH=sha512:28e82fe76aa163fa9ef053ff5064a666e3198f6d743d806bd0ff98bc73b7aa2e68784b26ecafae146b6cc4e70749fef99a5dadde8bd3ebf92cebb399ee6d6296
+ VERSION=beta-2.0.0136
+ SOURCE_HASH=sha512:a4724cf869cc7d095c68f6b23d284e564af1795ac23b1486e1b291fe093a4fb12bf02b95ee18672bd48c4e5fa52b31b2b6f60d0868977d8089339fc0193754a9
SOURCE=${SPELLX}-$VERSION-src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ODBC\_V2-0-BETA
SOURCE_URL[0]=http://www.praktik.km.ua/downloads/$SOURCE
diff --git a/database/odbcjdbc/HISTORY b/odbc-drivers/odbcjdbc/HISTORY
index 680ede7889..a4f8bba073 100644
--- a/database/odbcjdbc/HISTORY
+++ b/odbc-drivers/odbcjdbc/HISTORY
@@ -1,3 +1,9 @@
+2006-06-22 Treeve Jelbert <treeve01@pi.be>
+ * DETAILS: version 2.0.0136
+ * FINAL, POST_RESURRECT: move to section level
+ * odbc.fb: renamed as odbc.in, for consistency with other xxxxodbc spells
+ * POST_REMOVE: make compatible with libiodbc
+
2006-06-20 Treeve Jelbert <treeve01@pi.be>
* DETAILS: version 2.0.0135
diff --git a/database/odbcjdbc/INSTALL b/odbc-drivers/odbcjdbc/INSTALL
index 1a36e22a68..1a36e22a68 100755
--- a/database/odbcjdbc/INSTALL
+++ b/odbc-drivers/odbcjdbc/INSTALL
diff --git a/database/odbcjdbc/PRE_BUILD b/odbc-drivers/odbcjdbc/PRE_BUILD
index 7e8a059922..7e8a059922 100755
--- a/database/odbcjdbc/PRE_BUILD
+++ b/odbc-drivers/odbcjdbc/PRE_BUILD
diff --git a/database/odbcjdbc/odbc.fb b/odbc-drivers/odbcjdbc/odbc.in
index 946644c2bf..946644c2bf 100644
--- a/database/odbcjdbc/odbc.fb
+++ b/odbc-drivers/odbcjdbc/odbc.in
diff --git a/database/picoodbc/BUILD b/odbc-drivers/picoodbc/BUILD
index cd41035dba..cd41035dba 100755
--- a/database/picoodbc/BUILD
+++ b/odbc-drivers/picoodbc/BUILD
diff --git a/database/picoodbc/DEPENDS b/odbc-drivers/picoodbc/DEPENDS
index 57484d22f2..57484d22f2 100755
--- a/database/picoodbc/DEPENDS
+++ b/odbc-drivers/picoodbc/DEPENDS
diff --git a/database/picoodbc/DETAILS b/odbc-drivers/picoodbc/DETAILS
index a3c1521f66..76127e2292 100755
--- a/database/picoodbc/DETAILS
+++ b/odbc-drivers/picoodbc/DETAILS
@@ -6,9 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/picoODBC-$VERSION
SOURCE_URL[0]=$WEB_SITE/$SOURCE
SOURCE_HASH=sha512:4259c548f2be53ddb617dfee28140bebbae59ada84f302310e4c9ceaff7ed899a84f4cfad83d301d6b0bdc86d97e6e5da670f9a63eca1f8a5378bab5d4b7cb76
ENTERED=20030202
- UPDATED=20040718
LICENSE[0]=GPL
- BUILD_API=2
DOCS="README"
KEYWORDS="database"
SHORT="ODBC driver for picoSQL"
diff --git a/database/picoodbc/HISTORY b/odbc-drivers/picoodbc/HISTORY
index c3e5a9dffc..7de0009730 100644
--- a/database/picoodbc/HISTORY
+++ b/odbc-drivers/picoodbc/HISTORY
@@ -1,3 +1,7 @@
+2006-06-23 Treeve Jelbert <treeve01@pi.be>
+ * FINAL, POST_RESURRECT: move to section level
+ * POST_REMOVE: make compatible with libiodbc
+
2006-05-27 Treeve Jelbert <treeve01@pi.be>
* PRE_BUILD, pico.diff: add
fix compile with gcc-4.1.1
diff --git a/database/picoodbc/INSTALL b/odbc-drivers/picoodbc/INSTALL
index 008c092b23..008c092b23 100755
--- a/database/picoodbc/INSTALL
+++ b/odbc-drivers/picoodbc/INSTALL
diff --git a/database/picoodbc/PRE_BUILD b/odbc-drivers/picoodbc/PRE_BUILD
index b14b77f034..b14b77f034 100755
--- a/database/picoodbc/PRE_BUILD
+++ b/odbc-drivers/picoodbc/PRE_BUILD
diff --git a/database/picoodbc/odbc.in b/odbc-drivers/picoodbc/odbc.in
index 194e45f436..194e45f436 100644
--- a/database/picoodbc/odbc.in
+++ b/odbc-drivers/picoodbc/odbc.in
diff --git a/database/picoodbc/pico.diff b/odbc-drivers/picoodbc/pico.diff
index 663a0b0c89..663a0b0c89 100644
--- a/database/picoodbc/pico.diff
+++ b/odbc-drivers/picoodbc/pico.diff
diff --git a/database/sqliteodbc/DEPENDS b/odbc-drivers/sqliteodbc/DEPENDS
index 16ad3d84b5..16ad3d84b5 100755
--- a/database/sqliteodbc/DEPENDS
+++ b/odbc-drivers/sqliteodbc/DEPENDS
diff --git a/database/sqliteodbc/DETAILS b/odbc-drivers/sqliteodbc/DETAILS
index d9d57df042..eaaf6f6b77 100755
--- a/database/sqliteodbc/DETAILS
+++ b/odbc-drivers/sqliteodbc/DETAILS
@@ -8,9 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-$VERSION
SOURCE_URL[0]=$WEB_SITE/$SOURCE
LICENSE=$WEB_SITE/license.terms
ENTERED=20031206
- UPDATED=20050730
DOCS="ChangeLog README *.html license.terms"
- BUILD_API=2
KEYWORDS="sqlite database"
SHORT="an ODBC wrapper for the sqlite database engine"
cat << EOF
diff --git a/database/sqliteodbc/HISTORY b/odbc-drivers/sqliteodbc/HISTORY
index 95452115f0..83995ee223 100644
--- a/database/sqliteodbc/HISTORY
+++ b/odbc-drivers/sqliteodbc/HISTORY
@@ -1,3 +1,7 @@
+2006-06-22 Treeve Jelbert <treeve01@pi.be>
+ * FINAL, POST_RESURRECT: move to section level
+ * POST_REMOVE: make compatible ith libiodbc
+
2006-04-20 Treeve Jelbert <treeve01@pi.be>
* DETAILS: version 0.67
* DETAILS DEPENDS: remove gcc34
diff --git a/database/sqliteodbc/odbc.in b/odbc-drivers/sqliteodbc/odbc.in
index 4f8a4f6ec8..4f8a4f6ec8 100644
--- a/database/sqliteodbc/odbc.in
+++ b/odbc-drivers/sqliteodbc/odbc.in