- upgrade to 0.94a;

- mark broken (against) on FreeBSD-4.x.

6 files changed, 163 insertions, 129 deletions

diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index 1b78f37cd82b..e7f46d58e5bc 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		gambas
-PORTVERSION=		0.93b
-PORTREVISION?=	1
+PORTVERSION=		0.94a
 CATEGORIES=		lang
 MASTER_SITES=		http://gambas.sourceforge.net/
 
@@ -36,6 +35,7 @@ LIBS2FIX=		libqt-mt libkdecore libkdeui libDCOP libkio
 SRC2FIX1=		configure src/comp/gbi.c src/exec/gbx_library.c
 SRC2FIX2=		src/comp/gbc_archive.c src/comp/gbi.c		\
 			src/exec/gbx_library.c src/share/gb_component.h
+SRC2FIX3=		Makefile.in src/exec/gbx_project.c
 
 .if !defined(WITHOUT_SDL)
 USE_SDL=		mixer
@@ -49,6 +49,10 @@ PLIST_SUB+=		SDL="@comment "
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+BROKEN=	"Does not compile with gcc-2.95"
+.endif
+
 .for lib in ${LIBS2FIX}
 NEW${lib:U}!=	${LDCONFIG} -r | ${GREP} ${lib} | ${GREP} -v 'compat/pkg'	\
 		| ${AWK} -F 'lib\/' '{print $$2}'
@@ -68,10 +72,10 @@ CONFIGURE_ARGS+=	--without-postgresql-includes				\
 PLIST_SUB+=		PGSQL="@comment "
 .endif
 
-.if exists(${LOCALBASE}/include/sqlite.h) && ${OSVERSION} > 500000
+.if exists(${LOCALBASE}/include/sqlite.h)
 WITH_SQLITE=		yes
 .endif
-.if defined(WITH_SQLITE) && ${OSVERSION} > 500000
+.if defined(WITH_SQLITE)
 LIB_DEPENDS+=		sqlite.2:${PORTSDIR}/databases/sqlite
 CONFIGURE_ARGS+=	--with-sqlite-includes=${LOCALBASE}/include		\
 			--with-sqlite-libraries=${LOCALBASE}/lib
@@ -94,9 +98,11 @@ pre-configure:
 	@${REINPLACE_CMD} -e "s|/usr/bin/gb|${PREFIX}/bin/gb|g"	\
 		${WRKSRC}/${src}
 .endfor
+.for src in ${SRC2FIX3}
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g"	${WRKSRC}/${src}
+.endfor
 .if !defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e "s|# FreeBSD-Doc-Comment||" ${WRKSRC}/Makefile.in
 .endif
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/lang/gambas/distinfo b/lang/gambas/distinfo
index ec8fc97b3199..c3bfd0aee246 100644
--- a/lang/gambas/distinfo
+++ b/lang/gambas/distinfo
@@ -1,2 +1,2 @@
-MD5 (gambas-0.93b.tar.bz2) = eac083d7e50a57549b79b11bed4516be
-SIZE (gambas-0.93b.tar.bz2) = 3624715
+MD5 (gambas-0.94a.tar.bz2) = 00e9e481bd1d9069aad124b21f06e110
+SIZE (gambas-0.94a.tar.bz2) = 3700855
diff --git a/lang/gambas/files/patch-Makefile.in b/lang/gambas/files/patch-Makefile.in
index d0f7e679a3c4..8aaa478e03dc 100644
--- a/lang/gambas/files/patch-Makefile.in
+++ b/lang/gambas/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Tue May 18 22:53:43 2004
-+++ Makefile.in	Wed May 19 21:49:17 2004
+--- Makefile.in.orig	Tue Jun 22 12:45:17 2004
++++ Makefile.in	Tue Jun 22 23:51:34 2004
 @@ -35,6 +35,7 @@
  DESTDIR =
  
@@ -8,7 +8,7 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  
-@@ -379,25 +380,25 @@
+@@ -379,16 +380,16 @@
  
  install-exec-local:
  	@echo
