update to 2.2.3

This is a major update, too much to list here.

pkgsrc notes:
I've removed the subversion dependency because this is too heavy as
a dependency in the default case. Might become an addon.
Thanks to Ulrich Etile for help and testing. (There might be remaining
issues on some platforms, but I wanted to checkpoint before the Q4 freeze.)

10 files changed, 275 insertions, 493 deletions

diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 768ed540ba2..63b45af07bc 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.58 2007/10/05 22:01:16 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2007/12/16 14:49:39 drochner Exp $
 
-DISTNAME=	anjuta-2.0.2
-PKGREVISION=	7
+DISTNAME=	anjuta-2.2.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=anjuta/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.anjuta.org/
@@ -12,7 +12,6 @@ COMMENT=	Gnome based IDE for C and C++
 DEPENDS+=	autogen-[0-9]*:../../devel/autogen
 DEPENDS+=	autoconf>=2.59:../../devel/autoconf
 DEPENDS+=	automake>=1.8.2:../../devel/automake
-DEPENDS+=	glade>=2.6.0:../../devel/glade
 DEPENDS+=	gnome-terminal>=2.4.2:../../x11/gnome-terminal
 DEPENDS+=	libtool>=1.5.2:../../devel/libtool
 DEPENDS+=	yelp>=2.4.2:../../misc/yelp
@@ -24,6 +23,7 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake:run pkg-config:run msgfmt:run perl:run sh:run
+USE_TOOLS+=		bash:run
 GNU_CONFIGURE=		yes
 
 SUBST_CLASSES+=		unused
@@ -34,22 +34,28 @@ SUBST_FILES.unused+=	tagmanager/lua.c tagmanager/options.c tagmanager/parse.c
 SUBST_FILES.unused+=	tagmanager/parse.h tagmanager/regex.c
 SUBST_FILES.unused+=	tagmanager/tm_file_entry.c tagmanager/tm_project.c
 SUBST_FILES.unused+=	tagmanager/tm_source_file.c tagmanager/tm_workspace.c
