[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other

[Florin Braescu]

commit 3c477041766832c98dd8c06e48ba5f918b98bd0c
Author: Florin Braescu <florin at lunar-linux.org>
Date: Thu, 06 Sep 2012 10:24:28 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/3c477041766832c98dd8c06e48ba5f918b98bd0c

Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
  sql/xbase/BUILD   | +8/-5     
  sql/xbase/DETAILS | +21/-12   
  2 files changed

--- a/sql/xbase/BUILD
+++ b/sql/xbase/BUILD
@@ -1,10 +1,13 @@
 (
 
-  cd ../ &&
-  patch_it $SOURCE_CACHE/$SOURCE2 0 &&
-  cd $SOURCE_DIRECTORY &&
-
-  cp /usr/share/automake/config.sub $SOURCE_DIRECTORY &&
+  patch_it $SOURCE2 1 &&
+  patch_it $SOURCE3 1 &&
+  patch_it $SOURCE4 1 &&
+  patch_it $SOURCE5 1 &&
+
+  sedit "s:int i = 0:int j = 0:g" bin/dumprecs.cpp &&
+  sedit "s:MyFile.DumpRecord(i+1):MyFile.DumpRecord(j+1):g" bin/dumprecs.cpp &&
+  sedit "s:i++:j++:g" bin/dumprecs.cpp &&
 
   default_build
 
--- a/sql/xbase/DETAILS
+++ b/sql/xbase/DETAILS
@@ -1,15 +1,24 @@
-       MODULE=xbase
-      VERSION=2.0.0
-       SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE2=$MODULE-$VERSION-01.patch
-   SOURCE_URL=$SFORGE_URL/xdb
-  SOURCE2_URL=$PATCH_URL
-   SOURCE_VFY=sha1:b3ee9e4c3299a11f31b0b199e958817bb0e24d5b
-  SOURCE2_VFY=sha1:91b8728750e93344663911262f2c77a1e92721e1
-     WEB_SITE=http://linux.techass.com/projects/xdb/
-      ENTERED=20060205
-      UPDATED=20101107
-        SHORT="DBF (dBase and other) database files, NDX (dbase) and NTX, and DBT formats"
+          MODULE=xbase
+         VERSION=2.0.0
+          SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE2=xbase-$VERSION-fixconfig.patch
+         SOURCE3=xbase-$VERSION-fixheader.patch
+         SOURCE4=xbase-$VERSION-gcc43.patch
+         SOURCE5=xbase-$VERSION-x86_64.patch
+      SOURCE_URL=$SFORGE_URL/xdb
+     SOURCE2_URL=http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-db/xbase/files/
+     SOURCE3_URL=http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-db/xbase/files/
+     SOURCE4_URL=http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-db/xbase/files/
+     SOURCE5_URL=http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-db/xbase/files/
+      SOURCE_VFY=sha1:b3ee9e4c3299a11f31b0b199e958817bb0e24d5b
+     SOURCE2_VFY=sha1:9f1bc25aafa442899c9621bcfe9546d580cce136
+     SOURCE3_VFY=sha1:792221596f1d68efde992ba9e261df1ddd28f6ae
+     SOURCE4_VFY=sha1:324f275e4f6fb4710dc204af7c8fae7f099d570f
+     SOURCE5_VFY=sha1:3e3c9527635fa4345f22dff719b417922268327b
+        WEB_SITE=http://linux.techass.com/projects/xdb/
+         ENTERED=20060205
+         UPDATED=20120906
+           SHORT="DBF (dBase and other) database files, NDX (dbase) and NTX, and DBT formats"
 
 PSAFE=no
 cat << EOF