@@ -26,32 +26,29 @@
 +	 echo "Making symbolic links in %%PREFIX%%/bin..."; \
 +	 rm -f %%PREFIX%%/bin/gbx; \
 +	 ln -sf $(bindir)/gbx %%PREFIX%%/bin/gbx; \
-+	 rm -f %%PREFIX%%/gbc; \
++	 rm -f %%PREFIX%%/bin/gbc; \
 +	 ln -sf $(bindir)/gbc %%PREFIX%%/bin/gbc; \
-+	 rm -f %%PREFIX%%/gba; \
++	 rm -f %%PREFIX%%/bin/gba; \
 +	 ln -sf $(bindir)/gba %%PREFIX%%/bin/gba; \
-+	 rm -f %%PREFIX%%/gbi; \
++	 rm -f %%PREFIX%%/bin/gbi; \
 +	 ln -sf $(bindir)/gbi %%PREFIX%%/bin/gbi; \
  	fi
  
  	@echo
+@@ -401,28 +402,28 @@
+ 	@echo
  	@echo "Installing the development environment..."
  	@(cd $(srcdir)/app; d=`pwd`; for p in *; do echo "Compiling $$p..."; cd $$d/$$p; \
 -	  gbc -ag; gba; rm -rf .gambas; $(INSTALL) $$p $(bindir); done)
 -	@if test "$(bindir)" != "/usr/bin" && test "$(bindir)" != "/usr/bin/"; then \
 -	 rm -f /usr/bin/gambas; \
 -	 ln -s $(bindir)/gambas /usr/bin/gambas; \
-+	  $(bindir)/gbc -ag; $(bindir)/gba; rm -rf .gambas; $(INSTALL) $$p $(bindir); done)
++	  %%PREFIX%%/bin/gbc -ag; %%PREFIX%%/bin/gba; rm -rf .gambas; $(INSTALL) $$p $(bindir); done)
 +	@if test "$(bindir)" != "%%PREFIX%%/bin" && test "$(bindir)" != "%%PREFIX%%/bin/"; then \
 +	 rm -f %%PREFIX%%/bin/gambas; \
-+	 ln -s $(bindir)/gambas %%PREFIX%%/bin/gambas; \
++	 ln -sf $(bindir)/gambas %%PREFIX%%/bin/gambas; \
          fi
  
