Update to 2.3.5.

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

4 files changed, 22 insertions, 23 deletions

diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 7a5dfc4fe..5f165bdab 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/anjuta/Makefile,v 1.19 2008/01/29 13:29:58 kwm Exp $
+#   $MCom: ports/devel/anjuta/Makefile,v 1.20 2008/02/11 00:02:24 marcus Exp $
 #
 
 PORTNAME=	anjuta
-PORTVERSION=	2.3.4
+PORTVERSION=	2.3.5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	anjuta
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index 1e070ec74..b5b9141d5 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,3 +1,3 @@
-MD5 (anjuta-2.3.4.tar.bz2) = 34bbe835a29fd6859a6b57ab459b54d0
-SHA256 (anjuta-2.3.4.tar.bz2) = 900f0b9195a79e8c3d40474a8a93cbea269936b71ebe8df0218b18299ceb7376
-SIZE (anjuta-2.3.4.tar.bz2) = 6210760
+MD5 (anjuta-2.3.5.tar.bz2) = f252e663fdd23ffae1f1f46c3ef91e14
+SHA256 (anjuta-2.3.5.tar.bz2) = fca380ef61a73892fbdd768aa767a29a5e630a7591cc362ab06f3f54a34e431a
+SIZE (anjuta-2.3.5.tar.bz2) = 6289554
diff --git a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c
index 04d98efab..1c7679ab2 100644
--- a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c
+++ b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c
@@ -1,5 +1,5 @@
---- 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
+--- libanjuta/anjuta-launcher.c.orig	2008-02-15 18:32:29.000000000 -0500
++++ libanjuta/anjuta-launcher.c	2008-02-25 22:45:03.000000000 -0500
 @@ -37,7 +37,7 @@
  #include <signal.h>
  
@@ -9,17 +9,17 @@
  #    include <pty.h>
  #  else
  #    include <libutil.h>
-@@ -745,7 +745,8 @@
+@@ -749,7 +749,8 @@ anjuta_launcher_scan_output (GIOChannel 
  		GError *err = NULL;
  		do
  		{
 -			g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err);
 +			GIOStatus status;
 +			status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err);
- 			if (n > 0 && !err) /* There is output */
+ 			if (n > 0) /* There is output */
  			{
  				gchar *utf8_chars;
-@@ -772,6 +773,13 @@
+@@ -776,6 +777,13 @@ anjuta_launcher_scan_output (GIOChannel 
  				anjuta_launcher_synchronize (launcher);
  				ret = FALSE;
  			}
@@ -33,17 +33,17 @@
  		/* Read next chars if buffer was too small
  		 * (the maximum length of one character is 6 bytes) */
  		} while (!err && (n > FILE_BUFFER_SIZE - 7));
-@@ -801,7 +809,8 @@
+@@ -805,7 +813,8 @@ anjuta_launcher_scan_error (GIOChannel *
  		GError *err = NULL;
  		do
  		{
 -			g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err);
 +			GIOStatus status;
 +			status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err);
- 			if (n > 0 && !err) /* There is stderr output */
+ 			if (n > 0) /* There is stderr output */
  			{
  				gchar *utf8_chars;
-@@ -829,6 +838,13 @@
+@@ -833,6 +842,13 @@ anjuta_launcher_scan_error (GIOChannel *
  				anjuta_launcher_synchronize (launcher);
  				ret = FALSE;
  			}
@@ -57,18 +57,18 @@
  		/* Read next chars if buffer was too small
  		 * (the maximum length of one character is 6 bytes) */
  		} while (!err && (n > FILE_BUFFER_SIZE - 7));
-@@ -858,7 +874,8 @@
+@@ -862,7 +878,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch
  		GError *err = NULL;
  		do
  		{
 -			g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err);
 +			GIOStatus status;
 +			status = g_io_channel_read_chars (channel, buffer, FILE_BUFFER_SIZE-1, &n, &err);
- 			if (n > 0 && !err) /* There is stderr output */
+ 			if (n > 0) /* There is stderr output */
  			{
  				gchar *utf8_chars;
-@@ -889,6 +906,10 @@
- 				DEBUG_PRINT ("pty: %s", err->message);
+@@ -893,6 +910,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch
+ 				g_warning ("pty: %s", err->message);
  				ret = FALSE;
  			}
 +			else if (status == G_IO_STATUS_EOF)
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index 43aab463b..8c6a4ea70 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -1,5 +1,4 @@
 bin/anjuta
