Upgrade to 0.93a.

Warning: the installation directories have changed.

7 files changed, 132 insertions, 174 deletions

diff --git a/lang/gambas/files/patch-Makefile.in b/lang/gambas/files/patch-Makefile.in
index abf811bf87e4..d0f7e679a3c4 100644
--- a/lang/gambas/files/patch-Makefile.in
+++ b/lang/gambas/files/patch-Makefile.in
@@ -1,6 +1,14 @@
---- Makefile.in.orig	Sun Mar 14 15:21:27 2004
-+++ Makefile.in	Thu Mar 25 12:18:02 2004
-@@ -376,25 +376,25 @@
+--- Makefile.in.orig	Tue May 18 22:53:43 2004
++++ Makefile.in	Wed May 19 21:49:17 2004
+@@ -35,6 +35,7 @@
+ DESTDIR =
+ 
+ pkgdatadir = $(datadir)/@PACKAGE@
++examplesdir = @datadir@/examples/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ 
+@@ -379,25 +380,25 @@
  
  install-exec-local:
  	@echo
@@ -14,8 +22,8 @@
 -	 ln -s $(bindir)/gba /usr/bin/gba; \
 -	 rm -f /usr/bin/gbi; \
 -	 ln -s $(bindir)/gbi /usr/bin/gbi; \
-+	@if test "$(bindir)" != "%%PREFIX%%" && test "$(bindir)" != "%%PREFIX%%/"; then \
-+	 echo "Making symbolic links in %%PREFIX%%..."; \
++	@if test "$(bindir)" != "%%PREFIX%%/bin" && test "$(bindir)" != "%%PREFIX%%/bin/"; then \
++	 echo "Making symbolic links in %%PREFIX%%/bin..."; \
 +	 rm -f %%PREFIX%%/bin/gbx; \
 +	 ln -sf $(bindir)/gbx %%PREFIX%%/bin/gbx; \
 +	 rm -f %%PREFIX%%/gbc; \
@@ -34,71 +42,48 @@
 -	 rm -f /usr/bin/gambas; \
 -	 ln -s $(bindir)/gambas /usr/bin/gambas; \
 +	  $(bindir)/gbc -ag; $(bindir)/gba; rm -rf .gambas; $(INSTALL) $$p $(bindir); done)
-+	@if test "$(bindir)" != "%%PREFIX%%" && test "$(bindir)" != "%%PREFIX%%/"; then \
++	@if test "$(bindir)" != "%%PREFIX%%/bin" && test "$(bindir)" != "%%PREFIX%%/bin/"; then \
 +	 rm -f %%PREFIX%%/bin/gambas; \
 +	 ln -s $(bindir)/gambas %%PREFIX%%/bin/gambas; \
          fi
  
  	@echo
-@@ -404,34 +404,38 @@
- 	@rm -f $(libdir)/lib.gb.la
- 	@rm -f $(libdir)/lib.gb.so*
+@@ -407,22 +408,22 @@
+ 	@rm -f $(pkglibdir)/lib.gb.la
+ 	@rm -f $(pkglibdir)/lib.gb.so*
  
 -	@echo
 -	@echo "Installing the gambas help files..."
--	@$(INSTALL) -d $(datadir)/help
--	@rm -rf $(datadir)/help
--	@cp -R $(srcdir)/help $(datadir)
+-	@$(INSTALL) -d $(pkgdatadir)/help
+-	@rm -rf $(pkgdatadir)/help
+-	@cp -R $(srcdir)/help $(pkgdatadir)
 -
 -	@echo
 -	@echo "Installing the gambas examples..."
