10 files changed, 342 insertions, 154 deletions

diff --git a/x11-toolkits/gtkada-gps/Makefile b/x11-toolkits/gtkada-gps/Makefile
index 8f5c990f867b..681911b7e9c5 100644
--- a/x11-toolkits/gtkada-gps/Makefile
+++ b/x11-toolkits/gtkada-gps/Makefile
@@ -1,51 +1,58 @@
-# New ports collection makefile for:   gtkada-gcc
-# Date Created:			24 Dec 2006
-# Whom:				Petr Holub <hopet@ics.muni.cz>
+# New ports collection makefile for: gtkada-gps
+# Date created:		31 Dec 2006
+# Whom:			John Merryweather Cooper
 #
 # $FreeBSD$
 #
 
-PORTNAME=	gtkada
-PORTVERSION=	2.8.1
+PORTNAME=	gtkada-gps
+PORTVERSION=	3.1.3
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gnuada
-PKGNAMESUFFIX=	-gcc
-DISTNAME=	gnat-gcc-gtkada-4.1.1_2.8.1-r6.src
-EXTRACT_SUFX=	.rpm
+MASTER_SITES=	http://libre.adacore.com/
+EXTRACT_SUFX=	-src.tgz
 
-MAINTAINER=	hopet@ics.muni.cz
-COMMENT=	Gtk2 binding for lang/gnat-gcc41 port of GNAT Ada compiler
+MAINTAINER=	john_m_cooper@yahoo.com
+COMMENT=	GNOME Gtk2 Ada Binding
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/gcc41/gcc41:${PORTSDIR}/lang/gnat-gcc41
+BUILD_DEPENDS=	gnatmake:${PORTSDIR}/lang/gnat
 
-EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
+CONFLICTS=	gtkada-[0-9]* gtkada-devel-[0-9]* gtkada-gcc-[0-9]*
 
-WRKSRC=		${WRKDIR}/GtkAda-2_8_1
-
-CONFLICTS=	gtkada-[0-9]* \
-		gtkada-devel-[0-9]*
+USE_GNOME=	gtk20 libglade2
+USE_GMAKE=	yes
 
