Update to 1.1.98

8 files changed, 251 insertions, 11 deletions

diff --git a/devel/anjuta-devel/Makefile b/devel/anjuta-devel/Makefile
index 2654313fbc77..a686a8cdda4a 100644
--- a/devel/anjuta-devel/Makefile
+++ b/devel/anjuta-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	anjuta
-PORTVERSION=	1.1.97
+PORTVERSION=	1.1.98
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	anjuta
@@ -19,7 +19,7 @@ LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 NO_LATEST_LINK=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeprintui libgnomeui vte libzvt
+USE_GNOME=	gnomeprefix gnomehack libgnomeprintui libgnomeui vte
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/anjuta-devel/distinfo b/devel/anjuta-devel/distinfo
index a97add2137f5..39cab594f201 100644
--- a/devel/anjuta-devel/distinfo
+++ b/devel/anjuta-devel/distinfo
@@ -1 +1 @@
-MD5 (anjuta-1.1.97.tar.gz) = fc938d304f29f62353ab5fdf48c93685
+MD5 (anjuta-1.1.98.tar.gz) = cd4a048c856831d5eaddd6e78de3169c
diff --git a/devel/anjuta-devel/files/patch-scintilla_PlatGTK.cxx b/devel/anjuta-devel/files/patch-scintilla_PlatGTK.cxx
index 7ae677acb523..5621f808d287 100644
--- a/devel/anjuta-devel/files/patch-scintilla_PlatGTK.cxx
+++ b/devel/anjuta-devel/files/patch-scintilla_PlatGTK.cxx
@@ -1,6 +1,6 @@
---- 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 @@
+--- scintilla/PlatGTK.cxx.orig	Mon Sep 29 19:29:19 2003
++++ scintilla/PlatGTK.cxx	Sat Nov  8 05:00:37 2003
+@@ -1034,7 +1034,7 @@
  static char *UTF8FromIconv(iconv_t iconvh, const char *s, int len) {
  	if (iconvh != ((iconv_t)(-1))) {
  		char *utfForm = new char[len*3+1];
@@ -9,3 +9,12 @@
  		size_t inLeft = len;
  		char *pout = utfForm;
  		size_t outLeft = len*3+1;
+@@ -1051,7 +1051,7 @@
+ static size_t MultiByteLenFromIconv(iconv_t iconvh, const char *s, size_t len) {
+ 	for (size_t lenMB=1; (lenMB<4) && (lenMB <= len); lenMB++) {
+ 		char wcForm[2];
+-		char *pin = const_cast<char *>(s);
++		const char *pin = s;
+ 		size_t inLeft = lenMB;
+ 		char *pout = wcForm;
+ 		size_t outLeft = 2;
diff --git a/devel/anjuta-devel/files/patch-scintilla_ScintillaGTK.cxx b/devel/anjuta-devel/files/patch-scintilla_ScintillaGTK.cxx
index 767da9e3c071..9d5781689af0 100644
--- a/devel/anjuta-devel/files/patch-scintilla_ScintillaGTK.cxx
+++ b/devel/anjuta-devel/files/patch-scintilla_ScintillaGTK.cxx
@@ -1,7 +1,7 @@
---- 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);
+--- scintilla/ScintillaGTK.cxx.orig	Mon Sep 29 19:29:20 2003
++++ scintilla/ScintillaGTK.cxx	Sat Nov  8 05:02:57 2003
+@@ -965,7 +965,7 @@
+ 					iconv_t iconvh = iconv_open(source, "UTF-8");
  					if (iconvh != ((iconv_t)(-1))) {
  						char localeVal[4]="\0\0\0";
 -						char *pin = utfVal;
@@ -9,3 +9,12 @@
  						size_t inLeft = strlen(utfVal);
  						char *pout = localeVal;
  						size_t outLeft = sizeof(localeVal);
+@@ -1103,7 +1103,7 @@
+ 	iconv_t iconvh = iconv_open(charSetDest, charSetSource);
+ 	if (iconvh != ((iconv_t)(-1))) {
+ 		destForm = new char[len*3+1];
+-		char *pin = s;
++		const char *pin = s;
+ 		size_t inLeft = len;
+ 		char *pout = destForm;
+ 		size_t outLeft = len*3+1;
diff --git a/devel/anjuta-devel/files/patch-src::appwizard_cbs.c b/devel/anjuta-devel/files/patch-src::appwizard_cbs.c
new file mode 100644
index 000000000000..92cfdbbc0b81
--- /dev/null
+++ b/devel/anjuta-devel/files/patch-src::appwizard_cbs.c
@@ -0,0 +1,14 @@
+--- src/appwizard_cbs.c.orig	Sat Nov  8 05:35:15 2003
++++ src/appwizard_cbs.c	Sat Nov  8 05:35:41 2003
+@@ -235,10 +235,10 @@
+ 			    gnomedruidpage, gpointer arg1, gpointer user_data)
+ {
+ 	AppWizard *aw;
+-	aw = user_data;
+ 	GtkTextBuffer *buffer;
+ 	GtkTextIter start, end;
+ 	
++	aw = user_data;
+ 	g_free (aw->description);
+ 	buffer =
+ 		gtk_text_view_get_buffer (GTK_TEXT_VIEW (aw->widgets.description_text));
diff --git a/devel/anjuta-devel/files/patch-src::launcher.c b/devel/anjuta-devel/files/patch-src::launcher.c
new file mode 100644
index 000000000000..a73683d18ebd
--- /dev/null
+++ b/devel/anjuta-devel/files/patch-src::launcher.c
@@ -0,0 +1,26 @@
+--- src/launcher.c.orig	Wed Nov  5 21:50:36 2003
++++ src/launcher.c	Sat Nov  8 05:43:47 2003
+@@ -23,10 +23,10 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <signal.h>
+-#include <pty.h>
+ #include <assert.h>
+ #include <gnome.h>
+ #include <termios.h>
++#include <vte/pty.h>
+ 
+ #include "pixmaps.h"
+ #include "launcher.h"
+@@ -836,9 +836,9 @@
+ 		/* Set no delays for the write pipes (non_buffered) so
+ 		that we get all the outputs immidiately */
+ 		if ((md = fcntl (stdout_pipe[1], F_GETFL)) != -1)
+-			fcntl (stdout_pipe[1], F_SETFL, O_SYNC | md);
++			fcntl (stdout_pipe[1], F_SETFL, O_FSYNC | md);
+ 		if ((md = fcntl (stderr_pipe[1], F_GETFL)) != -1)
+-			fcntl (stderr_pipe[1], F_SETFL, O_SYNC | md);
++			fcntl (stderr_pipe[1], F_SETFL, O_FSYNC | md);
+ 		
+ 		execvp (args[0], args);
+ 		g_error (_("Cannot execute command shell"));
diff --git a/devel/anjuta-devel/files/patch-src::start-with.c b/devel/anjuta-devel/files/patch-src::start-with.c
new file mode 100644
index 000000000000..9fe4ebd71889
--- /dev/null
+++ b/devel/anjuta-devel/files/patch-src::start-with.c
@@ -0,0 +1,15 @@
+--- src/start-with.c.orig	Sat Nov  8 05:55:08 2003
++++ src/start-with.c	Sat Nov  8 05:55:51 2003
+@@ -54,9 +54,11 @@
+ on_open_last_project_clicked (GtkButton *button, gpointer data)
+ {
+ 	GtkWidget *dialog = GTK_WIDGET (data);	
++	gchar* prj_filename;
++
+ 	/*  Do not allow a second click  */
+ 	gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE);
+-	gchar *prj_filename = anjuta_preferences_get (app->preferences,
++	prj_filename = anjuta_preferences_get (app->preferences,
+ 												  "anjuta.last.open.project");
+ 	project_dbase_load_project (app->project_dbase, prj_filename, TRUE);
+ 	g_free (prj_filename);
diff --git a/devel/anjuta-devel/pkg-plist b/devel/anjuta-devel/pkg-plist
index 86e052e9ab48..cf4836be8fdd 100644
--- a/devel/anjuta-devel/pkg-plist
+++ b/devel/anjuta-devel/pkg-plist
@@ -20,6 +20,7 @@ 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/gdl/glade/layout.glade
 share/gnome/anjuta/glade/anjuta.glade
 share/gnome/anjuta/glade/applogo.png
 share/gnome/anjuta/glade/start-with-import.png
@@ -119,9 +120,163 @@ share/gnome/anjuta/welcome.txt
 %%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/applications/anjuta.desktop
+share/gnome/help/anjuta/C/anjuta-faqs.xml
+share/gnome/help/anjuta/C/anjuta-manual.xml
+share/gnome/help/anjuta/C/anjuta-tutorial.xml
+share/gnome/help/anjuta/C/authors.xml
+share/gnome/help/anjuta/C/build.xml
+share/gnome/help/anjuta/C/compileopts.xml
+share/gnome/help/anjuta/C/debugger.xml
+share/gnome/help/anjuta/C/execute.xml
+share/gnome/help/anjuta/C/figures/a2ps.png
+share/gnome/help/anjuta/C/figures/arguments.png
+share/gnome/help/anjuta/C/figures/attach.png
+share/gnome/help/anjuta/C/figures/brk_add.png
+share/gnome/help/anjuta/C/figures/brk_dlg.png
+share/gnome/help/anjuta/C/figures/brk_edit.png
+share/gnome/help/anjuta/C/figures/ccview.png
+share/gnome/help/anjuta/C/figures/ccview_class.png
+share/gnome/help/anjuta/C/figures/ccview_struct.png
+share/gnome/help/anjuta/C/figures/configure_dlg.png
+share/gnome/help/anjuta/C/figures/defines.png
+share/gnome/help/anjuta/C/figures/devt_menu.png
+share/gnome/help/anjuta/C/figures/divided.png
+share/gnome/help/anjuta/C/figures/doxygen.png
+share/gnome/help/anjuta/C/figures/editor_guides.png
+share/gnome/help/anjuta/C/figures/editor_margins.png
+share/gnome/help/anjuta/C/figures/editor_markers.png
+share/gnome/help/anjuta/C/figures/evaluate.png
+share/gnome/help/anjuta/C/figures/fileview.png
+share/gnome/help/anjuta/C/figures/find_files.png
+share/gnome/help/anjuta/C/figures/find_replace.png
+share/gnome/help/anjuta/C/figures/find_text.png
+share/gnome/help/anjuta/C/figures/frame.png
+share/gnome/help/anjuta/C/figures/glade-l.png
+share/gnome/help/anjuta/C/figures/icons.png
+share/gnome/help/anjuta/C/figures/includes.png
+share/gnome/help/anjuta/C/figures/inspect.png
+share/gnome/help/anjuta/C/figures/interface.png
+share/gnome/help/anjuta/C/figures/lib_paths.png
+share/gnome/help/anjuta/C/figures/libraries.png
+share/gnome/help/anjuta/C/figures/local_variables.png
+share/gnome/help/anjuta/C/figures/mainwin.png
+share/gnome/help/anjuta/C/figures/menu_detached.png
+share/gnome/help/anjuta/C/figures/menu_main.png
+share/gnome/help/anjuta/C/figures/message_win.png
+share/gnome/help/anjuta/C/figures/open_file.png
+share/gnome/help/anjuta/C/figures/open_file_multiple.png
+share/gnome/help/anjuta/C/figures/optimizations.png
+share/gnome/help/anjuta/C/figures/other_opts.png
+share/gnome/help/anjuta/C/figures/prefs_print.png
+share/gnome/help/anjuta/C/figures/print_dlg.png
+share/gnome/help/anjuta/C/figures/print_preview.png
+share/gnome/help/anjuta/C/figures/project_info.png
+share/gnome/help/anjuta/C/figures/project_win.png
+share/gnome/help/anjuta/C/figures/registers.png
+share/gnome/help/anjuta/C/figures/scrshot.png
+share/gnome/help/anjuta/C/figures/sharedlibs.png
+share/gnome/help/anjuta/C/figures/signal_mod.png
+share/gnome/help/anjuta/C/figures/signals.png
+share/gnome/help/anjuta/C/figures/stack.png
+share/gnome/help/anjuta/C/figures/supports.png
+share/gnome/help/anjuta/C/figures/symbol_browser.png
+share/gnome/help/anjuta/C/figures/tool-editor.png
+share/gnome/help/anjuta/C/figures/toolbar_browser.png
+share/gnome/help/anjuta/C/figures/toolbar_debug.png
+share/gnome/help/anjuta/C/figures/toolbar_ext.png
+share/gnome/help/anjuta/C/figures/toolbar_format.png
+share/gnome/help/anjuta/C/figures/toolbar_main.png
+share/gnome/help/anjuta/C/figures/toolbar_tags.png
+share/gnome/help/anjuta/C/figures/variable_tip.png
+share/gnome/help/anjuta/C/figures/warnings.png
+share/gnome/help/anjuta/C/figures/watch.png
+share/gnome/help/anjuta/C/figures/watch_add.png
+share/gnome/help/anjuta/C/fileoperations.xml
+share/gnome/help/anjuta/C/interface.xml
+share/gnome/help/anjuta/C/introduction.xml
+share/gnome/help/anjuta/C/legal.xml
+share/gnome/help/anjuta/C/license.xml
+share/gnome/help/anjuta/C/preferences.xml
+share/gnome/help/anjuta/C/projects.xml
+share/gnome/help/anjuta/C/template.xml
+share/gnome/help/anjuta/C/tools.xml
+share/gnome/help/anjuta/ja/anjuta-faqs.xml
+share/gnome/help/anjuta/ja/anjuta-manual.xml
+share/gnome/help/anjuta/ja/authors.xml
+share/gnome/help/anjuta/ja/build.xml
+share/gnome/help/anjuta/ja/compileopts.xml
+share/gnome/help/anjuta/ja/debugger.xml
+share/gnome/help/anjuta/ja/execute.xml
+share/gnome/help/anjuta/ja/figures/appwiz1.png
+share/gnome/help/anjuta/ja/figures/appwiz2.png
+share/gnome/help/anjuta/ja/figures/appwiz3.png
+share/gnome/help/anjuta/ja/figures/appwiz4.png
+share/gnome/help/anjuta/ja/figures/arguments.png
+share/gnome/help/anjuta/ja/figures/attach.png
+share/gnome/help/anjuta/ja/figures/brk_add.png
+share/gnome/help/anjuta/ja/figures/brk_dlg.png
+share/gnome/help/anjuta/ja/figures/brk_edit.png
+share/gnome/help/anjuta/ja/figures/ccview.png
+share/gnome/help/anjuta/ja/figures/ccview_class.png
+share/gnome/help/anjuta/ja/figures/ccview_struct.png
+share/gnome/help/anjuta/ja/figures/configure_dlg.png
+share/gnome/help/anjuta/ja/figures/defines.png
+share/gnome/help/anjuta/ja/figures/devt_menu.png
+share/gnome/help/anjuta/ja/figures/evaluate.png
+share/gnome/help/anjuta/ja/figures/fileview.png
+share/gnome/help/anjuta/ja/figures/find_files.png
+share/gnome/help/anjuta/ja/figures/find_replace.png
+share/gnome/help/anjuta/ja/figures/find_text.png
+share/gnome/help/anjuta/ja/figures/frame.png
+share/gnome/help/anjuta/ja/figures/impwiz.png
+share/gnome/help/anjuta/ja/figures/includes.png
+share/gnome/help/anjuta/ja/figures/inspect.png
+share/gnome/help/anjuta/ja/figures/lib_paths.png
+share/gnome/help/anjuta/ja/figures/libraries.png
+share/gnome/help/anjuta/ja/figures/mainwin.png
+share/gnome/help/anjuta/ja/figures/menu_detached.png
+share/gnome/help/anjuta/ja/figures/menu_main.png
+share/gnome/help/anjuta/ja/figures/message_win.png
+share/gnome/help/anjuta/ja/figures/open_file.png
+share/gnome/help/anjuta/ja/figures/optimizations.png
+share/gnome/help/anjuta/ja/figures/other_opts.png
+share/gnome/help/anjuta/ja/figures/project_info.png
+share/gnome/help/anjuta/ja/figures/project_win.png
+share/gnome/help/anjuta/ja/figures/registers.png
+share/gnome/help/anjuta/ja/figures/scrshot.png
+share/gnome/help/anjuta/ja/figures/sharedlibs.png
+share/gnome/help/anjuta/ja/figures/signal_mod.png
+share/gnome/help/anjuta/ja/figures/signals.png
+share/gnome/help/anjuta/ja/figures/stack.png
+share/gnome/help/anjuta/ja/figures/supports.png
+share/gnome/help/anjuta/ja/figures/toolbar_browser.png
+share/gnome/help/anjuta/ja/figures/toolbar_debug.png
+share/gnome/help/anjuta/ja/figures/toolbar_ext.png
+share/gnome/help/anjuta/ja/figures/toolbar_format.png
+share/gnome/help/anjuta/ja/figures/toolbar_main.png
+share/gnome/help/anjuta/ja/figures/toolbar_tags.png
+share/gnome/help/anjuta/ja/figures/warnings.png
+share/gnome/help/anjuta/ja/figures/watch.png
+share/gnome/help/anjuta/ja/figures/watch_add.png
+share/gnome/help/anjuta/ja/fileoperations.xml
+share/gnome/help/anjuta/ja/interface.xml
+share/gnome/help/anjuta/ja/introduction.xml
+share/gnome/help/anjuta/ja/legal.xml
+share/gnome/help/anjuta/ja/license.xml
+share/gnome/help/anjuta/ja/preferences.xml
+share/gnome/help/anjuta/ja/projects.xml
 share/gnome/mime-info/anjuta.mime
+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.UTF-8.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/anjuta/anjuta-faqs-ja_JP.UTF-8.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.UTF-8.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/anjuta/anjuta-manual-ja_JP.UTF-8.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/anjuta_icon.png
 share/gnome/pixmaps/anjuta/anjuta_logo.png
 share/gnome/pixmaps/anjuta/anjuta_logo1.png
@@ -255,6 +410,7 @@ share/locale/hi/LC_MESSAGES/anjuta.mo
 share/locale/it/LC_MESSAGES/anjuta.mo
 share/locale/ja/LC_MESSAGES/anjuta.mo
 share/locale/ml/LC_MESSAGES/anjuta.mo
+share/locale/ms/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
@@ -270,6 +426,12 @@ 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/help/anjuta/ja/figures
+@dirrm share/gnome/help/anjuta/ja
+@dirrm share/gnome/help/anjuta/C/figures
+@dirrm share/gnome/help/anjuta/C
+@dirrm share/gnome/help/anjuta
 @dirrm share/gnome/anjuta/gdl/glade
 @dirrm share/gnome/anjuta/gdl
 %%PORTDOCS%%@dirrm share/doc/anjuta
@@ -279,3 +441,8 @@ share/locale/zh_TW/LC_MESSAGES/anjuta.mo
 @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.UTF-8.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.UTF-8.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