25 files changed, 291 insertions, 532 deletions

diff --git a/devel/anjuta-devel/Makefile b/devel/anjuta-devel/Makefile
index 908c90ff5cb1..329f04142c03 100644
--- a/devel/anjuta-devel/Makefile
+++ b/devel/anjuta-devel/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	anjuta
-# Date created:				31 March 2001
-# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
+# Date created:				13 May 2003
+# Whom:					Sergey Akifyev <asa@gascom.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	anjuta
-PORTVERSION=	1.0.2
+PORTVERSION=	1.1.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	anjuta
@@ -14,21 +14,28 @@ MASTER_SITE_SUBDIR=	anjuta
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Integrated Development Environment for C and C++
 
-LIB_DEPENDS=	scintilla.1:${PORTSDIR}/x11-toolkits/scintilla \
-		pcre.0:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
+NO_LATEST_LINK=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomevfs gnomeprint gdkpixbuf libglade
+USE_GNOME=	gnomeprefix gnomehack libgnomeprint libgnomeui vte libzvt
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's#-lpthread#${PTHREAD_LIBS}#g ; \
-		 s#DATADIRNAME=lib#DATADIRNAME=share#g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/src/Makefile.in
+MAN1=		anjuta.1 anjuta_launcher.1
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/pixmaps/applogo.png \
+		${PREFIX}/share/gnome/anjuta/glade
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for f in AUTHORS COPYING ChangeLog FUTURE INSTALL NEWS README \
+	doc/ScintillaDoc.html TODO
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/anjuta-devel/distinfo b/devel/anjuta-devel/distinfo
index e3a86b733052..abc0c36d12dc 100644
--- a/devel/anjuta-devel/distinfo
+++ b/devel/anjuta-devel/distinfo
@@ -1 +1 @@
-MD5 (anjuta-1.0.2.tar.gz) = e7dc6520265fd8099d22927a6763a26b
+MD5 (anjuta-1.1.1.tar.gz) = 377ae3ad98242f50970da985b484eb15
diff --git a/devel/anjuta-devel/files/patch-Makefile.in b/devel/anjuta-devel/files/patch-Makefile.in
index 4818d62bd379..e9fe21a1db2a 100644
--- a/devel/anjuta-devel/files/patch-Makefile.in
+++ b/devel/anjuta-devel/files/patch-Makefile.in
@@ -1,23 +1,31 @@
---- Makefile.in.orig	Fri Mar 28 09:16:24 2003
-+++ Makefile.in	Fri Mar 28 09:17:36 2003
-@@ -176,9 +176,9 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
+--- Makefile.in.orig	Wed May 14 13:01:45 2003
++++ Makefile.in	Wed May 14 13:02:02 2003
+@@ -281,17 +281,17 @@
+ 	done
  