-CONFIGURE_ENV+=	PATH=${LOCALBASE}/bin/gcc41:${PATH} CC=${LOCALBASE}/bin/gcc41/gcc41
-MAKE_ENV+=	PATH=${LOCALBASE}/bin/gcc41:${PATH} CC=${LOCALBASE}/bin/gcc41/gcc41
+.include <bsd.port.pre.mk>
 
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gtk20 libglade2
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-#EXAMPLESDIR=	${DATADIR}/examples
-
-do-extract:
-	if [ ! -d ${WRKDIR} ]; then \
-		${MKDIR} ${WRKDIR}; \
-	fi
-	( cd ${WRKDIR} && \
-	rpm2cpio.pl <${DISTDIR}/gnat-gcc-gtkada-4.1.1_2.8.1-r6.src.rpm | ${CPIO} -i GtkAda-2_8_1.tar.bz2 && \
-	tar jxf GtkAda-2_8_1.tar.bz2 )
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/projects/Makefile
-
-.include <bsd.port.mk>
+# Check for GNAT sources.
+.if !exists(${DISTDIR}/${DISTFILE}) && !defined(PACKAGE_BUILDING)
+ECHO_MSG=	${PRINTF}
+IGNORE=Because of licensing and registration restrictions, you must fetch\n \
+	the source distribution manually.  Please access\n \
+	http://libre.adacore.com/\ with a web browser, register\n \
+	(It's free!) and log in.  Download the source files:\n\n \
+	\t${DISTFILE}\n\n \
+	and place them in ${DISTDIR}\n
+	${ECHO_MSG} ${IGNORE}
+.endif
+
+WRKSRC=		${WRKDIR}/GtkAda-2.4.2
+DOCSDIR=	${PREFIX}/share/doc/gtkada
+EXAMPLESDIR=	${PREFIX}/share/examples/gtkada
+MAKE_ENV=	"MAKE=${GMAKE}"
+
+# This explicit call avoids some permission problems that seem insolveable
+# any other way
+do-install:
+	@(cd ${WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} \
+		${MAKE_ARGS} install)
+.if !defined(NOPORTDOCS)
+	@(cd ${WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} \
+		${MAKE_ARGS} install-doc)
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/gtkada-gps/distinfo b/x11-toolkits/gtkada-gps/distinfo
index e3ac2aef2181..b8b468b9356f 100644
--- a/x11-toolkits/gtkada-gps/distinfo
+++ b/x11-toolkits/gtkada-gps/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnat-gcc-gtkada-4.1.1_2.8.1-r6.src.rpm) = f36752403c0d80bae76e4809cfd49da0
-SHA256 (gnat-gcc-gtkada-4.1.1_2.8.1-r6.src.rpm) = ab51eab988838e7e5ecc554c3d3fbf63d89cf65e051454e34969858911d2235d
-SIZE (gnat-gcc-gtkada-4.1.1_2.8.1-r6.src.rpm) = 3714530
+MD5 (gtkada-gps-3.1.3-src.tgz) = 202dd13a137bcc6faeecf8224c32d591
+SHA256 (gtkada-gps-3.1.3-src.tgz) = 5fc19e258508a1bbbd70bec3aa870b93ddb597fd79c3e3976e8f52a6d9dcfabc
+SIZE (gtkada-gps-3.1.3-src.tgz) = 2817708
diff --git a/x11-toolkits/gtkada-gps/files/patch-Makefile.common.in b/x11-toolkits/gtkada-gps/files/patch-Makefile.common.in
new file mode 100644
index 000000000000..40f956e84643
--- /dev/null
+++ b/x11-toolkits/gtkada-gps/files/patch-Makefile.common.in
@@ -0,0 +1,11 @@
+--- src/Makefile.common.in.orig	Sun Jan 14 22:10:57 2007
++++ src/Makefile.common.in	Sun Jan 14 22:12:02 2007
+@@ -20,7 +20,7 @@
+ INSTALL       = @INSTALL@
+ INSTALL_DATA  = @INSTALL_DATA@
+ 
+-CP = cp -p -f
++CP = cp -p
+ LN = ln -f -s
+ CHMOD = chmod
+ ARFLAGS = cr
diff --git a/x11-toolkits/gtkada-gps/files/patch-Makefile.in b/x11-toolkits/gtkada-gps/files/patch-Makefile.in
new file mode 100644
index 000000000000..d01875acfa55
--- /dev/null
+++ b/x11-toolkits/gtkada-gps/files/patch-Makefile.in
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	Fri Jan 12 19:13:39 2007
++++ Makefile.in	Fri Jan 12 19:14:49 2007
+@@ -22,9 +22,11 @@
+ 	$(MAKE) -C $(src_dir) install
+ 	$(MAKE) -C $(projects_dir) install
+ 	$(MAKE) -C $(testgtk_dir) install
+-	$(MAKE) -C $(doc_dir) install
+ 	$(MAKE) -C $(example_dir) install
+ 	$(MAKE) -C $(xml_dir) install
++
++install-doc:
++	$(MAKE) -C $(doc_dir) install
+ 
+ clean-generic:
+ 	-${RM} core
diff --git a/x11-toolkits/gtkada-gps/files/patch-projects_Makefile b/x11-toolkits/gtkada-gps/files/patch-projects_Makefile
new file mode 100644
index 000000000000..c74777b4d4b7
--- /dev/null
+++ b/x11-toolkits/gtkada-gps/files/patch-projects_Makefile
@@ -0,0 +1,13 @@
+--- projects/Makefile.orig	Tue Jan  2 02:03:32 2007
++++ projects/Makefile	Tue Jan  2 02:04:40 2007
+@@ -5,8 +5,8 @@
+ install: force
+ 	${MKDIR} $(prefix)/lib/gnat/
+ 	${MKDIR} $(prefix)/lib/gnat/gtkada
+-	$(MKDIR) $(prefix)/lib/pkgconfig/
+-	${CP} gtkada.pc $(prefix)/lib/pkgconfig/
++	$(MKDIR) $(prefix)/libdata/pkgconfig/
++	${CP} gtkada.pc $(prefix)/libdata/pkgconfig/
+ 	-${RM} ${prefix}/projects/gtkada*
+ 	./generate_prj.sh GtkAda "${prefix}" ${BUILD_SHARED}
+ ifeq ($(HAVE_LIBGLADE), True)
diff --git a/x11-toolkits/gtkada-gps/files/patch-src_gtk-text_iter.adb b/x11-toolkits/gtkada-gps/files/patch-src_gtk-text_iter.adb
new file mode 100644
index 000000000000..3cb920682dc0
--- /dev/null
+++ b/x11-toolkits/gtkada-gps/files/patch-src_gtk-text_iter.adb
@@ -0,0 +1,20 @@
+--- src/gtk-text_iter.adb.orig	Wed Oct 26 08:29:06 2005
++++ src/gtk-text_iter.adb	Tue Jan  2 00:55:36 2007
+@@ -1195,11 +1195,12 @@
+    -- Get_Text_Iter --
+    -------------------
+ 
+-   function Get_Text_Iter (Val : Glib.Values.GValue) return Gtk_Text_Iter is
+-   begin
+-      return Iter_Access_Address_Conversions.To_Pointer
+-               (Glib.Values.Get_Address (Val)).all;
+-   end Get_Text_Iter;
++--   function Get_Text_Iter (Val : Glib.Values.GValue) return Gtk_Text_Iter is
++--      Iter : Gtk_Text_Iter;
++--   begin
++--      Get_Text_Iter (Val => Val, Iter => Iter);
++--      return Iter;
++--   end Get_Text_Iter;
+ 
+ begin
+    if Gtk_Text_Iter'Size /= C_Gtk_Text_Iter_Size * 8 then
diff --git a/x11-toolkits/gtkada-gps/files/patch-src_gtk-text_iter.ads b/x11-toolkits/gtkada-gps/files/patch-src_gtk-text_iter.ads
new file mode 100644
index 000000000000..6d9ac36ed643
--- /dev/null
+++ b/x11-toolkits/gtkada-gps/files/patch-src_gtk-text_iter.ads
@@ -0,0 +1,11 @@
+--- src/gtk-text_iter.ads.orig	Mon Jan  1 23:39:23 2007
++++ src/gtk-text_iter.ads	Mon Jan  1 23:40:12 2007
+@@ -655,7 +655,7 @@
+    --  by the give GValue. Modifying the iterator returned does not modify
+    --  the iterator referenced by the GValue.
+ 
+-   function Get_Text_Iter (Val : Glib.Values.GValue) return Gtk_Text_Iter;
++--   function Get_Text_Iter (Val : Glib.Values.GValue) return Gtk_Text_Iter;
+    --  This is the function equivalent of procedure Get_Text_Iter above. It is
+    --  sometimes more convenient that then procedure, but its use is limited by
+    --  the fact that the result returned can not be stored in a variable, since
diff --git a/x11-toolkits/gtkada-gps/files/patch-testgtk_Makefile.in b/x11-toolkits/gtkada-gps/files/patch-testgtk_Makefile.in
new file mode 100644
index 000000000000..64700fe463d5
--- /dev/null
+++ b/x11-toolkits/gtkada-gps/files/patch-testgtk_Makefile.in
@@ -0,0 +1,11 @@
+--- testgtk/Makefile.in.orig	Sun Jan 14 22:13:38 2007
++++ testgtk/Makefile.in	Sun Jan 14 22:14:34 2007
+@@ -26,7 +26,7 @@
+ GNATMAKELDFLAGS = -largs -L$(src_dir) -L$(opengl_dir) -lgtkada @GTK_LIBS@ \
+ 		  $(TARGET_LFLAGS)
+ 
+-CP = cp -pf
++CP = cp -p
+ MKDIR = mkdir -p
+ RMDIR = rmdir
+ RM = rm -f
diff --git a/x11-toolkits/gtkada-gps/pkg-descr b/x11-toolkits/gtkada-gps/pkg-descr
index cfcb44b3d122..36d584a229c3 100644
--- a/x11-toolkits/gtkada-gps/pkg-descr
+++ b/x11-toolkits/gtkada-gps/pkg-descr
@@ -1,7 +1,10 @@
-GtkAda is an Ada95 graphical toolkit based on Gtk+, providing the complete set
-of Gtk+ widgets using the Object-Oriented features of this language.
+This is GtkAda version 3.1.3. This package is an Ada2005 graphical library
+for the Gimp Toolkit, which means this is a set of packages to allow you
+to easily create some graphical interfaces under X11 and Win32, using Ada2005
+as a programming language.
 