- 	@echo
-@@ -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 $(pkgdatadir)/help
diff --git a/lang/gambas/files/patch-app::gambas::FPropertyProject.class b/lang/gambas/files/patch-app::gambas::FPropertyProject.class
deleted file mode 100644
index 87eaf9661e6a..000000000000
--- a/lang/gambas/files/patch-app::gambas::FPropertyProject.class
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./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
- 
-@@ -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
- '   
diff --git a/lang/gambas/files/patch-src::exec::gbx_project.c b/lang/gambas/files/patch-src::exec::gbx_project.c
new file mode 100644
index 000000000000..c56365d89f0e
--- /dev/null
+++ b/lang/gambas/files/patch-src::exec::gbx_project.c
@@ -0,0 +1,11 @@
+--- ./src/exec/gbx_project.c.orig	Sun Jun  6 10:34:28 2004
++++ ./src/exec/gbx_project.c	Fri Jun 25 21:11:03 2004
+@@ -263,7 +263,7 @@
+ 
+   STRING_new(&PROJECT_exec_path, FILE_get_dir(FILE_get_dir(path)), -1);
+ 
+-  STRING_new(&PROJECT_lib_path, FILE_cat(PROJECT_exec_path, "lib/gambas", NULL), 0);
++  STRING_new(&PROJECT_lib_path, "%%PREFIX%%/lib/gambas", 0);
+ 
+   /* fichier projet */
+ 
diff --git a/lang/gambas/pkg-plist b/lang/gambas/pkg-plist
index 6355299e49b4..4e6fb53f9560 100644
--- a/lang/gambas/pkg-plist
+++ b/lang/gambas/pkg-plist
@@ -97,12 +97,6 @@ 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%%/AnalogWatch/.gambas/FRMCLOCK
-%%PORTDOCS%%%%EXAMPLESDIR%%/AnalogWatch/.kdbgrc.gbx
-%%PORTDOCS%%%%EXAMPLESDIR%%/AnalogWatch/.project
-%%PORTDOCS%%%%EXAMPLESDIR%%/AnalogWatch/AnalogWatch
-%%PORTDOCS%%%%EXAMPLESDIR%%/AnalogWatch/FrmClock.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/AnalogWatch/FrmClock.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/KateBrowser/.gambas/FBROWSER
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/KateBrowser/.kdbgrc.gbx
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/KateBrowser/.lang/.pot
@@ -113,7 +107,6 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/KateBrowser/arrow.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/Scripting/.gambas/FSCRIPT
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/Scripting/.kdbgrc.gbx
-%%PORTDOCS%%%%EXAMPLESDIR%%/Automation/Scripting/.lang/.pot
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/Scripting/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/Scripting/FScript.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Automation/Scripting/FScript.form
@@ -146,25 +139,12 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Timer/FTimer.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Timer/FTimer.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Basic/Timer/Timer
-%%PORTDOCS%%%%EXAMPLESDIR%%/Clock/.gambas/FCLOCK
-%%PORTDOCS%%%%EXAMPLESDIR%%/Clock/.project
-%%PORTDOCS%%%%EXAMPLESDIR%%/Clock/Clock
-%%PORTDOCS%%%%EXAMPLESDIR%%/Clock/FClock.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/Clock/FClock.form
-%%PORTDOCS%%%%EXAMPLESDIR%%/Clock/img/arrow_hour.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/Clock/img/arrow_min.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/Clock/img/arrow_sec.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/Clock/img/clock_bg_big1.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/Clock/img/clock_bg_big2.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/Clock/img/clock_bg_big3.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/Clock/img/clock_bg_big4.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/.gambas/FABOUT
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/.gambas/FCONN
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/.gambas/FMAIN
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/.gambas/FPREVIEW
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/.gambas/MGLOBAL
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/.kdbgrc.gbx
-%%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/.lock
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/DataReportExample
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/DataReportExample/Fabout.class
@@ -191,14 +171,39 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/Database/FMain.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/Database/FRequest.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Database/Database/FRequest.form
-%%PORTDOCS%%%%EXAMPLESDIR%%/Evaluator/.gambas/FEVAL
-%%PORTDOCS%%%%EXAMPLESDIR%%/Evaluator/.kdbgrc.gbx
-%%PORTDOCS%%%%EXAMPLESDIR%%/Evaluator/.lang/.pot
-%%PORTDOCS%%%%EXAMPLESDIR%%/Evaluator/.project
-%%PORTDOCS%%%%EXAMPLESDIR%%/Evaluator/Evaluator
-%%PORTDOCS%%%%EXAMPLESDIR%%/Evaluator/FEval.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/Evaluator/FEval.form
-%%PORTDOCS%%%%EXAMPLESDIR%%/Evaluator/FEval.pot
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/AnalogWatch/.gambas/FRMCLOCK
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/AnalogWatch/.kdbgrc.gbx
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/AnalogWatch/.project
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/AnalogWatch/AnalogWatch
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/AnalogWatch/FrmClock.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/AnalogWatch/FrmClock.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/.gambas/FCLOCK
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/.icon/16.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/.icon/32.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/.icon/48.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/.project
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/CHANGELOG
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/Clock
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/FClock.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/FClock.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/img/arrow_hour.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/img/arrow_min.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/img/arrow_sec.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/img/clock_bg_big1.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/img/clock_bg_big2.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/img/clock_bg_big3.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/Clock/img/clock_bg_big4.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/ImageViewer/.gambas/FVIEWER
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/ImageViewer/.project
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/ImageViewer/.project~
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/ImageViewer/FViewer.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/ImageViewer/FViewer.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/ImageViewer/ImageViewer
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/OnScreenDisplay/.gambas/FONSCREENDISPLAY
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/OnScreenDisplay/.project
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/OnScreenDisplay/FOnScreenDisplay.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/OnScreenDisplay/FOnScreenDisplay.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Drawing/OnScreenDisplay/OnScreenDisplay
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/Console/.gambas/FCONSOLE
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/Console/.kdbgrc.gbx
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/Console/.lang/.pot
@@ -217,15 +222,6 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/MoviePlayer/pause.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/MoviePlayer/play.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Exec/MoviePlayer/stop.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/Explorer/.gambas/FEXPLORER
-%%PORTDOCS%%%%EXAMPLESDIR%%/Explorer/.project
-%%PORTDOCS%%%%EXAMPLESDIR%%/Explorer/Explorer
-%%PORTDOCS%%%%EXAMPLESDIR%%/Explorer/FExplorer.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/Explorer/FExplorer.form
-%%PORTDOCS%%%%EXAMPLESDIR%%/Explorer/file.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/Explorer/folder.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/Explorer/quit.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/Explorer/refresh.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Games/RobotFindsKitten/.gambas/FRFK
 %%PORTDOCS%%%%EXAMPLESDIR%%/Games/RobotFindsKitten/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Games/RobotFindsKitten/COPYING
