Update to 0.3.5. Unfortunately it is another victim of larger compatibility

problem with some of the core GNOME components (vfs, oaf or bonobo I guess), so
similarly to Evolution and Nautilus it hangs solidly at startup right after
displaying fine splash screen. :((

27 files changed, 326 insertions, 245 deletions

diff --git a/devel/gide/Makefile b/devel/gide/Makefile
index 04eb0025e6e5..e314cd771224 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -6,24 +6,28 @@
 #
 
 PORTNAME=	gide
-PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTVERSION=	0.3.5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gIDE
 
 MAINTAINER=	gnome@FreeBSD.org
 
+BUILD_DEPENDS=	xml-i18n-update:${PORTSDIR}/textproc/xml-i18-tools
+LIB_DEPENDS=	gdl.0:${PORTSDIR}/x11-toolkits/gdl \
+		gbf.0:${PORTSDIR}/devel/gnomebuild \
+		gdf.0:${PORTSDIR}/devel/gnomedebug
+
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
 USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		gide.1 gdbio.1
-
-PLIST_SUB=	VERSION=${PORTVERSION}
+MAN1=		gide.1
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
@@ -36,4 +40,7 @@ pre-patch:
 	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/*.c
 	@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/src/*.c
 
+pre-configure:
+	@${LN} -sf ${LOCALBASE}/share/xml-i18n-tools/*.in ${WRKSRC}
+
 .include <bsd.port.mk>
diff --git a/devel/gide/distinfo b/devel/gide/distinfo
index b39b999e10aa..85bd82cb56b3 100644
--- a/devel/gide/distinfo
+++ b/devel/gide/distinfo
@@ -1 +1 @@
-MD5 (gide-0.3.0.tar.gz) = b7195eef0c3155ed239adef252428ffc
+MD5 (gide-0.3.5.tar.bz2) = 1f0d5a8233022610007abe4b673ddc62
diff --git a/devel/gide/files/patch-ar b/devel/gide/files/patch-ar
deleted file mode 100644
index 79b91fa8b1d6..000000000000
--- a/devel/gide/files/patch-ar
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/gide.c.orig	Sun Feb 27 00:59:52 2000
-+++ src/gide.c	Sun Apr  2 02:51:26 2000
-@@ -223,7 +223,7 @@
- 
- 	cfg->fontname = (gchar *) realloc( cfg->fontname, 100 );
- 
--	strcpy( cfg->fontname, "-dec-terminal-medium-r-normal-*-*-140-*-*-c-*-iso8859-1" );
-+	strcpy( cfg->fontname, "-dec-terminal-medium-r-normal-*-*-140-*-*-c-*-iso8859-1,*" );
- /*	cfg->font = NULL;*/
- 	cfg->disable_font_stuff = FALSE;
- 	cfg->bgcol = NULL;
-@@ -260,16 +260,16 @@
- 
- 	cfg->tab_width = 4;
- 	cfg->incpath = (gchar *) realloc( cfg->incpath, 40 );
--	strcpy( cfg->incpath, "/usr/include:/usr/local/include" );
-+	strcpy( cfg->incpath, "/usr/include:%%LOCALBASE%%/include:%%X11BASE%%/include" );
- 	cfg->ccopt = (gchar *) realloc( cfg->ccopt, 2 );
- 	strcpy( cfg->ccopt, "" );
- 	cfg->libpath = (gchar *) realloc( cfg->libpath, 40 );
--	strcpy( cfg->libpath, "/lib:/usr/lib:/usr/local/lib" );
-+	strcpy( cfg->libpath, "/lib:/usr/lib:%%LOCALBASE%%/lib:%%X11BASE%%/lib" );
- 	cfg->ldopt = (gchar *) realloc( cfg->ldopt, 2 );
- 	strcpy( cfg->ldopt, "" );
- 
- 	cfg->bash = (gchar *) realloc( cfg->bash, 20 );
--	strcpy( cfg->bash, "/bin/bash" );
-+	strcpy( cfg->bash, "/bin/sh" );
- 
- 	cfg->xterm = (gchar *) realloc( cfg->xterm, 10 );
- 	strcpy( cfg->xterm, "xterm" );
-@@ -298,7 +298,7 @@
- 	}
- 	cfg->style = gtk_style_new();
- 	gdk_font_unref( cfg->style->font );
--	cfg->style->font = gdk_font_load( cfg->fontname );
-+	cfg->style->font = gdk_fontset_load( cfg->fontname );
- /*	if( !cfg->style->font )
- 	{
- 		strcpy( cfg->fontname, "default font???" );
-@@ -419,7 +419,7 @@
- 		}
- 		cfg->style = gtk_style_new();
- 		gdk_font_unref( cfg->style->font );
--		if( (new_font = gdk_font_load( cfg->fontname )) )
-+		if( (new_font = gdk_fontset_load( cfg->fontname )) )
- 		{
- 			cfg->style->font = new_font;
- 		}
diff --git a/devel/gide/files/patch-aw b/devel/gide/files/patch-aw
deleted file mode 100644
index 8f6dbb7ac9cd..000000000000
--- a/devel/gide/files/patch-aw
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/GtkEditor/gtkeditor/gtkeditor-regex.h.orig	Mon Oct 11 09:49:57 1999
-+++ src/GtkEditor/gtkeditor/gtkeditor-regex.h	Mon Feb 28 01:35:42 2000
-@@ -24,7 +24,11 @@
- #define GTKEDITOR_REGEX_H
- 
- #include <sys/types.h>
-+#ifdef __FreeBSD__
-+#include <gnuregex.h>
-+#else
- #include <regex.h>
-+#endif
- #include <string.h>
- 
- #include <gtk/gtk.h>
diff --git a/devel/gide/files/patch-ax b/devel/gide/files/patch-ax
deleted file mode 100644
index 5fe455eb0242..000000000000
--- a/devel/gide/files/patch-ax
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/GtkEditor/gtkeditor/gtkhint.c.orig	Mon Dec  6 01:40:45 1999
-+++ src/GtkEditor/gtkeditor/gtkhint.c	Mon Feb 28 01:41:00 2000
-@@ -31,7 +31,11 @@
- #include <gtk/gtktext.h>
- 
- #include "gtkeditor.h"
-+#ifdef __FreeBSD__
-+#include <gnuregex.h>
-+#else
- #include "regex.h"
-+#endif
- #include "gtkhint.h"
- 
- 
diff --git a/devel/gide/files/patch-ay b/devel/gide/files/patch-ay
deleted file mode 100644
index d1dd3f524650..000000000000
--- a/devel/gide/files/patch-ay
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/GtkEditor/gtkeditor/internal.h.orig	Mon Oct 11 09:49:57 1999
-+++ src/GtkEditor/gtkeditor/internal.h	Mon Feb 28 01:33:16 2000
-@@ -24,7 +24,11 @@
- #define INTERNAL_H
- 
- #include <sys/types.h>
-+#ifdef __FreeBSD__
-+#include <gnuregex.h>
-+#else
- #include <regex.h>
-+#endif
- 
- #include "gtkeditor.h"
- #include "syntaxtable.h"
diff --git a/devel/gide/files/patch-az b/devel/gide/files/patch-az
deleted file mode 100644
index 5daacf81368e..000000000000
--- a/devel/gide/files/patch-az
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/gI_help.c.orig	Sun Apr  2 02:47:20 2000
-+++ src/gI_help.c	Sun Apr  2 02:52:39 2000
-@@ -370,8 +370,8 @@
- 
- 		/* FIXME: We should let the user select which font they want */
- 
--		normal = gdk_font_load ("-misc-fixed-medium-r-normal-*-*-120-*-*-c-*-iso8859-1");
--		bold = gdk_font_load ("-misc-fixed-bold-r-normal-*-*-120-*-*-c-*-iso8859-1");
-+		normal = gdk_fontset_load ("-misc-fixed-medium-r-normal-*-*-120-*-*-c-*-iso8859-1,*");
-+		bold = gdk_fontset_load ("-misc-fixed-bold-r-normal-*-*-120-*-*-c-*-iso8859-1,*");
- 
- 		hbox_man_ctrls = gtk_hbox_new( FALSE, 4 );
- 		gtk_container_add( GTK_CONTAINER( vbox_main ), hbox_man_ctrls );
diff --git a/devel/gide/files/patch-ba b/devel/gide/files/patch-ba
deleted file mode 100644
index 22c29a34ccca..000000000000
--- a/devel/gide/files/patch-ba
+++ /dev/null
@@ -1,20 +0,0 @@
---- extra/gide.scm.orig	Tue Dec  7 03:32:32 1999
-+++ extra/gide.scm	Sun Apr  2 02:53:52 2000
-@@ -23,7 +23,7 @@
- (define tmpdir "/tmp")
- 
- ;; Editor
--(define fontname "-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1")
-+(define fontname "-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1,*")
- (define disable_font #f)
- (define wordwrap #t)
- (define autosave #f)
-@@ -40,7 +40,7 @@
- (define toolbar-custom #f)
- (define toolbar-custom-list
- 	'())
--(define bash "/bin/bash")
-+(define bash "/bin/sh")
- (define xterm "xterm")
- 
- ;; Projects
diff --git a/devel/gide/files/patch-bb b/devel/gide/files/patch-bb
deleted file mode 100644
index dc537e6b474f..000000000000
--- a/devel/gide/files/patch-bb
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	Fri May 12 16:14:47 2000
-+++ configure	Wed May 17 09:36:16 2000
-@@ -2238,8 +2238,9 @@
- #define WITH_REGEX 1
- EOF
- 
--  echo $ac_n "checking for GNU regex in libc""... $ac_c" 1>&6
--echo "configure:2243: checking for GNU regex in libc" >&5
-+LIBS="$LIBS -lgnuregex"
-+  echo $ac_n "checking for GNU regex in libgnuregex""... $ac_c" 1>&6
-+echo "configure:2243: checking for GNU regex in libgnuregex" >&5
- if eval "test \"`echo '$''{'am_cv_gnu_regex'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
diff --git a/devel/gide/files/patch-bc b/devel/gide/files/patch-bc
deleted file mode 100644
index f57ce5ac4dfb..000000000000
--- a/devel/gide/files/patch-bc
+++ /dev/null
@@ -1,66 +0,0 @@
---- plugins/asciitable/Makefile.in.orig	Sun May 14 10:11:31 2000
-+++ plugins/asciitable/Makefile.in	Tue Jun 13 17:35:48 2000
-@@ -157,7 +157,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libgide_asciitable_la_LDFLAGS = 
-+libgide_asciitable_la_LDFLAGS = -avoid-version
- libgide_asciitable_la_LIBADD = 
- libgide_asciitable_la_OBJECTS =  plugin_asciitable.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
---- plugins/browser/Makefile.in.orig	Sun May 14 10:11:35 2000
-+++ plugins/browser/Makefile.in	Tue Jun 13 17:35:54 2000
-@@ -163,7 +163,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libgide_browser_la_LDFLAGS = 
-+libgide_browser_la_LDFLAGS = -avoid-version
- libgide_browser_la_DEPENDENCIES =  GtkSCB/libGtkSCB.la
- libgide_browser_la_OBJECTS =  plugin_browser.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
---- plugins/calculator/Makefile.in.orig	Sun May 14 10:11:33 2000
-+++ plugins/calculator/Makefile.in	Tue Jun 13 17:36:01 2000
-@@ -157,7 +157,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libgide_calculator_la_LDFLAGS = 
-+libgide_calculator_la_LDFLAGS = -avoid-version
- libgide_calculator_la_LIBADD = 
- libgide_calculator_la_OBJECTS =  plugin_calculator.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
---- plugins/docstat/Makefile.in.orig	Sun May 14 10:11:34 2000
-+++ plugins/docstat/Makefile.in	Tue Jun 13 17:36:08 2000
-@@ -157,7 +157,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libgide_docstat_la_LDFLAGS = 
-+libgide_docstat_la_LDFLAGS = -avoid-version
- libgide_docstat_la_LIBADD = 
- libgide_docstat_la_OBJECTS =  plugin_docstat.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
---- plugins/sample/Makefile.in.orig	Sun May 14 10:11:29 2000
-+++ plugins/sample/Makefile.in	Tue Jun 13 17:36:15 2000
-@@ -163,7 +163,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libgide_sample_la_LDFLAGS = 
-+libgide_sample_la_LDFLAGS = -avoid-version
- libgide_sample_la_LIBADD = 
- libgide_sample_la_OBJECTS =  plugin-sample.lo
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
---- plugins/text/Makefile.in.orig	Sun May 14 10:11:32 2000
-+++ plugins/text/Makefile.in	Tue Jun 13 17:36:23 2000
-@@ -158,7 +158,7 @@
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
--libgide_text_la_LDFLAGS = 
-+libgide_text_la_LDFLAGS = -avoid-version
- libgide_text_la_LIBADD = 
- libgide_text_la_OBJECTS =  plugin_text.lo plugin_text_insert.lo \
- plugin_text_delete.lo plugin_text_replace.lo
diff --git a/devel/gide/files/patch-bd b/devel/gide/files/patch-bd
deleted file mode 100644
index a9b15c4b0390..000000000000
--- a/devel/gide/files/patch-bd
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Sun May 14 10:11:41 2000
-+++ src/Makefile.in	Tue Jun 13 17:33:29 2000
-@@ -161,7 +161,7 @@
- 
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lgnuregex
- gide_OBJECTS =  gI_about.o gI_cfp.o gI_compile.o gI_document.o gI_edit.o \
- gI_file.o gI_files.o gI_functions.o gI_help.o gI_menus.o gI_prefs.o \
- gI_project.o gI_search.o gI_tools.o gI_run.o gI_tree.o gI_window.o \
diff --git a/devel/gide/files/patch-plugins::asciitable::Makefile.in b/devel/gide/files/patch-plugins::asciitable::Makefile.in
new file mode 100644
index 000000000000..0f351a345c3c
--- /dev/null
+++ b/devel/gide/files/patch-plugins::asciitable::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/asciitable/Makefile.in	2001/07/24 10:42:10	1.1
++++ plugins/asciitable/Makefile.in	2001/07/24 10:42:42
+@@ -159,7 +159,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_asciitable_la_LDFLAGS = 
++libgide_asciitable_la_LDFLAGS = -avoid-version
+ libgide_asciitable_la_DEPENDENCIES = 
+ libgide_asciitable_la_OBJECTS =  asciitable-tool.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gide/files/patch-plugins::calculator::Makefile.in b/devel/gide/files/patch-plugins::calculator::Makefile.in
new file mode 100644
index 000000000000..43bfb723f60f
--- /dev/null
+++ b/devel/gide/files/patch-plugins::calculator::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/calculator/Makefile.in	2001/07/24 10:42:10	1.1
++++ plugins/calculator/Makefile.in	2001/07/24 10:42:46
+@@ -159,7 +159,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_calculator_la_LDFLAGS = 
++libgide_calculator_la_LDFLAGS = -avoid-version
+ libgide_calculator_la_DEPENDENCIES = 
+ libgide_calculator_la_OBJECTS =  calculator-tool.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gide/files/patch-plugins::debugger::Makefile.in b/devel/gide/files/patch-plugins::debugger::Makefile.in
new file mode 100644
index 000000000000..731e9c450d8a
--- /dev/null
+++ b/devel/gide/files/patch-plugins::debugger::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/debugger/Makefile.in	2001/07/24 10:42:10	1.1
++++ plugins/debugger/Makefile.in	2001/07/24 10:42:49
+@@ -162,7 +162,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_debugger_la_LDFLAGS = 
++libgide_debugger_la_LDFLAGS = -avoid-version
+ libgide_debugger_la_DEPENDENCIES = 
+ libgide_debugger_la_OBJECTS =  debugger-tool.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gide/files/patch-plugins::docstat::Makefile.in b/devel/gide/files/patch-plugins::docstat::Makefile.in
new file mode 100644
index 000000000000..7e931cbe49bf
--- /dev/null
+++ b/devel/gide/files/patch-plugins::docstat::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/docstat/Makefile.in	2001/07/24 10:42:10	1.1
++++ plugins/docstat/Makefile.in	2001/07/24 10:42:52
+@@ -159,7 +159,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_docstat_la_LDFLAGS = 
++libgide_docstat_la_LDFLAGS = -avoid-version
+ libgide_docstat_la_DEPENDENCIES = 
+ libgide_docstat_la_OBJECTS =  docstat-tool.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gide/files/patch-plugins::document-manager::Makefile.in b/devel/gide/files/patch-plugins::document-manager::Makefile.in
new file mode 100644
index 000000000000..5dbde8e151c6
--- /dev/null
+++ b/devel/gide/files/patch-plugins::document-manager::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/document-manager/Makefile.in	2001/07/24 10:42:10	1.1
++++ plugins/document-manager/Makefile.in	2001/07/24 10:42:55
+@@ -163,7 +163,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_docman_la_LDFLAGS = 
++libgide_docman_la_LDFLAGS = -avoid-version
+ libgide_docman_la_DEPENDENCIES = 
+ libgide_docman_la_OBJECTS =  document-manager-tool.lo file-ops.lo \
+ gide-document.lo gide-document-obj.lo gide-document-manager.lo \
diff --git a/devel/gide/files/patch-plugins::evo-mail::Makefile.in b/devel/gide/files/patch-plugins::evo-mail::Makefile.in
new file mode 100644
index 000000000000..af7950a119d7
--- /dev/null
+++ b/devel/gide/files/patch-plugins::evo-mail::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/evo-mail/Makefile.in	2001/07/24 10:42:10	1.1
++++ plugins/evo-mail/Makefile.in	2001/07/24 10:42:58
+@@ -166,7 +166,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_mail_la_LDFLAGS = 
++libgide_mail_la_LDFLAGS = -avoid-version
+ libgide_mail_la_DEPENDENCIES = 
+ libgide_mail_la_OBJECTS =  Evolution-Composer-common.lo \
+ Evolution-Composer-stubs.lo Evolution-Composer-skels.lo mail-tool.lo
diff --git a/devel/gide/files/patch-plugins::files::Makefile.in b/devel/gide/files/patch-plugins::files::Makefile.in
new file mode 100644
index 000000000000..1af8aab2a3d8
--- /dev/null
+++ b/devel/gide/files/patch-plugins::files::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/files/Makefile.in	2001/07/24 10:42:10	1.1
++++ plugins/files/Makefile.in	2001/07/24 10:43:02
+@@ -160,7 +160,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_files_la_LDFLAGS = 
++libgide_files_la_LDFLAGS = -avoid-version
+ libgide_files_la_DEPENDENCIES = 
+ libgide_files_la_OBJECTS =  files-tool.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gide/files/patch-plugins::functions::Makefile.in b/devel/gide/files/patch-plugins::functions::Makefile.in
new file mode 100644
index 000000000000..99d13a115978
--- /dev/null
+++ b/devel/gide/files/patch-plugins::functions::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/functions/Makefile.in	2001/07/24 10:42:10	1.1
++++ plugins/functions/Makefile.in	2001/07/24 10:43:05
+@@ -159,7 +159,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_functions_la_LDFLAGS = 
++libgide_functions_la_LDFLAGS = -avoid-version
+ libgide_functions_la_DEPENDENCIES = 
+ libgide_functions_la_OBJECTS =  functions-tool.lo functions.lo parser.lo \
+ protogen.lo tree.lo
diff --git a/devel/gide/files/patch-plugins::help::Makefile.in b/devel/gide/files/patch-plugins::help::Makefile.in
new file mode 100644
index 000000000000..9632246985a8
--- /dev/null
+++ b/devel/gide/files/patch-plugins::help::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/help/Makefile.in	2001/07/24 10:42:10	1.1
++++ plugins/help/Makefile.in	2001/07/24 10:43:08
+@@ -162,7 +162,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_help_la_LDFLAGS = 
++libgide_help_la_LDFLAGS = -avoid-version
+ libgide_help_la_DEPENDENCIES = 
+ libgide_help_la_OBJECTS =  help-tool.lo help.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gide/files/patch-plugins::help::help.c b/devel/gide/files/patch-plugins::help::help.c
new file mode 100644
index 000000000000..bb3e72eacc41
--- /dev/null
+++ b/devel/gide/files/patch-plugins::help::help.c
@@ -0,0 +1,46 @@
+
+$FreeBSD$
+
+--- plugins/help/help.c	2001/07/24 10:39:13	1.1
++++ plugins/help/help.c	2001/07/24 10:40:24
+@@ -112,8 +112,8 @@
+ 		gtk_text_forward_delete(GTK_TEXT(text_widget),
+ 			gtk_text_get_length(GTK_TEXT(text_widget)));
+ 		/* FIXME: need to free the font */
+-		bold = gdk_font_load(
+-			"-misc-fixed-bold-r-normal-*-*-120-*-*-c-*-iso8859-1");
++		bold = gdk_fontset_load(
++			"-misc-fixed-bold-r-normal-*-*-120-*-*-c-*-iso8859-1,*");
+ 		gtk_text_insert(GTK_TEXT(text_widget), bold,
+ 			&text_widget->style->black, NULL,
+ 			_("You need to select a section first") , -1);
+@@ -207,10 +207,10 @@
+ 	g_return_if_fail(GTK_IS_TEXT(text_widget));
+ 
+ 	/* FIXME: We should let the user select which font they want */
+-	normal = gdk_font_load(
+-		"-misc-fixed-medium-r-normal-*-*-120-*-*-c-*-iso8859-1");
+-	bold = gdk_font_load(
+-		"-misc-fixed-bold-r-normal-*-*-120-*-*-c-*-iso8859-1");
++	normal = gdk_fontset_load(
++		"-misc-fixed-medium-r-normal-*-*-120-*-*-c-*-iso8859-1,*");
++	bold = gdk_fontset_load(
++		"-misc-fixed-bold-r-normal-*-*-120-*-*-c-*-iso8859-1,*");
+ 
+ 	fp = popen(cmdstr, "r");
+ 	g_return_if_fail(fp);
+@@ -307,10 +307,10 @@
+ 	g_return_if_fail(GTK_IS_TEXT(text_widget));
+ 
+ 	/* FIXME: We should let the user select which font they want */
+-	normal = gdk_font_load(
+-		"-misc-fixed-medium-r-normal-*-*-120-*-*-c-*-iso8859-1");
+-	bold = gdk_font_load(
+-		"-misc-fixed-bold-r-normal-*-*-120-*-*-c-*-iso8859-1");
++	normal = gdk_fontset_load(
++		"-misc-fixed-medium-r-normal-*-*-120-*-*-c-*-iso8859-1,*");
++	bold = gdk_fontset_load(
++		"-misc-fixed-bold-r-normal-*-*-120-*-*-c-*-iso8859-1,*");
+ 
+ 	fp = popen(cmdstr, "r");
+ 	g_return_if_fail(fp);
diff --git a/devel/gide/files/patch-plugins::mail::Makefile.in b/devel/gide/files/patch-plugins::mail::Makefile.in
new file mode 100644
index 000000000000..290b183d4f7f
--- /dev/null
+++ b/devel/gide/files/patch-plugins::mail::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/mail/Makefile.in	2001/07/24 10:42:10	1.1
++++ plugins/mail/Makefile.in	2001/07/24 10:43:10
+@@ -159,7 +159,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_mail_la_LDFLAGS = 
++libgide_mail_la_LDFLAGS = -avoid-version
+ libgide_mail_la_DEPENDENCIES = 
+ libgide_mail_la_OBJECTS =  mail-tool.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gide/files/patch-plugins::project-manager::Makefile.in b/devel/gide/files/patch-plugins::project-manager::Makefile.in
new file mode 100644
index 000000000000..8d6e41cf3f93
--- /dev/null
+++ b/devel/gide/files/patch-plugins::project-manager::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/project-manager/Makefile.in	2001/07/24 10:42:10	1.1
++++ plugins/project-manager/Makefile.in	2001/07/24 10:43:13
+@@ -165,7 +165,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_project_la_LDFLAGS = 
++libgide_project_la_LDFLAGS = -avoid-version
+ libgide_project_la_DEPENDENCIES = 
+ libgide_project_la_OBJECTS =  project-tool.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gide/files/patch-plugins::sample::Makefile.in b/devel/gide/files/patch-plugins::sample::Makefile.in
new file mode 100644
index 000000000000..8d56a5f66b9e
--- /dev/null
+++ b/devel/gide/files/patch-plugins::sample::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/sample/Makefile.in	2001/07/24 10:42:10	1.1
++++ plugins/sample/Makefile.in	2001/07/24 10:43:15
+@@ -162,7 +162,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_sample_la_LDFLAGS = 
++libgide_sample_la_LDFLAGS = -avoid-version
+ libgide_sample_la_DEPENDENCIES = 
+ libgide_sample_la_OBJECTS =  sample-tool.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gide/files/patch-plugins::swapch::Makefile.in b/devel/gide/files/patch-plugins::swapch::Makefile.in
new file mode 100644
index 000000000000..aaddbc79b0dc
--- /dev/null
+++ b/devel/gide/files/patch-plugins::swapch::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/swapch/Makefile.in	2001/07/24 10:42:10	1.1
++++ plugins/swapch/Makefile.in	2001/07/24 10:43:18
+@@ -159,7 +159,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_swapch_la_LDFLAGS = 
++libgide_swapch_la_LDFLAGS = -avoid-version
+ libgide_swapch_la_DEPENDENCIES = 
+ libgide_swapch_la_OBJECTS =  swapch-tool.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/gide/files/patch-plugins::text::Makefile.in b/devel/gide/files/patch-plugins::text::Makefile.in
new file mode 100644
index 000000000000..91413e5abc35
--- /dev/null
+++ b/devel/gide/files/patch-plugins::text::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- plugins/text/Makefile.in	2001/07/24 10:42:10	1.1
++++ plugins/text/Makefile.in	2001/07/24 10:43:21
+@@ -159,7 +159,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_text_la_LDFLAGS = 
++libgide_text_la_LDFLAGS = -avoid-version
+ libgide_text_la_DEPENDENCIES = 
+ libgide_text_la_OBJECTS =  text-tool.lo text-delete.lo text-insert.lo \
+ text-replace.lo
diff --git a/devel/gide/pkg-plist b/devel/gide/pkg-plist
index db7be596bd9e..859e367ca727 100644
--- a/devel/gide/pkg-plist
+++ b/devel/gide/pkg-plist
@@ -1,31 +1,78 @@
-bin/gdbio
 bin/gide
-lib/gide/plugins/%%VERSION%%/libgide_asciitable.so
-lib/gide/plugins/%%VERSION%%/libgide_browser.so
-lib/gide/plugins/%%VERSION%%/libgide_calculator.so
-lib/gide/plugins/%%VERSION%%/libgide_docstat.so
-lib/gide/plugins/%%VERSION%%/libgide_sample.so
-lib/gide/plugins/%%VERSION%%/libgide_text.so
+bin/gide-clean.sh
+include/libgide/gide-tool.h
+include/libgide/gide-utils.h
+include/libgide/gide.h
+include/libgide/libgide.h
+lib/libgide-asciitable.so
+lib/libgide-calculator.so
+lib/libgide-debugger.so
+lib/libgide-docman.so
+lib/libgide-docstat.so
+lib/libgide-files.so
+lib/libgide-functions.so
+lib/libgide-help.so
+lib/libgide-mail.so
+lib/libgide-project.so
+lib/libgide-sample.so
+lib/libgide-swapch.so
+lib/libgide-text.so
+lib/libgide.a
+lib/libgide.so
+lib/libgide.so.0
 share/gnome/apps/Development/gIDE.desktop
-share/gnome/gide/extra/README
-share/gnome/gide/extra/compile_sets
-share/gnome/gide/extra/functions.highlight
-share/gnome/gide/extra/functions.ignore
-share/gnome/gide/extra/gide.conf
-share/gnome/gide/extra/gide.scm
-share/gnome/gide/extra/glob
-share/gnome/gide/extra/glob.scm
-share/gnome/gide/extra/patterns
-share/gnome/gide/extra/patterns.scm
-share/gnome/gide/glade/file-search-replace.glade
-share/gnome/gide/glade/plugin-manager.glade
-share/gnome/gide/glade/search-replace.glade
+share/gnome/gide/glade/man_plugin.glade
+share/gnome/gide/images/gide-debugger.png
+share/gnome/gide/images/gide-document-manager.png
+share/gnome/gide/images/gide-project-manager.png
+share/gnome/gide/images/gide-sample-plugin.png
+share/gnome/gide/images/splash.png
+share/gnome/gide/images/unknown-components.png
+share/gnome/idl/gide-docman.idl
+share/gnome/idl/gide-shell.idl
+share/gnome/idl/gide.idl
+share/gnome/oaf/Bonobo_Moniker_gide.oaf
+share/gnome/oaf/GNOME_Development_Plugin_asciitable.oaf
+share/gnome/oaf/GNOME_Development_Plugin_calculator.oaf
+share/gnome/oaf/GNOME_Development_Plugin_debugger.oaf
+share/gnome/oaf/GNOME_Development_Plugin_docstat.oaf
+share/gnome/oaf/GNOME_Development_Plugin_document-manager.oaf
+share/gnome/oaf/GNOME_Development_Plugin_files.oaf
+share/gnome/oaf/GNOME_Development_Plugin_functions.oaf
+share/gnome/oaf/GNOME_Development_Plugin_help.oaf
+share/gnome/oaf/GNOME_Development_Plugin_mail.oaf
+share/gnome/oaf/GNOME_Development_Plugin_project-manager.oaf
+share/gnome/oaf/GNOME_Development_Plugin_sample.oaf
+share/gnome/oaf/GNOME_Development_Plugin_swapch.oaf
+share/gnome/oaf/GNOME_Development_Plugin_text.oaf
+share/gnome/pixmaps/gide-close-project.png
+share/gnome/pixmaps/gide-new-project.png
+share/gnome/pixmaps/gide-open-project.png
 share/gnome/pixmaps/gide.png
+share/gnome/ui/gide-asciitable-plugin.xml
+share/gnome/ui/gide-calculator-plugin.xml
+share/gnome/ui/gide-debugger.xml
+share/gnome/ui/gide-docstat-plugin.xml
+share/gnome/ui/gide-document-manager.xml
+share/gnome/ui/gide-files-plugin.xml
+share/gnome/ui/gide-functions-plugin.xml
+share/gnome/ui/gide-help-plugin.xml
+share/gnome/ui/gide-mail-plugin.xml
+share/gnome/ui/gide-project-manager.xml
+share/gnome/ui/gide-sample-plugin.xml
+share/gnome/ui/gide-swapch-plugin.xml
+share/gnome/ui/gide-text-plugin.xml
+share/gnome/ui/gide.xml
+share/locale/da/LC_MESSAGES/gide.mo
+share/locale/de/LC_MESSAGES/gide.mo
+share/locale/es/LC_MESSAGES/gide.mo
 share/locale/fr/LC_MESSAGES/gide.mo
+share/locale/it/LC_MESSAGES/gide.mo
 share/locale/ja/LC_MESSAGES/gide.mo
+share/locale/sv/LC_MESSAGES/gide.mo
+share/locale/tr/LC_MESSAGES/gide.mo
+share/locale/uk/LC_MESSAGES/gide.mo
+@dirrm share/gnome/gide/images
 @dirrm share/gnome/gide/glade
-@dirrm share/gnome/gide/extra
 @dirrm share/gnome/gide
-@dirrm lib/gide/plugins/%%VERSION%%
-@dirrm lib/gide/plugins
-@dirrm lib/gide
+@dirrm include/libgide