--	@rm -rf $(datadir)/examples
--	@$(INSTALL) -d $(datadir)/examples
--	@cp -R $(srcdir)/examples $(datadir)
--	@(cd $(datadir)/examples; d=`pwd`; for p in */ */*/; do cd $$d/$$p; \
+-	@rm -rf $(pkgdatadir)/examples
+-	@$(INSTALL) -d $(pkgdatadir)/examples
+-	@cp -R $(srcdir)/examples $(pkgdatadir)
+-	@(cd $(pkgdatadir)/examples; d=`pwd`; for p in */ */*/; do cd $$d/$$p; \
 -	  if test -e .project; then \
 -	    echo "Compiling $$p..."; cd $$d/$$p; gbc -ag; gba; \
 -	  fi \
 -	done)
 +# FreeBSD-Doc-Comment	@echo
 +# FreeBSD-Doc-Comment	@echo "Installing the gambas help files..."
-+# FreeBSD-Doc-Comment	@$(INSTALL) -d $(datadir)/doc/gambas
-+# FreeBSD-Doc-Comment	@rm -rf $(datadir)/doc/gambas
-+# FreeBSD-Doc-Comment	@mv $(srcdir)/help $(srcdir)/gambas
-+# FreeBSD-Doc-Comment	@cp -R $(srcdir)/gambas $(datadir)/doc
-+# FreeBSD-Doc-Comment	@mv $(srcdir)/gambas $(srcdir)/help
++# FreeBSD-Doc-Comment	@$(INSTALL) -d $(pkgdatadir)/help
++# FreeBSD-Doc-Comment	@rm -rf $(pkgdatadir)/help
++# FreeBSD-Doc-Comment	@cp -R $(srcdir)/help $(pkgdatadir)
 +# FreeBSD-Doc-Comment
 +# FreeBSD-Doc-Comment	@echo
 +# FreeBSD-Doc-Comment	@echo "Installing the gambas examples..."
-+# FreeBSD-Doc-Comment	@rm -rf $(datadir)/examples/gambas
-+# FreeBSD-Doc-Comment	@$(INSTALL) -d $(datadir)/examples/gambas
-+# FreeBSD-Doc-Comment	@mv $(srcdir)/examples $(srcdir)/gambas
-+# FreeBSD-Doc-Comment	@cp -R $(srcdir)/gambas $(datadir)/examples
-+# FreeBSD-Doc-Comment	@mv $(srcdir)/gambas $(srcdir)/examples
-+# FreeBSD-Doc-Comment	@(cd $(datadir)/examples/gambas; d=`pwd`; for p in */ */*/; do cd $$d/$$p; \
++# FreeBSD-Doc-Comment	@rm -rf $(examplesdir)
++# FreeBSD-Doc-Comment	@$(INSTALL) -d $(examplesdir)
++# FreeBSD-Doc-Comment	@cp -R $(srcdir)/examples/* $(examplesdir)
++# FreeBSD-Doc-Comment	@(cd $(examplesdir); d=`pwd`; for p in */ */*/; do cd $$d/$$p; \
 +# FreeBSD-Doc-Comment	  if test -e .project; then \
 +# FreeBSD-Doc-Comment	    echo "Compiling $$p..."; cd $$d/$$p; $(bindir)/gbc -ag; $(bindir)/gba; \
 +# FreeBSD-Doc-Comment	  fi \
 +# FreeBSD-Doc-Comment	done)
  
  uninstall-local:
--	@rm -f /usr/bin/gbx
--	@rm -f /usr/bin/gbc
--	@rm -f /usr/bin/gba
--	@rm -f /usr/bin/gbi
--	@rm -f /usr/bin/gambas
-+	@rm -f %%PREFIX%%/bin/gbx
-+	@rm -f %%PREFIX%%/bin/gbc
-+	@rm -f %%PREFIX%%/bin/gba
-+	@rm -f %%PREFIX%%/bin/gbi
-+	@rm -f %%PREFIX%%/bin/gambas
- 	@(cd $(srcdir)/app; for p in *; do rm -f $(bindir)/$$p; done)
- 	@rm -rf $(libdir)/*.component
- 	@rm -rf $(libdir)/info
--	@rm -rf $(datadir)/help
--	@rm -rf $(datadir)/examples
-+	@rm -rf $(datadir)/doc/gambas
-+	@rm -rf $(datadir)/examples/gambas
- 
- dist-hook:
- 	@(cd $(distdir)/app; for p in *; do rm -rf $$p/.gambas $$p/.xvpics $$p/*/.xvpics $$p/*/*/.xvpics $$p/*~ $$p/*/*~ $$p/*/*/*~ $$p/.*.out $$p/*.out $$p/.lang/*.pot $$p/$$p; done)
+ 	@rm -f /usr/bin/gbx
diff --git a/lang/gambas/files/patch-app::gambas::FPropertyProject.class b/lang/gambas/files/patch-app::gambas::FPropertyProject.class
index 9c01b66f78bb..87eaf9661e6a 100644
--- a/lang/gambas/files/patch-app::gambas::FPropertyProject.class
+++ b/lang/gambas/files/patch-app::gambas::FPropertyProject.class
@@ -1,20 +1,20 @@
---- app/gambas/FPropertyProject.class.orig	Sat Jan 24 01:36:08 2004
-+++ app/gambas/FPropertyProject.class	Wed Jan 28 21:09:18 2004
-@@ -497,7 +497,7 @@
-   $sTemp = Temp$
-   
-   SHELL "(cd " & Project.Quote(Project.Dir) & "; wc -l *.module *.class *.form 2> /dev/null | tail -n1 > " & $sTemp & 
--    "; du -b | tail -n1 >> " & $sTemp & ")" AS $hProcess
-+    "; du -k | tail -n1 >> " & $sTemp & ")" AS $hProcess
-   
- END
+--- ./app/gambas/FPropertyProject.class.orig	Sun May 16 22:25:08 2004
++++ ./app/gambas/FPropertyProject.class	Tue May 18 23:44:31 2004
+@@ -507,7 +507,7 @@
+ '   $sTemp = Temp$
+ '   
+ '   SHELL "(cd " & Project.Quote(Project.Dir) & "; wc -l *.module *.class *.form 2> /dev/null | tail -n1 > " & $sTemp & 
+-'     "; du -b | tail -n1 >> " & $sTemp & ")" AS $hProcess
++'     "; du -k | tail -n1 >> " & $sTemp & ")" AS $hProcess
+ '   
+ ' END
  
-@@ -552,7 +552,7 @@
- '   TRY nLine = Val(File.Load(sTemp))
- '   TRY KILL sTemp
+@@ -562,7 +562,7 @@
+ ' '   TRY nLine = Val(File.Load(sTemp))
+ ' '   TRY KILL sTemp
+ ' '   
+-' '   SHELL "(cd " & Project.Quote(Project.Dir) & "; du -b | tail -n1 > " & sTemp & ")" WAIT
++' '   SHELL "(cd " & Project.Quote(Project.Dir) & "; du -k | tail -n1 > " & sTemp & ")" WAIT
+ ' '   TRY iSize = Val(File.Load(sTemp))
+ ' '   TRY KILL sTemp
  '   
--'   SHELL "(cd " & Project.Quote(Project.Dir) & "; du -b | tail -n1 > " & sTemp & ")" WAIT
-+'   SHELL "(cd " & Project.Quote(Project.Dir) & "; du -k | tail -n1 > " & sTemp & ")" WAIT
- '   TRY iSize = Val(File.Load(sTemp))
- '   TRY KILL sTemp
-   
diff --git a/lang/gambas/files/patch-configure b/lang/gambas/files/patch-configure
index f29ffc2d9c5a..8febdd25613e 100644
--- a/lang/gambas/files/patch-configure
+++ b/lang/gambas/files/patch-configure
@@ -1,24 +1,6 @@
---- configure.orig	Sun Mar 14 15:20:47 2004
-+++ configure	Thu Mar 25 10:38:38 2004
-@@ -287,7 +287,7 @@
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datadir='${prefix}/../share'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
-@@ -504,7 +504,7 @@
-   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-     ac_prev=prefix ;;
-   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
--    prefix="$ac_optarg" ;;
-+    prefix="$ac_optarg"/gambas ;;
- 
-   -program-prefix | --program-prefix | --program-prefi | --program-pref \
-   | --program-pre | --program-pr | --program-p)
-@@ -6877,6 +6877,7 @@
+--- configure.orig	Sat May 15 15:46:47 2004
++++ configure	Sun May 16 21:24:50 2004
+@@ -6889,6 +6889,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -26,7 +8,7 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7068,10 +7069,10 @@
+@@ -7080,10 +7081,10 @@
  
    case "${host}" in
      *-*-freebsd* )
@@ -41,7 +23,7 @@
        ;;
      *)
        THREAD_LIB="-lpthread"
-@@ -10222,7 +10223,7 @@
+@@ -10234,7 +10235,7 @@
        fi
      done
  
@@ -50,7 +32,14 @@
  
    fi
  
-@@ -10352,20 +10353,7 @@
+@@ -10358,26 +10359,13 @@
+       fi
+ 
+       gb_cv_header_sdl=$gb_inc_sdl
+-    
++
+ fi
+ 
  
      echo "$ac_t""$gb_cv_header_sdl" 1>&6
  
@@ -72,7 +61,7 @@
      if test "$gb_cv_header_sdl" = no; then
        have_inc_sdl="no"
        SDL_INC=""
-@@ -10468,16 +10456,7 @@
+@@ -10480,16 +10468,7 @@
      SDL_LIB=""
      SDL_PATH=""
  
@@ -90,7 +79,7 @@
  
    fi
  
-@@ -10725,8 +10704,8 @@
+@@ -11246,8 +11225,8 @@
  fi
  
  
@@ -101,7 +90,7 @@
  
  if test "$gambas_prof" = "yes"; then
    CFLAGS="$CFLAGS -pg"
-@@ -10756,8 +10735,8 @@
+@@ -11277,8 +11256,8 @@
    CFLAGS="$CFLAGS -Os"
    CXXFLAGS="$CXXFLAGS -Os"
  else
diff --git a/lang/gambas/files/patch-examples::Database::DataReportExample::Fconn.class b/lang/gambas/files/patch-examples::Database::DataReportExample::Fconn.class
deleted file mode 100644
index 7dfca6cbeebe..000000000000
--- a/lang/gambas/files/patch-examples::Database::DataReportExample::Fconn.class
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./examples/Database/DataReportExample/Fconn.class.orig	Mon Feb 23 17:31:34 2004
-+++ ./examples/Database/DataReportExample/Fconn.class	Sat Apr  3 17:29:08 2004
-@@ -16,7 +16,7 @@
- END
- 
- PUBLIC SUB ginput_KeyPress()
--  IF key.code=key.enter OR key.code=key.return THEN
-+  IF Key.Code=Key.Enter OR Key.Code=Key.Return THEN
-     SELECT CASE LAST.tag
-       CASE 1
-         textbox2.setfocus
-@@ -75,4 +75,4 @@
- 
- CATCH
-   Message.Error(Error.Text)
--END
-\ No newline at end of file
-+END
diff --git a/lang/gambas/files/patch-examples::Database::DataReportExample::Fmain.class b/lang/gambas/files/patch-examples::Database::DataReportExample::Fmain.class
deleted file mode 100644
index 9a80b6c0ca0b..000000000000
--- a/lang/gambas/files/patch-examples::Database::DataReportExample::Fmain.class
+++ /dev/null
@@ -1,62 +0,0 @@
---- ./examples/Database/DataReportExample/Fmain.class.orig	Sun Mar 14 11:01:59 2004
-+++ ./examples/Database/DataReportExample/Fmain.class	Sat Apr  3 17:26:02 2004
-@@ -45,7 +45,7 @@
-   WITH mglobal
-   SELECT CASE LAST.tag
-     CASE 1  'textbox ID
--      a=.chk (textbox1, key.code, "num")
-+      a=.chk (textbox1, Key.Code, "num")
-       SELECT CASE a
-         CASE 1
-           ME.close
-@@ -53,7 +53,7 @@
-           STOP EVENT
-       END SELECT
-   
--      IF key.code=key.enter OR key.code=key.return THEN
-+      IF Key.Code=Key.enter OR Key.Code=Key.return THEN
-         .rs=.db.exec("select name from user where id='" & textbox1.text & "'")
-         IF .rs.count<>0 THEN
-           textbox2.text=.rs!name
-@@ -64,7 +64,7 @@
-       END IF
-     
-     CASE 2  'textbox Name
--      a=.chk (textbox2, key.code)
-+      a=.chk (textbox2, Key.Code)
-       SELECT CASE a
-         CASE 1
-           ME.close
-@@ -72,7 +72,7 @@
-           STOP EVENT
-       END SELECT
-   
--      IF key.code=key.enter OR key.code=key.return THEN
-+      IF Key.Code=Key.enter OR Key.Code=Key.return THEN
-         textbox1.setfocus
-         .rs = .db.exec("select * from user where id='" & textbox1.text & "'")
-         IF .rs.count =0 THEN
-@@ -118,11 +118,11 @@
- END
- 
- PUBLIC SUB TableView1_KeyRelease()
--  SELECT CASE key.code
--    CASE key.Enter, key.Return
-+  SELECT CASE Key.Code
-+    CASE Key.Enter, Key.Return
-       tableview1_click()
-     
--    CASE key.Escape
-+    CASE Key.Escape
-       ME.close
-   END SELECT
- END
-@@ -142,7 +142,7 @@
- END
- 
- PUBLIC SUB gbtn_KeyPress()
--  IF key.code=key.escape THEN ME.close
-+  IF Key.Code=Key.Escape THEN ME.close
- END
- 
- PUBLIC SUB header(prn AS Boolean)
diff --git a/lang/gambas/files/patch-src::lib::db::sqlite::sqlitedataset.cpp b/lang/gambas/files/patch-src::lib::db::sqlite::sqlitedataset.cpp
index 0236faad08e2..675c0a2d7d78 100644
--- a/lang/gambas/files/patch-src::lib::db::sqlite::sqlitedataset.cpp
+++ b/lang/gambas/files/patch-src::lib::db::sqlite::sqlitedataset.cpp
@@ -1,5 +1,5 @@
---- ./src/lib/db/sqlite/sqlitedataset.cpp.orig	Fri Feb 27 22:53:21 2004
-+++ ./src/lib/db/sqlite/sqlitedataset.cpp	Thu Mar 25 10:33:48 2004
+--- src/lib/db/sqlite/sqlitedataset.cpp.orig	Fri Feb 27 22:53:21 2004
++++ src/lib/db/sqlite/sqlitedataset.cpp	Sun May 16 14:58:59 2004
 @@ -33,6 +33,9 @@
  #include <time.h>
  #include <iostream>
@@ -10,3 +10,15 @@
  
  #include "sqlitedataset.h"
  #include <unistd.h>
+@@ -148,7 +151,11 @@
+ 			    break; 
+ 		       case ft_Float:
+ 	 		    v.set_asString(reslt[i]);
++#if defined(__FreeBSD__) && !defined(_GLIBCPP_HAVE_STRTOF)
++	 		    v.set_asFloat((float)strtod(reslt[i], NULL));
++#else
+ 	 		    v.set_asFloat(strtof(reslt[i], NULL));
++#endif
+ 			    break; 
+ 		       case ft_Double:
+ 	 		    v.set_asString(reslt[i]);
diff --git a/lang/gambas/files/patch-src::lib::net::curl::Makefile.in b/lang/gambas/files/patch-src::lib::net::curl::Makefile.in
new file mode 100644
index 000000000000..fed04f598acd
--- /dev/null
+++ b/lang/gambas/files/patch-src::lib::net::curl::Makefile.in
@@ -0,0 +1,52 @@
+--- src/lib/net/curl/Makefile.in.orig	Tue May 18 22:54:40 2004
++++ src/lib/net/curl/Makefile.in	Wed May 19 21:52:16 2004
+@@ -155,18 +155,18 @@
+ 
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
+-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
++	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(pkglibdir)/$$p; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+ 	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
++	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(pkglibdir)/$$p; \
+ 	done
+ 
+ .c.o:
+@@ -214,7 +214,7 @@
+ maintainer-clean-libtool:
+ 
+ lib.gb.net.curl.la: $(lib_gb_net_curl_la_OBJECTS) $(lib_gb_net_curl_la_DEPENDENCIES)
+-	$(LINK) -rpath $(libdir) $(lib_gb_net_curl_la_LDFLAGS) $(lib_gb_net_curl_la_OBJECTS) $(lib_gb_net_curl_la_LIBADD) $(LIBS)
++	$(LINK) -rpath $(pkglibdir) $(lib_gb_net_curl_la_LDFLAGS) $(lib_gb_net_curl_la_OBJECTS) $(lib_gb_net_curl_la_LIBADD) $(LIBS)
+ 
+ tags: TAGS
+ 
+@@ -294,7 +294,7 @@
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs:
+-	$(mkinstalldirs)  $(DESTDIR)$(libdir)
++	$(mkinstalldirs)  $(DESTDIR)$(pkglibdir)
+ 
+ 
+ mostlyclean-generic:
+@@ -348,7 +348,7 @@
+ 
+ 
+ install-exec-local:
+-	@cp -f *.component $(libdir)
++	@cp -f *.component $(pkglibdir)
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.