-This version of GtkAda is designed to be used with lang/gnat-gcc41.
-
-WWW: https://libre2.adacore.com/GtkAda/
-WWW: http://gnuada.sourceforge.net/
+Every widget from gtk 2.2 has been bound, and the test
+program found in the gtk release has been reimplemented in Ada (have a
+look at the testgtk/ directory).
+ 
+WWW: http://libre.adacore.com/
diff --git a/x11-toolkits/gtkada-gps/pkg-plist b/x11-toolkits/gtkada-gps/pkg-plist
index 114d6734e2ae..823aa201b1ad 100644
--- a/x11-toolkits/gtkada-gps/pkg-plist
+++ b/x11-toolkits/gtkada-gps/pkg-plist
@@ -71,8 +71,6 @@ include/gtkada/glib-graphs.adb
 include/gtkada/glib-graphs.ads
 include/gtkada/glib-gslist.adb
 include/gtkada/glib-gslist.ads
-include/gtkada/glib-main.adb
-include/gtkada/glib-main.ads
 include/gtkada/glib-messages.adb
 include/gtkada/glib-messages.ads
 include/gtkada/glib-module.adb
@@ -85,8 +83,6 @@ include/gtkada/glib-properties.adb
 include/gtkada/glib-properties.ads
 include/gtkada/glib-type_conversion_hooks.adb
 include/gtkada/glib-type_conversion_hooks.ads
-include/gtkada/glib-types.adb
-include/gtkada/glib-types.ads
 include/gtkada/glib-unicode.adb
 include/gtkada/glib-unicode.ads
 include/gtkada/glib-values.adb
@@ -122,23 +118,16 @@ include/gtkada/gtk-button_box.adb
 include/gtkada/gtk-button_box.ads
 include/gtkada/gtk-calendar.adb
 include/gtkada/gtk-calendar.ads
+include/gtkada/gtk-cell_editable.adb
 include/gtkada/gtk-cell_editable.ads
-include/gtkada/gtk-cell_layout.adb
-include/gtkada/gtk-cell_layout.ads
 include/gtkada/gtk-cell_renderer.adb
 include/gtkada/gtk-cell_renderer.ads
-include/gtkada/gtk-cell_renderer_combo.adb
-include/gtkada/gtk-cell_renderer_combo.ads
 include/gtkada/gtk-cell_renderer_pixbuf.adb
 include/gtkada/gtk-cell_renderer_pixbuf.ads
-include/gtkada/gtk-cell_renderer_progress.adb
-include/gtkada/gtk-cell_renderer_progress.ads
 include/gtkada/gtk-cell_renderer_text.adb
 include/gtkada/gtk-cell_renderer_text.ads
 include/gtkada/gtk-cell_renderer_toggle.adb
 include/gtkada/gtk-cell_renderer_toggle.ads
