"odbcfb-RC1-2.0.0148"

11 files changed, 40 insertions, 36 deletions

diff --git a/ChangeLog b/ChangeLog
index 55e802cb41..57a6505f1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-11-22 Treeve Jelbert <treeve@sourcemage.org>
+	* odbc-drivers: rename odbcjdbc to odbcfb
+
 2008-11-22 George Sherwood <gsherwood@sourcemage.org>
 	* gnome2-apps/mybudget: deleted, broke dead spell.
 
diff --git a/odbc-drivers/odbcjdbc/BUILD b/odbc-drivers/odbcfb/BUILD
index 3a6e2068a9..82641a950d 100755
--- a/odbc-drivers/odbcjdbc/BUILD
+++ b/odbc-drivers/odbcfb/BUILD
@@ -1,5 +1,4 @@
-
-cd  $SOURCE_DIRECTORY/OdbcJdbc/Builds/Gcc.lin   &&
+cd  $SOURCE_DIRECTORY/Builds/Gcc.lin   &&
 if spell_ok unixodbc;then
   make -f makefile.linux ODBCMANAGER=unixODBC
 else
diff --git a/odbc-drivers/odbcjdbc/DEPENDS b/odbc-drivers/odbcfb/DEPENDS
index 60ac692dd6..60ac692dd6 100755
--- a/odbc-drivers/odbcjdbc/DEPENDS
+++ b/odbc-drivers/odbcfb/DEPENDS
diff --git a/odbc-drivers/odbcfb/DETAILS b/odbc-drivers/odbcfb/DETAILS
new file mode 100755
index 0000000000..f79eb4367b
--- /dev/null
+++ b/odbc-drivers/odbcfb/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=odbcfb
+          SPELLX=OdbcFb
+        WEB_SITE=http://www.ibphoenix.com
+         VERSION=RC1-2.0.0148
+     SOURCE_HASH=sha512:0af351a696d0eeb41f18542f43bdfd646ab9b44f86b0254de6de77f2643e6ae4d246a90e1d5da75f6a72c00888fc48a6d01fe8c7c81ef404d95deeeaa62e633d
+          SOURCE=${SPELLX}-Source-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+   SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/odbc/$SOURCE
+         LICENSE=IDPL
+         ENTERED=20031205
+            DOCS="ChangeLog  Install/HtmlHelp/*"
+        KEYWORDS="firebird database odbc"
+           SHORT="OBDC/JDBC driver for Firebird database"
+cat << EOF
+OBDC/JDBC driver for Firebird database
+EOF
diff --git a/odbc-drivers/odbcjdbc/HISTORY b/odbc-drivers/odbcfb/HISTORY
index 8afcc5ead5..c5a74c3d35 100644
--- a/odbc-drivers/odbcjdbc/HISTORY
+++ b/odbc-drivers/odbcfb/HISTORY
@@ -1,3 +1,14 @@
+2008-11-22 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version RC1-2.0.0148
+	  new url
+	  spell renamed to odbcfb
+	* PRE_BUILD: need to make a directory first
+	  no longer need patch
+	  fix CXXFLAGS
+	  fix compile with gcc-4.3.2
+	* fix.diff: deleted
+	* BUILD: adjust
+
 2008-10-12 Treeve Jelbert <treeve@sourcemage.org>
 	* fix.diff: firebird has moved
 
diff --git a/odbc-drivers/odbcjdbc/INSTALL b/odbc-drivers/odbcfb/INSTALL
index 3267a0ca62..3267a0ca62 100755
--- a/odbc-drivers/odbcjdbc/INSTALL
+++ b/odbc-drivers/odbcfb/INSTALL
diff --git a/odbc-drivers/odbcfb/PRE_BUILD b/odbc-drivers/odbcfb/PRE_BUILD
new file mode 100755
index 0000000000..c1ebc7d251
--- /dev/null
+++ b/odbc-drivers/odbcfb/PRE_BUILD
@@ -0,0 +1,9 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file          &&
+# gcc-4.3.2 fixes
+sed -i "s/g++/g++ $CXXFLAGS -std=c++0x/" Builds/Gcc.lin/makefile.linux &&
+sed -i '/stdlib/ a\
+#include <cstdint>
+' IscDbc/IscBlob.cpp IscDbc/IscArray.cpp IscDbc/IscProceduresResultSet.cpp \
+  IscDbc/Sqlda.cpp IscDbc/TypesResultSet.cpp
diff --git a/odbc-drivers/odbcjdbc/odbc.in b/odbc-drivers/odbcfb/odbc.in
index 2bd29f3fd5..2bd29f3fd5 100644
--- a/odbc-drivers/odbcjdbc/odbc.in
+++ b/odbc-drivers/odbcfb/odbc.in
diff --git a/odbc-drivers/odbcjdbc/DETAILS b/odbc-drivers/odbcjdbc/DETAILS
deleted file mode 100755
index 31f36d6722..0000000000
--- a/odbc-drivers/odbcjdbc/DETAILS
+++ /dev/null
@@ -1,17 +0,0 @@
-           SPELL=odbcjdbc
-local SPELLX SFCVS
-          SPELLX=OdbcFb32
-        WEB_SITE=http://www.ibphoenix.com
-         VERSION=beta-2.0.0144
-     SOURCE_HASH=sha512:572bea6d18d8a8106a9db25f0a4d27d1d86d0ce7744542af80b9b084b3b9c3e822f0925b4b1d4edb613cb584771eb1c64421178368337959343df859b4aa6e19
-          SOURCE=${SPELLX}-$VERSION-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/ODBC\_V2-0-BETA
-   SOURCE_URL[0]=http://www.praktik.km.ua/downloads/$SOURCE
-         LICENSE=IDPL
-         ENTERED=20031205
-            DOCS="ChangeLog  Install/HtmlHelp/*"
-        KEYWORDS="firebird database odbc"
-           SHORT="OBDC/JDBC driver for Firebird database"
-cat << EOF
-OBDC/JDBC driver for Firebird database
-EOF
diff --git a/odbc-drivers/odbcjdbc/PRE_BUILD b/odbc-drivers/odbcjdbc/PRE_BUILD
deleted file mode 100755
index 27a04a89ee..0000000000
--- a/odbc-drivers/odbcjdbc/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-  default_pre_build               &&
-  cd $SOURCE_DIRECTORY            &&
-  patch -p1 <$SPELL_DIRECTORY/fix.diff
diff --git a/odbc-drivers/odbcjdbc/fix.diff b/odbc-drivers/odbcjdbc/fix.diff
deleted file mode 100644
index abede734df..0000000000
--- a/odbc-drivers/odbcjdbc/fix.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr ODBC_V2-0-BETA/OdbcJdbc/Builds/Gcc.lin/makefile.linux ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/Gcc.lin/makefile.linux
---- ODBC_V2-0-BETA/OdbcJdbc/Builds/Gcc.lin/makefile.linux	2006-07-03 15:10:00.000000000 +0200
-+++ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/Gcc.lin/makefile.linux	2006-07-03 22:10:28.000000000 +0200
-@@ -75,8 +75,9 @@
- LIST_ODBCJDBCSETUPSRC	= $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
- LIST_ODBCJDBCSETUPOBJ	= $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
- #
--COMPFLAGS	= -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
-+COMPFLAGS	= -DPIC -fPIC $(CFLAGS) -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
- #
-+
- #LINKFLAGS	= -rdynamic -export-dynamic -shared 
- LINKFLAGS	= -shared
- EXTLIBS		= $(EXTLIBDIR) -lcrypt -ldl