4 files changed, 34 insertions, 32 deletions

diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index c631652780c8..cc72107c8a50 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		gambas
-PORTVERSION=		0.96
+PORTVERSION=		0.97
 CATEGORIES=		lang
 MASTER_SITES=		http://gambas.sourceforge.net/
 
@@ -19,7 +19,7 @@ USE_LIBLTDL=		yes
 USE_KDELIBS_VER=	3
 USE_GETTEXT=		yes
 USE_BZIP2=		yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=	15
 LIBTOOLFILES=		configure libltdl/configure
 LIBTOOLFLAGS=		# none
 USE_GMAKE=		yes
diff --git a/lang/gambas/distinfo b/lang/gambas/distinfo
index 882d2e8c834a..4c55316f0d5f 100644
--- a/lang/gambas/distinfo
+++ b/lang/gambas/distinfo
@@ -1,2 +1,2 @@
-MD5 (gambas-0.96.tar.bz2) = f0ea85f689a57348c7429dd24372ae2c
-SIZE (gambas-0.96.tar.bz2) = 3763029
+MD5 (gambas-0.97.tar.bz2) = c4707cd319060a2a2834124d802dc8e1
+SIZE (gambas-0.97.tar.bz2) = 3818823
diff --git a/lang/gambas/files/patch-Makefile.in b/lang/gambas/files/patch-Makefile.in
index 7f9a1664b097..e95885feca14 100644
--- a/lang/gambas/files/patch-Makefile.in
+++ b/lang/gambas/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Mon Jul 19 23:57:54 2004
-+++ Makefile.in	Sat Jul 31 17:31:52 2004
+--- Makefile.in.orig	Sat Aug 14 11:17:09 2004
++++ Makefile.in	Sat Aug 14 14:47:25 2004
 @@ -35,6 +35,7 @@
  DESTDIR =
  
@@ -8,13 +8,15 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  
-@@ -378,19 +379,18 @@
+@@ -378,23 +379,17 @@
  
  
  install-exec-local:
--	@echo "Installing with ROOT=$(ROOT)"
- 	@echo
- 
+-	@if test "x$(ROOT)" != "x"; then \
+-	 "Installing with ROOT=$(ROOT)"; \
+-         echo; \
+-        fi
+-
 -	@if test "$(bindir)" != "$(ROOT)/usr/bin" && test "$(bindir)" != "$(ROOT)/usr/bin/"; then \
 -	 echo "Making symbolic links in /usr/bin..."; \
 -	 rm -f $(ROOT)/usr/bin/gbx; \
@@ -25,6 +27,8 @@
 -	 ln -s $(bindir)/gba $(ROOT)/usr/bin/gba; \
 -	 rm -f $(ROOT)/usr/bin/gbi; \
 -	 ln -s $(bindir)/gbi $(ROOT)/usr/bin/gbi; \
+-	fi
+-
 +	@if test "$(bindir)" != "%%PREFIX%%/bin" && test "$(bindir)" != "%%PREFIX%%/bin/"; then \
 +	 echo "Making symbolic links in %%PREFIX%%/bin..."; \
 +	 rm -f %%PREFIX%%/bin/gbx; \
@@ -35,10 +39,11 @@
 +	 ln -sf $(bindir)/gba %%PREFIX%%/bin/gba; \
 +	 rm -f %%PREFIX%%/bin/gbi; \
 +	 ln -sf $(bindir)/gbi %%PREFIX%%/bin/gbi; \
- 	fi
- 
++ 	fi
  	@echo