-include/gtkada/gtk-cell_view.adb
-include/gtkada/gtk-cell_view.ads
 include/gtkada/gtk-check_button.adb
 include/gtkada/gtk-check_button.ads
 include/gtkada/gtk-check_menu_item.adb
@@ -153,10 +142,6 @@ include/gtkada/gtk-color_selection_dialog.adb
 include/gtkada/gtk-color_selection_dialog.ads
 include/gtkada/gtk-combo.adb
 include/gtkada/gtk-combo.ads
-include/gtkada/gtk-combo_box.adb
-include/gtkada/gtk-combo_box.ads
-include/gtkada/gtk-combo_box_entry.adb
-include/gtkada/gtk-combo_box_entry.ads
 include/gtkada/gtk-container.adb
 include/gtkada/gtk-container.ads
 include/gtkada/gtk-ctree.adb
@@ -171,20 +156,16 @@ include/gtkada/gtk-drawing_area.adb
 include/gtkada/gtk-drawing_area.ads
 include/gtkada/gtk-editable.adb
 include/gtkada/gtk-editable.ads
-include/gtkada/gtk-entry_completion.adb
-include/gtkada/gtk-entry_completion.ads
 include/gtkada/gtk-enums.adb
 include/gtkada/gtk-enums.ads
 include/gtkada/gtk-event_box.adb
 include/gtkada/gtk-event_box.ads
-include/gtkada/gtk-expander.adb
-include/gtkada/gtk-expander.ads
 include/gtkada/gtk-extra-border_combo.adb
 include/gtkada/gtk-extra-border_combo.ads
 include/gtkada/gtk-extra-color_combo.adb
 include/gtkada/gtk-extra-color_combo.ads
-include/gtkada/gtk-extra-combo_button.adb
-include/gtkada/gtk-extra-combo_button.ads
+include/gtkada/gtk-extra-combo_box.adb
+include/gtkada/gtk-extra-combo_box.ads
 include/gtkada/gtk-extra-font_combo.adb
 include/gtkada/gtk-extra-font_combo.ads
 include/gtkada/gtk-extra-item_entry.adb
@@ -197,18 +178,6 @@ include/gtkada/gtk-extra-plot_bar.adb
 include/gtkada/gtk-extra-plot_bar.ads
 include/gtkada/gtk-extra-plot_box.adb
 include/gtkada/gtk-extra-plot_box.ads
-include/gtkada/gtk-extra-plot_canvas-ellipse.adb
-include/gtkada/gtk-extra-plot_canvas-ellipse.ads
-include/gtkada/gtk-extra-plot_canvas-line.adb
-include/gtkada/gtk-extra-plot_canvas-line.ads
-include/gtkada/gtk-extra-plot_canvas-pixmap.adb
-include/gtkada/gtk-extra-plot_canvas-pixmap.ads
-include/gtkada/gtk-extra-plot_canvas-plot.adb
-include/gtkada/gtk-extra-plot_canvas-plot.ads
-include/gtkada/gtk-extra-plot_canvas-rectangle.adb
-include/gtkada/gtk-extra-plot_canvas-rectangle.ads
-include/gtkada/gtk-extra-plot_canvas-text.adb
-include/gtkada/gtk-extra-plot_canvas-text.ads
 include/gtkada/gtk-extra-plot_canvas.adb
 include/gtkada/gtk-extra-plot_canvas.ads
 include/gtkada/gtk-extra-plot_data.adb
@@ -283,8 +252,6 @@ include/gtkada/gtk-menu_item.adb
 include/gtkada/gtk-menu_item.ads
 include/gtkada/gtk-menu_shell.adb
 include/gtkada/gtk-menu_shell.ads
-include/gtkada/gtk-menu_tool_button.adb
-include/gtkada/gtk-menu_tool_button.ads
 include/gtkada/gtk-misc.adb
 include/gtkada/gtk-misc.ads
 include/gtkada/gtk-notebook.adb
@@ -311,8 +278,6 @@ include/gtkada/gtk-radio_button.adb
 include/gtkada/gtk-radio_button.ads
 include/gtkada/gtk-radio_menu_item.adb
 include/gtkada/gtk-radio_menu_item.ads
-include/gtkada/gtk-radio_tool_button.adb
-include/gtkada/gtk-radio_tool_button.ads
 include/gtkada/gtk-rc.adb
 include/gtkada/gtk-rc.ads
 include/gtkada/gtk-ruler.adb
@@ -329,10 +294,6 @@ include/gtkada/gtk-separator.adb
 include/gtkada/gtk-separator.ads
 include/gtkada/gtk-separator_menu_item.adb
 include/gtkada/gtk-separator_menu_item.ads
-include/gtkada/gtk-separator_tool_item.adb
-include/gtkada/gtk-separator_tool_item.ads
-include/gtkada/gtk-settings.adb
-include/gtkada/gtk-settings.ads
 include/gtkada/gtk-size_group.adb
 include/gtkada/gtk-size_group.ads
 include/gtkada/gtk-socket.adb
