diff options
author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-07-26 01:16:36 +0800 |
---|---|---|
committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-07-26 01:16:36 +0800 |
commit | 181f22437c81a50126939fff44f9bb9fa937ee74 (patch) | |
tree | f4f62ee25cce76550c5a0e03e6af7e95793c0f0a /databases/libgda/files | |
parent | d821bb7d23d9fb577710251f3fbe34c51e7e867b (diff) | |
download | marcuscom-ports-181f22437c81a50126939fff44f9bb9fa937ee74.tar.gz marcuscom-ports-181f22437c81a50126939fff44f9bb9fa937ee74.tar.zst marcuscom-ports-181f22437c81a50126939fff44f9bb9fa937ee74.zip |
USE_X_PREFIX -> USE_XLIB, bump the PORTREVISION.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6801 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'databases/libgda/files')
16 files changed, 232 insertions, 0 deletions
diff --git a/databases/libgda/files/patch-aa b/databases/libgda/files/patch-aa new file mode 100644 index 000000000..aa77c2716 --- /dev/null +++ b/databases/libgda/files/patch-aa @@ -0,0 +1,14 @@ + +$FreeBSD: ports/databases/libgda/files/patch-aa,v 1.5 2001/11/21 11:23:50 sobomax Exp $ + +--- Makefile.in.orig Wed Nov 21 10:29:52 2001 ++++ Makefile.in Wed Nov 21 10:30:19 2001 +@@ -158,7 +158,7 @@ + YACC = @YACC@ + l = @l@ + +-SUBDIRS = po intl macros idl lib bindings providers tools testing doc ++SUBDIRS = po intl macros idl lib bindings providers tools doc + + + EXTRA_DIST = COPYING libgda.spec.in xml-i18n-extract.in xml-i18n-merge.in xml-i18n-update.in diff --git a/databases/libgda/files/patch-bindings_c++_gdaBatch.cpp b/databases/libgda/files/patch-bindings_c++_gdaBatch.cpp new file mode 100644 index 000000000..2412c1226 --- /dev/null +++ b/databases/libgda/files/patch-bindings_c++_gdaBatch.cpp @@ -0,0 +1,11 @@ +--- bindings/c++/gdaBatch.cpp.orig Sat Jun 15 17:01:27 2002 ++++ bindings/c++/gdaBatch.cpp Sat Jun 15 17:01:41 2002 +@@ -127,7 +127,7 @@ + } + + GdaBatch* +-Batch::getCStruct (bool refn = true) const ++Batch::getCStruct (bool refn) const + { + if (refn) + ref (); diff --git a/databases/libgda/files/patch-bindings_c++_gdaCommand.cpp b/databases/libgda/files/patch-bindings_c++_gdaCommand.cpp new file mode 100644 index 000000000..8f8667e86 --- /dev/null +++ b/databases/libgda/files/patch-bindings_c++_gdaCommand.cpp @@ -0,0 +1,11 @@ +--- bindings/c++/gdaCommand.cpp.orig Sat Jun 15 17:02:00 2002 ++++ bindings/c++/gdaCommand.cpp Sat Jun 15 17:02:08 2002 +@@ -139,7 +139,7 @@ + */ + + GdaCommand* +-Command::getCStruct (bool refn = true) const ++Command::getCStruct (bool refn) const + { + if (refn) + ref (); diff --git a/databases/libgda/files/patch-bindings_c++_gdaConnection.cpp b/databases/libgda/files/patch-bindings_c++_gdaConnection.cpp new file mode 100644 index 000000000..aebf4440a --- /dev/null +++ b/databases/libgda/files/patch-bindings_c++_gdaConnection.cpp @@ -0,0 +1,11 @@ +--- bindings/c++/gdaConnection.cpp.orig Sat Jun 15 17:02:32 2002 ++++ bindings/c++/gdaConnection.cpp Sat Jun 15 17:02:41 2002 +@@ -294,7 +294,7 @@ + return gda_connection_get_version (_gda_connection); + } + +-GdaConnection* Connection::getCStruct (bool refn = true) const ++GdaConnection* Connection::getCStruct (bool refn) const + { + if (refn) ref (); + return _gda_connection; diff --git a/databases/libgda/files/patch-bindings_c++_gdaConnection.h b/databases/libgda/files/patch-bindings_c++_gdaConnection.h new file mode 100644 index 000000000..5846ac683 --- /dev/null +++ b/databases/libgda/files/patch-bindings_c++_gdaConnection.h @@ -0,0 +1,11 @@ +--- bindings/c++/gdaConnection.h.orig Sat Jun 15 17:00:34 2002 ++++ bindings/c++/gdaConnection.h Sat Jun 15 17:00:54 2002 +@@ -20,6 +20,8 @@ + #ifndef __gda_bindings_cpp_gdaConnectionH + #define __gda_bindings_cpp_gdaConnectionH + ++using namespace std; ++ + namespace gda { + + class Recordset; diff --git a/databases/libgda/files/patch-bindings_c++_gdaError.cpp b/databases/libgda/files/patch-bindings_c++_gdaError.cpp new file mode 100644 index 000000000..4b4e2c6ab --- /dev/null +++ b/databases/libgda/files/patch-bindings_c++_gdaError.cpp @@ -0,0 +1,11 @@ +--- bindings/c++/gdaError.cpp.orig Sat Jun 15 17:03:02 2002 ++++ bindings/c++/gdaError.cpp Sat Jun 15 17:03:09 2002 +@@ -98,7 +98,7 @@ + } + + GdaError* +-Error::getCStruct (bool refn = true) const ++Error::getCStruct (bool refn) const + { + if (refn) ref (); + return _gda_error; diff --git a/databases/libgda/files/patch-bindings_c++_gdaField.cpp b/databases/libgda/files/patch-bindings_c++_gdaField.cpp new file mode 100644 index 000000000..e650f0af2 --- /dev/null +++ b/databases/libgda/files/patch-bindings_c++_gdaField.cpp @@ -0,0 +1,11 @@ +--- bindings/c++/gdaField.cpp.orig Sat Jun 15 17:03:38 2002 ++++ bindings/c++/gdaField.cpp Sat Jun 15 17:03:45 2002 +@@ -428,7 +428,7 @@ + } + + GdaField* +-Field::getCStruct (bool refn = true) const ++Field::getCStruct (bool refn) const + { + if (refn) ref (); + return _gda_field; diff --git a/databases/libgda/files/patch-bindings_c++_gdaHelpers.h b/databases/libgda/files/patch-bindings_c++_gdaHelpers.h new file mode 100644 index 000000000..100ddee8a --- /dev/null +++ b/databases/libgda/files/patch-bindings_c++_gdaHelpers.h @@ -0,0 +1,11 @@ +--- bindings/c++/gdaHelpers.h.orig Sat Jun 15 17:04:17 2002 ++++ bindings/c++/gdaHelpers.h Sat Jun 15 17:04:31 2002 +@@ -19,6 +19,8 @@ + //#ifndef __gda_helpers_cpp_gdaHelpersH + //#define __gda_helpers_cpp_gdaHelpersH + ++using namespace std; ++ + namespace gda { + string gda_return_string (gchar* pszString); + }; diff --git a/databases/libgda/files/patch-bindings_c++_gdaIncludes.h b/databases/libgda/files/patch-bindings_c++_gdaIncludes.h new file mode 100644 index 000000000..b4d3d7a15 --- /dev/null +++ b/databases/libgda/files/patch-bindings_c++_gdaIncludes.h @@ -0,0 +1,11 @@ +--- bindings/c++/gdaIncludes.h.orig Sat Jun 15 16:53:57 2002 ++++ bindings/c++/gdaIncludes.h Sat Jun 15 16:55:03 2002 +@@ -51,4 +51,8 @@ + #include "gdaRecordset.h" + #include "gdaValue.h" + ++// Needed to get references to string working without having to pre-pend ++// std:: to each one. ++using namespace std; ++ + #endif // __gda_bindings_cpp_gdaIncludesH diff --git a/databases/libgda/files/patch-bindings_c++_gdaRecordset.cpp b/databases/libgda/files/patch-bindings_c++_gdaRecordset.cpp new file mode 100644 index 000000000..77a27c211 --- /dev/null +++ b/databases/libgda/files/patch-bindings_c++_gdaRecordset.cpp @@ -0,0 +1,11 @@ +--- bindings/c++/gdaRecordset.cpp.orig Sat Jun 15 17:05:30 2002 ++++ bindings/c++/gdaRecordset.cpp Sat Jun 15 17:05:55 2002 +@@ -254,7 +254,7 @@ + } + + GdaRecordset* +-Recordset::getCStruct (bool refn = true) const ++Recordset::getCStruct (bool refn) const + { + if (refn) ref (); + return _gda_recordset; diff --git a/databases/libgda/files/patch-configure b/databases/libgda/files/patch-configure new file mode 100644 index 000000000..04235bcc1 --- /dev/null +++ b/databases/libgda/files/patch-configure @@ -0,0 +1,13 @@ + +$FreeBSD: ports/databases/libgda/files/patch-configure,v 1.5 2002/05/01 20:23:00 sobomax Exp $ + +--- configure 2002/05/01 08:18:05 1.1 ++++ configure 2002/05/01 08:19:03 +@@ -5785,6 +5785,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in b/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in new file mode 100644 index 000000000..fe1e15733 --- /dev/null +++ b/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD: ports/databases/libgda/files/patch-doc::C::reference::libgda-client::Makefile.in,v 1.1 2002/05/01 20:23:00 sobomax Exp $ + +--- doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:16:31 1.1 ++++ doc/C/reference/libgda-client/Makefile.in 2002/05/01 08:17:40 +@@ -171,7 +171,7 @@ + LDFLAGS = " $(GDA_CLIENT_LIBS) $(top_builddir)/lib/gda-common/.libs/libgda-common.so $(top_builddir)/lib/gda-client/.libs/libgda-client.a " + + +-DOC_DIR = $(datadir)/html ++DOC_DIR = $(prefix)/share/doc/libgda + + DOC_DIR_INSTALL_FILES = libgda-client.args libgda-client.hierarchy libgda-client.signals libgda-client.types libgda-client-decl.txt libgda-client-sections.txt + diff --git a/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in b/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in new file mode 100644 index 000000000..4661dcd44 --- /dev/null +++ b/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD: ports/databases/libgda/files/patch-doc::C::reference::libgda-common::Makefile.in,v 1.1 2002/05/01 20:23:00 sobomax Exp $ + +--- doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:16:31 1.1 ++++ doc/C/reference/libgda-common/Makefile.in 2002/05/01 08:17:35 +@@ -171,7 +171,7 @@ + LDFLAGS = " $(GDA_CLIENT_LIBS) $(top_builddir)/lib/gda-common/.libs/libgda-common.a " + + +-DOC_DIR = $(datadir)/html ++DOC_DIR = $(prefix)/share/doc/libgda + + DOC_DIR_INSTALL_FILES = libgda-common.args libgda-common.hierarchy libgda-common.signals libgda-common.types libgda-common-decl.txt libgda-common-sections.txt + diff --git a/databases/libgda/files/patch-providers::gda-default-server::sqlite::lemon.c b/databases/libgda/files/patch-providers::gda-default-server::sqlite::lemon.c new file mode 100644 index 000000000..5aab82eb2 --- /dev/null +++ b/databases/libgda/files/patch-providers::gda-default-server::sqlite::lemon.c @@ -0,0 +1,50 @@ +--- providers/gda-default-server/sqlite/lemon.c.orig Mon Aug 4 09:34:14 2003 ++++ providers/gda-default-server/sqlite/lemon.c Mon Aug 4 09:43:12 2003 +@@ -7,7 +7,7 @@ + ** The author of this program disclaims copyright. + */ + #include <stdio.h> +-#include <varargs.h> ++#include <stdarg.h> + #include <string.h> + #include <ctype.h> + +@@ -70,7 +70,7 @@ + void Configlist_reset(/* void */); + + /********* From the file "error.h" ***************************************/ +-void ErrorMsg( /* char *, int, char *, ... */ ); ++void ErrorMsg( char *, int, char *, ... ); + + /****** From the file "option.h" ******************************************/ + struct s_options { +@@ -1092,12 +1092,13 @@ + #define ERRMSGSIZE 10000 /* Hope this is big enough. No way to error check */ + #define LINEWIDTH 79 /* Max width of any output line */ + #define PREFIXLIMIT 30 /* Max width of the prefix on each line */ +-void ErrorMsg(va_alist) +-va_dcl ++void ErrorMsg( char *filename, int lineno, char *format, ... ) + { ++ /* + char *filename; + int lineno; + char *format; ++ */ + char errmsg[ERRMSGSIZE]; + char prefix[PREFIXLIMIT+10]; + int errmsgsize; +@@ -1106,10 +1107,12 @@ + va_list ap; + int end, restart, base; + +- va_start(ap); ++ va_start(ap, format); ++ /* + filename = va_arg(ap,char*); + lineno = va_arg(ap,int); + format = va_arg(ap,char*); ++ */ + /* Prepare a prefix to be prepended to every output line */ + if( lineno>0 ){ + sprintf(prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno); diff --git a/databases/libgda/files/patch-tools::gda-buildserver.in b/databases/libgda/files/patch-tools::gda-buildserver.in new file mode 100644 index 000000000..f61d47a02 --- /dev/null +++ b/databases/libgda/files/patch-tools::gda-buildserver.in @@ -0,0 +1,14 @@ + +$FreeBSD: ports/databases/libgda/files/patch-tools::gda-buildserver.in,v 1.1 2001/08/06 10:56:39 sobomax Exp $ + +--- tools/gda-buildserver.in 2001/08/06 08:16:41 1.1 ++++ tools/gda-buildserver.in 2001/08/06 08:16:54 +@@ -7,7 +7,7 @@ + CC=@CC@ + shell=@shell@ + +-TEMPLATES_DIR="${prefix}/share/gda/templates" ++TEMPLATES_DIR="${prefix}/share/gnome/gda/templates" + TMPL_C_FILES="gda-srv-command.c gda-srv-connection.c gda-srv-recordset.c main-srv.c" + TMPL_H_FILES="gda-srv.h" + diff --git a/databases/libgda/files/patch-tools::templates::Makefile.in b/databases/libgda/files/patch-tools::templates::Makefile.in new file mode 100644 index 000000000..670d43b7f --- /dev/null +++ b/databases/libgda/files/patch-tools::templates::Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD: ports/databases/libgda/files/patch-tools::templates::Makefile.in,v 1.1 2001/08/06 10:56:39 sobomax Exp $ + +--- tools/templates/Makefile.in 2001/08/06 08:15:18 1.1 ++++ tools/templates/Makefile.in 2001/08/06 08:15:53 +@@ -148,7 +148,7 @@ + + EXTRA_DIST = $(TEMPLATE_FILES) + +-gdatemplatesdir = $(prefix)/share/gda/templates ++gdatemplatesdir = $(prefix)/share/gnome/gda/templates + gdatemplates_DATA = $(TEMPLATE_FILES) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../config.h |