Update to 0.1.8.

PR:		33527
Submitted by:	Lev A.Serebryakov <lev@macro.ru>

14 files changed, 544 insertions, 632 deletions

diff --git a/devel/anjuta-devel/Makefile b/devel/anjuta-devel/Makefile
index a38519cde2b2..2a64b53ecd3f 100644
--- a/devel/anjuta-devel/Makefile
+++ b/devel/anjuta-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	anjuta
-PORTVERSION=	0.1.7
+PORTVERSION=	0.1.8
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	anjuta
@@ -24,8 +24,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 pre-patch:
 	@${PERL} -pi -e 's#-lpthread#-pthread#g ; \
-		s#DATADIRNAME=lib#DATADIRNAME=share#g' ${WRKSRC}/configure
+		 s#DATADIRNAME=lib#DATADIRNAME=share#g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		 's#\$\(datadir\)/locale#\$\(prefix\)/share/locale#g'
+		's#\$\(datadir\)/locale#\$\(prefix\)/share/locale#g'
 
 .include <bsd.port.mk>
diff --git a/devel/anjuta-devel/distinfo b/devel/anjuta-devel/distinfo
index d1da03769950..ed446779dbad 100644
--- a/devel/anjuta-devel/distinfo
+++ b/devel/anjuta-devel/distinfo
@@ -1 +1 @@
-MD5 (anjuta-0.1.7.tar.gz) = 2d518592ced3d548d37a73e5f6285af4
+MD5 (anjuta-0.1.8.tar.gz) = 7bdfe257961dfbdcd63e7b8d7411a5fa
diff --git a/devel/anjuta-devel/files/patch-Makefile.in b/devel/anjuta-devel/files/patch-Makefile.in
index a3e2e54bd17d..c863c25da036 100644
--- a/devel/anjuta-devel/files/patch-Makefile.in
+++ b/devel/anjuta-devel/files/patch-Makefile.in
@@ -1,15 +1,28 @@
---- Makefile.in.orig	Sun Aug 12 11:01:09 2001
-+++ Makefile.in	Sun Aug 12 11:02:14 2001
-@@ -128,10 +128,10 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Fri Jan  4 16:09:11 2002
++++ Makefile.in	Fri Jan  4 16:26:58 2002
+@@ -137,11 +137,11 @@
  cxxflags_set = @cxxflags_set@
  l = @l@
  
--SUBDIRS = intl po macros scintilla ccview widgets manuals omf-install src pixmaps data doc launcher
-+SUBDIRS = intl po macros ccview widgets manuals omf-install src pixmaps data doc launcher
+-SUBDIRS = intl po macros tagmanager global-tags scintilla ccview 	widgets manuals omf-install src pixmaps data 	doc launcher
++SUBDIRS = intl po macros tagmanager global-tags ccview 	widgets manuals omf-install src pixmaps data 	launcher
+ 
  
  anjutadocdir = ${prefix}/doc/anjuta
--anjutadoc_DATA =  	README 	COPYING 	AUTHORS 	ChangeLog 	INSTALL 	NEWS 	TODO 	ABOUT-NLS
-+anjutadoc_DATA =
+-anjutadoc_DATA =  	README 	COPYING 	AUTHORS 	ChangeLog 	INSTALL 	NEWS 	TODO 	ABOUT-NLS 	FUTURE
++anjutadoc_DATA = # 	README 	COPYING 	AUTHORS 	ChangeLog 	INSTALL 	NEWS 	TODO 	ABOUT-NLS 	FUTURE
+ 
+ 
+ EXTRA_DIST =  	anjuta.desktop.in.in 	anjuta.spec.in 	xml-i18n-extract.in 	xml-i18n-merge.in 	xml-i18n-update.in 	$(anjutadoc_DATA)
+@@ -416,7 +416,7 @@
+ install-exec-am:
+ install-exec: install-exec-recursive
  
+-install-data-am: install-anjutadocDATA install-gnomemenuDATA
++install-data-am: install-gnomemenuDATA
+ install-data: install-data-recursive
  
- EXTRA_DIST =  	anjuta.desktop.in.in 	anjuta.prj 	anjuta.spec.in 	xml-i18n-extract.in 	xml-i18n-merge.in 	xml-i18n-update.in 	$(anjutadoc_DATA)
+ install-am: all-am
diff --git a/devel/anjuta-devel/files/patch-configure b/devel/anjuta-devel/files/patch-configure
index 7de922948ecf..7bf2e921a144 100644
--- a/devel/anjuta-devel/files/patch-configure
+++ b/devel/anjuta-devel/files/patch-configure
@@ -1,5 +1,8 @@
---- configure.orig	Fri Aug 24 12:34:57 2001
-+++ configure	Fri Aug 24 12:35:13 2001
+
+$FreeBSD$
+
+--- configure.orig	Fri Jan  4 15:39:12 2002
++++ configure	Fri Jan  4 16:07:50 2002
 @@ -8,6 +8,7 @@
  # gives unlimited permission to copy, distribute and modify it.
  
@@ -8,10 +11,24 @@
  ac_help=
  ac_default_prefix=/usr/local
  # Any additions from configure.in:
-@@ -4812,12 +4813,10 @@
- intl/Makefile
- po/Makefile.in
- macros/Makefile
+@@ -6391,10 +6392,10 @@
+   packageprefix=${prefix}
+ fi
+ 
+-packagedatadir=share/${PACKAGE}
+-packagedocdir=doc/${PACKAGE}
++packagedatadir=share/gnome/${PACKAGE}
++packagedocdir=share/doc/${PACKAGE}
+ 
+-packagepixmapsdir=share/pixmaps/${PACKAGE}
++packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}
+ packagehelpdir=share/gnome/help/${PACKAGE}
+ packagemenudir=share/gnome/apps
+ 
+@@ -6557,12 +6558,10 @@
+ tagmanager/Makefile
+ tagmanager/include/Makefile
+ global-tags/Makefile
 -scintilla/Makefile
  ccview/Makefile
  widgets/Makefile
@@ -21,7 +38,7 @@
  manuals/C/Makefile
  manuals/C/anjuta-manual/Makefile
  manuals/C/anjuta-faqs/Makefile
-@@ -4906,6 +4905,7 @@
+@@ -6656,6 +6655,7 @@
  s%@GNOME_CAPPLET_LIBS@%$GNOME_CAPPLET_LIBS%g
  s%@cflags_set@%$cflags_set%g
  s%@GTK_CONFIG@%$GTK_CONFIG%g
@@ -29,10 +46,10 @@
  s%@GTK_CFLAGS@%$GTK_CFLAGS%g
  s%@GTK_LIBS@%$GTK_LIBS%g
  s%@XPM_LIBS@%$XPM_LIBS%g
-@@ -4997,12 +4997,10 @@
- intl/Makefile
- po/Makefile.in
- macros/Makefile
+@@ -6759,12 +6759,10 @@
+ tagmanager/Makefile
+ tagmanager/include/Makefile
+ global-tags/Makefile
 -scintilla/Makefile
  ccview/Makefile
  widgets/Makefile
diff --git a/devel/anjuta-devel/files/patch-src-Makefile.in b/devel/anjuta-devel/files/patch-src-Makefile.in
index d53028b77864..2f0fd8759a78 100644
--- a/devel/anjuta-devel/files/patch-src-Makefile.in
+++ b/devel/anjuta-devel/files/patch-src-Makefile.in
@@ -1,133 +1,34 @@
---- src/Makefile.in.orig	Fri Aug 24 12:05:50 2001
-+++ src/Makefile.in	Fri Aug 24 12:09:03 2001
-@@ -128,7 +128,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
+
+$FreeBSD$
+
+--- src/Makefile.in.orig	Fri Jan  4 15:15:40 2002
++++ src/Makefile.in	Fri Jan  4 15:15:54 2002
+@@ -139,10 +139,10 @@
  
--INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR) 	 -I$(srcdir)/../scintilla/include 	 -I$(srcdir)/../widgets 	 -I$(srcdir)/../ccview 	 -I$(srcdir)/../pixmaps 	 -I.. -I. 	 -DHAVE_CONFIG_H 	 -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment -Wuninitialized -Wparentheses -Wtraditional -Wpointer-arith -Wmissing-prototypes 	 -O1 	 -g
-+INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR) 	 -I$(prefix)/include/scintilla 	 -I$(srcdir)/../widgets 	 -I$(srcdir)/../ccview 	 -I$(srcdir)/../pixmaps 	 -I.. -I. 	 -DHAVE_CONFIG_H 	 -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment -Wuninitialized -Wparentheses -Wtraditional -Wpointer-arith -Wmissing-prototypes
+ EXTRA_DIST = glades.h Prj-skelimpl.c Prj-skels.c Prj-stubs.c
  
+-INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR) 	$(EXTRA_GNOME_CFLAGS) 	$(EXTRA_ORBIT_CFLAGS) 	-I$(srcdir)/../scintilla/include 	-I$(srcdir)/../tagmanager/include 	-I$(srcdir)/../widgets 	-I$(srcdir)/../ccview 	-I$(srcdir)/../pixmaps 	-I.. -I. 	-Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment 	-Wuninitialized -Wparentheses -Wpointer-arith 	-Wmissing-prototypes  	-O1  	-g
++INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR) 	$(EXTRA_GNOME_CFLAGS) 	$(EXTRA_ORBIT_CFLAGS) 	-I$(prefix)/include/scintilla 	-I$(srcdir)/../tagmanager/include 	-I$(srcdir)/../widgets 	-I$(srcdir)/../ccview 	-I$(srcdir)/../pixmaps 	-I.. -I. 	-Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment 	-Wuninitialized -Wparentheses -Wpointer-arith 	-Wmissing-prototypes
  
- bin_PROGRAMS = anjuta
-@@ -136,7 +136,7 @@
- anjuta_SOURCES =  	aneditor.cxx 	aneditor.h 	anjuta.h 	anjuta_cbs.c 	anjuta_dirs.c 	anjuta_dirs.h 	anjuta_info.c 	anjuta_info.h 	appwiz_page1.c 	appwiz_page2.c 	appwiz_page3.c 	appwizard.c 	appwizard.h 	appwizard_cbs.c 	appwizard_cbs.h 	appwizard_gui.c 	attach_process.c 	attach_process.h 	attach_process_cbs.c 	attach_process_cbs.h 	attach_process_gui.c 	breakpoints.c 	breakpoints.h 	breakpoints_cbs.c 	breakpoints_cbs.h 	breakpoints_gui.c 	build_file.c 	build_file.h 	build_project.c 	build_project.h 	clean_project.c 	clean_project.h 	commands.c 	commands.h 	compile.c 	compile.h 	compiler_options.c 	compiler_options.h 	compiler_options_cbs.c 	compiler_options_cbs.h 	compiler_options_gui.c 	configurer.c 	configurer.h 	controls.c 	controls.h 	debugger.c 	debugger.h 	executer.c 	executer.h 	fileselection.c 	fileselection.h 	find_in_files.c 	find_in_files.h 	find_in_files_cbs.c 	find_in_files_cbs.h 	find_in_files_gui.c 	find_replace.c 	find_replace.h 	find_text.c 	find_text.h 	global.h 	gnome_project.c 	gnome_project.h 	goto_line.c 	goto_line.h 	help.c 	help.h 	launcher.c 	launcher.h 	lexer.h 	main.c 	main_menubar.c 	main_menubar.h 	main_menubar_def.h 	mainmenu_callbacks.c 	mainmenu_callbacks.h 	messagebox.c 	messagebox.h 	messages.c 	messages.h 	pixmaps.h 	preferences.c 	preferences.h 	preferences_gui.c 	project_dbase.c 	project_dbase.h 	project_config.c 	project_config.h 	project_dbase_gui.c 	properties.cxx 	properties.h 	registers.c 	registers.h 	registers_cbs.c 	registers_cbs.h 	registers_gui.c 	sharedlib.c 	sharedlib.h 	sharedlib_cbs.c 	sharedlib_cbs.h 	sharedlib_gui.c 	signals.c 	signals.h 	signals_cbs.c 	signals_cbs.h 	signals_gui.c 	splash.c 	splash.h 	src_paths.c 	src_paths.h 	src_paths_cbs.c 	src_paths_cbs.h 	src_paths_gui.c 	stack_trace.c 	stack_trace.h 	stack_trace_cbs.c 	stack_trace_cbs.h 	stack_trace_gui.c 	syntax.h 	tags_manager.c 	tags_manager.h 	text_editor.c 	text_editor.h 	text_editor_cbs.c 	text_editor_cbs.h 	text_editor_gui.c 	text_editor_gui.h 	text_editor_menu.c 	text_editor_menu.h 	toolbar.c 	toolbar.h 	toolbar_callbacks.c 	toolbar_callbacks.h 	utilities.c 	utilities.h 	watch.c 	watch.h 	watch_cbs.c 	watch_cbs.h 	watch_gui.c 	about.c 	appwiz_page4.c 	source.c 	anjuta.c 	anjuta_gui.c 	source.h 	glade_iface.c 	glade_iface.h 	compatibility_0.c 	compatibility_0.h 	defaults.c 	defaults.h 	about.h 	resources.c 	resources.h 	notebook.c 	notebook.h
  