@@ -371,26 +332,16 @@ include/gtkada/gtk-tips_query.adb
 include/gtkada/gtk-tips_query.ads
 include/gtkada/gtk-toggle_button.adb
 include/gtkada/gtk-toggle_button.ads
-include/gtkada/gtk-toggle_tool_button.adb
-include/gtkada/gtk-toggle_tool_button.ads
-include/gtkada/gtk-tool_button.adb
-include/gtkada/gtk-tool_button.ads
-include/gtkada/gtk-tool_item.adb
-include/gtkada/gtk-tool_item.ads
 include/gtkada/gtk-toolbar.adb
 include/gtkada/gtk-toolbar.ads
 include/gtkada/gtk-tooltips.adb
 include/gtkada/gtk-tooltips.ads
 include/gtkada/gtk-tree_model.adb
 include/gtkada/gtk-tree_model.ads
-include/gtkada/gtk-tree_model_filter.adb
-include/gtkada/gtk-tree_model_filter.ads
 include/gtkada/gtk-tree_model_sort.adb
 include/gtkada/gtk-tree_model_sort.ads
 include/gtkada/gtk-tree_selection.adb
 include/gtkada/gtk-tree_selection.ads
-include/gtkada/gtk-tree_sortable.adb
-include/gtkada/gtk-tree_sortable.ads
 include/gtkada/gtk-tree_store.adb
 include/gtkada/gtk-tree_store.ads
 include/gtkada/gtk-tree_view.adb
@@ -490,14 +441,12 @@ lib/gtkada/glib-glist.ali
 lib/gtkada/glib-gnodes.ali
 lib/gtkada/glib-graphs.ali
 lib/gtkada/glib-gslist.ali
-lib/gtkada/glib-main.ali
 lib/gtkada/glib-messages.ali
 lib/gtkada/glib-module.ali
 lib/gtkada/glib-object.ali
 lib/gtkada/glib-properties-creation.ali
 lib/gtkada/glib-properties.ali
 lib/gtkada/glib-type_conversion_hooks.ali
-lib/gtkada/glib-types.ali
 lib/gtkada/glib-unicode.ali
 lib/gtkada/glib-values.ali
 lib/gtkada/glib-xml.ali
@@ -517,14 +466,10 @@ lib/gtkada/gtk-button.ali
 lib/gtkada/gtk-button_box.ali
 lib/gtkada/gtk-calendar.ali
 lib/gtkada/gtk-cell_editable.ali
-lib/gtkada/gtk-cell_layout.ali
 lib/gtkada/gtk-cell_renderer.ali
-lib/gtkada/gtk-cell_renderer_combo.ali
 lib/gtkada/gtk-cell_renderer_pixbuf.ali
-lib/gtkada/gtk-cell_renderer_progress.ali
 lib/gtkada/gtk-cell_renderer_text.ali
 lib/gtkada/gtk-cell_renderer_toggle.ali
-lib/gtkada/gtk-cell_view.ali
 lib/gtkada/gtk-check_button.ali
 lib/gtkada/gtk-check_menu_item.ali
 lib/gtkada/gtk-clipboard.ali
@@ -532,8 +477,6 @@ lib/gtkada/gtk-clist.ali
 lib/gtkada/gtk-color_selection.ali
 lib/gtkada/gtk-color_selection_dialog.ali
 lib/gtkada/gtk-combo.ali
-lib/gtkada/gtk-combo_box.ali
-lib/gtkada/gtk-combo_box_entry.ali
 lib/gtkada/gtk-container.ali
 lib/gtkada/gtk-ctree.ali
 lib/gtkada/gtk-curve.ali
@@ -541,25 +484,17 @@ lib/gtkada/gtk-dialog.ali
 lib/gtkada/gtk-dnd.ali
 lib/gtkada/gtk-drawing_area.ali
 lib/gtkada/gtk-editable.ali
-lib/gtkada/gtk-entry_completion.ali
 lib/gtkada/gtk-enums.ali
 lib/gtkada/gtk-event_box.ali
-lib/gtkada/gtk-expander.ali
 lib/gtkada/gtk-extra-border_combo.ali
 lib/gtkada/gtk-extra-color_combo.ali
-lib/gtkada/gtk-extra-combo_button.ali
+lib/gtkada/gtk-extra-combo_box.ali
 lib/gtkada/gtk-extra-font_combo.ali
 lib/gtkada/gtk-extra-item_entry.ali
 lib/gtkada/gtk-extra-plot.ali
 lib/gtkada/gtk-extra-plot_3d.ali
 lib/gtkada/gtk-extra-plot_bar.ali
 lib/gtkada/gtk-extra-plot_box.ali
-lib/gtkada/gtk-extra-plot_canvas-ellipse.ali
-lib/gtkada/gtk-extra-plot_canvas-line.ali
-lib/gtkada/gtk-extra-plot_canvas-pixmap.ali
-lib/gtkada/gtk-extra-plot_canvas-plot.ali
-lib/gtkada/gtk-extra-plot_canvas-rectangle.ali
-lib/gtkada/gtk-extra-plot_canvas-text.ali
 lib/gtkada/gtk-extra-plot_canvas.ali
 lib/gtkada/gtk-extra-plot_data.ali
 lib/gtkada/gtk-extra-plot_polar.ali
