# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1232135781 -3600
# Node ID b48a2cd3a7b1391f1cb0c613ae9efe90c90b8e31
# Parent  da688f850c6d4bbf5d0fde6b062b101289445259
Remove versioned patch logic, and correct 64-bit building.

diff -r da688f850c6d -r b48a2cd3a7b1 xbase/xbase.patch
--- a/xbase/xbase.patch	Fri Jan 16 20:54:43 2009 +0100
+++ b/xbase/xbase.patch	Fri Jan 16 20:56:21 2009 +0100
@@ -1,6 +1,6 @@
-Index: xbase-2.0.0/tv/tvbrowse.cpp
---- xbase-2.0.0/tv/tvbrowse.cpp.orig	2000-09-20 22:34:02 +0200
-+++ xbase-2.0.0/tv/tvbrowse.cpp	2006-01-15 00:23:04 +0100
+Index: tv/tvbrowse.cpp
+--- tv/tvbrowse.cpp.orig	2000-09-20 22:34:02 +0200
++++ tv/tvbrowse.cpp	2006-01-15 00:23:04 +0100
 @@ -28,8 +28,8 @@
  #include <stdlib.h>
  #include <stdio.h>
@@ -12,9 +12,9 @@
  
  #define Uses_TEvent
  #include <tvision/tv.h>
-Index: xbase-2.0.0/tv/tvxbase.cpp
---- xbase-2.0.0/tv/tvxbase.cpp.orig	2000-09-20 22:34:02 +0200
-+++ xbase-2.0.0/tv/tvxbase.cpp	2006-01-15 00:23:04 +0100
+Index: tv/tvxbase.cpp
+--- tv/tvxbase.cpp.orig	2000-09-20 22:34:02 +0200
++++ tv/tvxbase.cpp	2006-01-15 00:23:04 +0100
 @@ -23,7 +23,7 @@
      Foundation, Inc., or see http://www.gnu.org/.
  */
@@ -24,9 +24,9 @@
  
  #define Uses_TApplication
  #define Uses_TButton
-Index: xbase-2.0.0/xbase/dbf.h
---- xbase-2.0.0/xbase/dbf.h.orig	2001-01-13 21:20:53 +0100
-+++ xbase-2.0.0/xbase/dbf.h	2006-01-15 00:23:04 +0100
+Index: xbase/dbf.h
+--- xbase/dbf.h.orig	2001-01-13 21:20:53 +0100
++++ xbase/dbf.h	2006-01-15 00:23:04 +0100
 @@ -65,7 +65,7 @@
  #include <xbase/xtypes.h>
  #include <xbase/xdate.h>