+-SCILEXERS =      ../scintilla/StyleContext.o 	../scintilla/LexCPP.o 	../scintilla/LexConf.o 	../scintilla/LexHTML.o 	../scintilla/LexLua.o 	../scintilla/LexOthers.o 	../scintilla/LexPerl.o 	../scintilla/LexPython.o 	../scintilla/LexSQL.o 	../scintilla/LexVB.o 	../scintilla/LexPascal.o 	../scintilla/LexAVE.o 	../scintilla/LexCrontab.o 	../scintilla/LexEiffel.o 	../scintilla/LexLisp.o 	../scintilla/LexRuby.o 	../scintilla/LexBullant.o 	../scintilla/LexAda.o
++SCILEXERS =      -lscintilla_lexers
  
--anjuta_LDADD =  	$(INTLLIBS) 	$(GNOME_LIBDIR) $(GNOMEUI_LIBS) 	 -L../scintilla -L../widgets -L../ccview 	 ../scintilla/LexCPP.o ../scintilla/LexConf.o ../scintilla/LexHTML.o ../scintilla/LexLua.o ../scintilla/LexOthers.o ../scintilla/LexPerl.o ../scintilla/LexPython.o ../scintilla/LexSQL.o ../scintilla/LexVB.o ../scintilla/LexPascal.o ../scintilla/LexAVE.o -lwidgets -lccview -lxml -lscintilla
-+anjuta_LDADD =  	$(INTLLIBS) 	$(GNOME_LIBDIR) $(GNOMEUI_LIBS) 	 -L../widgets -L../ccview -lwidgets -lccview -lxml -lscintilla
  
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
-@@ -168,10 +168,7 @@
- watch_cbs.o watch_gui.o about.o appwiz_page4.o source.o anjuta.o \
- anjuta_gui.o glade_iface.o compatibility_0.o defaults.o resources.o \
- notebook.o
--anjuta_DEPENDENCIES =  ../scintilla/LexCPP.o ../scintilla/LexConf.o \
--../scintilla/LexHTML.o ../scintilla/LexLua.o ../scintilla/LexOthers.o \
--../scintilla/LexPerl.o ../scintilla/LexPython.o ../scintilla/LexSQL.o \
--../scintilla/LexVB.o ../scintilla/LexPascal.o ../scintilla/LexAVE.o
+ bin_PROGRAMS = anjuta
+@@ -198,14 +198,7 @@
+ defaults.$(OBJEXT) resources.$(OBJEXT) notebook.$(OBJEXT) \
+ CORBA-Server.$(OBJEXT) Gladen-common.$(OBJEXT) glades.$(OBJEXT) \
+ Prj-common.$(OBJEXT) Gladen-stubs.$(OBJEXT) session.$(OBJEXT)
+-anjuta_DEPENDENCIES =  ../scintilla/StyleContext.o ../scintilla/LexCPP.o \
+-../scintilla/LexConf.o ../scintilla/LexHTML.o ../scintilla/LexLua.o \
+-../scintilla/LexOthers.o ../scintilla/LexPerl.o \
+-../scintilla/LexPython.o ../scintilla/LexSQL.o ../scintilla/LexVB.o \
+-../scintilla/LexPascal.o ../scintilla/LexAVE.o \
+-../scintilla/LexCrontab.o ../scintilla/LexEiffel.o \
+-../scintilla/LexLisp.o ../scintilla/LexRuby.o ../scintilla/LexBullant.o \
+-../scintilla/LexAda.o
 +anjuta_DEPENDENCIES =
  anjuta_LDFLAGS = 
  CXXFLAGS = @CXXFLAGS@
  CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-@@ -297,14 +294,7 @@
- 	  fi; \
- 	done
- about.o: about.c ../config.h utilities.h resources.h about.h
--aneditor.o: aneditor.cxx ../config.h ../scintilla/include/Platform.h \
--	../scintilla/include/PropSet.h ../scintilla/include/SString.h \
--	../scintilla/include/Accessor.h \
--	../scintilla/include/WindowAccessor.h \
--	../scintilla/include/KeyWords.h \
--	../scintilla/include/Scintilla.h \
--	../scintilla/include/ScintillaWidget.h \
--	../scintilla/include/SciLexer.h lexer.h properties.h aneditor.h
-+aneditor.o: aneditor.cxx ../config.h lexer.h properties.h aneditor.h
- anjuta_cbs.o: anjuta_cbs.c ../config.h text_editor.h global.h \
- 	text_editor_menu.h preferences.h properties.h aneditor.h \
- 	anjuta.h toolbar.h messagebox.h compiler_options.h src_paths.h \
-@@ -333,9 +323,7 @@
- 	anjuta_dirs.h executer.h configurer.h utilities.h \
- 	main_menubar.h help.h fileselection.h resources.h launcher.h \
- 	debugger.h watch.h registers.h stack_trace.h signals.h \
--	sharedlib.h attach_process.h controls.h anjuta_info.h \
--	../scintilla/include/Scintilla.h \
--	../scintilla/include/ScintillaWidget.h
-+	sharedlib.h attach_process.h controls.h anjuta_info.h
- appwizard_cbs.o: appwizard_cbs.c ../config.h anjuta.h toolbar.h \
- 	text_editor.h global.h text_editor_menu.h preferences.h \
- 	properties.h aneditor.h messagebox.h compiler_options.h \
-@@ -501,8 +489,7 @@
- 	find_text.h find_in_files.h messages.h project_dbase.h \
- 	tags_manager.h project_config.h commands.h anjuta_dirs.h \
- 	executer.h configurer.h utilities.h main_menubar.h help.h \
--	controls.h ../scintilla/include/Scintilla.h \
--	../scintilla/include/ScintillaWidget.h
-+	controls.h
- debugger.o: debugger.c ../config.h anjuta.h toolbar.h text_editor.h \
- 	global.h text_editor_menu.h preferences.h properties.h \
- 	aneditor.h messagebox.h compiler_options.h src_paths.h \
-@@ -557,9 +544,7 @@
- 	src_paths.h find_replace.h find_text.h find_in_files.h \
- 	messages.h project_dbase.h tags_manager.h project_config.h \
- 	commands.h breakpoints.h anjuta_dirs.h executer.h configurer.h \
--	utilities.h main_menubar.h help.h resources.h \
--	../scintilla/include/Scintilla.h \
--	../scintilla/include/ScintillaWidget.h
-+	utilities.h main_menubar.h help.h resources.h
- find_text.o: find_text.c ../config.h anjuta.h toolbar.h text_editor.h \
- 	global.h text_editor_menu.h preferences.h properties.h \
- 	aneditor.h messagebox.h compiler_options.h src_paths.h \
-@@ -622,8 +607,7 @@
- 	compile.h launcher.h appwizard.h debugger.h watch.h registers.h \
- 	stack_trace.h signals.h sharedlib.h attach_process.h \
- 	breakpoints_cbs.h goto_line.h resources.h controls.h \
--	signals_cbs.h watch_cbs.h ../scintilla/include/Scintilla.h \
--	../scintilla/include/ScintillaWidget.h
-+	signals_cbs.h watch_cbs.h
- main.o: main.c ../config.h splash.h anjuta.h toolbar.h text_editor.h \
- 	global.h text_editor_menu.h preferences.h properties.h \
- 	aneditor.h messagebox.h compiler_options.h src_paths.h \
-@@ -685,8 +669,7 @@
- 	../pixmaps/file_cpp.xpm ../pixmaps/file_h.xpm \
- 	../pixmaps/file_pix.xpm ../pixmaps/file_icon.xpm \
- 	../pixmaps/file_html.xpm ../pixmaps/file_i18n.xpm
--properties.o: properties.cxx ../scintilla/include/PropSet.h \
--	../scintilla/include/SString.h properties.h
-+properties.o: properties.cxx
- registers_cbs.o: registers_cbs.c ../config.h registers.h properties.h \
- 	registers_cbs.h debugger.h global.h breakpoints.h text_editor.h \
- 	text_editor_menu.h preferences.h aneditor.h watch.h \
-@@ -791,8 +774,7 @@
- 	messages.h project_dbase.h tags_manager.h project_config.h \
- 	commands.h breakpoints.h anjuta_dirs.h executer.h configurer.h \
- 	utilities.h main_menubar.h help.h controls.h text_editor_cbs.h \
--	text_editor_gui.h mainmenu_callbacks.h resources.h \
--	../scintilla/include/Scintilla.h
-+	text_editor_gui.h mainmenu_callbacks.h resources.h
- text_editor_gui.o: text_editor_gui.c ../config.h anjuta.h toolbar.h \
- 	text_editor.h global.h text_editor_menu.h preferences.h \
- 	properties.h aneditor.h messagebox.h compiler_options.h \
-@@ -800,9 +782,7 @@
- 	messages.h project_dbase.h tags_manager.h project_config.h \
- 	commands.h breakpoints.h anjuta_dirs.h executer.h configurer.h \
- 	utilities.h main_menubar.h help.h text_editor_cbs.h \
--	text_editor_gui.h mainmenu_callbacks.h pixmaps.h resources.h \
--	../scintilla/include/Scintilla.h \
--	../scintilla/include/ScintillaWidget.h
-+	text_editor_gui.h mainmenu_callbacks.h pixmaps.h resources.h
- text_editor_menu.o: text_editor_menu.c ../config.h resources.h \
- 	text_editor_menu.h anjuta.h toolbar.h text_editor.h global.h \
- 	preferences.h properties.h aneditor.h messagebox.h \
-@@ -820,10 +800,7 @@
- 	messages.h project_dbase.h tags_manager.h project_config.h \
- 	commands.h breakpoints.h anjuta_dirs.h executer.h configurer.h \
- 	utilities.h main_menubar.h help.h text_editor_gui.h \
--	text_editor_cbs.h syntax.h launcher.h \
--	../scintilla/include/Scintilla.h \
--	../scintilla/include/SciLexer.h \
--	../scintilla/include/ScintillaWidget.h lexer.h controls.h
-+	text_editor_cbs.h syntax.h launcher.h lexer.h controls.h
- toolbar_callbacks.o: toolbar_callbacks.c ../config.h anjuta.h toolbar.h \
- 	text_editor.h global.h text_editor_menu.h preferences.h \
- 	properties.h aneditor.h messagebox.h compiler_options.h \
diff --git a/devel/anjuta-devel/files/patch-src::anjuta.c b/devel/anjuta-devel/files/patch-src::anjuta.c
new file mode 100644
index 000000000000..39809a1af638
--- /dev/null
+++ b/devel/anjuta-devel/files/patch-src::anjuta.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/anjuta.c	2002/01/04 13:31:53	1.1
++++ src/anjuta.c	2002/01/04 13:34:07
+@@ -148,7 +148,7 @@
+ 		app->fileselection = create_fileselection_gui (&fsd1);
+ 		
+ 		/* Set to the current dir */
+-		fileselection_set_dir (app->fileselection, (gchar *)get_current_dir_name());
++		fileselection_set_dir (app->fileselection, (gchar *)g_get_current_dir ());
+ 		
+ 		app->save_as_fileselection = create_fileselection_gui (&fsd2);
+ 		app->save_as_build_msg_sel = create_fileselection_gui (&fsd3);
diff --git a/devel/anjuta-devel/pkg-plist b/devel/anjuta-devel/pkg-plist
index 004289e60510..0ce84f7b270a 100644
--- a/devel/anjuta-devel/pkg-plist
+++ b/devel/anjuta-devel/pkg-plist
@@ -1,40 +1,53 @@
 bin/anjuta
 bin/anjuta_launcher
-share/anjuta/README.stock_libs
-share/anjuta/anjuta.properties
-share/anjuta/autogen.sh.generic
-share/anjuta/autogen.sh.gnome
-share/anjuta/autogen.sh.gnomemm
-share/anjuta/autogen.sh.gtk
-share/anjuta/autogen.sh.gtkmm
-share/anjuta/gdb.init
-share/anjuta/header.c
-share/anjuta/internal.properties
-share/anjuta/linux-gnome-c.api
-share/anjuta/stock_libs.anj
-share/anjuta/tags2api.py
-share/anjuta/welcome.txt
+share/gnome/anjuta/README.stock_libs
+share/gnome/anjuta/anjuta.properties
+share/gnome/anjuta/autogen.sh.generic
+share/gnome/anjuta/autogen.sh.gnome
+share/gnome/anjuta/autogen.sh.gnomemm
+share/gnome/anjuta/autogen.sh.gtk
+share/gnome/anjuta/autogen.sh.gtkmm
+share/gnome/anjuta/gdb.init
+share/gnome/anjuta/gnome/ChangeLog
+share/gnome/anjuta/gnome/Makefile.am
+share/gnome/anjuta/gnome/aclocal-include.m4
+share/gnome/anjuta/gnome/autogen.sh
+share/gnome/anjuta/gnome/compiler-flags.m4
+share/gnome/anjuta/gnome/curses.m4
+share/gnome/anjuta/gnome/gnome-bonobo-check.m4
+share/gnome/anjuta/gnome/gnome-common.m4
+share/gnome/anjuta/gnome/gnome-fileutils.m4
+share/gnome/anjuta/gnome/gnome-gettext.m4
+share/gnome/anjuta/gnome/gnome-ghttp-check.m4
+share/gnome/anjuta/gnome/gnome-gnorba-check.m4
+share/gnome/anjuta/gnome/gnome-guile-checks.m4
+share/gnome/anjuta/gnome/gnome-libgtop-check.m4
+share/gnome/anjuta/gnome/gnome-objc-checks.m4
+share/gnome/anjuta/gnome/gnome-orbit-check.m4
+share/gnome/anjuta/gnome/gnome-print-check.m4
+share/gnome/anjuta/gnome/gnome-pthread-check.m4
+share/gnome/anjuta/gnome/gnome-support.m4
+share/gnome/anjuta/gnome/gnome-undelfs.m4
+share/gnome/anjuta/gnome/gnome-vfs.m4
+share/gnome/anjuta/gnome/gnome-x-checks.m4
+share/gnome/anjuta/gnome/gnome-xml-check.m4
+share/gnome/anjuta/gnome/gnome.m4
+share/gnome/anjuta/gnome/gperf-check.m4
+share/gnome/anjuta/gnome/linger.m4
+share/gnome/anjuta/gnome/need-declaration.m4
+share/gnome/anjuta/header.c
+share/gnome/anjuta/internal.properties
+share/gnome/anjuta/stock_libs.anj
+share/gnome/anjuta/system.tags
+share/gnome/anjuta/welcome.txt
 share/gnome/apps/Development/anjuta.desktop
 share/gnome/help/anjuta/C/anjuta-faqs/anjuta-faqs.sgml
-share/gnome/help/anjuta/C/anjuta-faqs/docbook.css
 share/gnome/help/anjuta/C/anjuta-faqs/index.html
 share/gnome/help/anjuta/C/anjuta-faqs/ln7.html
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/caution.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/home.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/important.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/next.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/note.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/prev.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/tip.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/toc-blank.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/toc-minus.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/toc-plus.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/up.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/warning.gif
 share/gnome/help/anjuta/C/anjuta-manual/add-rm-files.html
-share/gnome/help/anjuta/C/anjuta-manual/anjuta-contacts.html
-share/gnome/help/anjuta/C/anjuta-manual/anjuta-license.html
 share/gnome/help/anjuta/C/anjuta-manual/anjuta-manual.sgml
+share/gnome/help/anjuta/C/anjuta-manual/authors.html
+share/gnome/help/anjuta/C/anjuta-manual/authors.sgml
 share/gnome/help/anjuta/C/anjuta-manual/breaks-del.html
 share/gnome/help/anjuta/C/anjuta-manual/breaks-edit.html
 share/gnome/help/anjuta/C/anjuta-manual/breaks-enbdis.html
@@ -74,7 +87,6 @@ share/gnome/help/anjuta/C/anjuta-manual/debugging-exprs.html
 share/gnome/help/anjuta/C/anjuta-manual/debugging-stack.html
 share/gnome/help/anjuta/C/anjuta-manual/debugging.html
 share/gnome/help/anjuta/C/anjuta-manual/defines.html
-share/gnome/help/anjuta/C/anjuta-manual/docbook.css
 share/gnome/help/anjuta/C/anjuta-manual/editing-files.html
 share/gnome/help/anjuta/C/anjuta-manual/expr-watch.html
 share/gnome/help/anjuta/C/anjuta-manual/familiar.html
@@ -126,11 +138,12 @@ share/gnome/help/anjuta/C/anjuta-manual/figures/watch_add.png
 share/gnome/help/anjuta/C/anjuta-manual/file-operations.html
 share/gnome/help/anjuta/C/anjuta-manual/includes.html
 share/gnome/help/anjuta/C/anjuta-manual/index.html
-share/gnome/help/anjuta/C/anjuta-manual/information.html
 share/gnome/help/anjuta/C/anjuta-manual/introduction.html
 share/gnome/help/anjuta/C/anjuta-manual/libpaths.html
 share/gnome/help/anjuta/C/anjuta-manual/libraries.html
-share/gnome/help/anjuta/C/anjuta-manual/ln15.html
+share/gnome/help/anjuta/C/anjuta-manual/license.html
+share/gnome/help/anjuta/C/anjuta-manual/license.sgml
+share/gnome/help/anjuta/C/anjuta-manual/ln8.html
 share/gnome/help/anjuta/C/anjuta-manual/loadsave-prjs.html
 share/gnome/help/anjuta/C/anjuta-manual/main-win.html
 share/gnome/help/anjuta/C/anjuta-manual/menu.html
@@ -140,6 +153,7 @@ share/gnome/help/anjuta/C/anjuta-manual/open-save-files.html
 share/gnome/help/anjuta/C/anjuta-manual/optimization.html
 share/gnome/help/anjuta/C/anjuta-manual/other-operations-files.html
 share/gnome/help/anjuta/C/anjuta-manual/others.html
+share/gnome/help/anjuta/C/anjuta-manual/placeholder.html
 share/gnome/help/anjuta/C/anjuta-manual/preferences.html
 share/gnome/help/anjuta/C/anjuta-manual/project-build.html
 share/gnome/help/anjuta/C/anjuta-manual/project-config.html
@@ -152,156 +166,153 @@ share/gnome/help/anjuta/C/anjuta-manual/setting-compiler-options.html
 share/gnome/help/anjuta/C/anjuta-manual/stack-frame-info.html
 share/gnome/help/anjuta/C/anjuta-manual/stack-frame.html
 share/gnome/help/anjuta/C/anjuta-manual/stack-update.html
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/caution.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/home.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/important.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/next.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/note.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/prev.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/tip.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/toc-blank.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/toc-minus.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/toc-plus.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/up.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/warning.gif
 share/gnome/help/anjuta/C/anjuta-manual/toolbars.html
 share/gnome/help/anjuta/C/anjuta-manual/warnings.html
 share/gnome/help/anjuta/C/topic.dat
 share/gnome/omf/anjuta/anjuta-faqs-C.omf
 share/gnome/omf/anjuta/anjuta-manual-C.omf
+share/gnome/pixmaps/anjuta/add.xpm
+share/gnome/pixmaps/anjuta/anjuta_icon.png
+share/gnome/pixmaps/anjuta/anjuta_logo.png
+share/gnome/pixmaps/anjuta/anjuta_splash.png
+share/gnome/pixmaps/anjuta/app_wizard.jpg
+share/gnome/pixmaps/anjuta/appwid_blank.xpm
+share/gnome/pixmaps/anjuta/appwid_book.xpm
+share/gnome/pixmaps/anjuta/appwid_cd.xpm
+share/gnome/pixmaps/anjuta/appwid_chart.xpm
+share/gnome/pixmaps/anjuta/appwid_console.xpm
+share/gnome/pixmaps/anjuta/appwid_data.xpm
+share/gnome/pixmaps/anjuta/appwid_debug.xpm
+share/gnome/pixmaps/anjuta/appwid_draw.xpm
+share/gnome/pixmaps/anjuta/appwid_gear.xpm
+share/gnome/pixmaps/anjuta/appwid_globe.xpm
+share/gnome/pixmaps/anjuta/appwid_lib.xpm
+share/gnome/pixmaps/anjuta/appwid_pack.xpm
+share/gnome/pixmaps/anjuta/appwid_page.xpm
+share/gnome/pixmaps/anjuta/appwid_page1.xpm
+share/gnome/pixmaps/anjuta/appwid_penguin.xpm
+share/gnome/pixmaps/anjuta/appwid_sheet.xpm
+share/gnome/pixmaps/anjuta/appwid_wid.xpm
+share/gnome/pixmaps/anjuta/appwid_www.xpm
+share/gnome/pixmaps/anjuta/autocomplete.xpm
+share/gnome/pixmaps/anjuta/bfoldc.xpm
+share/gnome/pixmaps/anjuta/bfoldo.xpm
+share/gnome/pixmaps/anjuta/blank.xpm
+share/gnome/pixmaps/anjuta/block_end.xpm
+share/gnome/pixmaps/anjuta/block_select.xpm
+share/gnome/pixmaps/anjuta/block_start.xpm
+share/gnome/pixmaps/anjuta/bookmark_first.xpm
+share/gnome/pixmaps/anjuta/bookmark_last.xpm
+share/gnome/pixmaps/anjuta/bookmark_next.xpm
+share/gnome/pixmaps/anjuta/bookmark_prev.xpm
+share/gnome/pixmaps/anjuta/bookmark_toggle.xpm
+share/gnome/pixmaps/anjuta/breakpoint.xpm
+share/gnome/pixmaps/anjuta/build.xpm
+share/gnome/pixmaps/anjuta/build_all.xpm
+share/gnome/pixmaps/anjuta/build_stop.xpm
+share/gnome/pixmaps/anjuta/calltip.xpm
+share/gnome/pixmaps/anjuta/close_file.xpm
+share/gnome/pixmaps/anjuta/close_project.xpm
+share/gnome/pixmaps/anjuta/compile.xpm
+share/gnome/pixmaps/anjuta/configure.xpm
+share/gnome/pixmaps/anjuta/console.xpm
+share/gnome/pixmaps/anjuta/continue.xpm
+share/gnome/pixmaps/anjuta/copy.xpm
+share/gnome/pixmaps/anjuta/debug.xpm
+share/gnome/pixmaps/anjuta/debug_stop.xpm
+share/gnome/pixmaps/anjuta/dock.xpm
+share/gnome/pixmaps/anjuta/error_next.xpm
+share/gnome/pixmaps/anjuta/error_prev.xpm
+share/gnome/pixmaps/anjuta/exec.xpm
+share/gnome/pixmaps/anjuta/execute.xpm
+share/gnome/pixmaps/anjuta/file_c.xpm
+share/gnome/pixmaps/anjuta/file_cpp.xpm
+share/gnome/pixmaps/anjuta/file_file.xpm
+share/gnome/pixmaps/anjuta/file_h.xpm
+share/gnome/pixmaps/anjuta/file_html.xpm
+share/gnome/pixmaps/anjuta/file_i18n.xpm
+share/gnome/pixmaps/anjuta/file_icon.xpm
+share/gnome/pixmaps/anjuta/file_pix.xpm
+share/gnome/pixmaps/anjuta/find.xpm
+share/gnome/pixmaps/anjuta/find_replace.xpm
+share/gnome/pixmaps/anjuta/fold_close.xpm
+share/gnome/pixmaps/anjuta/fold_open.xpm
+share/gnome/pixmaps/anjuta/fold_toggle.xpm
+share/gnome/pixmaps/anjuta/frame.xpm
+share/gnome/pixmaps/anjuta/gear.xpm
+share/gnome/pixmaps/anjuta/goto.xpm
+share/gnome/pixmaps/anjuta/graph.xpm
+share/gnome/pixmaps/anjuta/handle_hide.xpm
+share/gnome/pixmaps/anjuta/handle_undock.xpm
+share/gnome/pixmaps/anjuta/help.xpm
+share/gnome/pixmaps/anjuta/indent.xpm
+share/gnome/pixmaps/anjuta/indent_auto.xpm
+share/gnome/pixmaps/anjuta/indent_dcr.xpm
+share/gnome/pixmaps/anjuta/indent_inc.xpm
+share/gnome/pixmaps/anjuta/indent_set.xpm
+share/gnome/pixmaps/anjuta/inspect.xpm
+share/gnome/pixmaps/anjuta/interface.xpm
+share/gnome/pixmaps/anjuta/interrupt.xpm
+share/gnome/pixmaps/anjuta/ledgreen.xpm
+share/gnome/pixmaps/anjuta/ledred.xpm
+share/gnome/pixmaps/anjuta/line-arrow.xbm
+share/gnome/pixmaps/anjuta/line-wrap.xbm
+share/gnome/pixmaps/anjuta/list_select.xpm
+share/gnome/pixmaps/anjuta/list_unselect.xpm
+share/gnome/pixmaps/anjuta/messages.xpm
+share/gnome/pixmaps/anjuta/mini-modules.xpm
+share/gnome/pixmaps/anjuta/mini_build.xpm
+share/gnome/pixmaps/anjuta/mini_cvs.xpm
+share/gnome/pixmaps/anjuta/mini_debug.xpm
+share/gnome/pixmaps/anjuta/mini_dock.xpm
+share/gnome/pixmaps/anjuta/mini_find.xpm
+share/gnome/pixmaps/anjuta/mini_locals.xpm
+share/gnome/pixmaps/anjuta/new_file.xpm
+share/gnome/pixmaps/anjuta/open_file.xpm
+share/gnome/pixmaps/anjuta/open_project.xpm
+share/gnome/pixmaps/anjuta/paste.xpm
+share/gnome/pixmaps/anjuta/pointer.xpm
+share/gnome/pixmaps/anjuta/preferences.xpm
+share/gnome/pixmaps/anjuta/print.xpm
+share/gnome/pixmaps/anjuta/project.xpm
+share/gnome/pixmaps/anjuta/redo.xpm
+share/gnome/pixmaps/anjuta/registers.xpm
+share/gnome/pixmaps/anjuta/reload.xpm
+share/gnome/pixmaps/anjuta/reload_file.xpm
+share/gnome/pixmaps/anjuta/remove.xpm
+share/gnome/pixmaps/anjuta/run_to_cursor.xpm
+share/gnome/pixmaps/anjuta/save.xpm
+share/gnome/pixmaps/anjuta/save_all.xpm
+share/gnome/pixmaps/anjuta/save_file.xpm
+share/gnome/pixmaps/anjuta/save_project.xpm
+share/gnome/pixmaps/anjuta/search.xpm
+share/gnome/pixmaps/anjuta/stack.xpm
+share/gnome/pixmaps/anjuta/step_in.xpm
+share/gnome/pixmaps/anjuta/step_out.xpm
+share/gnome/pixmaps/anjuta/step_over.xpm
+share/gnome/pixmaps/anjuta/stop.xpm
+share/gnome/pixmaps/anjuta/syntax.xpm
+share/gnome/pixmaps/anjuta/undo.xpm
+share/gnome/pixmaps/anjuta/undock.xpm
+share/gnome/pixmaps/anjuta/watch.xpm
+share/gnome/pixmaps/anjuta/wizard.xpm
+share/locale/de/LC_MESSAGES/anjuta.mo
 share/locale/es/LC_MESSAGES/anjuta.mo
 share/locale/fr/LC_MESSAGES/anjuta.mo
 share/locale/it/LC_MESSAGES/anjuta.mo
 share/locale/ja/LC_MESSAGES/anjuta.mo
+share/locale/nl/LC_MESSAGES/anjuta.mo
+share/locale/no/LC_MESSAGES/anjuta.mo
 share/locale/pl/LC_MESSAGES/anjuta.mo
+share/locale/pt_BR/LC_MESSAGES/anjuta.mo
 share/locale/ru/LC_MESSAGES/anjuta.mo
 share/locale/sv/LC_MESSAGES/anjuta.mo
+share/locale/ta/LC_MESSAGES/anjuta.mo
 share/locale/tr/LC_MESSAGES/anjuta.mo
 share/locale/uk/LC_MESSAGES/anjuta.mo
-share/pixmaps/anjuta/add.xpm
-share/pixmaps/anjuta/anjuta_icon.xpm
-share/pixmaps/anjuta/anjuta_logo.png
-share/pixmaps/anjuta/app_wizard.jpg
-share/pixmaps/anjuta/appwid_blank.xpm
-share/pixmaps/anjuta/appwid_book.xpm
-share/pixmaps/anjuta/appwid_cd.xpm
-share/pixmaps/anjuta/appwid_chart.xpm
-share/pixmaps/anjuta/appwid_console.xpm
-share/pixmaps/anjuta/appwid_data.xpm
-share/pixmaps/anjuta/appwid_debug.xpm
-share/pixmaps/anjuta/appwid_draw.xpm
-share/pixmaps/anjuta/appwid_gear.xpm
-share/pixmaps/anjuta/appwid_globe.xpm
-share/pixmaps/anjuta/appwid_lib.xpm
-share/pixmaps/anjuta/appwid_pack.xpm
-share/pixmaps/anjuta/appwid_page.xpm
-share/pixmaps/anjuta/appwid_page1.xpm
-share/pixmaps/anjuta/appwid_penguin.xpm
-share/pixmaps/anjuta/appwid_sheet.xpm
-share/pixmaps/anjuta/appwid_wid.xpm
-share/pixmaps/anjuta/appwid_www.xpm
-share/pixmaps/anjuta/autocomplete.xpm
-share/pixmaps/anjuta/bfoldc.xpm
-share/pixmaps/anjuta/bfoldo.xpm
-share/pixmaps/anjuta/blank.xpm
-share/pixmaps/anjuta/block_end.xpm
-share/pixmaps/anjuta/block_select.xpm
-share/pixmaps/anjuta/block_start.xpm
-share/pixmaps/anjuta/bookmark_first.xpm
-share/pixmaps/anjuta/bookmark_last.xpm
-share/pixmaps/anjuta/bookmark_next.xpm
-share/pixmaps/anjuta/bookmark_prev.xpm
-share/pixmaps/anjuta/bookmark_toggle.xpm
-share/pixmaps/anjuta/breakpoint.xpm
-share/pixmaps/anjuta/build.xpm
-share/pixmaps/anjuta/build_all.xpm
-share/pixmaps/anjuta/build_stop.xpm
-share/pixmaps/anjuta/calltip.xpm
-share/pixmaps/anjuta/close_file.xpm
-share/pixmaps/anjuta/close_project.xpm
-share/pixmaps/anjuta/compile.xpm
-share/pixmaps/anjuta/configure.xpm
-share/pixmaps/anjuta/console.xpm
-share/pixmaps/anjuta/continue.xpm
-share/pixmaps/anjuta/copy.xpm
-share/pixmaps/anjuta/debug.xpm
-share/pixmaps/anjuta/debug_stop.xpm
-share/pixmaps/anjuta/dock.xpm
-share/pixmaps/anjuta/error_next.xpm
-share/pixmaps/anjuta/error_prev.xpm
-share/pixmaps/anjuta/exec.xpm
-share/pixmaps/anjuta/execute.xpm
-share/pixmaps/anjuta/file_c.xpm
-share/pixmaps/anjuta/file_cpp.xpm
-share/pixmaps/anjuta/file_file.xpm
-share/pixmaps/anjuta/file_h.xpm
-share/pixmaps/anjuta/file_html.xpm
-share/pixmaps/anjuta/file_i18n.xpm
-share/pixmaps/anjuta/file_icon.xpm
-share/pixmaps/anjuta/file_pix.xpm
-share/pixmaps/anjuta/find.xpm
-share/pixmaps/anjuta/find_replace.xpm
-share/pixmaps/anjuta/fold_close.xpm
-share/pixmaps/anjuta/fold_open.xpm
-share/pixmaps/anjuta/fold_toggle.xpm
-share/pixmaps/anjuta/frame.xpm
-share/pixmaps/anjuta/gear.xpm
-share/pixmaps/anjuta/goto.xpm
-share/pixmaps/anjuta/graph.xpm
-share/pixmaps/anjuta/handle_hide.xpm
-share/pixmaps/anjuta/handle_undock.xpm
-share/pixmaps/anjuta/help.xpm
-share/pixmaps/anjuta/indent.xpm
-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/inspect.xpm
-share/pixmaps/anjuta/interface.xpm
-share/pixmaps/anjuta/interrupt.xpm
-share/pixmaps/anjuta/ledgreen.xpm
-share/pixmaps/anjuta/ledred.xpm
-share/pixmaps/anjuta/line-arrow.xbm
-share/pixmaps/anjuta/line-wrap.xbm
-share/pixmaps/anjuta/list_select.xpm
-share/pixmaps/anjuta/list_unselect.xpm
-share/pixmaps/anjuta/messages.xpm
-share/pixmaps/anjuta/mini-modules.xpm
-share/pixmaps/anjuta/mini_build.xpm
-share/pixmaps/anjuta/mini_cvs.xpm
-share/pixmaps/anjuta/mini_debug.xpm
-share/pixmaps/anjuta/mini_dock.xpm
-share/pixmaps/anjuta/mini_find.xpm
-share/pixmaps/anjuta/new_file.xpm
-share/pixmaps/anjuta/open_file.xpm
-share/pixmaps/anjuta/open_project.xpm
-share/pixmaps/anjuta/paste.xpm
-share/pixmaps/anjuta/pointer.xpm
-share/pixmaps/anjuta/preferences.xpm
-share/pixmaps/anjuta/print.xpm
-share/pixmaps/anjuta/project.xpm
-share/pixmaps/anjuta/redo.xpm
-share/pixmaps/anjuta/registers.xpm
-share/pixmaps/anjuta/reload.xpm
-share/pixmaps/anjuta/reload_file.xpm
-share/pixmaps/anjuta/remove.xpm
-share/pixmaps/anjuta/run_to_cursor.xpm
-share/pixmaps/anjuta/save.xpm
-share/pixmaps/anjuta/save_all.xpm
-share/pixmaps/anjuta/save_file.xpm
-share/pixmaps/anjuta/save_project.xpm
-share/pixmaps/anjuta/search.xpm
-share/pixmaps/anjuta/stack.xpm
-share/pixmaps/anjuta/step_in.xpm
-share/pixmaps/anjuta/step_out.xpm
-share/pixmaps/anjuta/step_over.xpm
-share/pixmaps/anjuta/stop.xpm
-share/pixmaps/anjuta/syntax.xpm
-share/pixmaps/anjuta/undo.xpm
-share/pixmaps/anjuta/undock.xpm
-share/pixmaps/anjuta/watch.xpm
-share/pixmaps/anjuta/wizard.xpm
-@dirrm share/pixmaps/anjuta
+share/locale/zh_CN/LC_MESSAGES/anjuta.mo
+share/locale/zh_TW/LC_MESSAGES/anjuta.mo
+@dirrm share/gnome/pixmaps/anjuta
 @dirrm share/gnome/omf/anjuta
 @dirrm share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images
 @dirrm share/gnome/help/anjuta/C/anjuta-manual/figures
@@ -311,5 +322,5 @@ share/pixmaps/anjuta/wizard.xpm
 @dirrm share/gnome/help/anjuta/C/anjuta-faqs
 @dirrm share/gnome/help/anjuta/C
 @dirrm share/gnome/help/anjuta
-@dirrm share/anjuta
-@dirrm doc/anjuta
+@dirrm share/gnome/anjuta/gnome
+@dirrm share/gnome/anjuta
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index a38519cde2b2..2a64b53ecd3f 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	anjuta
-PORTVERSION=	0.1.7
+PORTVERSION=	0.1.8
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	anjuta
@@ -24,8 +24,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 pre-patch:
 	@${PERL} -pi -e 's#-lpthread#-pthread#g ; \
-		s#DATADIRNAME=lib#DATADIRNAME=share#g' ${WRKSRC}/configure
+		 s#DATADIRNAME=lib#DATADIRNAME=share#g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		 's#\$\(datadir\)/locale#\$\(prefix\)/share/locale#g'
+		's#\$\(datadir\)/locale#\$\(prefix\)/share/locale#g'
 
 .include <bsd.port.mk>
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index d1da03769950..ed446779dbad 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1 +1 @@
-MD5 (anjuta-0.1.7.tar.gz) = 2d518592ced3d548d37a73e5f6285af4
+MD5 (anjuta-0.1.8.tar.gz) = 7bdfe257961dfbdcd63e7b8d7411a5fa
diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in
index a3e2e54bd17d..c863c25da036 100644
--- a/devel/anjuta/files/patch-Makefile.in
+++ b/devel/anjuta/files/patch-Makefile.in
@@ -1,15 +1,28 @@
---- Makefile.in.orig	Sun Aug 12 11:01:09 2001
-+++ Makefile.in	Sun Aug 12 11:02:14 2001
-@@ -128,10 +128,10 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Fri Jan  4 16:09:11 2002
++++ Makefile.in	Fri Jan  4 16:26:58 2002
+@@ -137,11 +137,11 @@
  cxxflags_set = @cxxflags_set@
  l = @l@
  
--SUBDIRS = intl po macros scintilla ccview widgets manuals omf-install src pixmaps data doc launcher
-+SUBDIRS = intl po macros ccview widgets manuals omf-install src pixmaps data doc launcher
+-SUBDIRS = intl po macros tagmanager global-tags scintilla ccview 	widgets manuals omf-install src pixmaps data 	doc launcher
++SUBDIRS = intl po macros tagmanager global-tags ccview 	widgets manuals omf-install src pixmaps data 	launcher
+ 
  
  anjutadocdir = ${prefix}/doc/anjuta
--anjutadoc_DATA =  	README 	COPYING 	AUTHORS 	ChangeLog 	INSTALL 	NEWS 	TODO 	ABOUT-NLS
-+anjutadoc_DATA =
+-anjutadoc_DATA =  	README 	COPYING 	AUTHORS 	ChangeLog 	INSTALL 	NEWS 	TODO 	ABOUT-NLS 	FUTURE
++anjutadoc_DATA = # 	README 	COPYING 	AUTHORS 	ChangeLog 	INSTALL 	NEWS 	TODO 	ABOUT-NLS 	FUTURE
+ 
+ 
+ EXTRA_DIST =  	anjuta.desktop.in.in 	anjuta.spec.in 	xml-i18n-extract.in 	xml-i18n-merge.in 	xml-i18n-update.in 	$(anjutadoc_DATA)
+@@ -416,7 +416,7 @@
+ install-exec-am:
+ install-exec: install-exec-recursive
  
+-install-data-am: install-anjutadocDATA install-gnomemenuDATA
++install-data-am: install-gnomemenuDATA
+ install-data: install-data-recursive
  
- EXTRA_DIST =  	anjuta.desktop.in.in 	anjuta.prj 	anjuta.spec.in 	xml-i18n-extract.in 	xml-i18n-merge.in 	xml-i18n-update.in 	$(anjutadoc_DATA)
+ install-am: all-am
diff --git a/devel/anjuta/files/patch-configure b/devel/anjuta/files/patch-configure
index 7de922948ecf..7bf2e921a144 100644
--- a/devel/anjuta/files/patch-configure
+++ b/devel/anjuta/files/patch-configure
@@ -1,5 +1,8 @@
---- configure.orig	Fri Aug 24 12:34:57 2001
-+++ configure	Fri Aug 24 12:35:13 2001
+
+$FreeBSD$
+
+--- configure.orig	Fri Jan  4 15:39:12 2002
++++ configure	Fri Jan  4 16:07:50 2002
 @@ -8,6 +8,7 @@
  # gives unlimited permission to copy, distribute and modify it.
  
@@ -8,10 +11,24 @@
  ac_help=
  ac_default_prefix=/usr/local
  # Any additions from configure.in:
-@@ -4812,12 +4813,10 @@
- intl/Makefile
- po/Makefile.in
- macros/Makefile
+@@ -6391,10 +6392,10 @@
+   packageprefix=${prefix}
+ fi
+ 
+-packagedatadir=share/${PACKAGE}
+-packagedocdir=doc/${PACKAGE}
++packagedatadir=share/gnome/${PACKAGE}
++packagedocdir=share/doc/${PACKAGE}
+ 
+-packagepixmapsdir=share/pixmaps/${PACKAGE}
++packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}
+ packagehelpdir=share/gnome/help/${PACKAGE}
+ packagemenudir=share/gnome/apps
+ 
+@@ -6557,12 +6558,10 @@
+ tagmanager/Makefile
+ tagmanager/include/Makefile
+ global-tags/Makefile
 -scintilla/Makefile
  ccview/Makefile
  widgets/Makefile
@@ -21,7 +38,7 @@
  manuals/C/Makefile
  manuals/C/anjuta-manual/Makefile
  manuals/C/anjuta-faqs/Makefile
-@@ -4906,6 +4905,7 @@
+@@ -6656,6 +6655,7 @@
  s%@GNOME_CAPPLET_LIBS@%$GNOME_CAPPLET_LIBS%g
  s%@cflags_set@%$cflags_set%g
  s%@GTK_CONFIG@%$GTK_CONFIG%g
@@ -29,10 +46,10 @@
  s%@GTK_CFLAGS@%$GTK_CFLAGS%g
  s%@GTK_LIBS@%$GTK_LIBS%g
  s%@XPM_LIBS@%$XPM_LIBS%g
-@@ -4997,12 +4997,10 @@
- intl/Makefile
- po/Makefile.in
- macros/Makefile
+@@ -6759,12 +6759,10 @@
+ tagmanager/Makefile
+ tagmanager/include/Makefile
+ global-tags/Makefile
 -scintilla/Makefile
  ccview/Makefile
  widgets/Makefile
diff --git a/devel/anjuta/files/patch-src-Makefile.in b/devel/anjuta/files/patch-src-Makefile.in
index d53028b77864..2f0fd8759a78 100644
--- a/devel/anjuta/files/patch-src-Makefile.in
+++ b/devel/anjuta/files/patch-src-Makefile.in
@@ -1,133 +1,34 @@
---- src/Makefile.in.orig	Fri Aug 24 12:05:50 2001
-+++ src/Makefile.in	Fri Aug 24 12:09:03 2001
-@@ -128,7 +128,7 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
+
+$FreeBSD$
+
+--- src/Makefile.in.orig	Fri Jan  4 15:15:40 2002
++++ src/Makefile.in	Fri Jan  4 15:15:54 2002
+@@ -139,10 +139,10 @@
  
--INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR) 	 -I$(srcdir)/../scintilla/include 	 -I$(srcdir)/../widgets 	 -I$(srcdir)/../ccview 	 -I$(srcdir)/../pixmaps 	 -I.. -I. 	 -DHAVE_CONFIG_H 	 -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment -Wuninitialized -Wparentheses -Wtraditional -Wpointer-arith -Wmissing-prototypes 	 -O1 	 -g
-+INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR) 	 -I$(prefix)/include/scintilla 	 -I$(srcdir)/../widgets 	 -I$(srcdir)/../ccview 	 -I$(srcdir)/../pixmaps 	 -I.. -I. 	 -DHAVE_CONFIG_H 	 -Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment -Wuninitialized -Wparentheses -Wtraditional -Wpointer-arith -Wmissing-prototypes
+ EXTRA_DIST = glades.h Prj-skelimpl.c Prj-skels.c Prj-stubs.c
  
+-INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR) 	$(EXTRA_GNOME_CFLAGS) 	$(EXTRA_ORBIT_CFLAGS) 	-I$(srcdir)/../scintilla/include 	-I$(srcdir)/../tagmanager/include 	-I$(srcdir)/../widgets 	-I$(srcdir)/../ccview 	-I$(srcdir)/../pixmaps 	-I.. -I. 	-Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment 	-Wuninitialized -Wparentheses -Wpointer-arith 	-Wmissing-prototypes  	-O1  	-g
++INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR) 	$(EXTRA_GNOME_CFLAGS) 	$(EXTRA_ORBIT_CFLAGS) 	-I$(prefix)/include/scintilla 	-I$(srcdir)/../tagmanager/include 	-I$(srcdir)/../widgets 	-I$(srcdir)/../ccview 	-I$(srcdir)/../pixmaps 	-I.. -I. 	-Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment 	-Wuninitialized -Wparentheses -Wpointer-arith 	-Wmissing-prototypes
  
- bin_PROGRAMS = anjuta
-@@ -136,7 +136,7 @@
- anjuta_SOURCES =  	aneditor.cxx 	aneditor.h 	anjuta.h 	anjuta_cbs.c 	anjuta_dirs.c 	anjuta_dirs.h 	anjuta_info.c 	anjuta_info.h 	appwiz_page1.c 	appwiz_page2.c 	appwiz_page3.c 	appwizard.c 	appwizard.h 	appwizard_cbs.c 	appwizard_cbs.h 	appwizard_gui.c 	attach_process.c 	attach_process.h 	attach_process_cbs.c 	attach_process_cbs.h 	attach_process_gui.c 	breakpoints.c 	breakpoints.h 	breakpoints_cbs.c 	breakpoints_cbs.h 	breakpoints_gui.c 	build_file.c 	build_file.h 	build_project.c 	build_project.h 	clean_project.c 	clean_project.h 	commands.c 	commands.h 	compile.c 	compile.h 	compiler_options.c 	compiler_options.h 	compiler_options_cbs.c 	compiler_options_cbs.h 	compiler_options_gui.c 	configurer.c 	configurer.h 	controls.c 	controls.h 	debugger.c 	debugger.h 	executer.c 	executer.h 	fileselection.c 	fileselection.h 	find_in_files.c 	find_in_files.h 	find_in_files_cbs.c 	find_in_files_cbs.h 	find_in_files_gui.c 	find_replace.c 	find_replace.h 	find_text.c 	find_text.h 	global.h 	gnome_project.c 	gnome_project.h 	goto_line.c 	goto_line.h 	help.c 	help.h 	launcher.c 	launcher.h 	lexer.h 	main.c 	main_menubar.c 	main_menubar.h 	main_menubar_def.h 	mainmenu_callbacks.c 	mainmenu_callbacks.h 	messagebox.c 	messagebox.h 	messages.c 	messages.h 	pixmaps.h 	preferences.c 	preferences.h 	preferences_gui.c 	project_dbase.c 	project_dbase.h 	project_config.c 	project_config.h 	project_dbase_gui.c 	properties.cxx 	properties.h 	registers.c 	registers.h 	registers_cbs.c 	registers_cbs.h 	registers_gui.c 	sharedlib.c 	sharedlib.h 	sharedlib_cbs.c 	sharedlib_cbs.h 	sharedlib_gui.c 	signals.c 	signals.h 	signals_cbs.c 	signals_cbs.h 	signals_gui.c 	splash.c 	splash.h 	src_paths.c 	src_paths.h 	src_paths_cbs.c 	src_paths_cbs.h 	src_paths_gui.c 	stack_trace.c 	stack_trace.h 	stack_trace_cbs.c 	stack_trace_cbs.h 	stack_trace_gui.c 	syntax.h 	tags_manager.c 	tags_manager.h 	text_editor.c 	text_editor.h 	text_editor_cbs.c 	text_editor_cbs.h 	text_editor_gui.c 	text_editor_gui.h 	text_editor_menu.c 	text_editor_menu.h 	toolbar.c 	toolbar.h 	toolbar_callbacks.c 	toolbar_callbacks.h 	utilities.c 	utilities.h 	watch.c 	watch.h 	watch_cbs.c 	watch_cbs.h 	watch_gui.c 	about.c 	appwiz_page4.c 	source.c 	anjuta.c 	anjuta_gui.c 	source.h 	glade_iface.c 	glade_iface.h 	compatibility_0.c 	compatibility_0.h 	defaults.c 	defaults.h 	about.h 	resources.c 	resources.h 	notebook.c 	notebook.h
  
+-SCILEXERS =      ../scintilla/StyleContext.o 	../scintilla/LexCPP.o 	../scintilla/LexConf.o 	../scintilla/LexHTML.o 	../scintilla/LexLua.o 	../scintilla/LexOthers.o 	../scintilla/LexPerl.o 	../scintilla/LexPython.o 	../scintilla/LexSQL.o 	../scintilla/LexVB.o 	../scintilla/LexPascal.o 	../scintilla/LexAVE.o 	../scintilla/LexCrontab.o 	../scintilla/LexEiffel.o 	../scintilla/LexLisp.o 	../scintilla/LexRuby.o 	../scintilla/LexBullant.o 	../scintilla/LexAda.o
++SCILEXERS =      -lscintilla_lexers
  
--anjuta_LDADD =  	$(INTLLIBS) 	$(GNOME_LIBDIR) $(GNOMEUI_LIBS) 	 -L../scintilla -L../widgets -L../ccview 	 ../scintilla/LexCPP.o ../scintilla/LexConf.o ../scintilla/LexHTML.o ../scintilla/LexLua.o ../scintilla/LexOthers.o ../scintilla/LexPerl.o ../scintilla/LexPython.o ../scintilla/LexSQL.o ../scintilla/LexVB.o ../scintilla/LexPascal.o ../scintilla/LexAVE.o -lwidgets -lccview -lxml -lscintilla
-+anjuta_LDADD =  	$(INTLLIBS) 	$(GNOME_LIBDIR) $(GNOMEUI_LIBS) 	 -L../widgets -L../ccview -lwidgets -lccview -lxml -lscintilla
  
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
-@@ -168,10 +168,7 @@
- watch_cbs.o watch_gui.o about.o appwiz_page4.o source.o anjuta.o \
- anjuta_gui.o glade_iface.o compatibility_0.o defaults.o resources.o \
- notebook.o
--anjuta_DEPENDENCIES =  ../scintilla/LexCPP.o ../scintilla/LexConf.o \
--../scintilla/LexHTML.o ../scintilla/LexLua.o ../scintilla/LexOthers.o \
--../scintilla/LexPerl.o ../scintilla/LexPython.o ../scintilla/LexSQL.o \
--../scintilla/LexVB.o ../scintilla/LexPascal.o ../scintilla/LexAVE.o
+ bin_PROGRAMS = anjuta
+@@ -198,14 +198,7 @@
+ defaults.$(OBJEXT) resources.$(OBJEXT) notebook.$(OBJEXT) \
+ CORBA-Server.$(OBJEXT) Gladen-common.$(OBJEXT) glades.$(OBJEXT) \
+ Prj-common.$(OBJEXT) Gladen-stubs.$(OBJEXT) session.$(OBJEXT)
+-anjuta_DEPENDENCIES =  ../scintilla/StyleContext.o ../scintilla/LexCPP.o \
+-../scintilla/LexConf.o ../scintilla/LexHTML.o ../scintilla/LexLua.o \
+-../scintilla/LexOthers.o ../scintilla/LexPerl.o \
+-../scintilla/LexPython.o ../scintilla/LexSQL.o ../scintilla/LexVB.o \
+-../scintilla/LexPascal.o ../scintilla/LexAVE.o \
+-../scintilla/LexCrontab.o ../scintilla/LexEiffel.o \
+-../scintilla/LexLisp.o ../scintilla/LexRuby.o ../scintilla/LexBullant.o \
+-../scintilla/LexAda.o
 +anjuta_DEPENDENCIES =
  anjuta_LDFLAGS = 
  CXXFLAGS = @CXXFLAGS@
  CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-@@ -297,14 +294,7 @@
- 	  fi; \
- 	done
- about.o: about.c ../config.h utilities.h resources.h about.h
--aneditor.o: aneditor.cxx ../config.h ../scintilla/include/Platform.h \
--	../scintilla/include/PropSet.h ../scintilla/include/SString.h \
--	../scintilla/include/Accessor.h \
--	../scintilla/include/WindowAccessor.h \
--	../scintilla/include/KeyWords.h \
--	../scintilla/include/Scintilla.h \
--	../scintilla/include/ScintillaWidget.h \
--	../scintilla/include/SciLexer.h lexer.h properties.h aneditor.h
-+aneditor.o: aneditor.cxx ../config.h lexer.h properties.h aneditor.h
- anjuta_cbs.o: anjuta_cbs.c ../config.h text_editor.h global.h \
- 	text_editor_menu.h preferences.h properties.h aneditor.h \
- 	anjuta.h toolbar.h messagebox.h compiler_options.h src_paths.h \
-@@ -333,9 +323,7 @@
- 	anjuta_dirs.h executer.h configurer.h utilities.h \
- 	main_menubar.h help.h fileselection.h resources.h launcher.h \
- 	debugger.h watch.h registers.h stack_trace.h signals.h \
--	sharedlib.h attach_process.h controls.h anjuta_info.h \
--	../scintilla/include/Scintilla.h \
--	../scintilla/include/ScintillaWidget.h
-+	sharedlib.h attach_process.h controls.h anjuta_info.h
- appwizard_cbs.o: appwizard_cbs.c ../config.h anjuta.h toolbar.h \
- 	text_editor.h global.h text_editor_menu.h preferences.h \
- 	properties.h aneditor.h messagebox.h compiler_options.h \
-@@ -501,8 +489,7 @@
- 	find_text.h find_in_files.h messages.h project_dbase.h \
- 	tags_manager.h project_config.h commands.h anjuta_dirs.h \
- 	executer.h configurer.h utilities.h main_menubar.h help.h \
--	controls.h ../scintilla/include/Scintilla.h \
--	../scintilla/include/ScintillaWidget.h
-+	controls.h
- debugger.o: debugger.c ../config.h anjuta.h toolbar.h text_editor.h \
- 	global.h text_editor_menu.h preferences.h properties.h \
- 	aneditor.h messagebox.h compiler_options.h src_paths.h \
-@@ -557,9 +544,7 @@
- 	src_paths.h find_replace.h find_text.h find_in_files.h \
- 	messages.h project_dbase.h tags_manager.h project_config.h \
- 	commands.h breakpoints.h anjuta_dirs.h executer.h configurer.h \
--	utilities.h main_menubar.h help.h resources.h \
--	../scintilla/include/Scintilla.h \
--	../scintilla/include/ScintillaWidget.h
-+	utilities.h main_menubar.h help.h resources.h
- find_text.o: find_text.c ../config.h anjuta.h toolbar.h text_editor.h \
- 	global.h text_editor_menu.h preferences.h properties.h \
- 	aneditor.h messagebox.h compiler_options.h src_paths.h \
-@@ -622,8 +607,7 @@
- 	compile.h launcher.h appwizard.h debugger.h watch.h registers.h \
- 	stack_trace.h signals.h sharedlib.h attach_process.h \
- 	breakpoints_cbs.h goto_line.h resources.h controls.h \
--	signals_cbs.h watch_cbs.h ../scintilla/include/Scintilla.h \
--	../scintilla/include/ScintillaWidget.h
-+	signals_cbs.h watch_cbs.h
- main.o: main.c ../config.h splash.h anjuta.h toolbar.h text_editor.h \
- 	global.h text_editor_menu.h preferences.h properties.h \
- 	aneditor.h messagebox.h compiler_options.h src_paths.h \
-@@ -685,8 +669,7 @@
- 	../pixmaps/file_cpp.xpm ../pixmaps/file_h.xpm \
- 	../pixmaps/file_pix.xpm ../pixmaps/file_icon.xpm \
- 	../pixmaps/file_html.xpm ../pixmaps/file_i18n.xpm
--properties.o: properties.cxx ../scintilla/include/PropSet.h \
--	../scintilla/include/SString.h properties.h
-+properties.o: properties.cxx
- registers_cbs.o: registers_cbs.c ../config.h registers.h properties.h \
- 	registers_cbs.h debugger.h global.h breakpoints.h text_editor.h \
- 	text_editor_menu.h preferences.h aneditor.h watch.h \
-@@ -791,8 +774,7 @@
- 	messages.h project_dbase.h tags_manager.h project_config.h \
- 	commands.h breakpoints.h anjuta_dirs.h executer.h configurer.h \
- 	utilities.h main_menubar.h help.h controls.h text_editor_cbs.h \
--	text_editor_gui.h mainmenu_callbacks.h resources.h \
--	../scintilla/include/Scintilla.h
-+	text_editor_gui.h mainmenu_callbacks.h resources.h
- text_editor_gui.o: text_editor_gui.c ../config.h anjuta.h toolbar.h \
- 	text_editor.h global.h text_editor_menu.h preferences.h \
- 	properties.h aneditor.h messagebox.h compiler_options.h \
-@@ -800,9 +782,7 @@
- 	messages.h project_dbase.h tags_manager.h project_config.h \
- 	commands.h breakpoints.h anjuta_dirs.h executer.h configurer.h \
- 	utilities.h main_menubar.h help.h text_editor_cbs.h \
--	text_editor_gui.h mainmenu_callbacks.h pixmaps.h resources.h \
--	../scintilla/include/Scintilla.h \
--	../scintilla/include/ScintillaWidget.h
-+	text_editor_gui.h mainmenu_callbacks.h pixmaps.h resources.h
- text_editor_menu.o: text_editor_menu.c ../config.h resources.h \
- 	text_editor_menu.h anjuta.h toolbar.h text_editor.h global.h \
- 	preferences.h properties.h aneditor.h messagebox.h \
-@@ -820,10 +800,7 @@
- 	messages.h project_dbase.h tags_manager.h project_config.h \
- 	commands.h breakpoints.h anjuta_dirs.h executer.h configurer.h \
- 	utilities.h main_menubar.h help.h text_editor_gui.h \
--	text_editor_cbs.h syntax.h launcher.h \
--	../scintilla/include/Scintilla.h \
--	../scintilla/include/SciLexer.h \
--	../scintilla/include/ScintillaWidget.h lexer.h controls.h
-+	text_editor_cbs.h syntax.h launcher.h lexer.h controls.h
- toolbar_callbacks.o: toolbar_callbacks.c ../config.h anjuta.h toolbar.h \
- 	text_editor.h global.h text_editor_menu.h preferences.h \
- 	properties.h aneditor.h messagebox.h compiler_options.h \
diff --git a/devel/anjuta/files/patch-src::anjuta.c b/devel/anjuta/files/patch-src::anjuta.c
new file mode 100644
index 000000000000..39809a1af638
--- /dev/null
+++ b/devel/anjuta/files/patch-src::anjuta.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/anjuta.c	2002/01/04 13:31:53	1.1
++++ src/anjuta.c	2002/01/04 13:34:07
+@@ -148,7 +148,7 @@
+ 		app->fileselection = create_fileselection_gui (&fsd1);
+ 		
+ 		/* Set to the current dir */
+-		fileselection_set_dir (app->fileselection, (gchar *)get_current_dir_name());
++		fileselection_set_dir (app->fileselection, (gchar *)g_get_current_dir ());
+ 		
+ 		app->save_as_fileselection = create_fileselection_gui (&fsd2);
+ 		app->save_as_build_msg_sel = create_fileselection_gui (&fsd3);
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index 004289e60510..0ce84f7b270a 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -1,40 +1,53 @@
 bin/anjuta
 bin/anjuta_launcher