-@@ -404,28 +404,28 @@
+ 	@echo "Creating the library info files..."
+ 	@rm -rf $(pkgdatadir)/info
+@@ -406,28 +401,28 @@
  	@echo
  	@echo "Installing the development environment..."
  	@(cd $(srcdir)/app; d=`pwd`; for p in *; do echo "Compiling $$p..."; cd $$d/$$p; \
diff --git a/lang/gambas/pkg-plist b/lang/gambas/pkg-plist
index a0cfa54e341d..a371199558e5 100644
--- a/lang/gambas/pkg-plist
+++ b/lang/gambas/pkg-plist
@@ -1,4 +1,3 @@
-bin/Util
 bin/gambas
 bin/gambas-database-manager
 bin/gba
@@ -9,87 +8,69 @@ lib/gambas/lib.gb.a
 lib/gambas/lib.gb.component
 lib/gambas/lib.gb.compress.a
 lib/gambas/lib.gb.compress.bzlib2.a
-lib/gambas/lib.gb.compress.bzlib2.la
 lib/gambas/lib.gb.compress.bzlib2.so
 lib/gambas/lib.gb.compress.bzlib2.so.0
 lib/gambas/lib.gb.compress.component
-lib/gambas/lib.gb.compress.la
 lib/gambas/lib.gb.compress.so
 lib/gambas/lib.gb.compress.so.0
 lib/gambas/lib.gb.compress.zlib.a
-lib/gambas/lib.gb.compress.zlib.la
 lib/gambas/lib.gb.compress.zlib.so
 lib/gambas/lib.gb.compress.zlib.so.0
 lib/gambas/lib.gb.db.a
 lib/gambas/lib.gb.db.component
-lib/gambas/lib.gb.db.la
 lib/gambas/lib.gb.db.mysql.a
-lib/gambas/lib.gb.db.mysql.la
 lib/gambas/lib.gb.db.mysql.so
 lib/gambas/lib.gb.db.mysql.so.0
 %%PGSQL%%lib/gambas/lib.gb.db.postgresql.a
-%%PGSQL%%lib/gambas/lib.gb.db.postgresql.la
 %%PGSQL%%lib/gambas/lib.gb.db.postgresql.so
 %%PGSQL%%lib/gambas/lib.gb.db.postgresql.so.0
 lib/gambas/lib.gb.db.so
 lib/gambas/lib.gb.db.so.0
 %%SQLITE%%lib/gambas/lib.gb.db.sqlite.a
-%%SQLITE%%lib/gambas/lib.gb.db.sqlite.la
 %%SQLITE%%lib/gambas/lib.gb.db.sqlite.so
 %%SQLITE%%lib/gambas/lib.gb.db.sqlite.so.0
 lib/gambas/lib.gb.debug.a
 lib/gambas/lib.gb.debug.component
-lib/gambas/lib.gb.debug.la
 lib/gambas/lib.gb.debug.so
 lib/gambas/lib.gb.debug.so.0
 lib/gambas/lib.gb.eval.a
 lib/gambas/lib.gb.eval.component
-lib/gambas/lib.gb.eval.la
 lib/gambas/lib.gb.eval.so
 lib/gambas/lib.gb.eval.so.0
 lib/gambas/lib.gb.net.a
 lib/gambas/lib.gb.net.component
 lib/gambas/lib.gb.net.curl.a
 lib/gambas/lib.gb.net.curl.component
-lib/gambas/lib.gb.net.curl.la
 lib/gambas/lib.gb.net.curl.so
 lib/gambas/lib.gb.net.curl.so.0
-lib/gambas/lib.gb.net.la
 lib/gambas/lib.gb.net.so
 lib/gambas/lib.gb.net.so.0
 lib/gambas/lib.gb.qt.a
 lib/gambas/lib.gb.qt.component
 lib/gambas/lib.gb.qt.editor.a
 lib/gambas/lib.gb.qt.editor.component
-lib/gambas/lib.gb.qt.editor.la
 lib/gambas/lib.gb.qt.editor.so
 lib/gambas/lib.gb.qt.editor.so.0
 lib/gambas/lib.gb.qt.ext.a
 lib/gambas/lib.gb.qt.ext.component
-lib/gambas/lib.gb.qt.ext.la
 lib/gambas/lib.gb.qt.ext.so
 lib/gambas/lib.gb.qt.ext.so.0
 lib/gambas/lib.gb.qt.kde.a
 lib/gambas/lib.gb.qt.kde.component
 lib/gambas/lib.gb.qt.kde.html.a
 lib/gambas/lib.gb.qt.kde.html.component
-lib/gambas/lib.gb.qt.kde.html.la
 lib/gambas/lib.gb.qt.kde.html.so
 lib/gambas/lib.gb.qt.kde.html.so.0
-lib/gambas/lib.gb.qt.kde.la
 lib/gambas/lib.gb.qt.kde.so
 lib/gambas/lib.gb.qt.kde.so.0
-lib/gambas/lib.gb.qt.la
 lib/gambas/lib.gb.qt.so
 lib/gambas/lib.gb.qt.so.0
 %%SDL%%lib/gambas/lib.gb.sdl.a
 %%SDL%%lib/gambas/lib.gb.sdl.component
-%%SDL%%lib/gambas/lib.gb.sdl.la
 %%SDL%%lib/gambas/lib.gb.sdl.so
 %%SDL%%lib/gambas/lib.gb.sdl.so.0
 lib/gambas/lib.gb.vb.a
 lib/gambas/lib.gb.vb.component
-lib/gambas/lib.gb.vb.la
 lib/gambas/lib.gb.vb.so
 lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/KateBrowser/.gambas/FBROWSER
@@ -141,6 +122,14 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Timer/FTimer.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Timer/Timer
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Timer/timer.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Basic/TreeView/.gambas/TREEVIEWEXAMPLE
+%%PORTDOCS%%%%EXAMPLESDIR%%/Basic/TreeView/.project
+%%PORTDOCS%%%%EXAMPLESDIR%%/Basic/TreeView/Female.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Basic/TreeView/Male.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Basic/TreeView/TreeView
+%%PORTDOCS%%%%EXAMPLESDIR%%/Basic/TreeView/TreeViewExample.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Basic/TreeView/TreeViewExample.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Basic/TreeView/treeview.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/.gambas/FABOUT
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/.gambas/FCONN
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/.gambas/FMAIN
@@ -278,6 +267,7 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Evaluator/FEval.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Evaluator/FEval.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Evaluator/FEval.pot
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Evaluator/calculator.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Explorer/.gambas/FEXPLORER
 %%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Explorer/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Explorer/Explorer
@@ -357,8 +347,12 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/WebBrowser/WebBrowser
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/WebBrowser/webbrowser.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/.gambas/FSOUNDPLAYER
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/.icon/16.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/.icon/32.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/.icon/48.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/.lang/.pot
 %%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/.project
+%%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/CHANGELOG
 %%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/FSoundPlayer.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/FSoundPlayer.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Sound/MusicPlayer/MusicPlayer
@@ -5933,6 +5927,7 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%@dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Sound/MusicPlayer/.gambas
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Sound/MusicPlayer/.icon
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Sound/MusicPlayer/.lang
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Sound/MusicPlayer
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Sound
@@ -5998,6 +5993,8 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Database/DataReportExample/.gambas
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Database/DataReportExample
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Database
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Basic/TreeView/.gambas
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Basic/TreeView
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Basic/Timer/.lang
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Basic/Timer/.gambas
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Basic/Timer