@@ -36,9 +36,9 @@
  #include <stdio.h>
  
  /*! \file dbf.h
-Index: xbase-2.0.0/xbase/ndx.cpp
---- xbase-2.0.0/xbase/ndx.cpp.orig	2001-03-21 01:28:53 +0100
-+++ xbase-2.0.0/xbase/ndx.cpp	2006-01-15 00:23:04 +0100
+Index: xbase/ndx.cpp
+--- xbase/ndx.cpp.orig	2001-03-21 01:28:53 +0100
++++ xbase/ndx.cpp	2006-01-15 00:23:04 +0100
 @@ -66,7 +66,8 @@
  #endif
  
@@ -49,9 +49,9 @@
  
  #ifdef XB_INDEX_NDX
  
-Index: xbase-2.0.0/xbase/stack.cpp
---- xbase-2.0.0/xbase/stack.cpp.orig	2000-11-10 20:04:17 +0100
-+++ xbase-2.0.0/xbase/stack.cpp	2006-01-15 00:23:04 +0100
+Index: xbase/stack.cpp
+--- xbase/stack.cpp.orig	2000-11-10 20:04:17 +0100
++++ xbase/stack.cpp	2006-01-15 00:23:04 +0100
 @@ -59,7 +59,8 @@
  
  #include <string.h>
@@ -62,9 +62,9 @@
  
  #include <xbase/xstack.h>
  
-Index: xbase-2.0.0/xbase/xbstring.cpp
---- xbase-2.0.0/xbase/xbstring.cpp.orig	2001-02-20 18:53:26 +0100
-+++ xbase-2.0.0/xbase/xbstring.cpp	2006-01-15 00:23:04 +0100
+Index: xbase/xbstring.cpp
+--- xbase/xbstring.cpp.orig	2001-02-20 18:53:26 +0100
++++ xbase/xbstring.cpp	2006-01-15 00:23:04 +0100
 @@ -582,7 +582,7 @@
  //! Short description.
  /*!
@@ -74,9 +74,9 @@
    return os << xbs.data;
  }
  
-Index: xbase-2.0.0/xbase/xbstring.h
---- xbase-2.0.0/xbase/xbstring.h.orig	2001-01-27 06:00:32 +0100
-+++ xbase-2.0.0/xbase/xbstring.h	2006-01-15 00:23:04 +0100
+Index: xbase/xbstring.h
+--- xbase/xbstring.h.orig	2001-01-27 06:00:32 +0100
++++ xbase/xbstring.h	2006-01-15 00:23:04 +0100
 @@ -56,7 +56,11 @@
  #endif
  
@@ -99,25 +99,9 @@
  
    xbString &remove(size_t pos = 0, int n = npos);
    xbString mid(size_t pos = 0, int n = npos) const;
-Index: xbsql-0.11/xbsql/Makefile.in
---- xbsql-0.11/xbsql/Makefile.in.orig	2003-03-28 21:03:25 +0100
-+++ xbsql-0.11/xbsql/Makefile.in	2006-01-15 10:01:51 +0100
-@@ -108,10 +108,10 @@
- 			  xbsql.tab.c xb_datetime.cpp
- 
- 
--libxbsql_la_LDFLAGS = -lxbase $(DEBUG)
-+libxbsql_la_LDFLAGS = @LDFLAGS@ -lxbase $(DEBUG)
- 
- xql_SOURCES = xql.cpp
--xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la
-+xql_LDADD = @LDFLAGS@ -lxbase -lreadline -l$(CURSES) ./libxbsql.la
- 
- 
- #install-data-hook:
-Index: xbase-2.0.0/ltmain.sh
---- xbase-2.0.0/ltmain.sh.orig	2000-06-01 08:03:18 +0200
-+++ xbase-2.0.0/ltmain.sh	2006-01-15 10:05:44 +0100
+Index: ltmain.sh
+--- ltmain.sh.orig	2000-06-01 08:03:18 +0200
++++ ltmain.sh	2006-01-15 10:05:44 +0100
 @@ -728,7 +728,7 @@
            ;;
          esac
diff -r da688f850c6d -r b48a2cd3a7b1 xbase/xbase.spec
--- a/xbase/xbase.spec	Fri Jan 16 20:54:43 2009 +0100
+++ b/xbase/xbase.spec	Fri Jan 16 20:56:21 2009 +0100
@@ -36,7 +36,7 @@
 Group:        Database
 License:      GPL
 Version:      %{V_xbase}
-Release:      20080101
+Release:      20090106
 
 #   list of sources
 Source0:      http://www.rekallrevealed.org/packages/xbase-%{V_xbase}.tgz
@@ -75,9 +75,25 @@
 %prep
     %setup -q -c
     %setup -q -T -D -a 1
-    %patch -p0
+    ( cd xbase-%{V_xbase}
+      %patch -p0
+    ) || exit $?
+    %{l_shtool} subst \
+        -e "s;/usr\(/lib/libncurses\)\.so;%{l_prefix}/\1.a;" \
+        xbsql-%{V_xbsql}/configure
+    %{l_shtool} subst \
+        -e 's;^\(libxbsql_la_LDFLAGS = -lxbase\);\1 @LDFLAGS@;' \
+        -e 's;^\(xql_LDADD =\) \(-lxbase\);\1 @LDFLAGS@ \2;' \
+        xbsql-%{V_xbsql}/xbsql/Makefile.in
 
 %build
+    platcomp="%{l_platform -t}"
+    case "%{l_platform -t}" in
+        sun4[uv]-sunos* ) platcomp="sparc-solaris" ;;
+        *-sunos*        ) platcomp="i386-solaris"  ;;
+        *-linux*        ) platcomp="i386-linux"    ;;
+        *-freebsd*      ) platcomp="i386-freebsd"  ;;
+    esac
     ( cd xbase-%{V_xbase}
       CC="%{l_cc}" \
       CXX="%{l_cxx}" \
@@ -86,6 +102,7 @@
       CPPFLAGS="%{l_cppflags}" \
       LDFLAGS="%{l_ldflags}" \
       ./configure \
+          --host=$platcomp \
           --prefix=%{l_prefix} \
           --disable-shared
       %{l_make} %{l_mflags -O}