@@ -247,13 +243,54 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Games/Snake/eat.wav
 %%PORTDOCS%%%%EXAMPLESDIR%%/Games/Snake/head.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Games/Snake/start.wav
-%%PORTDOCS%%%%EXAMPLESDIR%%/ImageViewer/.gambas/FVIEWER
-%%PORTDOCS%%%%EXAMPLESDIR%%/ImageViewer/.lang/.pot
-%%PORTDOCS%%%%EXAMPLESDIR%%/ImageViewer/.project
-%%PORTDOCS%%%%EXAMPLESDIR%%/ImageViewer/.project~
-%%PORTDOCS%%%%EXAMPLESDIR%%/ImageViewer/FViewer.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/ImageViewer/FViewer.form
-%%PORTDOCS%%%%EXAMPLESDIR%%/ImageViewer/ImageViewer
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/.gambas/CBOARDDESIGN
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/.gambas/CMOVE
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/.gambas/FBOARDSELECT
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/.gambas/FGAMEAREA
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/.gambas/GLOBAL
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/.gambas/MBOARDS
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/.project
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/CBoardDesign.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/CMove.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/FBoardSelect.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/FBoardSelect.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/FGameArea.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/FGameArea.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/Global.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/MBoards.module
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/Solitaire
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/ball.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/new.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/quit.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/redo.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Games/Solitaire/undo.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Evaluator/.gambas/FEVAL
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Evaluator/.kdbgrc.gbx
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Evaluator/.lang/.pot
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Evaluator/.project
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Evaluator/Evaluator
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Evaluator/FEval.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Evaluator/FEval.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Evaluator/FEval.pot
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Explorer/.gambas/FEXPLORER
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Explorer/.project
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Explorer/Explorer
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Explorer/FExplorer.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Explorer/FExplorer.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Explorer/file.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Explorer/folder.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Explorer/quit.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Explorer/refresh.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Notepad/.gambas/FABOUT
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Notepad/.gambas/FNOTEPAD
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Notepad/.lang/.pot
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Notepad/.project
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Notepad/FAbout.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Notepad/FAbout.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Notepad/FNotepad.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Notepad/FNotepad.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Notepad/Notepad
+%%PORTDOCS%%%%EXAMPLESDIR%%/Miscellaneous/Notepad/notepad.png
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/ClientSocket/.gambas/FRMMAIN
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/ClientSocket/.project
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/ClientSocket/ClientSocket
@@ -300,26 +337,11 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/UDPServerClient/FrmServer.class
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/UDPServerClient/FrmServer.form
 %%PORTDOCS%%%%EXAMPLESDIR%%/Networking/UDPServerClient/UDPServerClient