--SUBDIRS = intl po macros tagmanager global-tags scintilla \
-+SUBDIRS = intl po macros tagmanager global-tags \
- 	widgets printing manuals omf-install pixmaps scripts data \
--	doc launcher plugins src macros2
-+	launcher plugins src macros2
+ install-anjutadocDATA: $(anjutadoc_DATA)
+-	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(anjutadocdir)
+-	@list='$(anjutadoc_DATA)'; for p in $$list; do \
+-	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjutadocdir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjutadocdir)/$$p; \
+-	  else if test -f $$p; then \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(anjutadocdir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(anjutadocdir)/$$p; \
+-	  fi; fi; \
+-	done
++#	@$(NORMAL_INSTALL)
++#	$(mkinstalldirs) $(DESTDIR)$(anjutadocdir)
++#	@list='$(anjutadoc_DATA)'; for p in $$list; do \
++#	  if test -f $(srcdir)/$$p; then \
++#	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjutadocdir)/$$p"; \
++#	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjutadocdir)/$$p; \
++#	  else if test -f $$p; then \
++#	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(anjutadocdir)/$$p"; \
++#	    $(INSTALL_DATA) $$p $(DESTDIR)$(anjutadocdir)/$$p; \
++#	  fi; fi; \
++#	done
  
- 
- anjutadocdir = ${prefix}/@NO_PREFIX_PACKAGE_DOC_DIR@
-@@ -592,7 +592,7 @@
- 
- info-am:
- 
--install-data-am: install-anjuta_dataDATA install-anjutadocDATA \
-+install-data-am: install-anjuta_dataDATA \
- 	install-gnomemenuDATA
- 
- install-exec-am:
+ uninstall-anjutadocDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/devel/anjuta-devel/files/patch-anjuta.glade b/devel/anjuta-devel/files/patch-anjuta.glade
new file mode 100644
index 000000000000..7693cf04d101
--- /dev/null
+++ b/devel/anjuta-devel/files/patch-anjuta.glade
@@ -0,0 +1,29 @@
+--- anjuta.glade.orig	Wed May 14 14:32:42 2003
++++ anjuta.glade	Wed May 14 14:34:40 2003
+@@ -15866,7 +15866,7 @@
+ 	  <property name="background_color">#39ce8206b5ac</property>
+ 	  <property name="logo_background_color">#39ce8206b5ac</property>
+ 	  <property name="textbox_color">#ffffffffffff</property>
+-	  <property name="logo">applogo.png</property>
++	  <property name="logo">%%PREFIX%%/share/gnome/pixmaps/anjuta/applogo.png</property>
+ 	</widget>
+       </child>
+ 
+@@ -15875,7 +15875,7 @@
+ 	  <property name="visible">True</property>
+ 	  <property name="title" translatable="yes">Windows style</property>
+ 	  <property name="logo_background">#c440084ceacc</property>
+-	  <property name="logo">applogo.png</property>
++	  <property name="logo">%%PREFIX%%/share/gnome/pixmaps/anjuta/applogo.png</property>
+ 
+ 	  <child internal-child="vbox">
+ 	    <widget class="GtkVBox" id="druid-vbox1">
+@@ -16079,7 +16079,7 @@
+ 
+ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
+ </property>
+-	  <property name="logo">applogo.png</property>
++<property name="logo">%%PREFIX%%/share/gnome/pixmaps/anjuta/applogo.png</property>
+ 	</widget>
+       </child>
+     </widget>
diff --git a/devel/anjuta-devel/files/patch-configure b/devel/anjuta-devel/files/patch-configure
index 237d3a30ecc3..07c1d452624c 100644
--- a/devel/anjuta-devel/files/patch-configure
+++ b/devel/anjuta-devel/files/patch-configure
@@ -1,14 +1,6 @@
---- configure.orig	Tue Mar 25 09:35:14 2003
-+++ configure	Sat Mar 29 09:27:42 2003
-@@ -16315,6 +16315,7 @@
- 
- 
- packagesrcdir=`cd $srcdir && pwd`
-+GLIB_CONFIG="$GLIB_CONFIG"
- 
- if test "x${prefix}" = "xNONE"; then
-   packageprefix=${ac_default_prefix}
-@@ -16322,11 +16323,11 @@
+--- configure.orig	Thu May  8 13:51:57 2003
++++ configure	Wed May 14 14:18:35 2003
+@@ -13335,11 +13335,11 @@
    packageprefix=${prefix}
  fi
  
@@ -22,33 +14,3 @@
  packagehelpdir=share/gnome/help/${PACKAGE}
  packagemenudir=share/gnome/apps
  packageplugindir=lib/${PACKAGE}
-@@ -16390,7 +16391,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 scripts/anjuta_first_run.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 scripts/anjuta_first_run.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
-@@ -16930,12 +16931,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" ;;
-@@ -17132,6 +17131,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-devel/files/patch-data::Makefile.in b/devel/anjuta-devel/files/patch-data::Makefile.in
deleted file mode 100644
index 20c72f963f79..000000000000
--- a/devel/anjuta-devel/files/patch-data::Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- data/Makefile.in.orig	Fri Mar 28 09:18:26 2003
-+++ data/Makefile.in	Fri Mar 28 09:19:51 2003
-@@ -196,10 +196,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 = \
diff --git a/devel/anjuta-devel/files/patch-data_Makefile.in b/devel/anjuta-devel/files/patch-data_Makefile.in
new file mode 100644
index 000000000000..81ae99415581
--- /dev/null
+++ b/devel/anjuta-devel/files/patch-data_Makefile.in
@@ -0,0 +1,16 @@
+--- data/Makefile.in.orig	Wed May 14 17:19:02 2003
++++ data/Makefile.in	Wed May 14 17:19:32 2003
+@@ -176,11 +176,11 @@
+ 	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_mimelnk_DATA = x-anjuta-project.desktop
++anjuta_mimelnk_DATA =
+ 
+ MACROS = \
+ 	ChangeLog \
diff --git a/devel/anjuta-devel/files/patch-doc-Makefile.in b/devel/anjuta-devel/files/patch-doc-Makefile.in
deleted file mode 100644
index e4678caf302a..000000000000
--- a/devel/anjuta-devel/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/Makefile.in.orig	Thu Feb 14 22:16:50 2002
-+++ doc/Makefile.in	Thu Feb 14 22:17:06 2002
-@@ -152,8 +152,7 @@
- 
- anjuta_docdir = $(prefix)/@NO_PREFIX_PACKAGE_DOC_DIR@
- 
--anjuta_doc_DATA = \
--	ScintillaDoc.html
-+anjuta_doc_DATA =
- 
- 
- EXTRA_DIST = $(anjuta_doc_DATA)
diff --git a/devel/anjuta-devel/files/patch-doc_Makefile.in b/devel/anjuta-devel/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..c7d02c112811
--- /dev/null
+++ b/devel/anjuta-devel/files/patch-doc_Makefile.in
@@ -0,0 +1,31 @@
+--- doc/Makefile.in.orig	Wed May 14 13:04:06 2003
++++ doc/Makefile.in	Wed May 14 13:04:39 2003
+@@ -239,17 +239,17 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
+ 
+ install-anjuta_docDATA: $(anjuta_doc_DATA)
+-	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(anjuta_docdir)
+-	@list='$(anjuta_doc_DATA)'; for p in $$list; do \
+-	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjuta_docdir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjuta_docdir)/$$p; \
+-	  else if test -f $$p; then \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(anjuta_docdir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(anjuta_docdir)/$$p; \
+-	  fi; fi; \
+-	done
++#	@$(NORMAL_INSTALL)
++#	$(mkinstalldirs) $(DESTDIR)$(anjuta_docdir)
++#	@list='$(anjuta_doc_DATA)'; for p in $$list; do \
++#	  if test -f $(srcdir)/$$p; then \
++#	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjuta_docdir)/$$p"; \
++#	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(anjuta_docdir)/$$p; \
++#	  else if test -f $$p; then \
++#	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(anjuta_docdir)/$$p"; \
++#	    $(INSTALL_DATA) $$p $(DESTDIR)$(anjuta_docdir)/$$p; \
++#	  fi; fi; \
++#	done
+ 
+ uninstall-anjuta_docDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/devel/anjuta-devel/files/patch-launcher-Makefile.in b/devel/anjuta-devel/files/patch-launcher-Makefile.in
deleted file mode 100644
index 7935b72b58f1..000000000000
--- a/devel/anjuta-devel/files/patch-launcher-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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@
-@@ -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
--LDFLAGS = `glib-config --libs` 
-+LDFLAGS = `$(GLIB_CONFIG) --libs` 
- subdir = launcher
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/devel/anjuta-devel/files/patch-launcher-anjuta_launcher.c b/devel/anjuta-devel/files/patch-launcher-anjuta_launcher.c
deleted file mode 100644
index 9f8693b6b674..000000000000
--- a/devel/anjuta-devel/files/patch-launcher-anjuta_launcher.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- launcher/anjuta_launcher.c.orig	Sun Aug 12 11:37:07 2001
-+++ launcher/anjuta_launcher.c	Sun Aug 12 11:37:15 2001
-@@ -22,7 +22,7 @@
- #endif
- 
- #include <sys/types.h>
--#include <sys/unistd.h>
-+#include <unistd.h>
- #include <sys/wait.h>
- #include <stdio.h>
- #include <glib.h>
diff --git a/devel/anjuta-devel/files/patch-ltmain.sh b/devel/anjuta-devel/files/patch-ltmain.sh
index f90e4759111f..1c2fba5d533f 100644
--- a/devel/anjuta-devel/files/patch-ltmain.sh
+++ b/devel/anjuta-devel/files/patch-ltmain.sh
@@ -1,15 +1,15 @@
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
+--- ltmain.sh.orig	Fri Sep 13 15:38:11 2002
++++ ltmain.sh	Fri Oct 11 01:44:24 2002
+@@ -1073,8 +1073,16 @@
  	continue
  	;;
  
 +      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
 +
        -module)
  	module=yes
