diff options
Diffstat (limited to 'databases/sqlrelay/files')
| -rw-r--r-- | databases/sqlrelay/files/patch-Makefile (renamed from databases/sqlrelay/files/patch-Makefile.in) | 6 | ||||
| -rw-r--r-- | databases/sqlrelay/files/patch-config.mk.in | 17 | ||||
| -rw-r--r-- | databases/sqlrelay/files/patch-configure | 32 | ||||
| -rw-r--r-- | databases/sqlrelay/files/patch-configure.in | 14 | ||||
| -rw-r--r-- | databases/sqlrelay/files/patch-src::api::c++::src::Makefile.in | 31 | ||||
| -rw-r--r-- | databases/sqlrelay/files/patch-src::api::c::src::Makefile.in | 31 |
6 files changed, 40 insertions, 91 deletions
diff --git a/databases/sqlrelay/files/patch-Makefile.in b/databases/sqlrelay/files/patch-Makefile index 622367c75d5f..1dcfc92cbb33 100644 --- a/databases/sqlrelay/files/patch-Makefile.in +++ b/databases/sqlrelay/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.in.orig Sat Jun 23 13:55:47 2001 -+++ Makefile.in Mon Jul 2 21:43:00 2001 -@@ -22,9 +22,10 @@ +--- Makefile.orig Wed Oct 17 06:20:48 2001 ++++ Makefile Sun Feb 24 01:42:57 2002 +@@ -24,9 +24,10 @@ install: cd bin; $(MAKE) install diff --git a/databases/sqlrelay/files/patch-config.mk.in b/databases/sqlrelay/files/patch-config.mk.in index da1988cd56ca..0e1d0aec502b 100644 --- a/databases/sqlrelay/files/patch-config.mk.in +++ b/databases/sqlrelay/files/patch-config.mk.in @@ -1,13 +1,6 @@ ---- config.mk.in.orig Fri Aug 10 12:23:03 2001 -+++ config.mk.in Sat Jan 12 00:49:44 2002 -@@ -2,19 +2,20 @@ - VPATH = @srcdir@ - - VERSION = @VERSION@ -+SOVERSION = $(basename $(VERSION)) - - # installation directories - prefix = @prefix@ +--- config.mk.in.orig Thu Oct 18 11:54:14 2001 ++++ config.mk.in Sun Feb 24 01:49:43 2002 +@@ -8,13 +8,13 @@ exec_prefix= @exec_prefix@ incdir = @includedir@ libdir = @libdir@ @@ -23,12 +16,12 @@ tmpdir = ${localstatedir}/sqlrelay/tmp cachedir = ${localstatedir}/sqlrelay/cache -@@ -133,7 +134,7 @@ +@@ -167,7 +167,7 @@ # FreeTDS stuff FREETDSINCLUDES = @FREETDSINCLUDES@ -FREETDSLIBS = @FREETDSLIBS@ -+FREETDSLIBS = @FREETDSLIBS@ @ICONVLIBS@ ++FREETDSLIBS = @FREETDSLIBS@ @ICONVLIB@ FREETDSSTATIC = @FREETDSSTATIC@ # Sybase stuff diff --git a/databases/sqlrelay/files/patch-configure b/databases/sqlrelay/files/patch-configure new file mode 100644 index 000000000000..7af01c335b0f --- /dev/null +++ b/databases/sqlrelay/files/patch-configure @@ -0,0 +1,32 @@ +--- configure.orig Fri Oct 19 11:58:59 2001 ++++ configure Sun Feb 24 02:29:56 2002 +@@ -1604,7 +1604,7 @@ + fi + if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- HAVE_GNOME_XML="yes"; XMLINCLUDES="-I$LIBXMLPATH" ++ HAVE_GNOME_XML="yes"; XMLINCLUDES="-I$LIBXMLPATH/include" + else + echo "$ac_t""no" 1>&6 + +@@ -1629,7 +1629,7 @@ + fi + if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- HAVE_LIBXML="yes"; HAVE_GNOME_XML=""; XMLINCLUDES="-I$LIBXMLPATH" ++ HAVE_LIBXML="yes"; HAVE_GNOME_XML=""; XMLINCLUDES="-I$LIBXMLPATH/include" + else + echo "$ac_t""no" 1>&6 + +@@ -6882,10 +6882,7 @@ + fi + + if ( test -n "$JAVAINCLUDES"); then +- for i in `ls -l $JAVAPATH/include | grep drw | awk '{print $9}'` +- do +- JAVAINCLUDES="$JAVAINCLUDES -I$JAVAPATH/include/$i" +- done ++ JAVAINCLUDES="$JAVAINCLUDES -I`dirname $JAVAPATH/include/*/jni_md.h`" + fi + fi + diff --git a/databases/sqlrelay/files/patch-configure.in b/databases/sqlrelay/files/patch-configure.in deleted file mode 100644 index ba7832ccfb72..000000000000 --- a/databases/sqlrelay/files/patch-configure.in +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.in.orig Fri Aug 10 12:23:03 2001 -+++ configure.in Sat Sep 22 02:15:20 2001 -@@ -1308,10 +1308,7 @@ - AC_CHECK_FILE("$JAVAPATH/bin/javac",JAVAC="$JAVAPATH/bin/javac") - AC_CHECK_FILE("$JAVAPATH/include/jni.h",JAVAINCLUDES="-I$JAVAPATH/include") - if ( test -n "$JAVAINCLUDES"); then -- for i in `ls -l $JAVAPATH/include | grep drw | awk '{print $9}'` -- do -- JAVAINCLUDES="$JAVAINCLUDES -I$JAVAPATH/include/$i" -- done -+ JAVAINCLUDES="$JAVAINCLUDES -I`dirname $JAVAPATH/include/*/jni_md.h`" - fi - fi - diff --git a/databases/sqlrelay/files/patch-src::api::c++::src::Makefile.in b/databases/sqlrelay/files/patch-src::api::c++::src::Makefile.in deleted file mode 100644 index 101e9217d25f..000000000000 --- a/databases/sqlrelay/files/patch-src::api::c++::src::Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ ---- src/api/c++/src/Makefile.in.orig Sat Jun 23 13:55:51 2001 -+++ src/api/c++/src/Makefile.in Mon Jul 2 21:59:07 2001 -@@ -11,7 +11,7 @@ - all: - $(MAKE) ../lib/libsqlrclient.a; \ - if ( test ! -n "@MINGW32@" -a ! -n "@CYGWIN@" -a ! -n "@UWIN@" ); then \ -- $(MAKE) ../lib/libsqlrclient.so.$(VERSION); \ -+ $(MAKE) ../lib/libsqlrclient.so.$(SOVERSION); \ - else \ - $(MAKE) ../lib/libsqlrclient.dll; \ - fi -@@ -31,7 +31,7 @@ - $(RM) $@ - $(STATICAR) $@ $(OBJS) - --../lib/libsqlrclient.so.$(VERSION): $(SRCS) $(OBJS) -+../lib/libsqlrclient.so.$(SOVERSION): $(SRCS) $(OBJS) - $(DYNAMICAR) $@ $(OBJS) - - ../lib/libsqlrclient.dll: $(SRCS) $(OBJS) -@@ -44,8 +44,8 @@ - $(INSTALL) -m 644 ../lib/libsqlrclient.a $(libdir); \ - if ( test ! -n "@MINGW32@" -a ! -n "@CYGWIN@" -a ! -n "@UWIN@" ); then \ - $(RM) $(libdir)/libsqlrclient.so*; \ -- $(INSTALL) ../lib/libsqlrclient.so.$(VERSION) $(libdir); \ -- $(SYMLINK) $(libdir)/libsqlrclient.so.$(VERSION) $(libdir)/libsqlrclient.so; \ -+ $(INSTALL) ../lib/libsqlrclient.so.$(SOVERSION) $(libdir); \ -+ $(SYMLINK) $(libdir)/libsqlrclient.so.$(SOVERSION) $(libdir)/libsqlrclient.so; \ - else \ - $(INSTALL) ../lib/libsqlrclient.dll $(libdir); \ - $(INSTALL) ../lib/libsqlrclient.lib $(libdir); \ diff --git a/databases/sqlrelay/files/patch-src::api::c::src::Makefile.in b/databases/sqlrelay/files/patch-src::api::c::src::Makefile.in deleted file mode 100644 index 8cfb5331e568..000000000000 --- a/databases/sqlrelay/files/patch-src::api::c::src::Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ ---- src/api/c/src/Makefile.in.orig Sat Jun 23 13:55:51 2001 -+++ src/api/c/src/Makefile.in Mon Jul 2 21:58:04 2001 -@@ -11,7 +11,7 @@ - all: - $(MAKE) ../lib/libsqlrclientwrapper.a; \ - if ( test ! -n "@MINGW32@" -a ! -n "@CYGWIN@" -a ! -n "@UWIN@" ); then \ -- $(MAKE) ../lib/libsqlrclientwrapper.so.$(VERSION); \ -+ $(MAKE) ../lib/libsqlrclientwrapper.so.$(SOVERSION); \ - else \ - $(MAKE) ../lib/libsqlrclientwrapper.dll; \ - fi -@@ -31,7 +31,7 @@ - $(RM) $@ - $(STATICAR) $@ $(OBJS) - --../lib/libsqlrclientwrapper.so.$(VERSION): $(SRCS) $(OBJS) -+../lib/libsqlrclientwrapper.so.$(SOVERSION): $(SRCS) $(OBJS) - $(DYNAMICAR) $@ $(OBJS) - - ../lib/libsqlrclientwrapper.dll: $(SRCS) $(OBJS) -@@ -44,8 +44,8 @@ - $(INSTALL) -m 644 ../lib/libsqlrclientwrapper.a $(libdir); \ - if ( test ! -n "@MINGW32@" -a ! -n "@CYGWIN@" -a ! -n "@UWIN@" ); then \ - $(RM) $(libdir)/libsqlrclientwrapper.so*; \ -- $(INSTALL) ../lib/libsqlrclientwrapper.so.$(VERSION) $(libdir); \ -- $(SYMLINK) $(libdir)/libsqlrclientwrapper.so.$(VERSION) $(libdir)/libsqlrclientwrapper.so; \ -+ $(INSTALL) ../lib/libsqlrclientwrapper.so.$(SOVERSION) $(libdir); \ -+ $(SYMLINK) $(libdir)/libsqlrclientwrapper.so.$(SOVERSION) $(libdir)/libsqlrclientwrapper.so; \ - else \ - $(INSTALL) ../lib/libsqlrclientwrapper.dll $(libdir); \ - $(INSTALL) ../lib/libsqlrclientwrapper.lib $(libdir); \ |