-%%PORTDOCS%%%%EXAMPLESDIR%%/Notepad/.gambas/FABOUT
-%%PORTDOCS%%%%EXAMPLESDIR%%/Notepad/.gambas/FNOTEPAD
-%%PORTDOCS%%%%EXAMPLESDIR%%/Notepad/.lang/.pot
-%%PORTDOCS%%%%EXAMPLESDIR%%/Notepad/.project
-%%PORTDOCS%%%%EXAMPLESDIR%%/Notepad/FAbout.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/Notepad/FAbout.form
-%%PORTDOCS%%%%EXAMPLESDIR%%/Notepad/FNotepad.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/Notepad/FNotepad.form
-%%PORTDOCS%%%%EXAMPLESDIR%%/Notepad/Notepad
-%%PORTDOCS%%%%EXAMPLESDIR%%/Notepad/notepad.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/OnScreenDisplay/.gambas/FONSCREENDISPLAY
-%%PORTDOCS%%%%EXAMPLESDIR%%/OnScreenDisplay/.project
-%%PORTDOCS%%%%EXAMPLESDIR%%/OnScreenDisplay/FOnScreenDisplay.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/OnScreenDisplay/FOnScreenDisplay.form
-%%PORTDOCS%%%%EXAMPLESDIR%%/OnScreenDisplay/OnScreenDisplay
-%%PORTDOCS%%%%EXAMPLESDIR%%/WebBrowser/.gambas/FBROWSER
-%%PORTDOCS%%%%EXAMPLESDIR%%/WebBrowser/.project
-%%PORTDOCS%%%%EXAMPLESDIR%%/WebBrowser/FBrowser.class
-%%PORTDOCS%%%%EXAMPLESDIR%%/WebBrowser/FBrowser.form
-%%PORTDOCS%%%%EXAMPLESDIR%%/WebBrowser/WebBrowser
+%%PORTDOCS%%%%EXAMPLESDIR%%/Networking/WebBrowser/.gambas/FBROWSER
+%%PORTDOCS%%%%EXAMPLESDIR%%/Networking/WebBrowser/.project
+%%PORTDOCS%%%%EXAMPLESDIR%%/Networking/WebBrowser/FBrowser.class
+%%PORTDOCS%%%%EXAMPLESDIR%%/Networking/WebBrowser/FBrowser.form
+%%PORTDOCS%%%%EXAMPLESDIR%%/Networking/WebBrowser/WebBrowser
 %%PORTDOCS%%%%DATADIR%%/help/.rsrc/ChristopheBONNET/ALL_OBJECT.tar.gz
 %%PORTDOCS%%%%DATADIR%%/help/.rsrc/ChristopheBONNET/ALL_OBJECT.tar.gz,v
 %%PORTDOCS%%%%DATADIR%%/help/.rsrc/DifferencesFromVB/vbdiff.png
@@ -3175,7 +3197,6 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%DATADIR%%/help/WebSiteIntroduction.html
 %%PORTDOCS%%%%DATADIR%%/help/WebSiteScreenshots.html
 %%PORTDOCS%%%%DATADIR%%/help/WebStatistics.html
-%%PORTDOCS%%%%DATADIR%%/help/WebTopicList.html
 %%PORTDOCS%%%%DATADIR%%/help/WikiExportTodoList.html
 %%PORTDOCS%%%%DATADIR%%/help/WikiName.html
 %%PORTDOCS%%%%DATADIR%%/help/WikiRon.html
@@ -3184,19 +3205,34 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%%%DATADIR%%/help/YvickMiossec.html
 %%PORTDOCS%%%%DATADIR%%/help/ZenoDotus.html
 %%DATADIR%%/info/gb.compress.info
+%%DATADIR%%/info/gb.compress.list
 %%DATADIR%%/info/gb.db.info
+%%DATADIR%%/info/gb.db.list
 %%DATADIR%%/info/gb.debug.info
+%%DATADIR%%/info/gb.debug.list
 %%DATADIR%%/info/gb.eval.info
+%%DATADIR%%/info/gb.eval.list
 %%DATADIR%%/info/gb.info
+%%DATADIR%%/info/gb.list
 %%DATADIR%%/info/gb.net.curl.info
+%%DATADIR%%/info/gb.net.curl.list
 %%DATADIR%%/info/gb.net.info
+%%DATADIR%%/info/gb.net.list
 %%DATADIR%%/info/gb.qt.editor.info