-bin/anjuta-shell
 bin/anjuta_import.sh
 bin/anjuta_launcher
 include/libanjuta-1.0/libanjuta/anjuta-async-command.h
@@ -420,7 +419,6 @@ share/anjuta/ui/anjuta-patch.ui
 share/anjuta/ui/anjuta-project-manager.ui
 share/anjuta/ui/anjuta-sample.ui
 share/anjuta/ui/anjuta-search.ui
-share/anjuta/ui/anjuta-shell.ui
 %%SVN%%share/anjuta/ui/anjuta-subversion.ui
 share/anjuta/ui/anjuta-symbol-browser-plugin.ui
 share/anjuta/ui/anjuta-tools.ui
@@ -577,8 +575,8 @@ share/gnome/help/anjuta-manual/C/figures/open_file_multiple.png
 share/gnome/help/anjuta-manual/C/figures/prefs_print.png
 share/gnome/help/anjuta-manual/C/figures/print_dlg.png
 share/gnome/help/anjuta-manual/C/figures/print_preview.png
+share/gnome/help/anjuta-manual/C/figures/project-window.png
 share/gnome/help/anjuta-manual/C/figures/project_info.png
-share/gnome/help/anjuta-manual/C/figures/project_win.png
 share/gnome/help/anjuta-manual/C/figures/registers.png
 share/gnome/help/anjuta-manual/C/figures/save_as_file.png
 share/gnome/help/anjuta-manual/C/figures/search_expr.png
@@ -627,8 +625,8 @@ share/gnome/help/anjuta-manual/es/figures/open_file_multiple.png
 share/gnome/help/anjuta-manual/es/figures/prefs_print.png
 share/gnome/help/anjuta-manual/es/figures/print_dlg.png
 share/gnome/help/anjuta-manual/es/figures/print_preview.png
+share/gnome/help/anjuta-manual/es/figures/project-window.png
 share/gnome/help/anjuta-manual/es/figures/project_info.png
-share/gnome/help/anjuta-manual/es/figures/project_win.png
 share/gnome/help/anjuta-manual/es/figures/registers.png
 share/gnome/help/anjuta-manual/es/figures/save_as_file.png
 share/gnome/help/anjuta-manual/es/figures/search_expr.png
@@ -668,8 +666,8 @@ share/gnome/help/anjuta-manual/oc/figures/open_file_multiple.png
 share/gnome/help/anjuta-manual/oc/figures/prefs_print.png
 share/gnome/help/anjuta-manual/oc/figures/print_dlg.png
 share/gnome/help/anjuta-manual/oc/figures/print_preview.png
+share/gnome/help/anjuta-manual/oc/figures/project-window.png
 share/gnome/help/anjuta-manual/oc/figures/project_info.png
-share/gnome/help/anjuta-manual/oc/figures/project_win.png
 share/gnome/help/anjuta-manual/oc/figures/registers.png
 share/gnome/help/anjuta-manual/oc/figures/save_as_file.png
 share/gnome/help/anjuta-manual/oc/figures/search_expr.png
@@ -709,8 +707,8 @@ share/gnome/help/anjuta-manual/sv/figures/open_file_multiple.png
 share/gnome/help/anjuta-manual/sv/figures/prefs_print.png
 share/gnome/help/anjuta-manual/sv/figures/print_dlg.png
 share/gnome/help/anjuta-manual/sv/figures/print_preview.png
+share/gnome/help/anjuta-manual/sv/figures/project-window.png
 share/gnome/help/anjuta-manual/sv/figures/project_info.png
-share/gnome/help/anjuta-manual/sv/figures/project_win.png
 share/gnome/help/anjuta-manual/sv/figures/registers.png
 share/gnome/help/anjuta-manual/sv/figures/save_as_file.png
 share/gnome/help/anjuta-manual/sv/figures/search_expr.png
@@ -754,6 +752,7 @@ 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/kn/LC_MESSAGES/anjuta.mo
 share/locale/ko/LC_MESSAGES/anjuta.mo
 share/locale/mk/LC_MESSAGES/anjuta.mo
 share/locale/ml/LC_MESSAGES/anjuta.mo