Update to 2.3.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10064 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 81 insertions, 74 deletions

diff --git a/devel/anjuta-devel/Makefile b/devel/anjuta-devel/Makefile
index c6cd9f48e..b3558b4a9 100644
--- a/devel/anjuta-devel/Makefile
+++ b/devel/anjuta-devel/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/devel/anjuta-devel/Makefile,v 1.18 2007/12/25 20:56:39 kwm Exp $
 #
 
 PORTNAME=	anjuta
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	anjuta
@@ -45,6 +45,12 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_LDCONFIG=	yes
 PKGMESSAGE=     ${WRKDIR}/pkg-message
+GCONF_SCHEMAS=	anjuta-build-basic-autotools-plugin.schemas \
+		anjuta-cvs-plugin.schemas anjuta-document-manager.schemas \
+		anjuta-editor-scintilla.schemas anjuta-language-cpp-java.schemas \
+		anjuta-message-manager-plugin.schemas \
+		anjuta-symbol-browser-plugin.schemas \
+		anjuta-terminal-plugin.schemas anjuta.schemas
 
 MAN1=		anjuta.1 anjuta_launcher.1
 
diff --git a/devel/anjuta-devel/distinfo b/devel/anjuta-devel/distinfo
index d8ffd1660..6b7f1d532 100644
--- a/devel/anjuta-devel/distinfo
+++ b/devel/anjuta-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (anjuta-2.3.1.tar.bz2) = 794709b14fd1daea1dbe3e8cb38eb1e0
-SHA256 (anjuta-2.3.1.tar.bz2) = 7bd772b68660c658db3c80e954fcacffdf799318285484cc454e4c2ca982bbe2
-SIZE (anjuta-2.3.1.tar.bz2) = 5921984
+MD5 (anjuta-2.3.2.tar.bz2) = e9bb0fac62d51ad8328ea82abd83c3b9
+SHA256 (anjuta-2.3.2.tar.bz2) = c2c08bc684fe2bcb38c439c2dace89764c481525f105c79f396e979369a9d894
+SIZE (anjuta-2.3.2.tar.bz2) = 5996891
diff --git a/devel/anjuta-devel/files/patch-libanjuta_anjuta-launcher.c b/devel/anjuta-devel/files/patch-libanjuta_anjuta-launcher.c
index 73987d782..04d98efab 100644
--- a/devel/anjuta-devel/files/patch-libanjuta_anjuta-launcher.c
+++ b/devel/anjuta-devel/files/patch-libanjuta_anjuta-launcher.c
@@ -1,5 +1,5 @@
---- libanjuta/anjuta-launcher.c.orig	Mon Jun 11 13:22:08 2007
-+++ libanjuta/anjuta-launcher.c	Sun Jul  8 03:39:07 2007
+--- libanjuta/anjuta-launcher.c.orig	2008-01-06 18:26:38.000000000 +0100
++++ libanjuta/anjuta-launcher.c	2008-01-13 14:47:16.000000000 +0100
 @@ -37,7 +37,7 @@
  #include <signal.h>
  
@@ -9,7 +9,7 @@
  #    include <pty.h>
  #  else
  #    include <libutil.h>