+%%DATADIR%%/info/gb.qt.editor.list
 %%DATADIR%%/info/gb.qt.ext.info
+%%DATADIR%%/info/gb.qt.ext.list
 %%DATADIR%%/info/gb.qt.info
 %%DATADIR%%/info/gb.qt.kde.html.info
+%%DATADIR%%/info/gb.qt.kde.html.list
 %%DATADIR%%/info/gb.qt.kde.info
+%%DATADIR%%/info/gb.qt.kde.list
+%%DATADIR%%/info/gb.qt.list
 %%DATADIR%%/info/gb.sdl.info
+%%DATADIR%%/info/gb.sdl.list
 %%DATADIR%%/info/gb.vb.info
+%%DATADIR%%/info/gb.vb.list
+@dirrm %%DATADIR%%/info
 %%PORTDOCS%%@dirrm %%DATADIR%%/help/hello-world
 %%PORTDOCS%%@dirrm %%DATADIR%%/help/.rsrc/ZenoDotus
 %%PORTDOCS%%@dirrm %%DATADIR%%/help/.rsrc/YvickMiossec
@@ -5870,14 +5906,9 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%@dirrm %%DATADIR%%/help/.rsrc/AhmadKamal
 %%PORTDOCS%%@dirrm %%DATADIR%%/help/.rsrc
 %%PORTDOCS%%@dirrm %%DATADIR%%/help
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/WebBrowser/.gambas
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/WebBrowser
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/OnScreenDisplay/.lang
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/OnScreenDisplay/.gambas
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/OnScreenDisplay
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Notepad/.lang
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Notepad/.gambas
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Notepad
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Networking/WebBrowser/.gambas
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Networking/WebBrowser
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Networking/UDPServerClient/.lang
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Networking/UDPServerClient/.gambas
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Networking/UDPServerClient
@@ -5894,17 +5925,23 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Networking/ClientSocket/.gambas
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Networking/ClientSocket
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Networking
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/ImageViewer/.lang
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/ImageViewer/.gambas
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/ImageViewer
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Miscellaneous/Notepad/.lang
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Miscellaneous/Notepad/.gambas
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Miscellaneous/Notepad
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Miscellaneous/Explorer/.lang
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Miscellaneous/Explorer/.gambas
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Miscellaneous/Explorer
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Miscellaneous/Evaluator/.lang
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Miscellaneous/Evaluator/.gambas
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Miscellaneous/Evaluator
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Miscellaneous
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Games/Solitaire/.gambas
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Games/Solitaire
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Games/Snake/.gambas
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Games/Snake
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Games/RobotFindsKitten/.gambas
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Games/RobotFindsKitten
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Games
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Explorer/.lang
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Explorer/.gambas
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Explorer
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Exec/MoviePlayer/.lang
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Exec/MoviePlayer/.gambas
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Exec/MoviePlayer
@@ -5912,9 +5949,19 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Exec/Console/.gambas
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Exec/Console
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Exec
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Evaluator/.lang
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Evaluator/.gambas
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Evaluator
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Drawing/OnScreenDisplay/.lang
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Drawing/OnScreenDisplay/.gambas
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Drawing/OnScreenDisplay
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Drawing/ImageViewer/.lang
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Drawing/ImageViewer/.gambas
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Drawing/ImageViewer
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Drawing/Clock/img
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Drawing/Clock/.icon
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Drawing/Clock/.gambas
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Drawing/Clock
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Drawing/AnalogWatch/.gambas
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Drawing/AnalogWatch
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Drawing
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Database/Database/.lang
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Database/Database/.gambas
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Database/Database
@@ -5922,9 +5969,6 @@ 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%%/Clock/img
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Clock/.gambas
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Clock
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Basic/Timer/.lang
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Basic/Timer/.gambas
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Basic/Timer
@@ -5945,9 +5989,5 @@ lib/gambas/lib.gb.vb.so.0
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Automation/KateBrowser/.gambas
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Automation/KateBrowser
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/Automation
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/AnalogWatch/.gambas
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/AnalogWatch
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%DATADIR%%/info
-@dirrm %%DATADIR%%
 @dirrm lib/gambas