+SUBST_FILES.unused+=	tagmanager/eiffel.c tagmanager/lregex.c
+SUBST_FILES.unused+=	tagmanager/routines.c
 SUBST_SED.unused=	-e 's/__unused__/_exctags_unused_/g'
 
 REPLACE_SH+=		scripts/anjuta_import.sh.in
 REPLACE_PERL+=		plugins/tools/scripts/*.pl
+REPLACE_BASH+=		global-tags/create_global_tags.sh.in
 
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
 
 .include "../../devel/devhelp/buildlink3.mk"
 .include "../../devel/gdl/buildlink3.mk"
+.include "../../devel/glade3/buildlink3.mk"
 .include "../../devel/gnome-build/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/subversion-base/buildlink3.mk"
 .include "../../graphics/graphviz/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/gtksourceview/buildlink3.mk"
 .include "../../x11/vte/buildlink3.mk"
+.include "../../databases/shared-mime-info/mimedb.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/anjuta/PLIST b/devel/anjuta/PLIST
index f2ed1417b08..1106ca2f130 100644
--- a/devel/anjuta/PLIST
+++ b/devel/anjuta/PLIST
@@ -1,38 +1,47 @@
-@comment $NetBSD: PLIST,v 1.13 2007/01/12 21:32:58 rillig Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/12/16 14:49:40 drochner Exp $
 bin/anjuta
 bin/anjuta-shell
-bin/anjuta-tags
 bin/anjuta_import.sh
 bin/anjuta_launcher
-bin/create_global_tags.sh
-bin/test_tm_buffer
 include/libanjuta-1.0/libanjuta/anjuta-children.h
 include/libanjuta-1.0/libanjuta/anjuta-debug.h
 include/libanjuta-1.0/libanjuta/anjuta-encodings.h
+include/libanjuta-1.0/libanjuta/anjuta-enum-types.h
+include/libanjuta-1.0/libanjuta/anjuta-glue-factory.h
+include/libanjuta-1.0/libanjuta/anjuta-glue-plugin.h
 include/libanjuta-1.0/libanjuta/anjuta-launcher.h
 include/libanjuta-1.0/libanjuta/anjuta-marshal.h
 include/libanjuta-1.0/libanjuta/anjuta-plugin-description.h
+include/libanjuta-1.0/libanjuta/anjuta-plugin-manager.h
 include/libanjuta-1.0/libanjuta/anjuta-plugin.h
 include/libanjuta-1.0/libanjuta/anjuta-preferences-dialog.h
 include/libanjuta-1.0/libanjuta/anjuta-preferences.h
+include/libanjuta-1.0/libanjuta/anjuta-profile-manager.h
+include/libanjuta-1.0/libanjuta/anjuta-profile.h
+include/libanjuta-1.0/libanjuta/anjuta-save-prompt.h
+include/libanjuta-1.0/libanjuta/anjuta-serializer.h
 include/libanjuta-1.0/libanjuta/anjuta-session.h
 include/libanjuta-1.0/libanjuta/anjuta-shell.h
 include/libanjuta-1.0/libanjuta/anjuta-status.h
 include/libanjuta-1.0/libanjuta/anjuta-ui.h
 include/libanjuta-1.0/libanjuta/anjuta-utils.h
-include/libanjuta-1.0/libanjuta/glue-factory.h
-include/libanjuta-1.0/libanjuta/glue-plugin.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-bookmark.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-buildable.h
-include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-manager.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-cpu-debugger.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debug-manager.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-document-manager.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-assist.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-autocomplete.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-cell-style.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-cell.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-comment.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-convert.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-factory.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-folds.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-goto.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-hover.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-language.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-line-mode.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-selection.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-view.h
@@ -46,13 +55,15 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-help.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-indicable.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-iterable-tree.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-iterable.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-language-support.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-loader.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-macro.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-markable.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-message-manager.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-message-view.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-plugin-loader.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-preferences.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-print.h
-include/libanjuta-1.0/libanjuta/interfaces/ianjuta-profile.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project-manager.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-loader.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-savable.h
@@ -61,9 +72,12 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol-manager.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-terminal.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-todo.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-variable-debugger.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-vcs.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-wizard.h
 include/libanjuta-1.0/libanjuta/interfaces/libanjuta-iface-marshallers.h
+include/libanjuta-1.0/libanjuta/interfaces/libanjuta-interfaces.h
+include/libanjuta-1.0/libanjuta/interfaces/libanjuta.idl
 include/libanjuta-1.0/libanjuta/libanjuta.h
 include/libanjuta-1.0/libanjuta/resources.h
 lib/anjuta/anjuta-build-basic-autotools.plugin
@@ -71,7 +85,6 @@ lib/anjuta/anjuta-class-gen.plugin
 lib/anjuta/anjuta-class-inheritance.plugin
 lib/anjuta/anjuta-cvs.plugin
 lib/anjuta/anjuta-debug-manager.plugin
-lib/anjuta/anjuta-default-profile.plugin
 lib/anjuta/anjuta-devhelp.plugin
 lib/anjuta/anjuta-document-manager.plugin
 lib/anjuta/anjuta-editor.plugin
@@ -80,6 +93,7 @@ lib/anjuta/anjuta-file-wizard.plugin
 lib/anjuta/anjuta-gdb.plugin
 lib/anjuta/anjuta-glade.plugin
 lib/anjuta/anjuta-gtodo.plugin
+lib/anjuta/anjuta-language-cpp-java.plugin
 lib/anjuta/anjuta-loader.plugin
 lib/anjuta/anjuta-macro.plugin
 lib/anjuta/anjuta-message-manager.plugin
@@ -97,18 +111,20 @@ lib/anjuta/libanjuta-class-gen.la
 lib/anjuta/libanjuta-class-inheritance.la
 lib/anjuta/libanjuta-cvs-plugin.la
 lib/anjuta/libanjuta-debug-manager.la
-lib/anjuta/libanjuta-default-profile.la
 lib/anjuta/libanjuta-devhelp.la
 lib/anjuta/libanjuta-document-manager.la
 lib/anjuta/libanjuta-editor.la
 lib/anjuta/libanjuta-file-manager.la
 lib/anjuta/libanjuta-file-wizard.la
 lib/anjuta/libanjuta-gdb.la
+lib/anjuta/libanjuta-glade.la
 lib/anjuta/libanjuta-gtodo.la
+lib/anjuta/libanjuta-language-cpp-java.la
 lib/anjuta/libanjuta-loader.la
 lib/anjuta/libanjuta-macro.la
 lib/anjuta/libanjuta-message-view.la
 lib/anjuta/libanjuta-patch.la
+lib/anjuta/libanjuta-profiler.la
 lib/anjuta/libanjuta-project-import.la
 lib/anjuta/libanjuta-project-manager.la
 lib/anjuta/libanjuta-project-wizard.la
@@ -118,18 +134,21 @@ lib/anjuta/libanjuta-sourceview.la
 lib/anjuta/libanjuta-symbol-browser.la
 lib/anjuta/libanjuta-terminal.la
 lib/anjuta/libanjuta-tools.la
+lib/anjuta/profiler.plugin
 lib/anjuta/sourceview.plugin
 lib/libanjuta-ctags.la
 lib/libanjuta-egg.la
-lib/libanjuta-interfaces.la
 lib/libanjuta.la
 lib/pkgconfig/libanjuta-1.0.pc
 man/man1/anjuta.1
 man/man1/anjuta_launcher.1
+share/anjuta/AUTHORS
 share/anjuta/anjuta_project.template
 share/anjuta/build/automake-c.filters
-share/anjuta/class-templates/goc_template_header
-share/anjuta/class-templates/goc_template_source
+share/anjuta/class-templates/cc-header.tpl
+share/anjuta/class-templates/cc-source.tpl
+share/anjuta/class-templates/go-header.tpl
+share/anjuta/class-templates/go-source.tpl
 share/anjuta/gdb.init
 share/anjuta/glade/anjuta-build-basic-autotools-plugin.glade
 share/anjuta/glade/anjuta-class-gen-plugin.glade
@@ -139,6 +158,7 @@ share/anjuta/glade/anjuta-document-manager.glade
 share/anjuta/glade/anjuta-file-manager-plugin.glade
 share/anjuta/glade/anjuta-file-wizard.glade
 share/anjuta/glade/anjuta-gdb.glade
+share/anjuta/glade/anjuta-language-cpp-java.glade
 share/anjuta/glade/anjuta-macro.glade
 share/anjuta/glade/anjuta-message-manager-plugin.glade
 share/anjuta/glade/anjuta-project-import.glade
@@ -153,6 +173,10 @@ share/anjuta/glade/appwizard.png
 share/anjuta/glade/editor.glade
 share/anjuta/glade/layout.glade
 share/anjuta/glade/patch-plugin.glade
+share/anjuta/glade/profiler-call-graph.glade
+share/anjuta/glade/profiler-flat-profile.glade
+share/anjuta/glade/profiler-function-call-tree.glade
+share/anjuta/glade/profiler.glade
 share/anjuta/glade/sourceview.glade
 share/anjuta/glade/start-with-import.png
 share/anjuta/glade/start-with-open.png
@@ -162,10 +186,10 @@ share/anjuta/gtodo/gtodo.xsl
 share/anjuta/indent_test.c
 share/anjuta/layout.xml
 share/anjuta/macros.xml
-share/anjuta/profiles/default.anjuta
+share/anjuta/profiles/default.profile
 share/anjuta/project/anjuta-plugin-logo.png
 share/anjuta/project/anjuta-plugin.wiz
-share/anjuta/project/anjuta-plugin/configure.in.tpl
+share/anjuta/project/anjuta-plugin/configure.ac.tpl
 share/anjuta/project/anjuta-plugin/po/POTFILES.in
 share/anjuta/project/anjuta-plugin/src/Makefile.am.tpl
 share/anjuta/project/anjuta-plugin/src/plugin.c
@@ -173,26 +197,19 @@ share/anjuta/project/anjuta-plugin/src/plugin.glade
 share/anjuta/project/anjuta-plugin/src/plugin.h
 share/anjuta/project/anjuta-plugin/src/plugin.plugin.in
 share/anjuta/project/anjuta-plugin/src/plugin.ui
+share/anjuta/project/appwiz_sdl.png
 share/anjuta/project/cpp-logo.png
 share/anjuta/project/cpp.wiz
-share/anjuta/project/cpp/AUTHORS
-share/anjuta/project/cpp/ChangeLog
-share/anjuta/project/cpp/Makefile.am.tpl
-share/anjuta/project/cpp/NEWS
-share/anjuta/project/cpp/README
-share/anjuta/project/cpp/autogen.sh
-share/anjuta/project/cpp/configure.in.tpl
-share/anjuta/project/cpp/cvsignore
-share/anjuta/project/cpp/po/ChangeLog
+share/anjuta/project/cpp/configure.ac.tpl
 share/anjuta/project/cpp/po/POTFILES.in
-share/anjuta/project/cpp/po/cvsignore
-share/anjuta/project/cpp/project.anjuta
 share/anjuta/project/cpp/src/Makefile.am.tpl
 share/anjuta/project/cpp/src/cvsignore
-share/anjuta/project/cpp/src/main.cpp
+share/anjuta/project/cpp/src/main.cc
+share/anjuta/project/django-logo.png
+share/anjuta/project/django.wiz
 share/anjuta/project/gcj-logo.png
 share/anjuta/project/gcj.wiz
-share/anjuta/project/gcj/configure.in.tpl
+share/anjuta/project/gcj/configure.ac.tpl
 share/anjuta/project/gcj/src/Makefile.am.tpl
 share/anjuta/project/gnome-logo.png
 share/anjuta/project/gnome.wiz
@@ -212,18 +229,22 @@ share/anjuta/project/gtk/src/main.c
 share/anjuta/project/gtk/src/project.glade
 share/anjuta/project/gtkmm-logo.png
 share/anjuta/project/gtkmm.wiz
-share/anjuta/project/gtkmm/configure.in.tpl
 share/anjuta/project/gtkmm/po/POTFILES.in
 share/anjuta/project/gtkmm/src/Makefile.am.tpl
 share/anjuta/project/gtkmm/src/main.cc
 share/anjuta/project/gtkmm/src/project.glade
 share/anjuta/project/java-logo.png
 share/anjuta/project/java.wiz
-share/anjuta/project/java/configure.in.tpl
+share/anjuta/project/java/configure.ac.tpl
 share/anjuta/project/java/po/POTFILES.in
 share/anjuta/project/java/project.anjuta
 share/anjuta/project/java/src/Makefile.am.tpl
 share/anjuta/project/java/src/main.java
+share/anjuta/project/minimal.wiz
+share/anjuta/project/minimal/Makefile.am.tpl
+share/anjuta/project/minimal/autogen.sh
+share/anjuta/project/minimal/configure.ac.tpl
+share/anjuta/project/minimal/project.anjuta
 share/anjuta/project/mkfile-logo.png
 share/anjuta/project/mkfile.wiz
 share/anjuta/project/mkfile/po/ChangeLog
@@ -233,11 +254,17 @@ share/anjuta/project/mkfile/src/Makefile.tpl
 share/anjuta/project/mkfile/src/main.c
 share/anjuta/project/python-logo.png
 share/anjuta/project/python.wiz
-share/anjuta/project/python/configure.in.tpl
+share/anjuta/project/python/configure.ac.tpl
 share/anjuta/project/python/po/POTFILES.in
 share/anjuta/project/python/project.anjuta
 share/anjuta/project/python/src/Makefile.am.tpl
 share/anjuta/project/python/src/main.py
+share/anjuta/project/sdl.wiz
+share/anjuta/project/sdl/acinclude.m4.tpl
+share/anjuta/project/sdl/configure.ac.tpl
+share/anjuta/project/sdl/po/POTFILES.in
+share/anjuta/project/sdl/src/Makefile.am.tpl
+share/anjuta/project/sdl/src/main.c
 share/anjuta/project/terminal-logo.png
 share/anjuta/project/terminal.wiz
 share/anjuta/project/terminal/AUTHORS
@@ -246,9 +273,10 @@ share/anjuta/project/terminal/Makefile.am.tpl
 share/anjuta/project/terminal/NEWS
 share/anjuta/project/terminal/README
 share/anjuta/project/terminal/autogen.sh
-share/anjuta/project/terminal/configure.in.tpl
+share/anjuta/project/terminal/configure.ac.tpl
 share/anjuta/project/terminal/cvsignore
 share/anjuta/project/terminal/po/ChangeLog
+share/anjuta/project/terminal/po/LINGUAS
 share/anjuta/project/terminal/po/POTFILES.in
 share/anjuta/project/terminal/po/cvsignore
 share/anjuta/project/terminal/project.anjuta
@@ -257,7 +285,7 @@ share/anjuta/project/terminal/src/cvsignore
 share/anjuta/project/terminal/src/main.c
 share/anjuta/project/wxwin-logo.png
 share/anjuta/project/wxwin.wiz
-share/anjuta/project/wxwin/configure.in.tpl
+share/anjuta/project/wxwin/configure.ac.tpl
 share/anjuta/project/wxwin/po/POTFILES.in
 share/anjuta/project/wxwin/src/Makefile.am.tpl
 share/anjuta/project/wxwin/src/main.cc
@@ -270,7 +298,7 @@ share/anjuta/project/xlib-dock/src/wmgeneral.c
 share/anjuta/project/xlib-dock/src/wmgeneral.h
 share/anjuta/project/xlib-logo.png
 share/anjuta/project/xlib.wiz
-share/anjuta/project/xlib/configure.in.tpl
+share/anjuta/project/xlib/configure.ac.tpl
 share/anjuta/project/xlib/po/POTFILES.in
 share/anjuta/project/xlib/src/Makefile.am.tpl
 share/anjuta/project/xlib/src/main.c
@@ -322,6 +350,8 @@ share/anjuta/properties/vb.properties
 share/anjuta/properties/verilog.properties
 share/anjuta/properties/vhdl.properties
 share/anjuta/properties/yaml.properties
+share/anjuta/scripts/anjuta-tags
+share/anjuta/scripts/create_global_tags.sh
 share/anjuta/tools/find-fixmes.pl
 share/anjuta/tools/prepare-changelog.pl
 share/anjuta/tools/tools-2.xml
@@ -329,13 +359,13 @@ share/anjuta/tools/translation-status.pl
 share/anjuta/ui/anjuta-build-basic-autotools-plugin.ui
 share/anjuta/ui/anjuta-cvs.ui
 share/anjuta/ui/anjuta-debug-manager.ui
-share/anjuta/ui/anjuta-default-profile.ui
+share/anjuta/ui/anjuta-devhelp-simple.ui
 share/anjuta/ui/anjuta-devhelp.ui
 share/anjuta/ui/anjuta-document-manager.ui
 share/anjuta/ui/anjuta-file-manager.ui
-share/anjuta/ui/anjuta-gdb-plugin.ui
 share/anjuta/ui/anjuta-glade.ui
 share/anjuta/ui/anjuta-gtodo.ui
+share/anjuta/ui/anjuta-language-support-cpp-java.ui
 share/anjuta/ui/anjuta-loader-plugin.ui
 share/anjuta/ui/anjuta-macro.ui
 share/anjuta/ui/anjuta-message-manager.ui
@@ -347,8 +377,8 @@ share/anjuta/ui/anjuta-shell.ui
 share/anjuta/ui/anjuta-symbol-browser-plugin.ui
 share/anjuta/ui/anjuta-tools.ui
 share/anjuta/ui/anjuta.ui
+share/anjuta/ui/profiler.ui
 share/anjuta/welcome.txt
-share/application-registry/anjuta.applications
 share/applications/anjuta.desktop
 share/doc/anjuta/AUTHORS
 share/doc/anjuta/COPYING
@@ -362,164 +392,178 @@ share/doc/anjuta/ROADMAP
 share/doc/anjuta/ScintillaDoc.html
 share/doc/anjuta/THANKS
 share/doc/anjuta/TODO
-share/gnome/help/anjuta/C/anjuta-faqs.xml
-share/gnome/help/anjuta/C/anjuta-manual.xml
-share/gnome/help/anjuta/C/authors.xml
-share/gnome/help/anjuta/C/build.xml
-share/gnome/help/anjuta/C/debugger.xml
-share/gnome/help/anjuta/C/execute.xml
-share/gnome/help/anjuta/C/figures/a2ps.png
-share/gnome/help/anjuta/C/figures/add_edit_macro.png
-share/gnome/help/anjuta/C/figures/anjuta-in-action.png
-share/gnome/help/anjuta/C/figures/arguments.png
-share/gnome/help/anjuta/C/figures/attach.png
-share/gnome/help/anjuta/C/figures/brk_add.png
-share/gnome/help/anjuta/C/figures/brk_dlg.png
-share/gnome/help/anjuta/C/figures/brk_edit.png
-share/gnome/help/anjuta/C/figures/ccview.png
-share/gnome/help/anjuta/C/figures/ccview_class.png
-share/gnome/help/anjuta/C/figures/ccview_struct.png
-share/gnome/help/anjuta/C/figures/configure_dlg.png
-share/gnome/help/anjuta/C/figures/defines.png
-share/gnome/help/anjuta/C/figures/devt_menu.png
-share/gnome/help/anjuta/C/figures/display_macro.png
-share/gnome/help/anjuta/C/figures/doxygen.png
-share/gnome/help/anjuta/C/figures/editor_guides.png
-share/gnome/help/anjuta/C/figures/editor_margins.png
-share/gnome/help/anjuta/C/figures/editor_markers.png
-share/gnome/help/anjuta/C/figures/evaluate.png
-share/gnome/help/anjuta/C/figures/file_menu.png
-share/gnome/help/anjuta/C/figures/fileview.png
-share/gnome/help/anjuta/C/figures/frame.png
-share/gnome/help/anjuta/C/figures/includes.png
-share/gnome/help/anjuta/C/figures/insert_text.png
-share/gnome/help/anjuta/C/figures/inspect.png
-share/gnome/help/anjuta/C/figures/keyword_macro.png
-share/gnome/help/anjuta/C/figures/lib_paths.png
-share/gnome/help/anjuta/C/figures/libraries.png
-share/gnome/help/anjuta/C/figures/local_variables.png
-share/gnome/help/anjuta/C/figures/mainwin.png
-share/gnome/help/anjuta/C/figures/memory.png
-share/gnome/help/anjuta/C/figures/menu_detached.png
-share/gnome/help/anjuta/C/figures/menubar.png
-share/gnome/help/anjuta/C/figures/message_win.png
-share/gnome/help/anjuta/C/figures/new_file_wizard.png
-share/gnome/help/anjuta/C/figures/open_file.png
-share/gnome/help/anjuta/C/figures/open_file_multiple.png
-share/gnome/help/anjuta/C/figures/optimizations.png
-share/gnome/help/anjuta/C/figures/other_opts.png
-share/gnome/help/anjuta/C/figures/prefs_print.png
-share/gnome/help/anjuta/C/figures/print_dlg.png
-share/gnome/help/anjuta/C/figures/print_preview.png
-share/gnome/help/anjuta/C/figures/project_info.png
-share/gnome/help/anjuta/C/figures/project_win.png
-share/gnome/help/anjuta/C/figures/registers.png
-share/gnome/help/anjuta/C/figures/save_as_file.png
-share/gnome/help/anjuta/C/figures/search_expr.png
-share/gnome/help/anjuta/C/figures/search_expr_basic.png
-share/gnome/help/anjuta/C/figures/search_file_list.png
-share/gnome/help/anjuta/C/figures/search_file_pattern.png
-share/gnome/help/anjuta/C/figures/search_replace.png
-share/gnome/help/anjuta/C/figures/search_setting.png
-share/gnome/help/anjuta/C/figures/search_target.png
-share/gnome/help/anjuta/C/figures/search_target_action.png
-share/gnome/help/anjuta/C/figures/search_target_in.png
-share/gnome/help/anjuta/C/figures/sharedlibs.png
-share/gnome/help/anjuta/C/figures/signal_mod.png
-share/gnome/help/anjuta/C/figures/signals.png
-share/gnome/help/anjuta/C/figures/stack.png
-share/gnome/help/anjuta/C/figures/supports.png
-share/gnome/help/anjuta/C/figures/symbol_browser.png
-share/gnome/help/anjuta/C/figures/tool-editor.png
-share/gnome/help/anjuta/C/figures/toolbar_browser.png
-share/gnome/help/anjuta/C/figures/toolbar_debug.png
-share/gnome/help/anjuta/C/figures/toolbar_main.png
-share/gnome/help/anjuta/C/figures/variable_tip.png
-share/gnome/help/anjuta/C/figures/warnings.png
-share/gnome/help/anjuta/C/figures/watch.png
-share/gnome/help/anjuta/C/figures/watch_add.png
-share/gnome/help/anjuta/C/fileoperations.xml
-share/gnome/help/anjuta/C/interface.xml
-share/gnome/help/anjuta/C/introduction.xml
-share/gnome/help/anjuta/C/legal.xml
-share/gnome/help/anjuta/C/license.xml
-share/gnome/help/anjuta/C/preferences.xml
-share/gnome/help/anjuta/C/projects.xml
-share/gnome/help/anjuta/C/template.xml
-share/gnome/help/anjuta/C/tools.xml
-share/gtk-doc/html/libanjuta/action_block.html
+share/gnome/help/anjuta-faqs/C/anjuta-faqs.xml
+share/gnome/help/anjuta-faqs/C/legal.xml
+share/gnome/help/anjuta-manual/C/anjuta-manual.xml
+share/gnome/help/anjuta-manual/C/authors.xml
+share/gnome/help/anjuta-manual/C/debugger.xml
+share/gnome/help/anjuta-manual/C/figures/a2ps.png
+share/gnome/help/anjuta-manual/C/figures/add_edit_macro.png
+share/gnome/help/anjuta-manual/C/figures/anjuta-in-action.png
+share/gnome/help/anjuta-manual/C/figures/arguments.png
+share/gnome/help/anjuta-manual/C/figures/attach.png
+share/gnome/help/anjuta-manual/C/figures/brk_add.png
+share/gnome/help/anjuta-manual/C/figures/brk_dlg.png
+share/gnome/help/anjuta-manual/C/figures/brk_edit.png
+share/gnome/help/anjuta-manual/C/figures/ccview.png
+share/gnome/help/anjuta-manual/C/figures/ccview_class.png
+share/gnome/help/anjuta-manual/C/figures/ccview_struct.png
+share/gnome/help/anjuta-manual/C/figures/configure_dlg.png
+share/gnome/help/anjuta-manual/C/figures/defines.png
+share/gnome/help/anjuta-manual/C/figures/devt_menu.png
+share/gnome/help/anjuta-manual/C/figures/display_macro.png
+share/gnome/help/anjuta-manual/C/figures/doxygen.png
+share/gnome/help/anjuta-manual/C/figures/editor_guides.png
+share/gnome/help/anjuta-manual/C/figures/editor_margins.png
+share/gnome/help/anjuta-manual/C/figures/editor_markers.png
+share/gnome/help/anjuta-manual/C/figures/evaluate.png
+share/gnome/help/anjuta-manual/C/figures/file_menu.png
+share/gnome/help/anjuta-manual/C/figures/fileview.png
+share/gnome/help/anjuta-manual/C/figures/frame.png
+share/gnome/help/anjuta-manual/C/figures/includes.png
+share/gnome/help/anjuta-manual/C/figures/insert_text.png
+share/gnome/help/anjuta-manual/C/figures/inspect.png
+share/gnome/help/anjuta-manual/C/figures/keyword_macro.png
+share/gnome/help/anjuta-manual/C/figures/lib_paths.png
+share/gnome/help/anjuta-manual/C/figures/libraries.png
+share/gnome/help/anjuta-manual/C/figures/local_variables.png
+share/gnome/help/anjuta-manual/C/figures/mainwin.png
+share/gnome/help/anjuta-manual/C/figures/menu_detached.png
+share/gnome/help/anjuta-manual/C/figures/menubar.png
+share/gnome/help/anjuta-manual/C/figures/message_win.png
+share/gnome/help/anjuta-manual/C/figures/new_file_wizard.png
+share/gnome/help/anjuta-manual/C/figures/open_file.png
+share/gnome/help/anjuta-manual/C/figures/open_file_multiple.png
+share/gnome/help/anjuta-manual/C/figures/other_opts.png
+share/gnome/help/anjuta-manual/C/figures/prefs_print.png
+share/gnome/help/anjuta-manual/C/figures/print_preview.png
+share/gnome/help/anjuta-manual/C/figures/project_info.png
+share/gnome/help/anjuta-manual/C/figures/project_win.png
+share/gnome/help/anjuta-manual/C/figures/registers.png
+share/gnome/help/anjuta-manual/C/figures/save_as_file.png
+share/gnome/help/anjuta-manual/C/figures/search_expr.png
+share/gnome/help/anjuta-manual/C/figures/search_expr_basic.png
+share/gnome/help/anjuta-manual/C/figures/search_file_list.png
+share/gnome/help/anjuta-manual/C/figures/search_file_pattern.png
+share/gnome/help/anjuta-manual/C/figures/search_replace.png
+share/gnome/help/anjuta-manual/C/figures/search_setting.png
+share/gnome/help/anjuta-manual/C/figures/search_target.png
+share/gnome/help/anjuta-manual/C/figures/search_target_action.png
+share/gnome/help/anjuta-manual/C/figures/search_target_in.png
+share/gnome/help/anjuta-manual/C/figures/sharedlibs.png
+share/gnome/help/anjuta-manual/C/figures/signal_mod.png
+share/gnome/help/anjuta-manual/C/figures/signals.png
+share/gnome/help/anjuta-manual/C/figures/stack.png
+share/gnome/help/anjuta-manual/C/figures/supports.png
+share/gnome/help/anjuta-manual/C/figures/symbol_browser.png
+share/gnome/help/anjuta-manual/C/figures/tool-editor.png
+share/gnome/help/anjuta-manual/C/figures/toolbar_browser.png
+share/gnome/help/anjuta-manual/C/figures/toolbar_debug.png
+share/gnome/help/anjuta-manual/C/figures/toolbar_main.png
+share/gnome/help/anjuta-manual/C/figures/variable_tip.png
+share/gnome/help/anjuta-manual/C/figures/warnings.png
+share/gnome/help/anjuta-manual/C/figures/watch.png
+share/gnome/help/anjuta-manual/C/figures/watch_add.png
+share/gnome/help/anjuta-manual/C/fileoperations.xml
+share/gnome/help/anjuta-manual/C/interface.xml
+share/gnome/help/anjuta-manual/C/introduction.xml
+share/gnome/help/anjuta-manual/C/legal.xml
+share/gnome/help/anjuta-manual/C/license.xml
+share/gnome/help/anjuta-manual/C/preferences.xml
+share/gnome/help/anjuta-manual/C/projects.xml
+share/gnome/help/anjuta-manual/C/template.xml
+share/gnome/help/anjuta-manual/C/tools.xml
+share/gtk-doc/html/libanjuta/AnjutaLauncher.html
+share/gtk-doc/html/libanjuta/AnjutaPlugin.html
+share/gtk-doc/html/libanjuta/AnjutaPluginHandle.html
+share/gtk-doc/html/libanjuta/AnjutaPluginManager.html
+share/gtk-doc/html/libanjuta/AnjutaPreferences.html
+share/gtk-doc/html/libanjuta/AnjutaPreferencesDialog.html
+share/gtk-doc/html/libanjuta/AnjutaProfile.html
+share/gtk-doc/html/libanjuta/AnjutaProfileManager.html
+share/gtk-doc/html/libanjuta/AnjutaSavePrompt.html
+share/gtk-doc/html/libanjuta/AnjutaSerializer.html
+share/gtk-doc/html/libanjuta/AnjutaSession.html
+share/gtk-doc/html/libanjuta/AnjutaStatus.html
+share/gtk-doc/html/libanjuta/AnjutaUI.html
+share/gtk-doc/html/libanjuta/action-block.html
 share/gtk-doc/html/libanjuta/anjuta-architecture.html
 share/gtk-doc/html/libanjuta/anjuta-architecture.png
-share/gtk-doc/html/libanjuta/content_block.html
-share/gtk-doc/html/libanjuta/header_block.html
+share/gtk-doc/html/libanjuta/content-block.html
+share/gtk-doc/html/libanjuta/header-block.html
 share/gtk-doc/html/libanjuta/home.png
 share/gtk-doc/html/libanjuta/index.html
 share/gtk-doc/html/libanjuta/index.sgml
 share/gtk-doc/html/libanjuta/left.png
 share/gtk-doc/html/libanjuta/libanjuta-AnjutaCellRendererCaptionedImage.html
-share/gtk-doc/html/libanjuta/libanjuta-AnjutaLauncher.html
-share/gtk-doc/html/libanjuta/libanjuta-AnjutaPlugin.html
-share/gtk-doc/html/libanjuta/libanjuta-AnjutaPreferences.html
-share/gtk-doc/html/libanjuta/libanjuta-AnjutaPreferencesDialog.html
-share/gtk-doc/html/libanjuta/libanjuta-AnjutaStatus.html
-share/gtk-doc/html/libanjuta/libanjuta-AnjutaUI.html
 share/gtk-doc/html/libanjuta/libanjuta-ESplash.html
 share/gtk-doc/html/libanjuta/libanjuta-GluePlugin.html
 share/gtk-doc/html/libanjuta/libanjuta-anjuta-children.html
 share/gtk-doc/html/libanjuta/libanjuta-anjuta-debug.html
 share/gtk-doc/html/libanjuta/libanjuta-anjuta-encodings.html
+share/gtk-doc/html/libanjuta/libanjuta-anjuta-enum-types.html
 share/gtk-doc/html/libanjuta/libanjuta-anjuta-marshal.html
 share/gtk-doc/html/libanjuta/libanjuta-anjuta-plugin-description.html
 share/gtk-doc/html/libanjuta/libanjuta-anjuta-shell.html
 share/gtk-doc/html/libanjuta/libanjuta-anjuta-utils.html
 share/gtk-doc/html/libanjuta/libanjuta-api.html
+share/gtk-doc/html/libanjuta/libanjuta-glue-cpp.html
 share/gtk-doc/html/libanjuta/libanjuta-glue-factory.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-bookmark.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-buildable.html
-share/gtk-doc/html/libanjuta/libanjuta-ianjuta-context-list.html
-share/gtk-doc/html/libanjuta/libanjuta-ianjuta-context-text.html
-share/gtk-doc/html/libanjuta/libanjuta-ianjuta-context-tree.html
-share/gtk-doc/html/libanjuta/libanjuta-ianjuta-context.html
-share/gtk-doc/html/libanjuta/libanjuta-ianjuta-debugger-manager.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-cpu-debugger.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-debug-manager.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-debugger.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-document-manager.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor-assist.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor-cell-style.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor-cell.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor-comment.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor-convert.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor-factory.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor-folds.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor-goto.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor-hover.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor-language.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor-line-mode.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor-selection.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor-view.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor-zoom.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-editor.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-file-loader.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-file-manager.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-file-savable.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-file.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-help.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-indicable.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-iterable-tree.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-iterable.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-language-support.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-loader.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-macro.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-markable.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-message-manager.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-message-view.html
-share/gtk-doc/html/libanjuta/libanjuta-ianjuta-profile.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-preferences.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-print.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-project-manager.html
-share/gtk-doc/html/libanjuta/libanjuta-ianjuta-renderable.html
-share/gtk-doc/html/libanjuta/libanjuta-ianjuta-sand-box.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-stream-loader.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-stream-savable.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-stream.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-symbol-manager.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-symbol.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-terminal.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-todo.html
-share/gtk-doc/html/libanjuta/libanjuta-ianjuta-transformable.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-variable-debugger.html
+share/gtk-doc/html/libanjuta/libanjuta-ianjuta-vcs.html
 share/gtk-doc/html/libanjuta/libanjuta-ianjuta-wizard.html
 share/gtk-doc/html/libanjuta/libanjuta-internal-api.html
 share/gtk-doc/html/libanjuta/libanjuta-libanjuta-iface-marshallers.html
-share/gtk-doc/html/libanjuta/libanjuta-plugins.html
 share/gtk-doc/html/libanjuta/libanjuta-resources.html
 share/gtk-doc/html/libanjuta/libanjuta.devhelp
 share/gtk-doc/html/libanjuta/libanjuta.devhelp2
 share/gtk-doc/html/libanjuta/object-hierarchy.html
-share/gtk-doc/html/libanjuta/page_block.html
+share/gtk-doc/html/libanjuta/page-block.html
 share/gtk-doc/html/libanjuta/plugin-description-file.html
 share/gtk-doc/html/libanjuta/plugin-interfaces.html
 share/gtk-doc/html/libanjuta/project-wizard-format.html
@@ -531,8 +575,10 @@ share/gtk-doc/html/libanjuta/writing-plugins-simple.html
 share/gtk-doc/html/libanjuta/writing-plugins-sources.html
 share/gtk-doc/html/libanjuta/writing-plugins.html
 share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-anjuta.png
-share/icons/hicolor/48x48/apps/anjuta_icon.png
-share/icons/hicolor/scalable/apps/anjuta_icon.svg
+share/icons/gnome/scalable/mimetypes/gnome-mime-application-x-anjuta.svg
+share/icons/hicolor/48x48/apps/anjuta.png
+share/icons/hicolor/scalable/apps/anjuta.svg
+share/locale/ar/LC_MESSAGES/anjuta.mo
 share/locale/az/LC_MESSAGES/anjuta.mo
 share/locale/be/LC_MESSAGES/anjuta.mo
 share/locale/bg/LC_MESSAGES/anjuta.mo
@@ -540,6 +586,7 @@ share/locale/ca/LC_MESSAGES/anjuta.mo
 share/locale/cs/LC_MESSAGES/anjuta.mo
 share/locale/da/LC_MESSAGES/anjuta.mo
 share/locale/de/LC_MESSAGES/anjuta.mo
+share/locale/dz/LC_MESSAGES/anjuta.mo
 share/locale/el/LC_MESSAGES/anjuta.mo
 share/locale/en_CA/LC_MESSAGES/anjuta.mo
 share/locale/en_GB/LC_MESSAGES/anjuta.mo
@@ -560,6 +607,7 @@ share/locale/ms/LC_MESSAGES/anjuta.mo
 share/locale/nb/LC_MESSAGES/anjuta.mo
 share/locale/ne/LC_MESSAGES/anjuta.mo
 share/locale/nl/LC_MESSAGES/anjuta.mo
+share/locale/oc/LC_MESSAGES/anjuta.mo
 share/locale/pa/LC_MESSAGES/anjuta.mo
 share/locale/pl/LC_MESSAGES/anjuta.mo
 share/locale/pt/LC_MESSAGES/anjuta.mo
@@ -575,11 +623,8 @@ share/locale/tr/LC_MESSAGES/anjuta.mo
 share/locale/uk/LC_MESSAGES/anjuta.mo
 share/locale/zh_CN/LC_MESSAGES/anjuta.mo
 share/locale/zh_TW/LC_MESSAGES/anjuta.mo
-share/mime-info/anjuta.keys
-share/mime-info/anjuta.mime
 share/mime/packages/anjuta.xml
-share/omf/anjuta/anjuta-faqs-C.omf
-share/omf/anjuta/anjuta-manual-C.omf
+share/omf/anjuta-manual/anjuta-manual-C.omf
 share/pixmaps/anjuta/Icons.16x16.Class
 share/pixmaps/anjuta/Icons.16x16.Enum
 share/pixmaps/anjuta/Icons.16x16.Field
@@ -620,7 +665,6 @@ share/pixmaps/anjuta/Icons.16x16.Reference
 share/pixmaps/anjuta/anjuta-build-basic-autotools-plugin.png
 share/pixmaps/anjuta/anjuta-cvs-plugin.png
 share/pixmaps/anjuta/anjuta-debug-manager.plugin.png
-share/pixmaps/anjuta/anjuta-default-profile-plugin.png
 share/pixmaps/anjuta/anjuta-devhelp-plugin.png
 share/pixmaps/anjuta/anjuta-document-manager.png
 share/pixmaps/anjuta/anjuta-editor.png
@@ -629,6 +673,7 @@ share/pixmaps/anjuta/anjuta-file-wizard-plugin.png
 share/pixmaps/anjuta/anjuta-gdb.plugin.png
 share/pixmaps/anjuta/anjuta-glade-plugin.png
 share/pixmaps/anjuta/anjuta-gtodo-plugin.png
+share/pixmaps/anjuta/anjuta-language-cpp-java-plugin.png
 share/pixmaps/anjuta/anjuta-loader-plugin.png
 share/pixmaps/anjuta/anjuta-macro.png
 share/pixmaps/anjuta/anjuta-message-view.png
@@ -641,67 +686,32 @@ share/pixmaps/anjuta/anjuta-search.png
 share/pixmaps/anjuta/anjuta-symbol-browser-plugin.png
 share/pixmaps/anjuta/anjuta-terminal-plugin.png
 share/pixmaps/anjuta/anjuta-tools-plugin.png
+share/pixmaps/anjuta/anjuta.png
 share/pixmaps/anjuta/anjuta_logo.png
-share/pixmaps/anjuta/anjuta_logo1.png
-share/pixmaps/anjuta/anjuta_logo2.png
 share/pixmaps/anjuta/anjuta_splash.png
-share/pixmaps/anjuta/anjuta_splash_mini.png
-share/pixmaps/anjuta/applogo.png
-share/pixmaps/anjuta/appwiz_bonobo.png
-share/pixmaps/anjuta/appwiz_bonobo2.png
-share/pixmaps/anjuta/appwiz_gnome.png
-share/pixmaps/anjuta/appwiz_gnome2.png
-share/pixmaps/anjuta/appwiz_gnomemm.png
-share/pixmaps/anjuta/appwiz_gnomemm2.png
-share/pixmaps/anjuta/appwiz_gtk.png
-share/pixmaps/anjuta/appwiz_gtk2.png
-share/pixmaps/anjuta/appwiz_gtkmm.png
-share/pixmaps/anjuta/appwiz_gtkmm2.png
-share/pixmaps/anjuta/appwiz_libglade.png
-share/pixmaps/anjuta/appwiz_libglade2.png
-share/pixmaps/anjuta/appwiz_opengl.png
-share/pixmaps/anjuta/appwiz_sdl.png
-share/pixmaps/anjuta/appwiz_terminal.png
-share/pixmaps/anjuta/appwiz_wxwin.png
-share/pixmaps/anjuta/appwiz_xlib.png
-share/pixmaps/anjuta/appwizard.png
 share/pixmaps/anjuta/autocomplete-16.png
 share/pixmaps/anjuta/autocomplete.png
-share/pixmaps/anjuta/blank.xpm
 share/pixmaps/anjuta/block-end-16.png
 share/pixmaps/anjuta/block-end.png
 share/pixmaps/anjuta/block-start-16.png
 share/pixmaps/anjuta/block-start.png
 share/pixmaps/anjuta/block_select.xpm
-share/pixmaps/anjuta/bookmark-first-16.png
+share/pixmaps/anjuta/bookmark-clear.png
 share/pixmaps/anjuta/bookmark-first.png
-share/pixmaps/anjuta/bookmark-last-16.png
 share/pixmaps/anjuta/bookmark-last.png
-share/pixmaps/anjuta/bookmark-next-16.png
 share/pixmaps/anjuta/bookmark-next.png
-share/pixmaps/anjuta/bookmark-prev-16.png
 share/pixmaps/anjuta/bookmark-prev.png
+share/pixmaps/anjuta/bookmark-toggle.png
 share/pixmaps/anjuta/bookmark.png
-share/pixmaps/anjuta/bookmark_toggle.xpm
+share/pixmaps/anjuta/breakpoint-disabled.png
+share/pixmaps/anjuta/breakpoint-enabled.png
 share/pixmaps/anjuta/breakpoint.png
-share/pixmaps/anjuta/breakpoint.xpm
-share/pixmaps/anjuta/build.xpm
-share/pixmaps/anjuta/build_all.xpm
-share/pixmaps/anjuta/calltip.xpm
 share/pixmaps/anjuta/class-inheritance.png
 share/pixmaps/anjuta/class_logo.xpm
-share/pixmaps/anjuta/close_file_small.xpm
-share/pixmaps/anjuta/close_project.png
-share/pixmaps/anjuta/compile.xpm
-share/pixmaps/anjuta/configure.xpm
-share/pixmaps/anjuta/continue.xpm
-share/pixmaps/anjuta/debug.xpm
-share/pixmaps/anjuta/debug_stop.xpm
 share/pixmaps/anjuta/detach-16.png
 share/pixmaps/anjuta/detach.png
 share/pixmaps/anjuta/directory-accept.png
 share/pixmaps/anjuta/directory.png
-share/pixmaps/anjuta/dock.xpm
 share/pixmaps/anjuta/error-next-16.png
 share/pixmaps/anjuta/error-next.png
 share/pixmaps/anjuta/error-prev-16.png
@@ -718,11 +728,8 @@ share/pixmaps/anjuta/indent_auto.xpm
 share/pixmaps/anjuta/indent_dcr.xpm
 share/pixmaps/anjuta/indent_inc.xpm
 share/pixmaps/anjuta/indent_set.xpm
+share/pixmaps/anjuta/linemarker.png
 share/pixmaps/anjuta/locals.png
-share/pixmaps/anjuta/marker-attentive.png
-share/pixmaps/anjuta/marker-basic.png
-share/pixmaps/anjuta/marker-intense.png
-share/pixmaps/anjuta/marker-light.png
 share/pixmaps/anjuta/messages.xpm
 share/pixmaps/anjuta/password.png
 share/pixmaps/anjuta/pointer.png
@@ -730,6 +737,9 @@ share/pixmaps/anjuta/preferences-editor.png
 share/pixmaps/anjuta/preferences-general.png
 share/pixmaps/anjuta/preferences-messages.png
 share/pixmaps/anjuta/preferences-terminal.png
+share/pixmaps/anjuta/profiler.png
+share/pixmaps/anjuta/program-counter.png
+share/pixmaps/anjuta/run-to-cursor.png
 share/pixmaps/anjuta/sourceview.png
 share/pixmaps/anjuta/stack.png
 share/pixmaps/anjuta/step-into-16.png
@@ -738,35 +748,29 @@ share/pixmaps/anjuta/step-out-16.png
 share/pixmaps/anjuta/step-out.png
 share/pixmaps/anjuta/step-over-16.png
 share/pixmaps/anjuta/step-over.png
-share/pixmaps/anjuta/undock.png
+share/pixmaps/anjuta/swap.png
 share/pixmaps/anjuta/watch.png
 @dirrm share/pixmaps/anjuta
 @comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/omf/anjuta
+@dirrm share/omf/anjuta-manual
 @comment in scrollkeeper: @dirrm share/omf
-@dirrm share/mime/packages
-@comment in xdg-dirs: @dirrm share/mime-info
-@dirrm share/mime
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@comment in gnome-icon-theme: @dirrm share/icons/gnome/scalable/mimetypes
 @comment in gnome-icon-theme: @dirrm share/icons/gnome/48x48/mimetypes
-@comment in gnome-icon-theme: @dirrm share/icons/gnome/48x48
-@comment in gnome-icon-theme: @dirrm share/icons/gnome
-@comment in xdg-dirs: @dirrm share/icons
 @dirrm share/gtk-doc/html/libanjuta
-@dirrm share/gnome/help/anjuta/C/figures
-@dirrm share/gnome/help/anjuta/C
-@dirrm share/gnome/help/anjuta
+@dirrm share/gnome/help/anjuta-manual/C/figures
+@dirrm share/gnome/help/anjuta-manual/C
+@dirrm share/gnome/help/anjuta-manual
+@dirrm share/gnome/help/anjuta-faqs/C
+@dirrm share/gnome/help/anjuta-faqs
 @comment in gnome2-dirs: @dirrm share/gnome/help
-@comment in gnome2-dirs: @dirrm share/gnome
 @dirrm share/doc/anjuta
 @comment in xdg-dirs: @dirrm share/applications
-@comment in xdg-dirs: @dirrm share/application-registry
 @dirrm share/anjuta/ui
 @dirrm share/anjuta/tools
+@dirrm share/anjuta/scripts
 @dirrm share/anjuta/properties
 @dirrm share/anjuta/project/xlib/src
 @dirrm share/anjuta/project/xlib/po
@@ -780,12 +784,16 @@ share/pixmaps/anjuta/watch.png
 @dirrm share/anjuta/project/terminal/src
 @dirrm share/anjuta/project/terminal/po
 @dirrm share/anjuta/project/terminal
+@dirrm share/anjuta/project/sdl/src
+@dirrm share/anjuta/project/sdl/po
+@dirrm share/anjuta/project/sdl
 @dirrm share/anjuta/project/python/src
 @dirrm share/anjuta/project/python/po
 @dirrm share/anjuta/project/python
 @dirrm share/anjuta/project/mkfile/src
 @dirrm share/anjuta/project/mkfile/po
 @dirrm share/anjuta/project/mkfile
+@dirrm share/anjuta/project/minimal
 @dirrm share/anjuta/project/java/src
 @dirrm share/anjuta/project/java/po
 @dirrm share/anjuta/project/java
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index 55d6553bd03..0fc0b1c9fac 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.15 2007/10/05 22:01:16 joerg Exp $
+$NetBSD: distinfo,v 1.16 2007/12/16 14:49:40 drochner Exp $
 
-SHA1 (anjuta-2.0.2.tar.gz) = 5f11f6b642c310b8838237da5965272ebbd27426
-RMD160 (anjuta-2.0.2.tar.gz) = 9931311e2f65f66d149e64a02e1996b2b972b925
-Size (anjuta-2.0.2.tar.gz) = 6844511 bytes
-SHA1 (patch-aa) = bb2825744da8c70c1cddbe226bc3aec7e8ec4061
-SHA1 (patch-ba) = fc3a8036ff7886246fc21203b292be89585fa474
-SHA1 (patch-bb) = 9d4a6f63c9ba72d15c034bc3752320e5492c9cb2
-SHA1 (patch-bc) = 0e81a73de07cf24a20bcf7c7c35f8f5c280e2311
-SHA1 (patch-bd) = ffd4a8d3e1b88114d9642930066dde859910d894
-SHA1 (patch-be) = 9b0b0340d611c2ae6710028efb8457e21aa7cf30
+SHA1 (anjuta-2.2.3.tar.bz2) = 8c44f7d9d19899f47c71b297668cff85a273b7a1
+RMD160 (anjuta-2.2.3.tar.bz2) = 4e17d285f6dcb668a3e81cd87055253b745cfbd2
+Size (anjuta-2.2.3.tar.bz2) = 5547518 bytes
+SHA1 (patch-bb) = c7ecb2034d8b9f63905d878ff7d901eda7422c11
+SHA1 (patch-bf) = 8a07e2074019419111cf0845856a3a7636601a30
diff --git a/devel/anjuta/patches/patch-aa b/devel/anjuta/patches/patch-aa
deleted file mode 100644
index bd1528e9a73..00000000000
--- a/devel/anjuta/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2007/10/05 22:01:16 joerg Exp $
-
---- plugins/sourceview/anjuta-languages-manager.c.orig	2007-10-05 20:50:12.000000000 +0000
-+++ plugins/sourceview/anjuta-languages-manager.c
-@@ -110,15 +110,6 @@ get_gconf_key (GtkSourceLanguage *langua
- 	return key;
- }
- 
--static gchar * 
--gdk_color_to_string (GdkColor color)
--{
--	return g_strdup_printf ("#%04x%04x%04x",
--				color.red, 
--				color.green,
--				color.blue);
--}
--
- static gchar *
- tag_style_to_string (const GtkSourceTagStyle *style)
- {
-@@ -126,8 +117,8 @@ tag_style_to_string (const GtkSourceTagS
- 	gchar *background;
- 	gchar *foreground;
- 
--	background = gdk_color_to_string (style->background);
--	foreground = gdk_color_to_string (style->foreground);
-+	background = gdk_color_to_string (&style->background);
-+	foreground = gdk_color_to_string (&style->foreground);
- 
- 	res = g_strdup_printf ("%d/%s/%s/%d/%d/%d/%d",
- 			style->mask,
diff --git a/devel/anjuta/patches/patch-ba b/devel/anjuta/patches/patch-ba
deleted file mode 100644
index 7412ef16f76..00000000000
--- a/devel/anjuta/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2007/01/04 11:29:07 rillig Exp $
-
---- libanjuta/anjuta-children.c.orig	2005-04-20 14:04:30.000000000 +0200
-+++ libanjuta/anjuta-children.c	2007-01-04 04:13:58.000000000 +0100
-@@ -17,6 +17,8 @@
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
-+#include <signal.h>
-+
- #include <libanjuta/anjuta-children.h>
- 
- static GList *registered_child_processes = NULL;
diff --git a/devel/anjuta/patches/patch-bb b/devel/anjuta/patches/patch-bb
index 35577b40f96..02a612d6239 100644
--- a/devel/anjuta/patches/patch-bb
+++ b/devel/anjuta/patches/patch-bb
@@ -1,32 +1,16 @@
-$NetBSD: patch-bb,v 1.2 2007/02/02 17:05:58 joerg Exp $
+$NetBSD: patch-bb,v 1.3 2007/12/16 14:49:41 drochner Exp $
 
---- libanjuta/anjuta-launcher.c.orig	2006-02-26 10:15:28.000000000 +0000
+--- libanjuta/anjuta-launcher.c.orig	2007-08-13 23:39:27.000000000 +0200
 +++ libanjuta/anjuta-launcher.c
-@@ -24,7 +24,9 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <signal.h>
--#ifndef sun
-+#if defined(__DragonFly__)
-+#include <libutil.h>
-+#elif !defined(__sun) && !defined(__NetBSD__)
- #include <pty.h>
- #endif
- #include <assert.h>
-@@ -48,7 +50,15 @@
- #define ANJUTA_PIXMAP_PASSWORD "password.png"
- #define FILE_BUFFER_SIZE 1024
- #ifndef __MAX_BAUD
--#define __MAX_BAUD B460800
-+#  ifdef B460800
-+#    define __MAX_BAUD B460800
-+#  else
-+#    define __MAX_BAUD B230400
-+#  endif
+@@ -68,7 +68,11 @@
+ #ifdef __CYGWIN__
+ #define __MAX_BAUD B256000
+ #else
++#ifdef B460800
+ #define __MAX_BAUD B460800
++#else
++#define __MAX_BAUD B230400
 +#endif
-+
-+#if defined(__DragonFly__) && !defined(O_SYNC)
-+#define O_SYNC O_FSYNC
+ #endif
  #endif
  
- /*
diff --git a/devel/anjuta/patches/patch-bc b/devel/anjuta/patches/patch-bc
deleted file mode 100644
index f58907ff559..00000000000
--- a/devel/anjuta/patches/patch-bc
+++ /dev/null
@@ -1,170 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2007/01/04 11:29:07 rillig Exp $
-
-Tags: for-upstream
-
-Please check the code with -Wformat=2.
-
---- plugins/sourceview/anjuta-document-saver.c.orig	2006-03-03 14:53:04.000000000 +0100
-+++ plugins/sourceview/anjuta-document-saver.c	2007-01-04 05:23:01.000000000 +0100
-@@ -274,7 +274,7 @@ write_document_contents (gint           
- 		g_set_error (error,
- 			     ANJUTA_DOCUMENT_ERROR,
- 			     result,
--			     gnome_vfs_result_to_string (result));
-+			     "%s", gnome_vfs_result_to_string (result));
- 	}
- 
- 	return res;
-@@ -376,7 +376,7 @@ copy_file_data (gint     sfd,
- 			g_set_error (&err,
- 				     ANJUTA_DOCUMENT_ERROR,
- 				     result,
--				     gnome_vfs_result_to_string (result));
-+				     "%s", gnome_vfs_result_to_string (result));
- 
- 			ret = FALSE;
- 
-@@ -396,7 +396,7 @@ copy_file_data (gint     sfd,
- 				g_set_error (&err,
- 					     ANJUTA_DOCUMENT_ERROR,
- 					     result,
--					     gnome_vfs_result_to_string (result));
-+					     "%s", gnome_vfs_result_to_string (result));
- 
- 				ret = FALSE;
- 
-@@ -460,7 +460,7 @@ save_existing_local_file (AnjutaDocument
- 		g_set_error (&saver->priv->error,
- 			     ANJUTA_DOCUMENT_ERROR,
- 			     result,
--			     gnome_vfs_result_to_string (result));
-+			     "%s", gnome_vfs_result_to_string (result));
- 
- 		goto out;
- 	}
-@@ -473,7 +473,7 @@ save_existing_local_file (AnjutaDocument
- 			g_set_error (&saver->priv->error,
- 				     ANJUTA_DOCUMENT_ERROR,
- 				     GNOME_VFS_ERROR_IS_DIRECTORY,
--				     gnome_vfs_result_to_string (GNOME_VFS_ERROR_IS_DIRECTORY));
-+				     "%s", gnome_vfs_result_to_string (GNOME_VFS_ERROR_IS_DIRECTORY));
- 		}
- 		else
- 		{
-@@ -492,7 +492,7 @@ save_existing_local_file (AnjutaDocument
- 		g_set_error (&saver->priv->error,
- 			     ANJUTA_DOCUMENT_ERROR,
- 			     GNOME_VFS_ERROR_READ_ONLY,
--			     gnome_vfs_result_to_string (GNOME_VFS_ERROR_READ_ONLY));
-+			     "%s", gnome_vfs_result_to_string (GNOME_VFS_ERROR_READ_ONLY));
- 
- 		goto out;
- 	}
-@@ -523,7 +523,7 @@ save_existing_local_file (AnjutaDocument
- 		g_set_error (&saver->priv->error,
- 			     ANJUTA_DOCUMENT_ERROR,
- 			     GNOME_VFS_ERROR_GENERIC,
--			     gnome_vfs_result_to_string (GNOME_VFS_ERROR_GENERIC));
-+			     "%s", gnome_vfs_result_to_string (GNOME_VFS_ERROR_GENERIC));
- 
- 		goto out;
- 	}
-@@ -594,7 +594,7 @@ save_existing_local_file (AnjutaDocument
- 			g_set_error (&saver->priv->error,
- 				     ANJUTA_DOCUMENT_ERROR,
- 				     result,
--				     gnome_vfs_result_to_string (result));
-+				     "%s", gnome_vfs_result_to_string (result));
- 
- 			close (tmpfd);
- 			unlink (tmp_filename);
-@@ -610,7 +610,7 @@ save_existing_local_file (AnjutaDocument
- 			g_set_error (&saver->priv->error,
- 				     ANJUTA_DOCUMENT_ERROR,
- 				     result,
--				     gnome_vfs_result_to_string (result));
-+				     "%s", gnome_vfs_result_to_string (result));
- 
- 			/* try to restore... no error checking */
- 			rename (backup_filename, saver->priv->local_path);
-@@ -631,7 +631,7 @@ save_existing_local_file (AnjutaDocument
- 			g_set_error (&saver->priv->error,
- 				     ANJUTA_DOCUMENT_ERROR,
- 				     result,
--				     gnome_vfs_result_to_string (result));
-+				     "%s", gnome_vfs_result_to_string (result));
- 
- 			close (tmpfd);
- 			goto out;
-@@ -748,7 +748,7 @@ save_existing_local_file (AnjutaDocument
- 		g_set_error (&saver->priv->error,
- 			     ANJUTA_DOCUMENT_ERROR,
- 			     result,
--			     gnome_vfs_result_to_string (result));
-+			     "%s", gnome_vfs_result_to_string (result));
- 
- 		goto out;
- 	}
-@@ -794,7 +794,7 @@ save_new_local_file (AnjutaDocumentSaver
- 		g_set_error (&saver->priv->error,
- 			     ANJUTA_DOCUMENT_ERROR,
- 			     result,
--			     gnome_vfs_result_to_string (result));
-+			     "%s", gnome_vfs_result_to_string (result));
- 
- 		goto out;
- 	}
-@@ -867,7 +867,7 @@ save_local_file (AnjutaDocumentSaver *sa
- 	g_set_error (&saver->priv->error,
- 		     ANJUTA_DOCUMENT_ERROR,
- 		     result,
--		     gnome_vfs_result_to_string (result));
-+		     "%s", gnome_vfs_result_to_string (result));
- 
- 	next_phase = (GSourceFunc) open_local_failed;
- 
-@@ -910,7 +910,7 @@ remote_get_info_cb (GnomeVFSAsyncHandle 
- 		g_set_error (&saver->priv->error,
- 			     ANJUTA_DOCUMENT_ERROR,
- 			     info_result->result,
--			     gnome_vfs_result_to_string (info_result->result));
-+			     "%s", gnome_vfs_result_to_string (info_result->result));
- 
- 		remote_save_completed_or_failed (saver);
- 
-@@ -965,7 +965,7 @@ async_xfer_ok (GnomeVFSXferProgressInfo 
- 				g_set_error (&saver->priv->error,
- 					     ANJUTA_DOCUMENT_ERROR,
- 					     res,
--					     gnome_vfs_result_to_string (res));
-+					     "%s", gnome_vfs_result_to_string (res));
- 
- 				/* abort xfer */
- 				return 0;
-@@ -1076,7 +1076,7 @@ async_xfer_error (GnomeVFSXferProgressIn
- 	g_set_error (&saver->priv->error,
- 		     ANJUTA_DOCUMENT_ERROR,
- 		     progress_info->vfs_status,
--		     gnome_vfs_result_to_string (progress_info->vfs_status));
-+		     "%s", gnome_vfs_result_to_string (progress_info->vfs_status));
- 
- 	remote_save_completed_or_failed (saver);
- 
-@@ -1137,7 +1137,7 @@ save_remote_file_real (AnjutaDocumentSav
- 		g_set_error (&saver->priv->error,
- 			     ANJUTA_DOCUMENT_ERROR,
- 			     result,
--			     gnome_vfs_result_to_string (result));
-+			     "%s", gnome_vfs_result_to_string (result));
- 
- 		/* in this case no need to close the tmp file */
- 		save_completed_or_failed (saver);
-@@ -1188,7 +1188,7 @@ save_remote_file_real (AnjutaDocumentSav
- 		g_set_error (&saver->priv->error,
- 		    	     ANJUTA_DOCUMENT_ERROR,
- 		     	     result,
--			     gnome_vfs_result_to_string (result));
-+			     "%s", gnome_vfs_result_to_string (result));
- 
- 		goto error;
- 	}
diff --git a/devel/anjuta/patches/patch-bd b/devel/anjuta/patches/patch-bd
deleted file mode 100644
index 57200202f2e..00000000000
--- a/devel/anjuta/patches/patch-bd
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2007/01/04 11:29:07 rillig Exp $
-
---- plugins/terminal/terminal.c.orig	2005-06-24 16:21:21.000000000 +0200
-+++ plugins/terminal/terminal.c	2007-01-04 04:27:01.000000000 +0100
-@@ -19,6 +19,9 @@
- */
- 
- #include <config.h>
-+
-+#include <signal.h>
-+
- #include <libanjuta/anjuta-shell.h>
- #include <libanjuta/anjuta-children.h>
- #include <libanjuta/anjuta-debug.h>
diff --git a/devel/anjuta/patches/patch-be b/devel/anjuta/patches/patch-be
deleted file mode 100644
index 98f312e3deb..00000000000
--- a/devel/anjuta/patches/patch-be
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-be,v 1.1 2007/01/04 11:29:07 rillig Exp $
-
---- src/main.c.orig	2006-05-15 00:00:50.000000000 +0200
-+++ src/main.c	2007-01-04 05:24:45.000000000 +0100
-@@ -22,6 +22,10 @@
- #  include <config.h>
- #endif
- 
-+#ifdef ENABLE_NLS
-+#  include <locale.h>
-+#endif
-+
- #include <sys/stat.h>
- 
- #include <gnome.h>
diff --git a/devel/anjuta/patches/patch-bf b/devel/anjuta/patches/patch-bf
new file mode 100644
index 00000000000..0ff5d98fc43
--- /dev/null
+++ b/devel/anjuta/patches/patch-bf
@@ -0,0 +1,31 @@
+$NetBSD: patch-bf,v 1.1 2007/12/16 14:49:43 drochner Exp $
+
+--- ./plugins/document-manager/anjuta-docman.c.orig	2007-08-13 23:38:56.000000000 +0200
++++ ./plugins/document-manager/anjuta-docman.c
+@@ -84,6 +84,7 @@ static void anjuta_docman_grab_text_focu
+ static void on_notebook_switch_page (GtkNotebook * notebook,
+ 									 GtkNotebookPage * page,
+ 									 gint page_num, AnjutaDocman *docman);
++static gchar *get_real_path(const gchar *);
+ 
+ static void
+ on_text_editor_notebook_close_page (GtkButton* button, 
+@@ -926,7 +927,7 @@ anjuta_docman_goto_file_line_mark (Anjut
+ 	/* Get the normalized file path for comparision */
+ 	is_local_uri = gnome_vfs_uri_is_local (vfs_uri);
+ 	if (is_local_uri)
+-		normalized_path = realpath (gnome_vfs_uri_get_path (vfs_uri), NULL);
++		normalized_path = get_real_path (gnome_vfs_uri_get_path (vfs_uri));
+ 	if (normalized_path == NULL)
+ 		normalized_path = g_strdup (uri);
+ 	
+@@ -958,8 +959,7 @@ anjuta_docman_goto_file_line_mark (Anjut
+ 		vfs_uri = gnome_vfs_uri_new (te_uri);
+ 		te_is_local_uri = gnome_vfs_uri_is_local (vfs_uri);
+ 		if (te_is_local_uri)
+-			te_normalized_path = realpath (gnome_vfs_uri_get_path (vfs_uri),
+-										   NULL);
++			te_normalized_path = get_real_path (gnome_vfs_uri_get_path (vfs_uri));
+ 		if (te_normalized_path == NULL)
+ 			te_normalized_path = g_strdup (te_uri);
+ 		gnome_vfs_uri_unref (vfs_uri);