@@ -597,7 +532,6 @@ lib/gtkada/gtk-menu.ali
 lib/gtkada/gtk-menu_bar.ali
 lib/gtkada/gtk-menu_item.ali
 lib/gtkada/gtk-menu_shell.ali
-lib/gtkada/gtk-menu_tool_button.ali
 lib/gtkada/gtk-misc.ali
 lib/gtkada/gtk-notebook.ali
 lib/gtkada/gtk-object.ali
@@ -611,7 +545,6 @@ lib/gtkada/gtk-progress.ali
 lib/gtkada/gtk-progress_bar.ali
 lib/gtkada/gtk-radio_button.ali
 lib/gtkada/gtk-radio_menu_item.ali
-lib/gtkada/gtk-radio_tool_button.ali
 lib/gtkada/gtk-rc.ali
 lib/gtkada/gtk-ruler.ali
 lib/gtkada/gtk-scale.ali
@@ -620,8 +553,6 @@ lib/gtkada/gtk-scrolled_window.ali
 lib/gtkada/gtk-selection.ali
 lib/gtkada/gtk-separator.ali
 lib/gtkada/gtk-separator_menu_item.ali
-lib/gtkada/gtk-separator_tool_item.ali
-lib/gtkada/gtk-settings.ali
 lib/gtkada/gtk-size_group.ali
 lib/gtkada/gtk-socket.ali
 lib/gtkada/gtk-spin_button.ali
@@ -641,16 +572,11 @@ lib/gtkada/gtk-text_tag_table.ali
 lib/gtkada/gtk-text_view.ali
 lib/gtkada/gtk-tips_query.ali
 lib/gtkada/gtk-toggle_button.ali
-lib/gtkada/gtk-toggle_tool_button.ali
-lib/gtkada/gtk-tool_button.ali
-lib/gtkada/gtk-tool_item.ali
 lib/gtkada/gtk-toolbar.ali
 lib/gtkada/gtk-tooltips.ali
 lib/gtkada/gtk-tree_model.ali
-lib/gtkada/gtk-tree_model_filter.ali
 lib/gtkada/gtk-tree_model_sort.ali
 lib/gtkada/gtk-tree_selection.ali
-lib/gtkada/gtk-tree_sortable.ali
 lib/gtkada/gtk-tree_store.ali
 lib/gtkada/gtk-tree_view.ali
 lib/gtkada/gtk-tree_view_column.ali
@@ -670,13 +596,13 @@ lib/gtkada/gtkada-multi_paned.ali
 lib/gtkada/gtkada-pixmaps.ali
 lib/gtkada/gtkada-types.ali
 lib/gtkada/gtkada.ali
-lib/gtkada/libgtkada-2.8.so.1
+lib/gtkada/libgtkada-2.4.so.2
 lib/gtkada/libgtkada.a
 lib/gtkada/libgtkada.so
-lib/gtkada/libgtkada_gl-2.8.so.1
+lib/gtkada/libgtkada_gl-2.4.so.2
 lib/gtkada/libgtkada_gl.a
 lib/gtkada/libgtkada_gl.so
-lib/gtkada/libgtkada_glade-2.8.so.1
+lib/gtkada/libgtkada_glade-2.4.so.2
 lib/gtkada/libgtkada_glade.a
 lib/gtkada/libgtkada_glade.so
 lib/gtkada/pango-attributes.ali
@@ -686,23 +612,180 @@ lib/gtkada/pango-font.ali
 lib/gtkada/pango-layout.ali
 lib/gtkada/pango-tabs.ali
 lib/gtkada/pango.ali
-lib/libgtkada-2.8.so.1
+lib/libgtkada-2.4.so.2
 lib/libgtkada.so
-lib/libgtkada_gl-2.8.so.1
+lib/libgtkada_gl-2.4.so.2
 lib/libgtkada_gl.so
-lib/libgtkada_glade-2.8.so.1
+lib/libgtkada_glade-2.4.so.2
 lib/libgtkada_glade.so
 libdata/pkgconfig/gtkada.pc