-@@ -713,7 +713,8 @@ anjuta_launcher_scan_output (GIOChannel 
+@@ -745,7 +745,8 @@
  		GError *err = NULL;
  		do
  		{
@@ -19,7 +19,7 @@
  			if (n > 0 && !err) /* There is output */
  			{
  				gchar *utf8_chars;
-@@ -733,6 +734,13 @@ anjuta_launcher_scan_output (GIOChannel 
+@@ -772,6 +773,13 @@
  				anjuta_launcher_synchronize (launcher);
  				ret = FALSE;
  			}
@@ -33,7 +33,7 @@
  		/* Read next chars if buffer was too small
  		 * (the maximum length of one character is 6 bytes) */
  		} while (!err && (n > FILE_BUFFER_SIZE - 7));
-@@ -762,7 +770,8 @@ anjuta_launcher_scan_error (GIOChannel *
+@@ -801,7 +809,8 @@
  		GError *err = NULL;
  		do
  		{
@@ -43,7 +43,7 @@
  			if (n > 0 && !err) /* There is stderr output */
  			{
  				gchar *utf8_chars;
-@@ -782,6 +791,13 @@ anjuta_launcher_scan_error (GIOChannel *
+@@ -829,6 +838,13 @@
  				anjuta_launcher_synchronize (launcher);
  				ret = FALSE;
  			}
@@ -57,7 +57,7 @@
  		/* Read next chars if buffer was too small
  		 * (the maximum length of one character is 6 bytes) */
  		} while (!err && (n > FILE_BUFFER_SIZE - 7));
-@@ -811,7 +827,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch
+@@ -858,7 +874,8 @@
  		GError *err = NULL;
  		do
  		{
@@ -67,14 +67,14 @@
  			if (n > 0 && !err) /* There is stderr output */
  			{
  				gchar *utf8_chars;
-@@ -833,6 +850,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch
- 			else if (err && errno != EAGAIN && errno != EINTR)
- 			{
- 				g_warning (_("launcher.c: Error while reading child pty\n"));
-+				ret = FALSE;
-+			}
-+			else if (status == G_IO_STATUS_EOF)
-+			{
+@@ -889,6 +906,10 @@
+ 				DEBUG_PRINT ("pty: %s", err->message);
  				ret = FALSE;
  			}
++			else if (status == G_IO_STATUS_EOF)
++			{
++				ret = FALSE;
++			}
  		/* Read next chars if buffer was too small
+ 		 * (the maximum length of one character is 6 bytes) */
+ 		} while (!err && (n > FILE_BUFFER_SIZE - 7));
diff --git a/devel/anjuta-devel/files/patch-plugins_document-manager_anjuta-docman.c b/devel/anjuta-devel/files/patch-plugins_document-manager_anjuta-docman.c
index ab7c8552b..2408b619a 100644
--- a/devel/anjuta-devel/files/patch-plugins_document-manager_anjuta-docman.c
+++ b/devel/anjuta-devel/files/patch-plugins_document-manager_anjuta-docman.c
@@ -1,14 +1,14 @@
---- plugins/document-manager/anjuta-docman.c.orig	2007-10-09 10:19:41.000000000 +0200
-+++ plugins/document-manager/anjuta-docman.c	2007-11-02 12:04:00.000000000 +0100
-@@ -919,6 +919,7 @@
+--- plugins/document-manager/anjuta-docman.c.orig	2008-01-10 22:41:20.000000000 +0100
++++ plugins/document-manager/anjuta-docman.c	2008-01-13 17:22:34.000000000 +0100
+@@ -1101,6 +1101,7 @@ anjuta_docman_goto_file_line_mark (Anjut
  	const gchar *linenum;
- 	glong lineno;
+ 	gint lineno;
  	gboolean is_local_uri;
 +	gchar normalized_path_buf[PATH_MAX];
  	gchar *normalized_path = NULL;
  	
  	IAnjutaDocument *doc;
-@@ -944,9 +945,11 @@
+@@ -1126,9 +1127,11 @@ anjuta_docman_goto_file_line_mark (Anjut
  	/* Get the normalized file path for comparision */
  	is_local_uri = gnome_vfs_uri_is_local (vfs_uri);
  	if (is_local_uri)
@@ -23,46 +23,48 @@
  	
  	gnome_vfs_uri_unref (vfs_uri);
  	/* g_free(filename); */
-@@ -960,6 +963,7 @@
- 		AnjutaDocmanPage *page;
- 		gboolean te_is_local_uri;
- 		gchar *te_uri;
-+		char te_normalized_path_buf[PATH_MAX];
- 		gchar *te_normalized_path = NULL;
+@@ -1150,6 +1153,7 @@ anjuta_docman_goto_file_line_mark (Anjut
+ 		if (te_uri)
+ 		{
+ 			gboolean te_is_local_uri;
++			char te_normalized_path_buf[PATH_MAX];
+ 			gchar *te_normalized_path;
  		
- 		page = (AnjutaDocmanPage *) node->data;
-@@ -977,9 +981,11 @@
- 		te_is_local_uri = gnome_vfs_uri_is_local (vfs_uri);
- 		if (te_is_local_uri)
- 			te_normalized_path = realpath (gnome_vfs_uri_get_path (vfs_uri),
--										   NULL);
--		if (te_normalized_path == NULL)
--			te_normalized_path = g_strdup (te_uri);
-+										   te_normalized_path_buf);
-+		if (te_normalized_path == NULL) {
-+			(void) strlcpy (te_normalized_path_buf, te_uri, PATH_MAX);
-+			te_normalized_path = te_normalized_path_buf;
-+		}
- 		gnome_vfs_uri_unref (vfs_uri);
- 		
- 		if (strcmp (normalized_path, te_normalized_path) == 0
-@@ -1001,15 +1007,12 @@
- 			an_file_history_push (te_uri, lineno);
- 			g_free (uri);
+ 			/* Get the normalized file path for comparision */
+@@ -1157,9 +1161,13 @@ anjuta_docman_goto_file_line_mark (Anjut
+ 			te_is_local_uri = gnome_vfs_uri_is_local (vfs_uri);
+ 			if (te_is_local_uri)
+ 				te_normalized_path = realpath (gnome_vfs_uri_get_path (vfs_uri),
+-											   NULL);
++											   te_normalized_path_buf);
+ 			else
+ 				te_normalized_path = g_strdup (te_uri);
++			if (te_normalized_path == NULL) {
++				(void) strlcpy (te_normalized_path_buf, te_uri, PATH_MAX);
++				te_normalized_path = te_normalized_path_buf;
++			}
+ 			gnome_vfs_uri_unref (vfs_uri);
+ 
+ 			if (normalized_path && te_normalized_path)
+@@ -1181,9 +1189,7 @@ anjuta_docman_goto_file_line_mark (Anjut
+ 					anjuta_docman_present_notebook_page (docman, doc);
+ 					an_file_history_push (te_uri, lineno);
+ 					g_free (te_uri);
+-					g_free (te_normalized_path);
+ 					g_free (uri);
+-					g_free (normalized_path);
+ 					return IANJUTA_EDITOR (doc);
+ 				}
+ 			}
+@@ -1192,7 +1198,6 @@ anjuta_docman_goto_file_line_mark (Anjut
+ 				DEBUG_PRINT ("Unexpected NULL path");
+ 			}
  			g_free (te_uri);
--			g_free (normalized_path);
 -			g_free (te_normalized_path);
- 			if (IANJUTA_IS_EDITOR(doc))
- 				return IANJUTA_EDITOR(doc);
- 			else
- 				return NULL;
  		}
- 		g_free (te_uri);
--		g_free (te_normalized_path);
- 		node = g_list_next (node);
  	}
- 	te = anjuta_docman_add_editor (docman, uri, NULL);
-@@ -1028,7 +1031,6 @@
+ 	/* no deal, open a new document */
+@@ -1213,7 +1218,6 @@ anjuta_docman_goto_file_line_mark (Anjut
  		}
  	}
  	g_free (uri);
diff --git a/devel/anjuta-devel/pkg-plist b/devel/anjuta-devel/pkg-plist
index 402235b62..9b458de45 100644
--- a/devel/anjuta-devel/pkg-plist
+++ b/devel/anjuta-devel/pkg-plist
@@ -31,6 +31,7 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-buildable.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-cpu-debugger.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debug-manager.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-breakpoint.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger-variable.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-debugger.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-document-manager.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-document.h
@@ -76,7 +77,6 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol-manager.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-symbol.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-terminal.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-todo.h
-include/libanjuta-1.0/libanjuta/interfaces/ianjuta-variable-debugger.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-vcs.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-wizard.h
 include/libanjuta-1.0/libanjuta/interfaces/libanjuta-iface-marshallers.h
@@ -158,8 +158,6 @@ lib/anjuta/libanjuta-sample.la
 lib/anjuta/libanjuta-sample.so
 lib/anjuta/libanjuta-search.la
 lib/anjuta/libanjuta-search.so
-lib/anjuta/libanjuta-sourceview.la
-lib/anjuta/libanjuta-sourceview.so
 %%SVN%%lib/anjuta/libanjuta-subversion.la
 %%SVN%%lib/anjuta/libanjuta-subversion.so
 lib/anjuta/libanjuta-symbol-browser.la
@@ -175,7 +173,8 @@ lib/anjuta/liblanguage-manager.la
 lib/anjuta/liblanguage-manager.so
 lib/anjuta/liblanguage-manager.so.0
 lib/anjuta/profiler.plugin
-lib/anjuta/sourceview.plugin
+lib/glade3/modules/libgladeanjuta.la
+lib/glade3/modules/libgladeanjuta.so
 lib/libanjuta-ctags.la
 lib/libanjuta-ctags.so
 lib/libanjuta-ctags.so.0
@@ -199,6 +198,7 @@ share/anjuta/glade/anjuta-class-gen-plugin.glade
 share/anjuta/glade/anjuta-cvs-plugin.glade
 share/anjuta/glade/anjuta-debug-manager.glade
 share/anjuta/glade/anjuta-document-manager.glade
+share/anjuta/glade/anjuta-editor-scintilla.glade
 share/anjuta/glade/anjuta-file-wizard.glade
 share/anjuta/glade/anjuta-gdb.glade
 share/anjuta/glade/anjuta-language-cpp-java.glade
@@ -214,7 +214,6 @@ share/anjuta/glade/anjuta-tools.glade
 share/anjuta/glade/anjuta.glade
 share/anjuta/glade/applogo.png
 share/anjuta/glade/appwizard.png
-share/anjuta/glade/editor.glade
 share/anjuta/glade/file-manager.glade
 share/anjuta/glade/layout.glade
 share/anjuta/glade/patch-plugin.glade
@@ -222,7 +221,6 @@ share/anjuta/glade/profiler-call-graph.glade
 share/anjuta/glade/profiler-flat-profile.glade
 share/anjuta/glade/profiler-function-call-tree.glade
 share/anjuta/glade/profiler.glade
-share/anjuta/glade/sourceview.glade
 share/anjuta/glade/start-with-import.png
 share/anjuta/glade/start-with-open.png
 share/anjuta/glade/start-with-wizard.png
@@ -493,7 +491,6 @@ share/doc/libanjuta/IAnjutaSymbol.html
 share/doc/libanjuta/IAnjutaSymbolManager.html
 share/doc/libanjuta/IAnjutaTerminal.html
 share/doc/libanjuta/IAnjutaTodo.html
-share/doc/libanjuta/IAnjutaVariableDebugger.html
 share/doc/libanjuta/IAnjutaVcs.html
 share/doc/libanjuta/IAnjutaWizard.html
 share/doc/libanjuta/action-block.html
@@ -520,6 +517,7 @@ share/doc/libanjuta/libanjuta-IAnjutaEditorSearch.html
 share/doc/libanjuta/libanjuta-IAnjutaLanguage.html
 share/doc/libanjuta/libanjuta-IAnjutaPluginFactory.html
 share/doc/libanjuta/libanjuta-IAnjutaPluginLoader.html
+share/doc/libanjuta/libanjuta-IAnjutaVariableDebugger.html
 share/doc/libanjuta/libanjuta-Interface-marshallers.html
 share/doc/libanjuta/libanjuta-Marshallers.html
 share/doc/libanjuta/libanjuta-Private-utilities.html
@@ -542,6 +540,7 @@ share/doc/libanjuta/writing-plugins-build-setup.html
 share/doc/libanjuta/writing-plugins-simple.html
 share/doc/libanjuta/writing-plugins-sources.html
 share/doc/libanjuta/writing-plugins.html
+share/glade3/catalogs/anjuta-glade.xml
 share/gnome/help/anjuta-faqs/C/anjuta-faqs.xml
 share/gnome/help/anjuta-faqs/C/legal.xml
 share/gnome/help/anjuta-manual/C/anjuta-manual.xml
@@ -783,6 +782,7 @@ share/locale/gl/LC_MESSAGES/anjuta.mo
 share/locale/hi/LC_MESSAGES/anjuta.mo
 share/locale/hr/LC_MESSAGES/anjuta.mo
 share/locale/hu/LC_MESSAGES/anjuta.mo
+share/locale/id/LC_MESSAGES/anjuta.mo
 share/locale/it/LC_MESSAGES/anjuta.mo
 share/locale/ja/LC_MESSAGES/anjuta.mo
 share/locale/ko/LC_MESSAGES/anjuta.mo
@@ -799,6 +799,7 @@ share/locale/pt/LC_MESSAGES/anjuta.mo
 share/locale/pt_BR/LC_MESSAGES/anjuta.mo
 share/locale/ru/LC_MESSAGES/anjuta.mo
 share/locale/rw/LC_MESSAGES/anjuta.mo
+share/locale/si/LC_MESSAGES/anjuta.mo
 share/locale/sk/LC_MESSAGES/anjuta.mo
 share/locale/sl/LC_MESSAGES/anjuta.mo
 share/locale/sq/LC_MESSAGES/anjuta.mo
@@ -809,19 +810,14 @@ share/locale/tr/LC_MESSAGES/anjuta.mo
 share/locale/uk/LC_MESSAGES/anjuta.mo
 share/locale/zh_CN/LC_MESSAGES/anjuta.mo
 share/locale/zh_TW/LC_MESSAGES/anjuta.mo
-share/mime/XMLnamespaces
-share/mime/aliases
 share/mime/application/x-anjuta.xml
-share/mime/globs
-share/mime/magic
-share/mime/mime.cache
 share/mime/packages/anjuta.xml
-share/mime/subclasses
 share/omf/anjuta-manual/anjuta-manual-C.omf
 share/omf/anjuta-manual/anjuta-manual-es.omf
 share/omf/anjuta-manual/anjuta-manual-oc.omf
 share/pixmaps/anjuta/Icons.16x16.Class
 share/pixmaps/anjuta/Icons.16x16.Enum
+share/pixmaps/anjuta/Icons.16x16.Event
 share/pixmaps/anjuta/Icons.16x16.Field
 share/pixmaps/anjuta/Icons.16x16.FormsDesigner.BringToFront
 share/pixmaps/anjuta/Icons.16x16.FormsDesigner.SendToBack
@@ -847,6 +843,7 @@ share/pixmaps/anjuta/Icons.16x16.PrivateInterface
 share/pixmaps/anjuta/Icons.16x16.PrivateMethod
 share/pixmaps/anjuta/Icons.16x16.PrivateProperty
 share/pixmaps/anjuta/Icons.16x16.PrivateStruct
+share/pixmaps/anjuta/Icons.16x16.Property
 share/pixmaps/anjuta/Icons.16x16.ProtectedClass
 share/pixmaps/anjuta/Icons.16x16.ProtectedDelegate
 share/pixmaps/anjuta/Icons.16x16.ProtectedEnum
@@ -857,6 +854,7 @@ share/pixmaps/anjuta/Icons.16x16.ProtectedMethod
 share/pixmaps/anjuta/Icons.16x16.ProtectedProperty
 share/pixmaps/anjuta/Icons.16x16.ProtectedStruct
 share/pixmaps/anjuta/Icons.16x16.Reference
+share/pixmaps/anjuta/Icons.16x16.Struct
 share/pixmaps/anjuta/anjuta-attach-16.png
 share/pixmaps/anjuta/anjuta-attach-24.png
 share/pixmaps/anjuta/anjuta-block-end-16.png
@@ -902,7 +900,6 @@ share/pixmaps/anjuta/anjuta-document-manager-plugin-48.png
 share/pixmaps/anjuta/anjuta-document-manager-plugin.svg
 share/pixmaps/anjuta/anjuta-editor-scintilla-plugin-48.png
 share/pixmaps/anjuta/anjuta-editor-scintilla-plugin.svg
-share/pixmaps/anjuta/anjuta-editor-sourceview-plugin-48.png
 share/pixmaps/anjuta/anjuta-file-manager-plugin-48.png
 share/pixmaps/anjuta/anjuta-file-manager-plugin.svg
 share/pixmaps/anjuta/anjuta-file-wizard-plugin.png
@@ -1081,6 +1078,8 @@ share/pixmaps/anjuta/start-with-import.png
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @dirrmtry share/locale/sl/LC_MESSAGES
 @dirrmtry share/locale/sl
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES