13 files changed, 313 insertions, 202 deletions

diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 3b1421ed1f1f..fd0a79a834d3 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	anjuta
-PORTVERSION=	0.1.9
+PORTVERSION=	1.0.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	anjuta
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index 7108aa403bd8..d0eee2b7ac8e 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1 +1 @@
-MD5 (anjuta-0.1.9.tar.gz) = 645a108a816b30ecff1df13395e6ce00
+MD5 (anjuta-1.0.0.tar.gz) = 214e2b4997d87deda96405a6d97d6806
diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in
index 7f42511f1ab4..a85830d0f226 100644
--- a/devel/anjuta/files/patch-Makefile.in
+++ b/devel/anjuta/files/patch-Makefile.in
@@ -1,28 +1,28 @@
---- Makefile.in.orig	Fri Feb 15 17:25:54 2002
-+++ Makefile.in	Fri Feb 15 17:33:47 2002
-@@ -150,13 +150,13 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
+--- Makefile.in.orig	Tue Nov  5 15:12:07 2002
++++ Makefile.in	Tue Nov  5 15:13:29 2002
+@@ -171,13 +171,13 @@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
  
 -SUBDIRS = intl po macros tagmanager global-tags scintilla \
 +SUBDIRS = intl po macros tagmanager global-tags \
- 	widgets manuals omf-install src pixmaps data \
--	doc launcher plugins scripts
-+	launcher plugins scripts
+ 	widgets printing manuals omf-install pixmaps scripts data \
+-	doc launcher plugins src macros2
++	launcher plugins src macros2
  
  
- anjutadocdir = ${prefix}/doc/anjuta
+ anjutadocdir = ${prefix}/@NO_PREFIX_PACKAGE_DOC_DIR@
 -anjutadoc_DATA = \
 +anjutadoc_DATA = # \
  	README\
  	COPYING\
  	AUTHORS\
-@@ -448,7 +448,7 @@
- install-exec-am:
- install-exec: install-exec-recursive
+@@ -563,7 +563,7 @@
+ 
+ info-am:
  
 -install-data-am: install-anjutadocDATA install-gnomemenuDATA
 +install-data-am: install-gnomemenuDATA
- install-data: install-data-recursive
  
- install-am: all-am
+ install-exec-am:
+ 
diff --git a/devel/anjuta/files/patch-configure b/devel/anjuta/files/patch-configure
index ece49bb8864f..652c7ef1d11e 100644
--- a/devel/anjuta/files/patch-configure
+++ b/devel/anjuta/files/patch-configure
@@ -1,21 +1,20 @@
---- configure.orig	Thu Feb 14 22:13:15 2002
-+++ configure	Thu Feb 14 22:15:54 2002
-@@ -8,6 +8,7 @@
- # gives unlimited permission to copy, distribute and modify it.
+--- configure.orig	Mon Nov  4 03:12:17 2002
++++ configure	Tue Nov  5 15:17:37 2002
+@@ -16186,6 +16186,7 @@
  
- # Defaults:
+ 
+ packagesrcdir=`cd $srcdir && pwd`
 +GLIB_CONFIG="$GLIB_CONFIG"
- ac_help=
- ac_default_prefix=/usr/local
- # Any additions from configure.in:
-@@ -10328,11 +10329,11 @@
+ 
+ if test "x${prefix}" = "xNONE"; then
+   packageprefix=${ac_default_prefix}
+@@ -16193,11 +16194,11 @@
    packageprefix=${prefix}
  fi
  
 -packagedatadir=share/${PACKAGE}
--packagedocdir=doc/${PACKAGE}
 +packagedatadir=share/gnome/${PACKAGE}
-+packagedocdir=share/doc/${PACKAGE}
+ packagedocdir=share/doc/${PACKAGE}
  packageplugindir=lib/${PACKAGE}/plugins/${VERSION}
  
 -packagepixmapsdir=share/pixmaps/${PACKAGE}
@@ -23,35 +22,33 @@
  packagehelpdir=share/gnome/help/${PACKAGE}
  packagemenudir=share/gnome/apps
  packageplugindir=lib/${PACKAGE}
-@@ -10505,11 +10506,9 @@
- tagmanager/Makefile
- tagmanager/include/Makefile
- global-tags/Makefile
--scintilla/Makefile
- widgets/Makefile
- manuals/Makefile
- omf-install/Makefile
--scintilla/include/Makefile
- manuals/C/Makefile
- manuals/C/anjuta-manual/Makefile
- manuals/C/anjuta-faqs/Makefile
-@@ -10625,6 +10624,7 @@
- s%@GNOME_DOCKLETS_LIBS@%$GNOME_DOCKLETS_LIBS%g
- s%@GNOME_CAPPLET_LIBS@%$GNOME_CAPPLET_LIBS%g
- s%@cflags_set@%$cflags_set%g
-+s%@GLIB_CONFIG@%$GLIB_CONFIG%g
- s%@GTK_CONFIG@%$GTK_CONFIG%g
- s%@GTK_CFLAGS@%$GTK_CFLAGS%g
- s%@GTK_LIBS@%$GTK_LIBS%g
-@@ -10730,11 +10730,9 @@
- tagmanager/Makefile
- tagmanager/include/Makefile
- global-tags/Makefile
--scintilla/Makefile
- widgets/Makefile
- manuals/Makefile
- omf-install/Makefile
--scintilla/include/Makefile
- manuals/C/Makefile
- manuals/C/anjuta-manual/Makefile
- manuals/C/anjuta-faqs/Makefile
+@@ -16261,7 +16262,7 @@
+ _ACEOF
+ 
+ 
+-ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in macros/Makefile macros2/Makefile tagmanager/Makefile tagmanager/include/Makefile global-tags/Makefile scintilla/Makefile widgets/Makefile printing/Makefile manuals/Makefile omf-install/Makefile scintilla/include/Makefile manuals/C/Makefile manuals/C/anjuta-tutorial/Makefile manuals/C/anjuta-manual/Makefile manuals/C/anjuta-faqs/Makefile manuals/ja/Makefile manuals/ja/anjuta-manual/Makefile manuals/ja/anjuta-faqs/Makefile anjuta.spec src/Makefile pixmaps/Makefile data/Makefile data/welcome.txt data/properties/Makefile doc/anjuta.1 doc/anjuta_launcher.1 doc/Makefile scripts/Makefile scripts/anjuta_import.sh launcher/Makefile plugins/Makefile plugins/sample1/Makefile plugins/class-gen/Makefile plugins/patch/Makefile anjuta.desktop.in"
++ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in macros/Makefile macros2/Makefile tagmanager/Makefile tagmanager/include/Makefile global-tags/Makefile widgets/Makefile printing/Makefile manuals/Makefile omf-install/Makefile manuals/C/Makefile manuals/C/anjuta-tutorial/Makefile manuals/C/anjuta-manual/Makefile manuals/C/anjuta-faqs/Makefile manuals/ja/Makefile manuals/ja/anjuta-manual/Makefile manuals/ja/anjuta-faqs/Makefile anjuta.spec src/Makefile pixmaps/Makefile data/Makefile data/welcome.txt data/properties/Makefile doc/anjuta.1 doc/anjuta_launcher.1 doc/Makefile scripts/Makefile scripts/anjuta_import.sh launcher/Makefile plugins/Makefile plugins/sample1/Makefile plugins/class-gen/Makefile plugins/patch/Makefile anjuta.desktop.in"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -16801,12 +16802,10 @@
+   "tagmanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES tagmanager/Makefile" ;;
+   "tagmanager/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES tagmanager/include/Makefile" ;;
+   "global-tags/Makefile" ) CONFIG_FILES="$CONFIG_FILES global-tags/Makefile" ;;
+-  "scintilla/Makefile" ) CONFIG_FILES="$CONFIG_FILES scintilla/Makefile" ;;
+   "widgets/Makefile" ) CONFIG_FILES="$CONFIG_FILES widgets/Makefile" ;;
+   "printing/Makefile" ) CONFIG_FILES="$CONFIG_FILES printing/Makefile" ;;
+   "manuals/Makefile" ) CONFIG_FILES="$CONFIG_FILES manuals/Makefile" ;;
+   "omf-install/Makefile" ) CONFIG_FILES="$CONFIG_FILES omf-install/Makefile" ;;
+-  "scintilla/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES scintilla/include/Makefile" ;;
+   "manuals/C/Makefile" ) CONFIG_FILES="$CONFIG_FILES manuals/C/Makefile" ;;
+   "manuals/C/anjuta-tutorial/Makefile" ) CONFIG_FILES="$CONFIG_FILES manuals/C/anjuta-tutorial/Makefile" ;;
+   "manuals/C/anjuta-manual/Makefile" ) CONFIG_FILES="$CONFIG_FILES manuals/C/anjuta-manual/Makefile" ;;
+@@ -17002,6 +17001,7 @@
+ s,@GNOME_APPLETS_LIBS@,$GNOME_APPLETS_LIBS,;t t
+ s,@GNOME_DOCKLETS_LIBS@,$GNOME_DOCKLETS_LIBS,;t t
+ s,@GNOME_CAPPLET_LIBS@,$GNOME_CAPPLET_LIBS,;t t
++s,@GLIB_CONFIG@,$GLIB_CONFIG,;t t
+ s,@GTK_CONFIG@,$GTK_CONFIG,;t t
+ s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
+ s,@GTK_LIBS@,$GTK_LIBS,;t t
diff --git a/devel/anjuta/files/patch-data::Makefile.in b/devel/anjuta/files/patch-data::Makefile.in
index 63700064d2bb..b02225b46541 100644
--- a/devel/anjuta/files/patch-data::Makefile.in
+++ b/devel/anjuta/files/patch-data::Makefile.in
@@ -1,6 +1,19 @@
---- data/Makefile.in.orig	Fri Feb 15 17:24:52 2002
-+++ data/Makefile.in	Fri Feb 15 17:24:40 2002
-@@ -424,8 +424,8 @@
+--- data/Makefile.in.orig	Tue Nov  5 16:39:59 2002
++++ data/Makefile.in	Tue Nov  5 17:01:01 2002
+@@ -190,10 +190,10 @@
+ 	autogen.sh.wxwin
+ 
+ 
+-anjuta_mimedir = $(prefix)/share/mime-info
++anjuta_mimedir = $(prefix)/share/gnome/mime-info
+ anjuta_mime_DATA = anjuta.mime
+ 
+-anjuta_mimelnkdir = $(prefix)/share/mimelnk/application
++anjuta_mimelnkdir = $(prefix)/share/gnome/mimelnk/application
+ anjuta_mimelnk_DATA = x-anjuta-project.desktop
+ 
+ MACROS = \
+@@ -555,8 +555,8 @@
  	@rm -f system.tags
  
  system.tags:
@@ -9,6 +22,5 @@
 +	cd $(top_builddir)/tagmanager && $(MAKE) libctags.a
 +	cd $(top_builddir)/global-tags && $(MAKE) system.tags
  	mv $(top_builddir)/global-tags/system.tags .
- 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/devel/anjuta/files/patch-launcher-Makefile.in b/devel/anjuta/files/patch-launcher-Makefile.in
index 7cfd3a350f33..7935b72b58f1 100644
--- a/devel/anjuta/files/patch-launcher-Makefile.in
+++ b/devel/anjuta/files/patch-launcher-Makefile.in
@@ -1,26 +1,22 @@
---- launcher/Makefile.in.orig	Thu Feb 14 22:17:29 2002
-+++ launcher/Makefile.in	Thu Feb 14 22:18:22 2002
-@@ -12,6 +12,7 @@
- 
+--- launcher/Makefile.in.orig	Tue Nov  5 15:18:07 2002
++++ launcher/Makefile.in	Tue Nov  5 15:19:10 2002
+@@ -14,6 +14,7 @@
  
+ @SET_MAKE@
  SHELL = @SHELL@
 +GLIB_CONFIG = @GLIB_CONFIG@
  
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-@@ -150,13 +151,13 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
- 
--INCLUDES = `glib-config --cflags` -I. -I.. -g -O
-+INCLUDES = `$(GLIB_CONFIG) --cflags` -I. -I.. -g -O
- 
+@@ -170,9 +171,9 @@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+-INCLUDES = `glib-config --cflags` -I. -I..
++INCLUDES = `$(GLIB_CONFIG) --cflags` -I. -I..
  bin_PROGRAMS = anjuta_launcher
- 
- anjuta_launcher_SOURCES = anjuta_launcher.c
- 
--anjuta_launcher_LDFLAGS = `glib-config --libs` 
-+anjuta_launcher_LDFLAGS = `$(GLIB_CONFIG) --libs`
+-LDFLAGS = `glib-config --libs` 
++LDFLAGS = `$(GLIB_CONFIG) --libs` 
+ subdir = launcher
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/devel/anjuta/files/patch-plugins::class-gen::Makefile.in b/devel/anjuta/files/patch-plugins::class-gen::Makefile.in
index feb611acefd3..877fc0a52456 100644
--- a/devel/anjuta/files/patch-plugins::class-gen::Makefile.in
+++ b/devel/anjuta/files/patch-plugins::class-gen::Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- plugins/class-gen/Makefile.in	2002/02/19 08:11:57	1.1
-+++ plugins/class-gen/Makefile.in	2002/02/19 08:12:25
-@@ -192,7 +192,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libanjuta_clsGen_la_LDFLAGS = 
+--- plugins/class-gen/Makefile.in.orig	Tue Nov  5 15:19:38 2002
++++ plugins/class-gen/Makefile.in	Tue Nov  5 15:20:28 2002
+@@ -210,7 +210,7 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(plugin_LTLIBRARIES)
+ 
+-libanjuta_clsGen_la_LDFLAGS =
 +libanjuta_clsGen_la_LDFLAGS = -module -avoid-version
- libanjuta_clsGen_la_LIBADD = 
- libanjuta_clsGen_la_OBJECTS =  clsGen.lo
- CFLAGS = @CFLAGS@
+ libanjuta_clsGen_la_LIBADD =
+ am_libanjuta_clsGen_la_OBJECTS = clsGen.lo
+ libanjuta_clsGen_la_OBJECTS = $(am_libanjuta_clsGen_la_OBJECTS)
diff --git a/devel/anjuta/files/patch-plugins::sample1::Makefile.in b/devel/anjuta/files/patch-plugins::sample1::Makefile.in
index cd5e5ad60b2b..d08c010621c1 100644
--- a/devel/anjuta/files/patch-plugins::sample1::Makefile.in
+++ b/devel/anjuta/files/patch-plugins::sample1::Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- plugins/sample1/Makefile.in	2002/02/19 08:11:57	1.1
-+++ plugins/sample1/Makefile.in	2002/02/19 08:12:31
-@@ -193,7 +193,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libanjuta_sample1_la_LDFLAGS = 
+--- plugins/sample1/Makefile.in.orig	Tue Nov  5 15:21:02 2002
++++ plugins/sample1/Makefile.in	Tue Nov  5 15:21:35 2002
+@@ -210,7 +210,7 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(plugin_LTLIBRARIES)
+ 
+-libanjuta_sample1_la_LDFLAGS =
 +libanjuta_sample1_la_LDFLAGS = -module -avoid-version
- libanjuta_sample1_la_LIBADD = 
- libanjuta_sample1_la_OBJECTS =  plugin-sample1.lo
- CFLAGS = @CFLAGS@
+ libanjuta_sample1_la_LIBADD =
+ am_libanjuta_sample1_la_OBJECTS = plugin-sample1.lo
+ libanjuta_sample1_la_OBJECTS = $(am_libanjuta_sample1_la_OBJECTS)
diff --git a/devel/anjuta/files/patch-plugins_patch_Makefile.in b/devel/anjuta/files/patch-plugins_patch_Makefile.in
new file mode 100644
index 000000000000..f30e428913f3
--- /dev/null
+++ b/devel/anjuta/files/patch-plugins_patch_Makefile.in
@@ -0,0 +1,11 @@
+--- plugins/patch/Makefile.in.orig	Tue Nov  5 16:59:47 2002
++++ plugins/patch/Makefile.in	Tue Nov  5 16:59:56 2002
+@@ -210,7 +210,7 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(plugin_LTLIBRARIES)
+ 
+-libanjuta_patch_la_LDFLAGS =
++libanjuta_patch_la_LDFLAGS = -module -avoid-version
+ libanjuta_patch_la_LIBADD =
+ am_libanjuta_patch_la_OBJECTS = patch-plugin.lo
+ libanjuta_patch_la_OBJECTS = $(am_libanjuta_patch_la_OBJECTS)
diff --git a/devel/anjuta/files/patch-po::Makefile.in.in b/devel/anjuta/files/patch-po::Makefile.in.in
deleted file mode 100644
index 7699b0d99997..000000000000
--- a/devel/anjuta/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- po/Makefile.in.in	2002/01/22 18:34:36	1.1
-+++ po/Makefile.in.in	2002/01/22 18:34:45
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
-
diff --git a/devel/anjuta/files/patch-src-Makefile.in b/devel/anjuta/files/patch-src-Makefile.in
index 17187147319b..af786456e5d4 100644
--- a/devel/anjuta/files/patch-src-Makefile.in
+++ b/devel/anjuta/files/patch-src-Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	Fri Feb 15 17:01:26 2002
-+++ src/Makefile.in	Fri Feb 15 17:03:35 2002
-@@ -157,38 +157,17 @@
+--- src/Makefile.in.orig	Tue Nov  5 15:22:08 2002
++++ src/Makefile.in	Tue Nov  5 15:23:34 2002
+@@ -178,7 +178,7 @@
  	$(GNOME_INCLUDEDIR)\
  	$(EXTRA_GNOME_CFLAGS)\
  	$(EXTRA_ORBIT_CFLAGS)\
@@ -9,15 +9,10 @@
  	-I$(srcdir)/../tagmanager/include \
  	-I$(srcdir)/../widgets \
  	-I$(srcdir)/../pixmaps \
- 	-I.. -I. \
- 	-Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment\
- 	-Wuninitialized -Wparentheses -Wpointer-arith\
--	-Wmissing-prototypes\
-- 	-O1\
-- 	-g
-+	-Wmissing-prototypes
+@@ -186,28 +186,8 @@
+ 	-I.. -I. -DPACKAGE_BIN_DIR=\"$(bindir)\"
+ 
  
--
 -SCILEXERS = \
 -    ../scintilla/StyleContext.o\
 -	../scintilla/LexCPP.o\
@@ -37,38 +32,45 @@
 -	../scintilla/LexRuby.o\
 -	../scintilla/LexBullant.o\
 -	../scintilla/LexAda.o\
--	../scintilla/LexBaan.o
-+SCILEXERS =		 -lscintilla_lexers
-+SCINTILLA =		 -lscintilla
- 
+-	../scintilla/LexBaan.o\
+-	../scintilla/LexMatlab.o
+-
++SCILEXERS =             -lscintilla_lexers
++SCINTILLA =             -lscintilla
  
  bin_PROGRAMS = anjuta
-@@ -387,9 +366,9 @@
+ 
+@@ -413,10 +393,10 @@
  	$(GNOMEUI_LIBS)\
  	$(EXTRA_GNOME_LIBS)\
  	$(EXTRA_ORBIT_LIBS)\
 -	$(top_builddir)/scintilla/libscintilla.a\
  	$(top_builddir)/tagmanager/libctags.a\
  	$(top_builddir)/widgets/libwidgets.a\
+ 	$(top_builddir)/printing/libanjutaprint.a\
 +	$(SCINTILLA)\
  	$(SCILEXERS)
  
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -441,16 +420,7 @@
- compatibility_0.$(OBJEXT) defaults.$(OBJEXT) resources.$(OBJEXT) \
- CORBA-Server.$(OBJEXT) Gladen-common.$(OBJEXT) glades.$(OBJEXT) \
- Prj-common.$(OBJEXT) Gladen-stubs.$(OBJEXT) session.$(OBJEXT)
--anjuta_DEPENDENCIES =  $(top_builddir)/scintilla/libscintilla.a \
--$(top_builddir)/tagmanager/libctags.a \
--$(top_builddir)/widgets/libwidgets.a ../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 ../scintilla/LexBaan.o
+ subdir = src
+@@ -473,20 +453,7 @@
+ 	Gladen-common.$(OBJEXT) glades.$(OBJEXT) Prj-common.$(OBJEXT) \
+ 	Gladen-stubs.$(OBJEXT) session.$(OBJEXT)
+ anjuta_OBJECTS = $(am_anjuta_OBJECTS)
+-anjuta_DEPENDENCIES = $(top_builddir)/scintilla/libscintilla.a \
+-	$(top_builddir)/tagmanager/libctags.a \
+-	$(top_builddir)/widgets/libwidgets.a \
+-	$(top_builddir)/printing/libanjutaprint.a \
+-	../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 \
+-	../scintilla/LexBaan.o ../scintilla/LexMatlab.o
 +anjuta_DEPENDENCIES =
- anjuta_LDFLAGS = 
- CXXFLAGS = @CXXFLAGS@
- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ anjuta_LDFLAGS =
+ 
+ DEFS = @DEFS@
diff --git a/devel/anjuta/files/patch-src_aneditor.cxx b/devel/anjuta/files/patch-src_aneditor.cxx
new file mode 100644
index 000000000000..f8e2d88bce8b
--- /dev/null
+++ b/devel/anjuta/files/patch-src_aneditor.cxx
@@ -0,0 +1,12 @@
+--- src/aneditor.cxx.orig	Tue Nov  5 15:51:38 2002
++++ src/aneditor.cxx	Tue Nov  5 15:52:01 2002
+@@ -289,6 +289,9 @@
+ 	void EvalOutputArrived(GList* lines, int textPos, const string &expression);
+ };
+ 
++inline bool nonFuncChar(char ch) {
++    return strchr("\t\n\r !\"#%&'()*+,-./:;<=>?@[\\]^`{|}~", ch) != NULL;
++}
+ 
+ class ExpressionEvaluationTipInfo
+ // Utility class to help displaying expression values in tips.
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index 07a89c77224d..9a48f20be760 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -2,14 +2,17 @@ bin/anjuta
 bin/anjuta_import.sh
 bin/anjuta_launcher
 lib/anjuta/libanjuta_clsGen.so
+lib/anjuta/libanjuta_patch.so
 lib/anjuta/libanjuta_sample1.so
 share/gnome/anjuta/README.stock_libs
 share/gnome/anjuta/anjuta_project.template
 share/gnome/anjuta/autogen.sh.generic
 share/gnome/anjuta/autogen.sh.gnome
+share/gnome/anjuta/autogen.sh.gnome2
 share/gnome/anjuta/autogen.sh.gnomemm
 share/gnome/anjuta/autogen.sh.gtk
 share/gnome/anjuta/autogen.sh.gtkmm
+share/gnome/anjuta/autogen.sh.wxwin
 share/gnome/anjuta/gdb.init
 share/gnome/anjuta/gnome/ChangeLog
 share/gnome/anjuta/gnome/Makefile.am
@@ -27,6 +30,7 @@ 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-pilot.m4
 share/gnome/anjuta/gnome/gnome-print-check.m4
 share/gnome/anjuta/gnome/gnome-pthread-check.m4
 share/gnome/anjuta/gnome/gnome-support.m4
@@ -38,6 +42,20 @@ 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/gnome2/ChangeLog
+share/gnome/anjuta/gnome2/Makefile.am
+share/gnome/anjuta/gnome2/autogen.sh
+share/gnome/anjuta/gnome2/check-utmp.m4
+share/gnome/anjuta/gnome2/compiler-flags.m4
+share/gnome/anjuta/gnome2/curses.m4
+share/gnome/anjuta/gnome2/gnome-common.m4
+share/gnome/anjuta/gnome2/gnome-cxx-check.m4
+share/gnome/anjuta/gnome2/gnome-gettext.m4
+share/gnome/anjuta/gnome2/gnome-pkgconfig.m4
+share/gnome/anjuta/gnome2/gnome-platform.m4
+share/gnome/anjuta/gnome2/gnome-pthread-check.m4
+share/gnome/anjuta/gnome2/gnome-x-checks.m4
+share/gnome/anjuta/gnome2/linger.m4
 share/gnome/anjuta/header.c
 share/gnome/anjuta/properties/ada.properties
 share/gnome/anjuta/properties/anjuta.properties
@@ -50,8 +68,10 @@ share/gnome/anjuta/properties/html.properties
 share/gnome/anjuta/properties/idl.properties
 share/gnome/anjuta/properties/java.properties
 share/gnome/anjuta/properties/latex.properties
+share/gnome/anjuta/properties/lisp.properties
 share/gnome/anjuta/properties/lua.properties
 share/gnome/anjuta/properties/make.properties
+share/gnome/anjuta/properties/matlab.properties
 share/gnome/anjuta/properties/others.properties
 share/gnome/anjuta/properties/pascal.properties
 share/gnome/anjuta/properties/perl.properties
@@ -61,38 +81,23 @@ share/gnome/anjuta/properties/rc.properties
 share/gnome/anjuta/properties/ruby.properties
 share/gnome/anjuta/properties/sample.properties
 share/gnome/anjuta/properties/sql.properties
+share/gnome/anjuta/properties/tcltk.properties
+share/gnome/anjuta/properties/user.properties
 share/gnome/anjuta/properties/vb.properties
 share/gnome/anjuta/properties/xml.properties
+share/gnome/anjuta/setup-gettext
 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/index.html
-share/gnome/help/anjuta/C/anjuta-faqs/ln7.html
-share/gnome/help/anjuta/C/anjuta-manual/add-rm-files.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/browsing-files.html
 share/gnome/help/anjuta/C/anjuta-manual/build.sgml
-share/gnome/help/anjuta/C/anjuta-manual/building.html
 share/gnome/help/anjuta/C/anjuta-manual/compileopts.sgml
-share/gnome/help/anjuta/C/anjuta-manual/debugger-exec.html
-share/gnome/help/anjuta/C/anjuta-manual/debugger-others.html
 share/gnome/help/anjuta/C/anjuta-manual/debugger.sgml
-share/gnome/help/anjuta/C/anjuta-manual/debugging-breaks.html
-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/editing-files.html
 share/gnome/help/anjuta/C/anjuta-manual/execute.sgml
-share/gnome/help/anjuta/C/anjuta-manual/familiar.html
-share/gnome/help/anjuta/C/anjuta-manual/figures/appwiz1.png
-share/gnome/help/anjuta/C/anjuta-manual/figures/appwiz2.png
-share/gnome/help/anjuta/C/anjuta-manual/figures/appwiz3.png
-share/gnome/help/anjuta/C/anjuta-manual/figures/appwiz4.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/arguments.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/attach.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/brk_add.png
@@ -104,24 +109,31 @@ share/gnome/help/anjuta/C/anjuta-manual/figures/ccview_struct.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/configure_dlg.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/defines.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/devt_menu.png
+share/gnome/help/anjuta/C/anjuta-manual/figures/editor_guides.png
+share/gnome/help/anjuta/C/anjuta-manual/figures/editor_margins.png
+share/gnome/help/anjuta/C/anjuta-manual/figures/editor_markers.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/evaluate.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/fileview.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/find_files.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/find_replace.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/find_text.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/frame.png
-share/gnome/help/anjuta/C/anjuta-manual/figures/impwiz.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/includes.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/inspect.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/lib_paths.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/libraries.png
+share/gnome/help/anjuta/C/anjuta-manual/figures/local_variables.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/mainwin.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/menu_detached.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/menu_main.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/message_win.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/open_file.png
+share/gnome/help/anjuta/C/anjuta-manual/figures/open_file_multiple.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/optimizations.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/other_opts.png
+share/gnome/help/anjuta/C/anjuta-manual/figures/prefs_print.png
+share/gnome/help/anjuta/C/anjuta-manual/figures/print_dlg.png
+share/gnome/help/anjuta/C/anjuta-manual/figures/print_preview.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/project_info.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/project_win.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/registers.png
@@ -131,52 +143,105 @@ share/gnome/help/anjuta/C/anjuta-manual/figures/signal_mod.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/signals.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/stack.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/supports.png
+share/gnome/help/anjuta/C/anjuta-manual/figures/symbol_browser.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/toolbar_browser.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/toolbar_debug.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/toolbar_ext.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/toolbar_format.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/toolbar_main.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/toolbar_tags.png
+share/gnome/help/anjuta/C/anjuta-manual/figures/variable_tip.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/warnings.png
 share/gnome/help/anjuta/C/anjuta-manual/figures/watch.png
 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/fileoperations.sgml
-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/interface.sgml
-share/gnome/help/anjuta/C/anjuta-manual/introduction.html
 share/gnome/help/anjuta/C/anjuta-manual/introduction.sgml
-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/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
-share/gnome/help/anjuta/C/anjuta-manual/multiple-find-files.html
-share/gnome/help/anjuta/C/anjuta-manual/new-projects.html
-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/preferences.html
 share/gnome/help/anjuta/C/anjuta-manual/preferences.sgml
-share/gnome/help/anjuta/C/anjuta-manual/project-build.html
-share/gnome/help/anjuta/C/anjuta-manual/project-config.html
-share/gnome/help/anjuta/C/anjuta-manual/project-files.html
-share/gnome/help/anjuta/C/anjuta-manual/project-information.html
-share/gnome/help/anjuta/C/anjuta-manual/project-management.html
 share/gnome/help/anjuta/C/anjuta-manual/projects.sgml
-share/gnome/help/anjuta/C/anjuta-manual/running.html
-share/gnome/help/anjuta/C/anjuta-manual/search-replace-files.html
-share/gnome/help/anjuta/C/anjuta-manual/setting-compiler-options.html
-share/gnome/help/anjuta/C/anjuta-manual/toolbars.html
-share/gnome/help/anjuta/C/anjuta-manual/warnings.html
+share/gnome/help/anjuta/C/anjuta-tutorial/anjuta-tutorial.sgml
+share/gnome/help/anjuta/C/anjuta-tutorial/figures/divided.png
+share/gnome/help/anjuta/C/anjuta-tutorial/figures/glade-l.png
+share/gnome/help/anjuta/C/anjuta-tutorial/figures/icons.png
+share/gnome/help/anjuta/C/anjuta-tutorial/figures/interface.png
+share/gnome/help/anjuta/C/anjuta-tutorial/index.html
 share/gnome/help/anjuta/C/topic.dat
+share/gnome/help/anjuta/ja/anjuta-faqs/anjuta-faqs.sgml
+share/gnome/help/anjuta/ja/anjuta-faqs/index.html
+share/gnome/help/anjuta/ja/anjuta-manual/anjuta-manual.sgml
+share/gnome/help/anjuta/ja/anjuta-manual/authors.sgml
+share/gnome/help/anjuta/ja/anjuta-manual/build.sgml
+share/gnome/help/anjuta/ja/anjuta-manual/compileopts.sgml
+share/gnome/help/anjuta/ja/anjuta-manual/debugger.sgml
+share/gnome/help/anjuta/ja/anjuta-manual/execute.sgml
+share/gnome/help/anjuta/ja/anjuta-manual/figures/appwiz1.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/appwiz2.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/appwiz3.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/appwiz4.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/arguments.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/attach.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/brk_add.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/brk_dlg.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/brk_edit.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/ccview.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/ccview_class.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/ccview_struct.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/configure_dlg.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/defines.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/devt_menu.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/evaluate.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/fileview.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/find_files.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/find_replace.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/find_text.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/frame.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/impwiz.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/includes.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/inspect.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/lib_paths.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/libraries.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/mainwin.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/menu_detached.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/menu_main.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/message_win.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/open_file.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/optimizations.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/other_opts.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/project_info.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/project_win.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/registers.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/scrshot.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/sharedlibs.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/signal_mod.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/signals.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/stack.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/supports.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/toolbar_browser.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/toolbar_debug.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/toolbar_ext.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/toolbar_format.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/toolbar_main.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/toolbar_tags.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/warnings.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/watch.png
+share/gnome/help/anjuta/ja/anjuta-manual/figures/watch_add.png
+share/gnome/help/anjuta/ja/anjuta-manual/fileoperations.sgml
+share/gnome/help/anjuta/ja/anjuta-manual/index.html
+share/gnome/help/anjuta/ja/anjuta-manual/interface.sgml
+share/gnome/help/anjuta/ja/anjuta-manual/introduction.sgml
+share/gnome/help/anjuta/ja/anjuta-manual/license.sgml
+share/gnome/help/anjuta/ja/anjuta-manual/preferences.sgml
+share/gnome/help/anjuta/ja/anjuta-manual/projects.sgml
+share/gnome/help/anjuta/ja/topic.dat
+share/gnome/mime-info/anjuta.mime
+share/gnome/mimelnk/application/x-anjuta-project.desktop
 share/gnome/omf/anjuta/anjuta-faqs-C.omf
+share/gnome/omf/anjuta/anjuta-faqs-ja_JP.eucJP.omf
 share/gnome/omf/anjuta/anjuta-manual-C.omf
+share/gnome/omf/anjuta/anjuta-manual-ja_JP.eucJP.omf
+share/gnome/omf/anjuta/anjuta-tutorial-C.omf
 share/gnome/pixmaps/anjuta/add.xpm
 share/gnome/pixmaps/anjuta/an_tag.xpm
 share/gnome/pixmaps/anjuta/anjuta_icon.png
@@ -184,12 +249,20 @@ share/gnome/pixmaps/anjuta/anjuta_logo.png
 share/gnome/pixmaps/anjuta/anjuta_splash.png
 share/gnome/pixmaps/anjuta/applogo.png
 share/gnome/pixmaps/anjuta/appwiz_bonobo.png
+share/gnome/pixmaps/anjuta/appwiz_bonobo2.png
 share/gnome/pixmaps/anjuta/appwiz_gnome.png
+share/gnome/pixmaps/anjuta/appwiz_gnome2.png
 share/gnome/pixmaps/anjuta/appwiz_gnomemm.png
+share/gnome/pixmaps/anjuta/appwiz_gnomemm2.png
 share/gnome/pixmaps/anjuta/appwiz_gtk.png
+share/gnome/pixmaps/anjuta/appwiz_gtk2.png
 share/gnome/pixmaps/anjuta/appwiz_gtkmm.png
+share/gnome/pixmaps/anjuta/appwiz_gtkmm2.png
 share/gnome/pixmaps/anjuta/appwiz_libglade.png
+share/gnome/pixmaps/anjuta/appwiz_libglade2.png
 share/gnome/pixmaps/anjuta/appwiz_terminal.png
+share/gnome/pixmaps/anjuta/appwiz_wxwin.png
+share/gnome/pixmaps/anjuta/appwiz_xlib.png
 share/gnome/pixmaps/anjuta/appwizard.png
 share/gnome/pixmaps/anjuta/autocomplete.xpm
 share/gnome/pixmaps/anjuta/bfoldc.xpm
@@ -261,6 +334,7 @@ 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/madeinanjuta.xcf
 share/gnome/pixmaps/anjuta/messages.xpm
 share/gnome/pixmaps/anjuta/mini-modules.xpm
 share/gnome/pixmaps/anjuta/mini_build.xpm
@@ -271,12 +345,27 @@ share/gnome/pixmaps/anjuta/mini_find.xpm
 share/gnome/pixmaps/anjuta/mini_locals.xpm
 share/gnome/pixmaps/anjuta/mini_term.xpm
 share/gnome/pixmaps/anjuta/new_file.xpm
+share/gnome/pixmaps/anjuta/new_folder.xpm
 share/gnome/pixmaps/anjuta/ofolder.xpm
 share/gnome/pixmaps/anjuta/open_file.xpm
 share/gnome/pixmaps/anjuta/open_project.xpm
+share/gnome/pixmaps/anjuta/password.png
 share/gnome/pixmaps/anjuta/paste.xpm
 share/gnome/pixmaps/anjuta/pointer.xpm
 share/gnome/pixmaps/anjuta/preferences.xpm
+share/gnome/pixmaps/anjuta/prefs_autoformat.xpm
+share/gnome/pixmaps/anjuta/prefs_build.xpm
+share/gnome/pixmaps/anjuta/prefs_cvs.xpm
+share/gnome/pixmaps/anjuta/prefs_editor.xpm
+share/gnome/pixmaps/anjuta/prefs_general.xpm
+share/gnome/pixmaps/anjuta/prefs_messages.xpm
+share/gnome/pixmaps/anjuta/prefs_print.xpm
+share/gnome/pixmaps/anjuta/prefs_styles.xpm
+share/gnome/pixmaps/anjuta/print_color.xpm
+share/gnome/pixmaps/anjuta/print_landscape.xpm
+share/gnome/pixmaps/anjuta/print_layout.xpm
+share/gnome/pixmaps/anjuta/print_nocolor.xpm
+share/gnome/pixmaps/anjuta/print_portrait.xpm
 share/gnome/pixmaps/anjuta/print.xpm
 share/gnome/pixmaps/anjuta/project.xpm
 share/gnome/pixmaps/anjuta/redo.xpm
@@ -318,6 +407,7 @@ share/locale/az/LC_MESSAGES/anjuta.mo
 share/locale/da/LC_MESSAGES/anjuta.mo
 share/locale/de/LC_MESSAGES/anjuta.mo
 share/locale/el/LC_MESSAGES/anjuta.mo
+share/locale/en_GB/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
@@ -328,6 +418,7 @@ share/locale/pl/LC_MESSAGES/anjuta.mo
 share/locale/pt/LC_MESSAGES/anjuta.mo
 share/locale/pt_BR/LC_MESSAGES/anjuta.mo
 share/locale/ru/LC_MESSAGES/anjuta.mo
+share/locale/sk/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
@@ -336,15 +427,23 @@ 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/mimelnk/application
+@dirrm share/gnome/mimelnk
+@dirrm share/gnome/help/anjuta/C/anjuta-tutorial/figures
+@dirrm share/gnome/help/anjuta/C/anjuta-tutorial
 @dirrm share/gnome/help/anjuta/C/anjuta-manual/figures
 @dirrm share/gnome/help/anjuta/C/anjuta-manual
-@dirrm share/gnome/help/anjuta/C/anjuta-faqs/stylesheet-images
 @dirrm share/gnome/help/anjuta/C/anjuta-faqs/figures
 @dirrm share/gnome/help/anjuta/C/anjuta-faqs
 @dirrm share/gnome/help/anjuta/C
+@dirrm share/gnome/help/anjuta/ja/anjuta-manual/figures
+@dirrm share/gnome/help/anjuta/ja/anjuta-manual
+@dirrm share/gnome/help/anjuta/ja/anjuta-faqs/figures
+@dirrm share/gnome/help/anjuta/ja/anjuta-faqs
+@dirrm share/gnome/help/anjuta/ja
 @dirrm share/gnome/help/anjuta
 @dirrm share/gnome/anjuta/properties
+@dirrm share/gnome/anjuta/gnome2
 @dirrm share/gnome/anjuta/gnome
 @dirrm share/gnome/anjuta
 @dirrm lib/anjuta