@@ -17,17 +17,17 @@
  	continue
  	;;
  
-@@ -2412,6 +2420,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
+@@ -2502,6 +2510,9 @@
+ 	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
  	    ;;
 +	  *-*-freebsd*)
 +	    # FreeBSD doesn't need this...
 +	    ;;
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,12 @@
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4286,10 +4297,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
@@ -40,4 +40,3 @@
  
  	# Maybe install the static library, too.
  	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-
diff --git a/devel/anjuta-devel/files/patch-plugins::class-gen::Makefile.in b/devel/anjuta-devel/files/patch-plugins::class-gen::Makefile.in
deleted file mode 100644
index 877fc0a52456..000000000000
--- a/devel/anjuta-devel/files/patch-plugins::class-gen::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 =
- am_libanjuta_clsGen_la_OBJECTS = clsGen.lo
- libanjuta_clsGen_la_OBJECTS = $(am_libanjuta_clsGen_la_OBJECTS)
diff --git a/devel/anjuta-devel/files/patch-plugins::sample1::Makefile.in b/devel/anjuta-devel/files/patch-plugins::sample1::Makefile.in
deleted file mode 100644
index d08c010621c1..000000000000
--- a/devel/anjuta-devel/files/patch-plugins::sample1::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 =
- am_libanjuta_sample1_la_OBJECTS = plugin-sample1.lo
- libanjuta_sample1_la_OBJECTS = $(am_libanjuta_sample1_la_OBJECTS)
diff --git a/devel/anjuta-devel/files/patch-plugins_patch_Makefile.in b/devel/anjuta-devel/files/patch-plugins_patch_Makefile.in
deleted file mode 100644
index f30e428913f3..000000000000
--- a/devel/anjuta-devel/files/patch-plugins_patch_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-devel/files/patch-scintilla_PlatGTK.cxx b/devel/anjuta-devel/files/patch-scintilla_PlatGTK.cxx
new file mode 100644
index 000000000000..7ae677acb523
--- /dev/null
+++ b/devel/anjuta-devel/files/patch-scintilla_PlatGTK.cxx
@@ -0,0 +1,11 @@
+--- scintilla/PlatGTK.cxx.orig	Tue May 13 10:54:01 2003
++++ scintilla/PlatGTK.cxx	Tue May 13 10:55:23 2003
+@@ -1032,7 +1032,7 @@
+ static char *UTF8FromIconv(iconv_t iconvh, const char *s, int len) {
+ 	if (iconvh != ((iconv_t)(-1))) {
+ 		char *utfForm = new char[len*3+1];
+-		char *pin = const_cast<char *>(s);
++		const char *pin = s;
+ 		size_t inLeft = len;
+ 		char *pout = utfForm;
+ 		size_t outLeft = len*3+1;
diff --git a/devel/anjuta-devel/files/patch-scintilla_ScintillaGTK.cxx b/devel/anjuta-devel/files/patch-scintilla_ScintillaGTK.cxx
new file mode 100644
index 000000000000..767da9e3c071
--- /dev/null
+++ b/devel/anjuta-devel/files/patch-scintilla_ScintillaGTK.cxx
@@ -0,0 +1,11 @@
+--- scintilla/ScintillaGTK.cxx.orig	Tue May 13 10:57:21 2003
++++ scintilla/ScintillaGTK.cxx	Tue May 13 10:58:24 2003
+@@ -876,7 +876,7 @@
+ 					iconv_t iconvh = iconv_open("UTF8", source);
+ 					if (iconvh != ((iconv_t)(-1))) {
+ 						char localeVal[4]="\0\0\0";
+-						char *pin = utfVal;
++						const char *pin = utfVal;
+ 						size_t inLeft = strlen(utfVal);
+ 						char *pout = localeVal;
+ 						size_t outLeft = sizeof(localeVal);
diff --git a/devel/anjuta-devel/files/patch-scripts_anjuta_import.sh.in b/devel/anjuta-devel/files/patch-scripts_anjuta_import.sh.in
new file mode 100644
index 000000000000..94b1413d60db
--- /dev/null
+++ b/devel/anjuta-devel/files/patch-scripts_anjuta_import.sh.in
@@ -0,0 +1,8 @@
+--- scripts/anjuta_import.sh.in.orig	Wed May 14 16:09:42 2003
++++ scripts/anjuta_import.sh.in	Wed May 14 16:11:15 2003
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Shell script to automatically create an Anjuta 1.x project file
+ # Copyright: Biswapesh Chattopadhyay (biswapesh_chatterjee@tcscal.co.in) 2001-2002
diff --git a/devel/anjuta-devel/files/patch-src-Makefile.in b/devel/anjuta-devel/files/patch-src-Makefile.in
deleted file mode 100644
index 93ce3138c8ea..000000000000
--- a/devel/anjuta-devel/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,81 +0,0 @@
---- src/Makefile.in.orig	Fri Mar 28 09:20:58 2003
-+++ src/Makefile.in	Fri Mar 28 09:23:15 2003
-@@ -183,7 +183,7 @@
- 	$(EXTRA_ORBIT_CFLAGS)\
- 	$(PCRE_CFLAGS)\
- 	$(FREEBSD_BUILD)\
--	-I$(srcdir)/../scintilla/include \
-+	-I%%X11BASE%%/include/scintilla \
- 	-I$(srcdir)/../tagmanager/include \
- 	-I$(srcdir)/../widgets \
- 	-I$(srcdir)/../pixmaps \
-@@ -191,31 +191,8 @@
- 	-I.. -I. -DPACKAGE_BIN_DIR=\"$(bindir)\"
- 
- 
--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\
--	../scintilla/LexBaan.o\
--	../scintilla/LexMatlab.o \
--	../scintilla/LexAsm.o \
--	../scintilla/LexFortran.o \
--	../scintilla/LexCSS.o
--
-+SCILEXERS =		-lscintilla_lexers
-+SCINTILLA =		-lscintilla
- 
- bin_PROGRAMS = anjuta
- 
-@@ -423,10 +400,10 @@
- 	$(EXTRA_GNOME_LIBS)\
- 	$(EXTRA_ORBIT_LIBS)\
- 	$(PCRE_LIBS)\
--	$(top_builddir)/scintilla/libscintilla.a\
- 	$(top_builddir)/tagmanager/libctags.a\
- 	$(top_builddir)/widgets/libwidgets.a\
- 	$(top_builddir)/printing/libanjutaprint.a\
-+	$(SCINTILLA)\
- 	$(SCILEXERS)
- 
- 
-@@ -500,22 +477,7 @@
- 	compatibility_0.$(OBJEXT) defaults.$(OBJEXT) \
- 	resources.$(OBJEXT) session.$(OBJEXT) widget-registry.$(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 \
--	../scintilla/LexAsm.o ../scintilla/LexFortran.o \
--	../scintilla/LexCSS.o
-+anjuta_DEPENDENCIES = 
- anjuta_LDFLAGS =
- 
- DEFS = @DEFS@
diff --git a/devel/anjuta-devel/files/patch-src-stack_trace_cbs.c b/devel/anjuta-devel/files/patch-src-stack_trace_cbs.c
new file mode 100644
index 000000000000..1bd19f228067
--- /dev/null
+++ b/devel/anjuta-devel/files/patch-src-stack_trace_cbs.c
@@ -0,0 +1,20 @@
+--- src/stack_trace_cbs.c.orig	Tue May 13 11:02:44 2003
++++ src/stack_trace_cbs.c	Tue May 13 11:03:51 2003
+@@ -42,6 +42,8 @@
+ 	{
+ 		/* update the current index iterator and number in the stack trace object */
+ 		GtkTreeIter iter;
++		GdkEventButton *bevent;
++
+ 		if (!get_current_iter (st,&iter))
+ 			return FALSE;
+ 		
+@@ -49,7 +51,7 @@
+ 		st->current_index_iter = gtk_tree_iter_copy (&iter);		
+ 		st->current_index = get_index_from_iter (st,&iter);
+ 				
+-		GdkEventButton *bevent = (GdkEventButton *) event;
++		bevent = (GdkEventButton *) event;
+ 		if (bevent->button != 3)
+ 			return FALSE;
+ 		bevent->button = 1;
diff --git a/devel/anjuta-devel/files/patch-src_aneditor.cxx b/devel/anjuta-devel/files/patch-src_aneditor.cxx
deleted file mode 100644
index f8e2d88bce8b..000000000000
--- a/devel/anjuta-devel/files/patch-src_aneditor.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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-devel/files/patch-src_source.c b/devel/anjuta-devel/files/patch-src_source.c
new file mode 100644
index 000000000000..3d421d9bf133
--- /dev/null
+++ b/devel/anjuta-devel/files/patch-src_source.c
@@ -0,0 +1,20 @@
+--- src/source.c.orig	Wed May 14 14:17:11 2003
++++ src/source.c	Wed May 14 14:17:23 2003
+@@ -314,7 +314,7 @@
+ 		 "fi\n\n");
+ 	fprintf (fp,
+ 		 "dnl Set PACKAGE DATA & DOC DIR\n"
+-		 "packagedatadir=share/${PACKAGE}\n"
++		 "packagedatadir=share/gnome/${PACKAGE}\n"
+ 		 "packagedocdir=doc/${PACKAGE}\n"
+ 		 "\n");
+ 	
+@@ -332,7 +332,7 @@
+ 	{
+ 		fprintf (fp,
+ 			 "dnl Set PACKAGE DIRs in config.h.\n"
+-			 "packagepixmapsdir=share/pixmaps/${PACKAGE}\n"
++			 "packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}\n"
+ 			 "packagehelpdir=share/gnome/help/${PACKAGE}\n"
+ 			 "packagemenudir=share/gnome/apps\n");
+ 	}
diff --git a/devel/anjuta-devel/files/patch-tagmanager::parse.h b/devel/anjuta-devel/files/patch-tagmanager::parse.h
deleted file mode 100644
index 2647cdaff6de..000000000000
--- a/devel/anjuta-devel/files/patch-tagmanager::parse.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- tagmanager/parse.h.orig	Fri Feb 15 16:44:43 2002
-+++ tagmanager/parse.h	Fri Feb 15 16:44:54 2002
-@@ -13,6 +13,7 @@
- /*
- *   INCLUDE FILES
- */
-+#include <sys/types.h>
- #include "general.h"	/* must always come first */
- 
- #include "parsers.h"	/* contains list of parsers */
diff --git a/devel/anjuta-devel/pkg-descr b/devel/anjuta-devel/pkg-descr
index d289b4bdf3da..4a68250856d2 100644
--- a/devel/anjuta-devel/pkg-descr
+++ b/devel/anjuta-devel/pkg-descr
@@ -5,4 +5,4 @@ basically a GUI interface for the bunch of command line programming
 utilites and tools available for FreeBSD, which are usually run in console
 and are very user unfriendly.
 
-WWW: http://anjuta.sourceforge.net/
+WWW: http://www.anjuta.org/
diff --git a/devel/anjuta-devel/pkg-plist b/devel/anjuta-devel/pkg-plist
index 9a1879b898c7..f2c374a38b7a 100644
--- a/devel/anjuta-devel/pkg-plist
+++ b/devel/anjuta-devel/pkg-plist
@@ -1,12 +1,16 @@
 bin/anjuta
-bin/anjuta_first_run.sh
 bin/anjuta_import.sh
 bin/anjuta_launcher
+lib/anjuta/libanjuta_clsGen.a
 lib/anjuta/libanjuta_clsGen.so
+lib/anjuta/libanjuta_clsGen.so.0
+lib/anjuta/libanjuta_patch.a
 lib/anjuta/libanjuta_patch.so
+lib/anjuta/libanjuta_patch.so.0
+lib/anjuta/libanjuta_sample1.a
 lib/anjuta/libanjuta_sample1.so
+lib/anjuta/libanjuta_sample1.so.0
 share/gnome/anjuta/README.stock_libs
-share/gnome/anjuta/anjuta.glade
 share/gnome/anjuta/anjuta_project.template
 share/gnome/anjuta/autogen.sh.generic
 share/gnome/anjuta/autogen.sh.gnome
@@ -16,6 +20,13 @@ 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/glade/anjuta.glade
+share/gnome/anjuta/glade/applogo.png
+share/gnome/anjuta/glade/start-with-import.png
+share/gnome/anjuta/glade/start-with-open.png
+share/gnome/anjuta/glade/start-with-wizard.png
+share/gnome/anjuta/glade/windows-style-docked.png
+share/gnome/anjuta/glade/windows-style-undocked.png
 share/gnome/anjuta/gnome/ChangeLog
 share/gnome/anjuta/gnome/Makefile.am
 share/gnome/anjuta/gnome/aclocal-include.m4
@@ -24,6 +35,7 @@ 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-cxx-check.m4
 share/gnome/anjuta/gnome/gnome-fileutils.m4
 share/gnome/anjuta/gnome/gnome-gettext.m4
 share/gnome/anjuta/gnome/gnome-ghttp-check.m4
@@ -44,6 +56,7 @@ 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/gnome/psiconv.m4
 share/gnome/anjuta/gnome2/ChangeLog
 share/gnome/anjuta/gnome2/Makefile.am
 share/gnome/anjuta/gnome2/autogen.sh
@@ -59,7 +72,6 @@ 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/licence.txt
 share/gnome/anjuta/properties/ada.properties
 share/gnome/anjuta/properties/anjuta.properties
 share/gnome/anjuta/properties/asm.properties
@@ -84,6 +96,7 @@ share/gnome/anjuta/properties/others.properties
 share/gnome/anjuta/properties/pascal.properties
 share/gnome/anjuta/properties/perl.properties
 share/gnome/anjuta/properties/php.properties
+share/gnome/anjuta/properties/pov.properties
 share/gnome/anjuta/properties/props.properties
 share/gnome/anjuta/properties/python.properties
 share/gnome/anjuta/properties/rc.properties
@@ -98,170 +111,21 @@ share/gnome/anjuta/setup-gettext
 share/gnome/anjuta/stock_libs.anj
 share/gnome/anjuta/system.tags
 share/gnome/anjuta/welcome.txt
+%%PORTDOCS%%share/doc/anjuta/AUTHORS
+%%PORTDOCS%%share/doc/anjuta/COPYING
+%%PORTDOCS%%share/doc/anjuta/ChangeLog
+%%PORTDOCS%%share/doc/anjuta/FUTURE
+%%PORTDOCS%%share/doc/anjuta/INSTALL
+%%PORTDOCS%%share/doc/anjuta/NEWS
+%%PORTDOCS%%share/doc/anjuta/README
+%%PORTDOCS%%share/doc/anjuta/ScintillaDoc.html
+%%PORTDOCS%%share/doc/anjuta/TODO
+share/gnome/anjuta/gdl/glade/layout.glade
 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-manual/anjuta-manual.sgml
-share/gnome/help/anjuta/C/anjuta-manual/build.sgml
-share/gnome/help/anjuta/C/anjuta-manual/compileopts.sgml
-share/gnome/help/anjuta/C/anjuta-manual/debugger.sgml
-share/gnome/help/anjuta/C/anjuta-manual/execute.sgml
-share/gnome/help/anjuta/C/anjuta-manual/figures/a2ps.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
-share/gnome/help/anjuta/C/anjuta-manual/figures/brk_dlg.png
-share/gnome/help/anjuta/C/anjuta-manual/figures/brk_edit.png
-share/gnome/help/anjuta/C/anjuta-manual/figures/ccview.png
-share/gnome/help/anjuta/C/anjuta-manual/figures/ccview_class.png
-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/doxygen.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/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
-share/gnome/help/anjuta/C/anjuta-manual/figures/scrshot.png
-share/gnome/help/anjuta/C/anjuta-manual/figures/sharedlibs.png
-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/tool-editor.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/fileoperations.sgml
-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.sgml
-share/gnome/help/anjuta/C/anjuta-manual/preferences.sgml
-share/gnome/help/anjuta/C/anjuta-manual/projects.sgml
-share/gnome/help/anjuta/C/anjuta-manual/tools.sgml
-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
-@exec scrollkeeper-install -q %D/share/gnome/omf/anjuta/anjuta-faqs-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/anjuta/anjuta-faqs-ja_JP.eucJP.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/anjuta/anjuta-faqs-ja_JP.eucJP.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/anjuta/anjuta-manual-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/anjuta/anjuta-manual-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/anjuta/anjuta-manual-ja_JP.eucJP.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/anjuta/anjuta-manual-ja_JP.eucJP.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/anjuta/anjuta-tutorial-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/anjuta/anjuta-tutorial-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/pixmaps/anjuta/add.xpm
-share/gnome/pixmaps/anjuta/an_tag.xpm
 share/gnome/pixmaps/anjuta/anjuta_icon.png
 share/gnome/pixmaps/anjuta/anjuta_logo.png
+share/gnome/pixmaps/anjuta/anjuta_logo1.png
 share/gnome/pixmaps/anjuta/anjuta_splash.png
 share/gnome/pixmaps/anjuta/applogo.png
 share/gnome/pixmaps/anjuta/appwiz_bonobo.png
@@ -276,64 +140,65 @@ 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_opengl.png
+share/gnome/pixmaps/anjuta/appwiz_sdl.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/autocomplete-16.png
+share/gnome/pixmaps/anjuta/autocomplete.png
 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-end-16.png
+share/gnome/pixmaps/anjuta/block-end.png
+share/gnome/pixmaps/anjuta/block-start-16.png
+share/gnome/pixmaps/anjuta/block-start.png
 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-first-16.png
+share/gnome/pixmaps/anjuta/bookmark-first.png
+share/gnome/pixmaps/anjuta/bookmark-last-16.png
+share/gnome/pixmaps/anjuta/bookmark-last.png
+share/gnome/pixmaps/anjuta/bookmark-next-16.png
+share/gnome/pixmaps/anjuta/bookmark-next.png
+share/gnome/pixmaps/anjuta/bookmark-prev-16.png
+share/gnome/pixmaps/anjuta/bookmark-prev.png
 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/cfolder.xpm
-share/gnome/pixmaps/anjuta/close_file.xpm
 share/gnome/pixmaps/anjuta/close_file_small.xpm
-share/gnome/pixmaps/anjuta/close_project.xpm
+share/gnome/pixmaps/anjuta/close_project.png
 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/error-next-16.png
+share/gnome/pixmaps/anjuta/error-next.png
+share/gnome/pixmaps/anjuta/error-prev-16.png
+share/gnome/pixmaps/anjuta/error-prev.png
+share/gnome/pixmaps/anjuta/file_c.png
+share/gnome/pixmaps/anjuta/file_core.png
+share/gnome/pixmaps/anjuta/file_cpp.png
+share/gnome/pixmaps/anjuta/file_exec.png
+share/gnome/pixmaps/anjuta/file_file.png
+share/gnome/pixmaps/anjuta/file_h.png
+share/gnome/pixmaps/anjuta/file_html.png
+share/gnome/pixmaps/anjuta/file_i18n.png
+share/gnome/pixmaps/anjuta/file_icon.png
+share/gnome/pixmaps/anjuta/file_pix.png
+share/gnome/pixmaps/anjuta/file_text.png
+share/gnome/pixmaps/anjuta/file_unknown.png
 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/fv_core.xpm
-share/gnome/pixmaps/anjuta/fv_exec.xpm
-share/gnome/pixmaps/anjuta/fv_image.xpm
-share/gnome/pixmaps/anjuta/fv_text.xpm
-share/gnome/pixmaps/anjuta/fv_unknown.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
@@ -346,10 +211,6 @@ share/gnome/pixmaps/anjuta/inspect.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/madeinanjuta.xcf
 share/gnome/pixmaps/anjuta/messages.xpm
 share/gnome/pixmaps/anjuta/mini-modules.xpm
@@ -360,46 +221,32 @@ 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/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/open_project.png
 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.xpm
+share/gnome/pixmaps/anjuta/preferences-build.png
+share/gnome/pixmaps/anjuta/preferences-cvs.png
+share/gnome/pixmaps/anjuta/preferences-editor.png
+share/gnome/pixmaps/anjuta/preferences-general.png
+share/gnome/pixmaps/anjuta/preferences-indentation.png
+share/gnome/pixmaps/anjuta/preferences-messages.png
+share/gnome/pixmaps/anjuta/preferences-print.png
+share/gnome/pixmaps/anjuta/preferences-terminal.png
 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/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/save_project.png
 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/sv_class.xpm
 share/gnome/pixmaps/anjuta/sv_function.xpm
 share/gnome/pixmaps/anjuta/sv_macro.xpm
@@ -415,17 +262,18 @@ share/gnome/pixmaps/anjuta/sv_struct.xpm
 share/gnome/pixmaps/anjuta/sv_unknown.xpm
 share/gnome/pixmaps/anjuta/sv_variable.xpm
 share/gnome/pixmaps/anjuta/syntax.xpm
-share/gnome/pixmaps/anjuta/undo.xpm
-share/gnome/pixmaps/anjuta/undock.xpm
+share/gnome/pixmaps/anjuta/undock.png
 share/gnome/pixmaps/anjuta/watch.xpm
 share/gnome/pixmaps/anjuta/wizard.xpm
 share/locale/az/LC_MESSAGES/anjuta.mo
+share/locale/be/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/hi/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
@@ -441,30 +289,15 @@ share/locale/tr/LC_MESSAGES/anjuta.mo
 share/locale/uk/LC_MESSAGES/anjuta.mo
 share/locale/zh_CN/LC_MESSAGES/anjuta.mo
 share/locale/zh_TW/LC_MESSAGES/anjuta.mo
+@dirrm share/mimelnk/application
+@dirrm share/mimelnk
 @dirrm share/gnome/pixmaps/anjuta
-@dirrm share/gnome/omf/anjuta
-@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/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/gdl/glade
+@dirrm share/gnome/anjuta/gdl
+%%PORTDOCS%%@dirrm share/doc/anjuta
 @dirrm share/gnome/anjuta/properties
 @dirrm share/gnome/anjuta/gnome2
 @dirrm share/gnome/anjuta/gnome
+@dirrm share/gnome/anjuta/glade
 @dirrm share/gnome/anjuta
 @dirrm lib/anjuta
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/anjuta/anjuta-faqs-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/anjuta/anjuta-faqs-ja_JP.eucJP.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/anjuta/anjuta-manual-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/anjuta/anjuta-manual-ja_JP.eucJP.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/anjuta/anjuta-tutorial-C.omf 2>/dev/null || /usr/bin/true