-%%DOCSDIR%%/gtkada_rm/checkbutton.jpg
-%%DOCSDIR%%/gtkada_rm/font.jpg
-%%DOCSDIR%%/gtkada_rm/gtkada_rm.texi
-%%DOCSDIR%%/gtkada_rm/texinfo.tex
-%%DOCSDIR%%/gtkada_rm/togglebutton.jpg
-%%DOCSDIR%%/gtkada_ug/boxes.gif
-%%DOCSDIR%%/gtkada_ug/gtkada_ug.texi
-%%DOCSDIR%%/gtkada_ug/hierarchy.jpg
-%%DOCSDIR%%/gtkada_ug/hierarchy.txt
-%%DOCSDIR%%/gtkada_ug/texinfo.tex
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Index.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fCanvas_005fLink.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGObject.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGdk.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGdk_002eBitmap.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGdk_002eColor.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGdk_002eCursor.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGdk_002eDrawable.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGdk_002eEvent.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGdk_002eFont.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGdk_002eGC.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGdk_002eMain.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGdk_002ePixbuf.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGdk_002ePixmap.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGdk_002eRgb.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGdk_002eThreads.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlade.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlade_002eXML.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlade_005fXML.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib_002eConvert.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib_002eError.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib_002eGSlist.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib_002eGeneric_005fProperties.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib_002eGlist.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib_002eMessages.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib_002eModule.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib_002eObject.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib_002eProperties.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib_002eProperties_002eCreation.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib_002eType_005fConversion_005fHooks.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib_002eUnicode.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib_002eValues.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGlib_002eXML.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eAccel_005fLabel.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eAdjustment.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eAlignment.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eArguments.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eArrow.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eAspect_005fFrame.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eBin.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eBox.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eButton.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eButton_005fBox.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eCalendar.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eCheck_005fButton.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eCheck_005fMenu_005fItem.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eClist.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eColor_005fSelection.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eColor_005fSelection_005fDialog.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eCombo.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eContainer.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eCtree.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eCurve.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eDialog.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eDnd.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eDrawing_005fArea.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eEditable.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eEvent_005fBox.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002eBorder_005fCombo.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002eColor_005fCombo.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002eCombo_005fBox.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002eFont_005fCombo.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002eItem_005fEntry.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002ePlot.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002ePlot_005f3D.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002ePlot_005fBar.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002ePlot_005fBox.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002ePlot_005fCanvas.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002ePlot_005fData.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002ePlot_005fPolar.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002ePlot_005fPs.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002ePlot_005fSurface.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eExtra_002eSheet.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eFile_005fSelection.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eFixed.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eFont_005fSelection.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eFont_005fSelection_005fDialog.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eFrame.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eGEntry.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eGLArea.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eGRange.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eGamma_005fCurve.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eGrange.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eHandle_005fBox.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eHandlers.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eHbutton_005fBox.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eImage.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eImage_005fMenu_005fItem.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eItem.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eLabel.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eLayout.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eMain.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eMarshallers.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eMenu.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eMenu_005fBar.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eMenu_005fItem.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eMenu_005fShell.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eMisc.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eNotebook.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eObject.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eOld_005fEditable.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eOption_005fMenu.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002ePaned.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002ePlug.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eProgress.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eProgress_005fBar.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eRadio_005fButton.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eScrolled_005fWindow.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eSelection.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eSeparator_005fMenu_005fItem.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eSize_005fGroup.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eSocket.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eSpin_005fButton.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eStatus_005fBar.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eStock.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eTable.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eText.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eText_005fAttributes.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eText_005fBuffer.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eText_005fIter.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eText_005fMark.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eText_005fTag.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eText_005fTag_005fTable.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eText_005fView.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eToggle_005fButton.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eToolbar.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eTooltips.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eTree_005fModel.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eTree_005fStore.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eTree_005fView.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eTree_005fView_005fColumn.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eType_005fConversion.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eVbutton_005fBox.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eWidget.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtk_002eWindow.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtkada.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtkada_002eCanvas.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtkada_002eDialogs.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtkada_002eFile_005fSelection.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtkada_002eHandlers.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtkada_002eIntl.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtkada_002ePixmaps.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fGtkada_002eTypes.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fPango.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fPango_002eAttributes.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fPango_002eFont.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fPango_002eLayout.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/Package_005fPango_005fLayout.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/checkbutton.jpg
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/font.jpg
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.ps
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/gtkada_rm.texi
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/index.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/texinfo.tex
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_rm/togglebutton.jpg
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/boxes.gif
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/gtkada_ug.html
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/gtkada_ug.info
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/gtkada_ug.ps
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/gtkada_ug.texi
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/gtkada_ug.txt
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/hierarchy.jpg
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/hierarchy.txt
+%%PORTDOCS%%%%DOCSDIR%%/gtkada_ug/texinfo.tex
 %%EXAMPLESDIR%%/base_widget/Makefile
 %%EXAMPLESDIR%%/base_widget/README
 %%EXAMPLESDIR%%/base_widget/main.adb
@@ -744,6 +827,28 @@ libdata/pkgconfig/gtkada.pc
 %%EXAMPLESDIR%%/dynamic_cast/Makefile
 %%EXAMPLESDIR%%/dynamic_cast/README
 %%EXAMPLESDIR%%/dynamic_cast/dynamic.adb