-share/anjuta/README.stock_libs
-share/anjuta/anjuta.properties
-share/anjuta/autogen.sh.generic
-share/anjuta/autogen.sh.gnome
-share/anjuta/autogen.sh.gnomemm
-share/anjuta/autogen.sh.gtk
-share/anjuta/autogen.sh.gtkmm
-share/anjuta/gdb.init
-share/anjuta/header.c
-share/anjuta/internal.properties
-share/anjuta/linux-gnome-c.api
-share/anjuta/stock_libs.anj
-share/anjuta/tags2api.py
-share/anjuta/welcome.txt
+share/gnome/anjuta/README.stock_libs
+share/gnome/anjuta/anjuta.properties
+share/gnome/anjuta/autogen.sh.generic
+share/gnome/anjuta/autogen.sh.gnome
+share/gnome/anjuta/autogen.sh.gnomemm
+share/gnome/anjuta/autogen.sh.gtk
+share/gnome/anjuta/autogen.sh.gtkmm
+share/gnome/anjuta/gdb.init
+share/gnome/anjuta/gnome/ChangeLog
+share/gnome/anjuta/gnome/Makefile.am
+share/gnome/anjuta/gnome/aclocal-include.m4
+share/gnome/anjuta/gnome/autogen.sh
+share/gnome/anjuta/gnome/compiler-flags.m4
+share/gnome/anjuta/gnome/curses.m4
+share/gnome/anjuta/gnome/gnome-bonobo-check.m4
+share/gnome/anjuta/gnome/gnome-common.m4
+share/gnome/anjuta/gnome/gnome-fileutils.m4
+share/gnome/anjuta/gnome/gnome-gettext.m4
+share/gnome/anjuta/gnome/gnome-ghttp-check.m4
+share/gnome/anjuta/gnome/gnome-gnorba-check.m4
+share/gnome/anjuta/gnome/gnome-guile-checks.m4
+share/gnome/anjuta/gnome/gnome-libgtop-check.m4
+share/gnome/anjuta/gnome/gnome-objc-checks.m4
+share/gnome/anjuta/gnome/gnome-orbit-check.m4
+share/gnome/anjuta/gnome/gnome-print-check.m4
+share/gnome/anjuta/gnome/gnome-pthread-check.m4
+share/gnome/anjuta/gnome/gnome-support.m4
+share/gnome/anjuta/gnome/gnome-undelfs.m4
+share/gnome/anjuta/gnome/gnome-vfs.m4
+share/gnome/anjuta/gnome/gnome-x-checks.m4
+share/gnome/anjuta/gnome/gnome-xml-check.m4
+share/gnome/anjuta/gnome/gnome.m4
+share/gnome/anjuta/gnome/gperf-check.m4
+share/gnome/anjuta/gnome/linger.m4
+share/gnome/anjuta/gnome/need-declaration.m4
+share/gnome/anjuta/header.c
+share/gnome/anjuta/internal.properties
+share/gnome/anjuta/stock_libs.anj
+share/gnome/anjuta/system.tags
+share/gnome/anjuta/welcome.txt
 share/gnome/apps/Development/anjuta.desktop
 share/gnome/help/anjuta/C/anjuta-faqs/anjuta-faqs.sgml
-share/gnome/help/anjuta/C/anjuta-faqs/docbook.css
 share/gnome/help/anjuta/C/anjuta-faqs/index.html
 share/gnome/help/anjuta/C/anjuta-faqs/ln7.html
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/caution.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/home.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/important.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/next.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/note.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/prev.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/tip.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/toc-blank.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/toc-minus.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/toc-plus.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/up.gif
-share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images/warning.gif
 share/gnome/help/anjuta/C/anjuta-manual/add-rm-files.html
-share/gnome/help/anjuta/C/anjuta-manual/anjuta-contacts.html
-share/gnome/help/anjuta/C/anjuta-manual/anjuta-license.html
 share/gnome/help/anjuta/C/anjuta-manual/anjuta-manual.sgml
+share/gnome/help/anjuta/C/anjuta-manual/authors.html
+share/gnome/help/anjuta/C/anjuta-manual/authors.sgml
 share/gnome/help/anjuta/C/anjuta-manual/breaks-del.html
 share/gnome/help/anjuta/C/anjuta-manual/breaks-edit.html
 share/gnome/help/anjuta/C/anjuta-manual/breaks-enbdis.html
@@ -74,7 +87,6 @@ share/gnome/help/anjuta/C/anjuta-manual/debugging-exprs.html
 share/gnome/help/anjuta/C/anjuta-manual/debugging-stack.html
 share/gnome/help/anjuta/C/anjuta-manual/debugging.html
 share/gnome/help/anjuta/C/anjuta-manual/defines.html
-share/gnome/help/anjuta/C/anjuta-manual/docbook.css
 share/gnome/help/anjuta/C/anjuta-manual/editing-files.html
 share/gnome/help/anjuta/C/anjuta-manual/expr-watch.html
 share/gnome/help/anjuta/C/anjuta-manual/familiar.html
@@ -126,11 +138,12 @@ share/gnome/help/anjuta/C/anjuta-manual/figures/watch_add.png
 share/gnome/help/anjuta/C/anjuta-manual/file-operations.html
 share/gnome/help/anjuta/C/anjuta-manual/includes.html
 share/gnome/help/anjuta/C/anjuta-manual/index.html
-share/gnome/help/anjuta/C/anjuta-manual/information.html
 share/gnome/help/anjuta/C/anjuta-manual/introduction.html
 share/gnome/help/anjuta/C/anjuta-manual/libpaths.html
 share/gnome/help/anjuta/C/anjuta-manual/libraries.html
-share/gnome/help/anjuta/C/anjuta-manual/ln15.html
+share/gnome/help/anjuta/C/anjuta-manual/license.html
+share/gnome/help/anjuta/C/anjuta-manual/license.sgml
+share/gnome/help/anjuta/C/anjuta-manual/ln8.html
 share/gnome/help/anjuta/C/anjuta-manual/loadsave-prjs.html
 share/gnome/help/anjuta/C/anjuta-manual/main-win.html
 share/gnome/help/anjuta/C/anjuta-manual/menu.html
@@ -140,6 +153,7 @@ share/gnome/help/anjuta/C/anjuta-manual/open-save-files.html
 share/gnome/help/anjuta/C/anjuta-manual/optimization.html
 share/gnome/help/anjuta/C/anjuta-manual/other-operations-files.html
 share/gnome/help/anjuta/C/anjuta-manual/others.html
+share/gnome/help/anjuta/C/anjuta-manual/placeholder.html
 share/gnome/help/anjuta/C/anjuta-manual/preferences.html
 share/gnome/help/anjuta/C/anjuta-manual/project-build.html
 share/gnome/help/anjuta/C/anjuta-manual/project-config.html
@@ -152,156 +166,153 @@ share/gnome/help/anjuta/C/anjuta-manual/setting-compiler-options.html
 share/gnome/help/anjuta/C/anjuta-manual/stack-frame-info.html
 share/gnome/help/anjuta/C/anjuta-manual/stack-frame.html
 share/gnome/help/anjuta/C/anjuta-manual/stack-update.html
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/caution.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/home.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/important.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/next.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/note.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/prev.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/tip.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/toc-blank.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/toc-minus.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/toc-plus.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/up.gif
-share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images/warning.gif
 share/gnome/help/anjuta/C/anjuta-manual/toolbars.html
 share/gnome/help/anjuta/C/anjuta-manual/warnings.html
 share/gnome/help/anjuta/C/topic.dat
 share/gnome/omf/anjuta/anjuta-faqs-C.omf
 share/gnome/omf/anjuta/anjuta-manual-C.omf
+share/gnome/pixmaps/anjuta/add.xpm
+share/gnome/pixmaps/anjuta/anjuta_icon.png
+share/gnome/pixmaps/anjuta/anjuta_logo.png
+share/gnome/pixmaps/anjuta/anjuta_splash.png
+share/gnome/pixmaps/anjuta/app_wizard.jpg
+share/gnome/pixmaps/anjuta/appwid_blank.xpm
+share/gnome/pixmaps/anjuta/appwid_book.xpm
+share/gnome/pixmaps/anjuta/appwid_cd.xpm
+share/gnome/pixmaps/anjuta/appwid_chart.xpm
+share/gnome/pixmaps/anjuta/appwid_console.xpm
+share/gnome/pixmaps/anjuta/appwid_data.xpm
+share/gnome/pixmaps/anjuta/appwid_debug.xpm
+share/gnome/pixmaps/anjuta/appwid_draw.xpm
+share/gnome/pixmaps/anjuta/appwid_gear.xpm
+share/gnome/pixmaps/anjuta/appwid_globe.xpm
+share/gnome/pixmaps/anjuta/appwid_lib.xpm
+share/gnome/pixmaps/anjuta/appwid_pack.xpm
+share/gnome/pixmaps/anjuta/appwid_page.xpm
+share/gnome/pixmaps/anjuta/appwid_page1.xpm
+share/gnome/pixmaps/anjuta/appwid_penguin.xpm
+share/gnome/pixmaps/anjuta/appwid_sheet.xpm
+share/gnome/pixmaps/anjuta/appwid_wid.xpm
+share/gnome/pixmaps/anjuta/appwid_www.xpm
+share/gnome/pixmaps/anjuta/autocomplete.xpm
+share/gnome/pixmaps/anjuta/bfoldc.xpm
+share/gnome/pixmaps/anjuta/bfoldo.xpm
+share/gnome/pixmaps/anjuta/blank.xpm
+share/gnome/pixmaps/anjuta/block_end.xpm
+share/gnome/pixmaps/anjuta/block_select.xpm
+share/gnome/pixmaps/anjuta/block_start.xpm
+share/gnome/pixmaps/anjuta/bookmark_first.xpm
+share/gnome/pixmaps/anjuta/bookmark_last.xpm
+share/gnome/pixmaps/anjuta/bookmark_next.xpm
+share/gnome/pixmaps/anjuta/bookmark_prev.xpm
+share/gnome/pixmaps/anjuta/bookmark_toggle.xpm
+share/gnome/pixmaps/anjuta/breakpoint.xpm
+share/gnome/pixmaps/anjuta/build.xpm
+share/gnome/pixmaps/anjuta/build_all.xpm
+share/gnome/pixmaps/anjuta/build_stop.xpm
+share/gnome/pixmaps/anjuta/calltip.xpm
+share/gnome/pixmaps/anjuta/close_file.xpm
+share/gnome/pixmaps/anjuta/close_project.xpm
+share/gnome/pixmaps/anjuta/compile.xpm
+share/gnome/pixmaps/anjuta/configure.xpm
+share/gnome/pixmaps/anjuta/console.xpm
+share/gnome/pixmaps/anjuta/continue.xpm
+share/gnome/pixmaps/anjuta/copy.xpm
+share/gnome/pixmaps/anjuta/debug.xpm
+share/gnome/pixmaps/anjuta/debug_stop.xpm
+share/gnome/pixmaps/anjuta/dock.xpm
+share/gnome/pixmaps/anjuta/error_next.xpm
+share/gnome/pixmaps/anjuta/error_prev.xpm
+share/gnome/pixmaps/anjuta/exec.xpm
+share/gnome/pixmaps/anjuta/execute.xpm
+share/gnome/pixmaps/anjuta/file_c.xpm
+share/gnome/pixmaps/anjuta/file_cpp.xpm
+share/gnome/pixmaps/anjuta/file_file.xpm
+share/gnome/pixmaps/anjuta/file_h.xpm
+share/gnome/pixmaps/anjuta/file_html.xpm
+share/gnome/pixmaps/anjuta/file_i18n.xpm
+share/gnome/pixmaps/anjuta/file_icon.xpm
+share/gnome/pixmaps/anjuta/file_pix.xpm
+share/gnome/pixmaps/anjuta/find.xpm
+share/gnome/pixmaps/anjuta/find_replace.xpm
+share/gnome/pixmaps/anjuta/fold_close.xpm
+share/gnome/pixmaps/anjuta/fold_open.xpm
+share/gnome/pixmaps/anjuta/fold_toggle.xpm
+share/gnome/pixmaps/anjuta/frame.xpm
+share/gnome/pixmaps/anjuta/gear.xpm
+share/gnome/pixmaps/anjuta/goto.xpm
+share/gnome/pixmaps/anjuta/graph.xpm
+share/gnome/pixmaps/anjuta/handle_hide.xpm
+share/gnome/pixmaps/anjuta/handle_undock.xpm
+share/gnome/pixmaps/anjuta/help.xpm
+share/gnome/pixmaps/anjuta/indent.xpm
+share/gnome/pixmaps/anjuta/indent_auto.xpm
+share/gnome/pixmaps/anjuta/indent_dcr.xpm
+share/gnome/pixmaps/anjuta/indent_inc.xpm
+share/gnome/pixmaps/anjuta/indent_set.xpm
+share/gnome/pixmaps/anjuta/inspect.xpm
+share/gnome/pixmaps/anjuta/interface.xpm
+share/gnome/pixmaps/anjuta/interrupt.xpm
+share/gnome/pixmaps/anjuta/ledgreen.xpm
+share/gnome/pixmaps/anjuta/ledred.xpm
+share/gnome/pixmaps/anjuta/line-arrow.xbm
+share/gnome/pixmaps/anjuta/line-wrap.xbm
+share/gnome/pixmaps/anjuta/list_select.xpm
+share/gnome/pixmaps/anjuta/list_unselect.xpm
+share/gnome/pixmaps/anjuta/messages.xpm
+share/gnome/pixmaps/anjuta/mini-modules.xpm
+share/gnome/pixmaps/anjuta/mini_build.xpm
+share/gnome/pixmaps/anjuta/mini_cvs.xpm
+share/gnome/pixmaps/anjuta/mini_debug.xpm
+share/gnome/pixmaps/anjuta/mini_dock.xpm
+share/gnome/pixmaps/anjuta/mini_find.xpm
+share/gnome/pixmaps/anjuta/mini_locals.xpm
+share/gnome/pixmaps/anjuta/new_file.xpm
+share/gnome/pixmaps/anjuta/open_file.xpm
+share/gnome/pixmaps/anjuta/open_project.xpm
+share/gnome/pixmaps/anjuta/paste.xpm
+share/gnome/pixmaps/anjuta/pointer.xpm
+share/gnome/pixmaps/anjuta/preferences.xpm
+share/gnome/pixmaps/anjuta/print.xpm
+share/gnome/pixmaps/anjuta/project.xpm
+share/gnome/pixmaps/anjuta/redo.xpm
+share/gnome/pixmaps/anjuta/registers.xpm
+share/gnome/pixmaps/anjuta/reload.xpm
+share/gnome/pixmaps/anjuta/reload_file.xpm
+share/gnome/pixmaps/anjuta/remove.xpm
+share/gnome/pixmaps/anjuta/run_to_cursor.xpm
+share/gnome/pixmaps/anjuta/save.xpm
+share/gnome/pixmaps/anjuta/save_all.xpm
+share/gnome/pixmaps/anjuta/save_file.xpm
+share/gnome/pixmaps/anjuta/save_project.xpm
+share/gnome/pixmaps/anjuta/search.xpm
+share/gnome/pixmaps/anjuta/stack.xpm
+share/gnome/pixmaps/anjuta/step_in.xpm
+share/gnome/pixmaps/anjuta/step_out.xpm
+share/gnome/pixmaps/anjuta/step_over.xpm
+share/gnome/pixmaps/anjuta/stop.xpm
+share/gnome/pixmaps/anjuta/syntax.xpm
+share/gnome/pixmaps/anjuta/undo.xpm
+share/gnome/pixmaps/anjuta/undock.xpm
+share/gnome/pixmaps/anjuta/watch.xpm
+share/gnome/pixmaps/anjuta/wizard.xpm
+share/locale/de/LC_MESSAGES/anjuta.mo
 share/locale/es/LC_MESSAGES/anjuta.mo
 share/locale/fr/LC_MESSAGES/anjuta.mo
 share/locale/it/LC_MESSAGES/anjuta.mo
 share/locale/ja/LC_MESSAGES/anjuta.mo
