head	1.1;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.01.15.09.16.28;	author rse;	state Exp;
branches
	1.1.2.1;
next	;
commitid	fXdToaFZ9EfmYFhr;

1.1.2.1
date	2006.01.15.09.16.28;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.58.11;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.1
log
@new package: xbase 2.0.0 (Xbase DBMS Toolkit)
@
text
@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
@@@@ -28,8 +28,8 @@@@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <iomanip.h>
-#include <strstream.h>
+#include <sstream>
+#include <iomanip>
 
 #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
@@@@ -23,7 +23,7 @@@@
     Foundation, Inc., or see http://www.gnu.org/.
 */
 
-#include <iostream.h>
+#include <iostream>
 
 #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
@@@@ -65,7 +65,7 @@@@
 #include <xbase/xtypes.h>
 #include <xbase/xdate.h>
 
-#include <iostream.h>
+#include <iostream>
 #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
@@@@ -66,7 +66,8 @@@@
 #endif
 
 #include <xbase/xbase.h>
-#include <iostream.h>
+#include <iostream>
+using std::cout;
 
 #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
@@@@ -59,7 +59,8 @@@@
 
 #include <string.h>
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
+using std::cout;
 
 #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
@@@@ -582,7 +582,7 @@@@
 //! Short description.
 /*!
 */
-XBDLLEXPORT ostream& operator << ( ostream& os, const xbString& xbs ) {
+XBDLLEXPORT std::ostream& operator << ( std::ostream& os, const xbString& xbs ) {
   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
@@@@ -56,7 +56,11 @@@@
 #endif
 
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
+
+using std::endl;
+using std::cin;
+using std::cout;
 
 /*! \file xbstring.h
 */
@@@@ -119,7 +123,7 @@@@
   bool operator <= ( const xbString& ) const;
   bool operator >= ( const xbString& ) const;
 
-  friend ostream& operator << ( ostream&, const xbString& );
+  friend std::ostream& operator << ( std::ostream&, const xbString& );
 
   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
@@@@ -728,7 +728,7 @@@@
           ;;
         esac
         deplibs="$deplibs $arg"
-        lib_search_path="$lib_search_path `expr $arg : '-L\(.*\)'`"
+        lib_search_path="$lib_search_path `expr x$arg : 'x-L\(.*\)'`"
         ;;
 
       -l*) deplibs="$deplibs $arg" ;;
@


1.1.2.1
log
@file xbase.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:58:11 +0000
@
text
@d1 129
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 129
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
@@@@ -28,8 +28,8 @@@@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <iomanip.h>
-#include <strstream.h>
+#include <sstream>
+#include <iomanip>
 
 #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
@@@@ -23,7 +23,7 @@@@
     Foundation, Inc., or see http://www.gnu.org/.
 */
 
-#include <iostream.h>
+#include <iostream>
 
 #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
@@@@ -65,7 +65,7 @@@@
 #include <xbase/xtypes.h>
 #include <xbase/xdate.h>
 
-#include <iostream.h>
+#include <iostream>
 #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
@@@@ -66,7 +66,8 @@@@
 #endif
 
 #include <xbase/xbase.h>
-#include <iostream.h>
+#include <iostream>
+using std::cout;
 
 #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
@@@@ -59,7 +59,8 @@@@
 
 #include <string.h>
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
+using std::cout;
 
 #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
@@@@ -582,7 +582,7 @@@@
 //! Short description.
 /*!
 */
-XBDLLEXPORT ostream& operator << ( ostream& os, const xbString& xbs ) {
+XBDLLEXPORT std::ostream& operator << ( std::ostream& os, const xbString& xbs ) {
   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
@@@@ -56,7 +56,11 @@@@
 #endif
 
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
+
+using std::endl;
+using std::cin;
+using std::cout;
 
 /*! \file xbstring.h
 */
@@@@ -119,7 +123,7 @@@@
   bool operator <= ( const xbString& ) const;
   bool operator >= ( const xbString& ) const;
 
-  friend ostream& operator << ( ostream&, const xbString& );
+  friend std::ostream& operator << ( std::ostream&, const xbString& );
 
   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
@@@@ -728,7 +728,7 @@@@
           ;;
         esac
         deplibs="$deplibs $arg"
-        lib_search_path="$lib_search_path `expr $arg : '-L\(.*\)'`"
+        lib_search_path="$lib_search_path `expr x$arg : 'x-L\(.*\)'`"
         ;;
 
       -l*) deplibs="$deplibs $arg" ;;
@