+%%EXAMPLESDIR%%/editor/Makefile
+%%EXAMPLESDIR%%/editor/README
+%%EXAMPLESDIR%%/editor/about_dialog_pkg-callbacks.adb
+%%EXAMPLESDIR%%/editor/about_dialog_pkg-callbacks.ads
+%%EXAMPLESDIR%%/editor/about_dialog_pkg.adb
+%%EXAMPLESDIR%%/editor/about_dialog_pkg.ads
+%%EXAMPLESDIR%%/editor/callbacks_gladeedit.ads
+%%EXAMPLESDIR%%/editor/file_utils.adb
+%%EXAMPLESDIR%%/editor/file_utils.ads
+%%EXAMPLESDIR%%/editor/gladeedit.adb
+%%EXAMPLESDIR%%/editor/main_window_pkg-callbacks.adb
+%%EXAMPLESDIR%%/editor/main_window_pkg-callbacks.ads
+%%EXAMPLESDIR%%/editor/main_window_pkg.adb
+%%EXAMPLESDIR%%/editor/main_window_pkg.ads
+%%EXAMPLESDIR%%/editor/open_file_selection_pkg-callbacks.adb
+%%EXAMPLESDIR%%/editor/open_file_selection_pkg-callbacks.ads
+%%EXAMPLESDIR%%/editor/open_file_selection_pkg.adb
+%%EXAMPLESDIR%%/editor/open_file_selection_pkg.ads
+%%EXAMPLESDIR%%/editor/save_file_selection_pkg-callbacks.adb
+%%EXAMPLESDIR%%/editor/save_file_selection_pkg-callbacks.ads
+%%EXAMPLESDIR%%/editor/save_file_selection_pkg.adb
+%%EXAMPLESDIR%%/editor/save_file_selection_pkg.ads
 %%EXAMPLESDIR%%/gtk_examples/Makefile
 %%EXAMPLESDIR%%/gtk_examples/README
 %%EXAMPLESDIR%%/gtk_examples/scribble.adb
@@ -788,18 +893,12 @@ libdata/pkgconfig/gtkada.pc
 %%EXAMPLESDIR%%/testgtk/create_calendar.ads
 %%EXAMPLESDIR%%/testgtk/create_canvas.adb
 %%EXAMPLESDIR%%/testgtk/create_canvas.ads
-%%EXAMPLESDIR%%/testgtk/create_cell_view.adb
-%%EXAMPLESDIR%%/testgtk/create_cell_view.ads
 %%EXAMPLESDIR%%/testgtk/create_check_buttons.adb
 %%EXAMPLESDIR%%/testgtk/create_check_buttons.ads
-%%EXAMPLESDIR%%/testgtk/create_clipboard.adb
-%%EXAMPLESDIR%%/testgtk/create_clipboard.ads
 %%EXAMPLESDIR%%/testgtk/create_clist.adb
 %%EXAMPLESDIR%%/testgtk/create_clist.ads
 %%EXAMPLESDIR%%/testgtk/create_color_selection.adb
 %%EXAMPLESDIR%%/testgtk/create_color_selection.ads
-%%EXAMPLESDIR%%/testgtk/create_combo_box.adb
-%%EXAMPLESDIR%%/testgtk/create_combo_box.ads
 %%EXAMPLESDIR%%/testgtk/create_ctree.adb
 %%EXAMPLESDIR%%/testgtk/create_ctree.ads
 %%EXAMPLESDIR%%/testgtk/create_cursors.adb
@@ -876,8 +975,6 @@ libdata/pkgconfig/gtkada.pc
 %%EXAMPLESDIR%%/testgtk/create_sheet.ads
 %%EXAMPLESDIR%%/testgtk/create_size_groups.adb
 %%EXAMPLESDIR%%/testgtk/create_size_groups.ads
-%%EXAMPLESDIR%%/testgtk/create_sources.adb
-%%EXAMPLESDIR%%/testgtk/create_sources.ads
 %%EXAMPLESDIR%%/testgtk/create_spin.adb
 %%EXAMPLESDIR%%/testgtk/create_spin.ads
 %%EXAMPLESDIR%%/testgtk/create_splittable.adb
@@ -898,8 +995,6 @@ libdata/pkgconfig/gtkada.pc
 %%EXAMPLESDIR%%/testgtk/create_tooltips.ads
 %%EXAMPLESDIR%%/testgtk/create_tree.adb
 %%EXAMPLESDIR%%/testgtk/create_tree.ads
-%%EXAMPLESDIR%%/testgtk/create_tree_filter.adb
-%%EXAMPLESDIR%%/testgtk/create_tree_filter.ads
 %%EXAMPLESDIR%%/testgtk/create_tree_view.adb
 %%EXAMPLESDIR%%/testgtk/create_tree_view.ads
 %%EXAMPLESDIR%%/testgtk/dancing-penguin.gif
@@ -980,16 +1075,18 @@ share/gps/plug-ins/gtkada.xml
 @dirrm %%EXAMPLESDIR%%/powergnu
 @dirrm %%EXAMPLESDIR%%/handlers
 @dirrm %%EXAMPLESDIR%%/gtk_examples
+@dirrm %%EXAMPLESDIR%%/editor
 @dirrm %%EXAMPLESDIR%%/dynamic_cast
 @dirrm %%EXAMPLESDIR%%/doublebuffer
 @dirrm %%EXAMPLESDIR%%/documentation
 @dirrm %%EXAMPLESDIR%%/composite_widget
 @dirrm %%EXAMPLESDIR%%/calendar_combo
 @dirrm %%EXAMPLESDIR%%/base_widget
-@dirrm %%EXAMPLESDIR%%/
-@dirrm %%DOCSDIR%%/gtkada_ug
-@dirrm %%DOCSDIR%%/gtkada_rm
-@dirrm %%DOCSDIR%%
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/gtkada_ug
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/gtkada_rm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm libdata/pkgconfig
 @dirrm lib/gtkada
 @dirrm lib/gnat/gtkada
 @dirrm lib/gnat