+share/locale/nl/LC_MESSAGES/anjuta.mo
+share/locale/no/LC_MESSAGES/anjuta.mo
 share/locale/pl/LC_MESSAGES/anjuta.mo
+share/locale/pt_BR/LC_MESSAGES/anjuta.mo
 share/locale/ru/LC_MESSAGES/anjuta.mo
 share/locale/sv/LC_MESSAGES/anjuta.mo
+share/locale/ta/LC_MESSAGES/anjuta.mo
 share/locale/tr/LC_MESSAGES/anjuta.mo
 share/locale/uk/LC_MESSAGES/anjuta.mo
-share/pixmaps/anjuta/add.xpm
-share/pixmaps/anjuta/anjuta_icon.xpm
-share/pixmaps/anjuta/anjuta_logo.png
-share/pixmaps/anjuta/app_wizard.jpg
-share/pixmaps/anjuta/appwid_blank.xpm
-share/pixmaps/anjuta/appwid_book.xpm
-share/pixmaps/anjuta/appwid_cd.xpm
-share/pixmaps/anjuta/appwid_chart.xpm
-share/pixmaps/anjuta/appwid_console.xpm
-share/pixmaps/anjuta/appwid_data.xpm
-share/pixmaps/anjuta/appwid_debug.xpm
-share/pixmaps/anjuta/appwid_draw.xpm
-share/pixmaps/anjuta/appwid_gear.xpm
-share/pixmaps/anjuta/appwid_globe.xpm
-share/pixmaps/anjuta/appwid_lib.xpm
-share/pixmaps/anjuta/appwid_pack.xpm
-share/pixmaps/anjuta/appwid_page.xpm
-share/pixmaps/anjuta/appwid_page1.xpm
-share/pixmaps/anjuta/appwid_penguin.xpm
-share/pixmaps/anjuta/appwid_sheet.xpm
-share/pixmaps/anjuta/appwid_wid.xpm
-share/pixmaps/anjuta/appwid_www.xpm
-share/pixmaps/anjuta/autocomplete.xpm
-share/pixmaps/anjuta/bfoldc.xpm
-share/pixmaps/anjuta/bfoldo.xpm
-share/pixmaps/anjuta/blank.xpm
-share/pixmaps/anjuta/block_end.xpm
-share/pixmaps/anjuta/block_select.xpm
-share/pixmaps/anjuta/block_start.xpm
-share/pixmaps/anjuta/bookmark_first.xpm
-share/pixmaps/anjuta/bookmark_last.xpm
-share/pixmaps/anjuta/bookmark_next.xpm
-share/pixmaps/anjuta/bookmark_prev.xpm
-share/pixmaps/anjuta/bookmark_toggle.xpm
-share/pixmaps/anjuta/breakpoint.xpm
-share/pixmaps/anjuta/build.xpm
-share/pixmaps/anjuta/build_all.xpm
-share/pixmaps/anjuta/build_stop.xpm
-share/pixmaps/anjuta/calltip.xpm
-share/pixmaps/anjuta/close_file.xpm
-share/pixmaps/anjuta/close_project.xpm
-share/pixmaps/anjuta/compile.xpm
-share/pixmaps/anjuta/configure.xpm
-share/pixmaps/anjuta/console.xpm
-share/pixmaps/anjuta/continue.xpm
-share/pixmaps/anjuta/copy.xpm
-share/pixmaps/anjuta/debug.xpm
-share/pixmaps/anjuta/debug_stop.xpm
-share/pixmaps/anjuta/dock.xpm
-share/pixmaps/anjuta/error_next.xpm
-share/pixmaps/anjuta/error_prev.xpm
-share/pixmaps/anjuta/exec.xpm
-share/pixmaps/anjuta/execute.xpm
-share/pixmaps/anjuta/file_c.xpm
-share/pixmaps/anjuta/file_cpp.xpm
-share/pixmaps/anjuta/file_file.xpm
-share/pixmaps/anjuta/file_h.xpm
-share/pixmaps/anjuta/file_html.xpm
-share/pixmaps/anjuta/file_i18n.xpm
-share/pixmaps/anjuta/file_icon.xpm
-share/pixmaps/anjuta/file_pix.xpm
-share/pixmaps/anjuta/find.xpm
-share/pixmaps/anjuta/find_replace.xpm
-share/pixmaps/anjuta/fold_close.xpm
-share/pixmaps/anjuta/fold_open.xpm
-share/pixmaps/anjuta/fold_toggle.xpm
-share/pixmaps/anjuta/frame.xpm
-share/pixmaps/anjuta/gear.xpm
-share/pixmaps/anjuta/goto.xpm
-share/pixmaps/anjuta/graph.xpm
-share/pixmaps/anjuta/handle_hide.xpm
-share/pixmaps/anjuta/handle_undock.xpm
-share/pixmaps/anjuta/help.xpm
-share/pixmaps/anjuta/indent.xpm
-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/inspect.xpm
-share/pixmaps/anjuta/interface.xpm
-share/pixmaps/anjuta/interrupt.xpm
-share/pixmaps/anjuta/ledgreen.xpm
-share/pixmaps/anjuta/ledred.xpm
-share/pixmaps/anjuta/line-arrow.xbm
-share/pixmaps/anjuta/line-wrap.xbm
-share/pixmaps/anjuta/list_select.xpm
-share/pixmaps/anjuta/list_unselect.xpm
-share/pixmaps/anjuta/messages.xpm
-share/pixmaps/anjuta/mini-modules.xpm
-share/pixmaps/anjuta/mini_build.xpm
-share/pixmaps/anjuta/mini_cvs.xpm
-share/pixmaps/anjuta/mini_debug.xpm
-share/pixmaps/anjuta/mini_dock.xpm
-share/pixmaps/anjuta/mini_find.xpm
-share/pixmaps/anjuta/new_file.xpm
-share/pixmaps/anjuta/open_file.xpm
-share/pixmaps/anjuta/open_project.xpm
-share/pixmaps/anjuta/paste.xpm
-share/pixmaps/anjuta/pointer.xpm
-share/pixmaps/anjuta/preferences.xpm
-share/pixmaps/anjuta/print.xpm
-share/pixmaps/anjuta/project.xpm
-share/pixmaps/anjuta/redo.xpm
-share/pixmaps/anjuta/registers.xpm
-share/pixmaps/anjuta/reload.xpm
-share/pixmaps/anjuta/reload_file.xpm
-share/pixmaps/anjuta/remove.xpm
-share/pixmaps/anjuta/run_to_cursor.xpm
-share/pixmaps/anjuta/save.xpm
-share/pixmaps/anjuta/save_all.xpm
-share/pixmaps/anjuta/save_file.xpm
-share/pixmaps/anjuta/save_project.xpm
-share/pixmaps/anjuta/search.xpm
-share/pixmaps/anjuta/stack.xpm
-share/pixmaps/anjuta/step_in.xpm
-share/pixmaps/anjuta/step_out.xpm
-share/pixmaps/anjuta/step_over.xpm
-share/pixmaps/anjuta/stop.xpm
-share/pixmaps/anjuta/syntax.xpm
-share/pixmaps/anjuta/undo.xpm
-share/pixmaps/anjuta/undock.xpm
-share/pixmaps/anjuta/watch.xpm
-share/pixmaps/anjuta/wizard.xpm
-@dirrm share/pixmaps/anjuta
+share/locale/zh_CN/LC_MESSAGES/anjuta.mo
+share/locale/zh_TW/LC_MESSAGES/anjuta.mo
+@dirrm share/gnome/pixmaps/anjuta
 @dirrm share/gnome/omf/anjuta
 @dirrm share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images
 @dirrm share/gnome/help/anjuta/C/anjuta-manual/figures
@@ -311,5 +322,5 @@ share/pixmaps/anjuta/wizard.xpm
 @dirrm share/gnome/help/anjuta/C/anjuta-faqs
 @dirrm share/gnome/help/anjuta/C
 @dirrm share/gnome/help/anjuta
-@dirrm share/anjuta
-@dirrm doc/anjuta
+@dirrm share/gnome/anjuta/gnome
+@dirrm share/gnome/anjuta