Presenting GNOME 2.26.1 for FreeBSD.

Approved by:	portmgr (marcus)

8 files changed, 167 insertions, 20 deletions

diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 495add874560..92831a096f08 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/anjuta/Makefile,v 1.37 2009/03/31 13:33:41 kwm Exp $
+#   $MCom: ports-stable/devel/anjuta/Makefile,v 1.6 2009/04/20 04:42:30 marcus Exp $
 #
 
 PORTNAME=	anjuta
-PORTVERSION=	2.26.0.1
-PORTREVISION=	3
+PORTVERSION=	2.26.1.0
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -30,7 +30,8 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		neato:${PORTSDIR}/graphics/graphviz \
 		p5-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
 		libtool:${PORTSDIR}/devel/libtool15 \
-		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+		${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \
+		exctags:${PORTSDIR}/devel/ctags
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	autotools:run
@@ -67,11 +68,22 @@ BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 USE_APACHE=	2.0+
 
+## Test if we got apache 20 or 22.
+.if exists(${LOCALBASE}/include/apache22/httpd.h)
+APR_CONFIG=${LOCALBASE}/bin/apr-1-config
+APU_CONFIG=${LOCALBASE}/bin/apu-1-config
+.else
+APR_CONFIG=${LOCALBASE}/lib/apache2/apr-config
+APU_CONFIG=${LOCALBASE}/lib/apache2/apu-config
+.endif
+CONFIGURE_ENV+=	APR_CFLAGS="`${APR_CONFIG} --includes`" \
+		APR_LIBS="`${APU_CONFIG} --libs`" \
+		APR_UTILS_CFLAGS="`${APU_CONFIG} --includes`" \
+		APR_UTILS_LIBS="`${APU_CONFIG} --libs`" \
+
 CONFIGURE_ARGS+=--with-subversion-dir=${LOCALBASE}/bin \
 		--with-svn-include=${LOCALBASE}/include \
-		--with-svn-lib=${LOCALBASE}/lib \
-		--with-apr-config=${LOCALBASE}/bin/apr-1-config \
-		--with-apu-config=${LOCALBASE}/bin/apu-1-config
+		--with-svn-lib=${LOCALBASE}/lib
 PLIST_SUB+=	SVN=""
 .else
 CONFIGURE_ARGS+=--disable-plugin-subversion
@@ -83,7 +95,10 @@ LIB_DEPENDS+=	devhelp-1.0:${PORTSDIR}/devel/devhelp
 PLIST_SUB+=	DEVHELP=""
 .else
 CONFIGURE_ARGS+=--disable-plugin-devhelp
-PLIST_SUB+=	DEVHELP="@comment "
+# XXX Even if we disable the devhelp plugin it gets build and installed.
+# See if versions beyond 2.26.1.0 still do this.
+#PLIST_SUB+=	DEVHELP="@comment "
+PLIST_SUB+=	DEVHELP=""
 .endif
 
 post-configure:
@@ -91,6 +106,9 @@ post-configure:
 	    	${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|"make|"gmake|g' \
 		${WRKSRC}/plugins/build-basic-autotools/plugin.c
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+	    	${WRKSRC}/plugins/symbol-db/plugin.h \
+		${WRKSRC}/plugins/symbol-db/symbol-db-prefs.h
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index a52aeb6d51b4..4c9969819570 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/anjuta-2.26.0.1.tar.bz2) = 84d3aae494f9866ca7d2a906be82a8df
-SHA256 (gnome2/anjuta-2.26.0.1.tar.bz2) = 9e4778cfd9bdf364ebccdedb9305cbe49fb7bc215ef7b12f9f07db4dfb1e1e1f
-SIZE (gnome2/anjuta-2.26.0.1.tar.bz2) = 7703345
+MD5 (gnome2/anjuta-2.26.1.0.tar.bz2) = 00d51cac65f2099d71f73c960830b633
+SHA256 (gnome2/anjuta-2.26.1.0.tar.bz2) = 80d27bcf1ebf803055014ae7d4295e5f025c2abdd22b7e465e6c7462ef027d45
+SIZE (gnome2/anjuta-2.26.1.0.tar.bz2) = 7705572
diff --git a/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c b/devel/anjuta/files/patch-libanjuta_anjuta-launcher.c
index 0235ff1e8d24..126c7d9e305b 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-05-29 22:37:02.000000000 +0200
-+++ libanjuta/anjuta-launcher.c	2008-06-05 16:12:17.000000000 +0200
+--- libanjuta/anjuta-launcher.c.orig	2009-03-18 04:24:10.000000000 -0400
++++ libanjuta/anjuta-launcher.c	2009-04-16 19:49:25.000000000 -0400
 @@ -761,7 +761,8 @@ anjuta_launcher_scan_output (GIOChannel 
  		GError *err = NULL;
  		do
@@ -10,7 +10,7 @@
  			if (n > 0) /* There is output */
  			{
  				gchar *utf8_chars = NULL;
-@@ -789,6 +790,13 @@ anjuta_launcher_scan_output (GIOChannel 
+@@ -789,6 +790,15 @@ anjuta_launcher_scan_output (GIOChannel 
  				anjuta_launcher_synchronize (launcher);
  				ret = FALSE;
  			}
@@ -18,13 +18,15 @@
 +			{
 +				launcher->priv->stdout_is_done = TRUE;
 +				anjuta_launcher_synchronize (launcher);
-+				ret = FALSE;
++				if (err)
++					g_error_free (err);
++				return 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));
-@@ -818,7 +826,8 @@ anjuta_launcher_scan_error (GIOChannel *
+@@ -818,7 +828,8 @@ anjuta_launcher_scan_error (GIOChannel *
  		GError *err = NULL;
  		do
  		{
@@ -34,7 +36,7 @@
  			if (n > 0) /* There is stderr output */
  			{
  				gchar *utf8_chars;
-@@ -844,6 +853,13 @@ anjuta_launcher_scan_error (GIOChannel *
+@@ -844,6 +855,15 @@ anjuta_launcher_scan_error (GIOChannel *
  				anjuta_launcher_synchronize (launcher);
  				ret = FALSE;
  			}
@@ -42,13 +44,15 @@
 +			{
 +				launcher->priv->stderr_is_done = TRUE;
 +				anjuta_launcher_synchronize (launcher);
-+				ret = FALSE;
++				if (err)
++					g_error_free (err);
++				return 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));
-@@ -873,7 +889,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch
+@@ -873,7 +893,8 @@ anjuta_launcher_scan_pty (GIOChannel *ch
  		GError *err = NULL;
  		do
  		{
@@ -58,13 +62,14 @@
  			if (n > 0) /* There is stderr output */
  			{
  				gchar *utf8_chars;
-@@ -902,6 +919,10 @@ anjuta_launcher_scan_pty (GIOChannel *ch
+@@ -902,6 +923,11 @@ anjuta_launcher_scan_pty (GIOChannel *ch
  			{
  				ret = FALSE;
  			}
 +			else if (status == G_IO_STATUS_EOF)
 +			{
 +				ret = FALSE;
++				break;
 +			}
  		/* Read next chars if buffer was too small
  		 * (the maximum length of one character is 6 bytes) */
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_plugin.c b/devel/anjuta/files/patch-plugins_symbol-db_plugin.c
new file mode 100644
index 000000000000..d19ef6d15a0a
--- /dev/null
+++ b/devel/anjuta/files/patch-plugins_symbol-db_plugin.c
@@ -0,0 +1,11 @@
+--- plugins/symbol-db/plugin.c.orig	2009-04-17 01:08:28.000000000 -0400
++++ plugins/symbol-db/plugin.c	2009-04-17 01:09:11.000000000 -0400
+@@ -1510,7 +1510,7 @@ do_check_offline_files_changed (SymbolDB
+ 	GHashTable *prj_elements_hash;
+ 	GPtrArray *to_add_files = NULL;
+ 	gint i;
+-	gint real_added ;
++	gint real_added = 0;
+ 	
+ 	pm = anjuta_shell_get_interface (ANJUTA_PLUGIN (sdb_plugin)->shell,
+ 									 IAnjutaProjectManager, NULL);	
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_plugin.h b/devel/anjuta/files/patch-plugins_symbol-db_plugin.h
new file mode 100644
index 000000000000..10565abef21e
--- /dev/null
+++ b/devel/anjuta/files/patch-plugins_symbol-db_plugin.h
@@ -0,0 +1,11 @@
+--- plugins/symbol-db/plugin.h.orig	2009-04-17 01:02:20.000000000 -0400
++++ plugins/symbol-db/plugin.h	2009-04-17 01:02:37.000000000 -0400
+@@ -49,7 +49,7 @@ typedef struct _SymbolDBPluginClass Symb
+ #include "symbol-db-prefs.h"
+ 
+ /* a sort of 'default' value for ctags executable. User must have it installed */
+-#define CTAGS_PATH			"/usr/bin/ctags"
++#define CTAGS_PATH			"%%LOCALBASE%%/bin/exctags"
+ 
+ struct _SymbolDBPlugin {
+ 	AnjutaPlugin parent;
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c
new file mode 100644
index 000000000000..1b6405e7555a
--- /dev/null
+++ b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-core.c
@@ -0,0 +1,80 @@
+--- plugins/symbol-db/symbol-db-engine-core.c.orig	2009-03-18 04:24:07.000000000 -0400
++++ plugins/symbol-db/symbol-db-engine-core.c	2009-04-20 00:40:52.000000000 -0400
+@@ -1486,7 +1486,7 @@ sdb_engine_ctags_output_thread (gpointer
+ 
+ 			/* found out a new marker */ 
+ 			marker_ptr = strstr (marker_ptr + len_marker, CTAGS_MARKER);
+-		} while (remaining_chars + len_marker < len_chars || marker_ptr != NULL);
++		} while (remaining_chars > 0 || marker_ptr != NULL);
+ 	}
+ 	else 
+ 	{
+@@ -1644,7 +1644,7 @@ sdb_engine_ctags_launcher_create (Symbol
+ 	anjuta_launcher_set_encoding (priv->ctags_launcher, NULL);
+ 		
+ 	g_signal_connect (G_OBJECT (priv->ctags_launcher), "child-exited",
+-						  G_CALLBACK (on_scan_files_end_1), NULL);
++						  G_CALLBACK (on_scan_files_end_1), dbe);
+ 
+ 	exe_string = g_strdup_printf ("%s --sort=no --fields=afmiKlnsStz --c++-kinds=+p "
+ 								  "--filter=yes --filter-terminator='"CTAGS_MARKER"'",
+@@ -1810,8 +1810,8 @@ sdb_engine_scan_files_1 (SymbolDBEngine 
+ 		gchar *temp_file;
+ 		while (TRUE)
+ 		{
+-			temp_file = g_strdup_printf ("/anjuta-%d_%ld.tags", getpid (),
+-								 time (NULL));
++			temp_file = g_strdup_printf ("%s/anjuta-%d_%ld.tags", SHARED_MEMORY_PREFIX, getpid (),
++								 (long) time (NULL));
+ 			gchar *test;
+ 			test = g_strconcat (SHARED_MEMORY_PREFIX, temp_file, NULL);
+ 			if (g_file_test (test, G_FILE_TEST_EXISTS) == TRUE)
+@@ -1831,12 +1831,12 @@ sdb_engine_scan_files_1 (SymbolDBEngine 
+ 		priv->shared_mem_str = temp_file;
+ 		
+ 		if ((priv->shared_mem_fd = 
+-			 shm_open (temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0)
++			 open (temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0)
+ 		{
+ 			g_warning ("Error while trying to open a shared memory file. Be"
+ 					   "sure to have "SHARED_MEMORY_PREFIX" mounted with tmpfs");
+ 		}
+-	
++
+ 		priv->shared_mem_file = fdopen (priv->shared_mem_fd, "a+b");
+ 		/*DEBUG_PRINT ("temp_file %s", temp_file);*/
+ 
+@@ -2419,7 +2419,7 @@ sdb_engine_init (SymbolDBEngine * object
+ static void
+ sdb_engine_unlink_shared_files (gpointer key, gpointer value, gpointer user_data)
+ {
+-	shm_unlink (key);
++	unlink (key);
+ }
+ 
+ static void 
+@@ -2508,7 +2508,7 @@ sdb_engine_finalize (GObject * object)
+ 	
+ 	if (priv->shared_mem_str)
+ 	{
+-		shm_unlink (priv->shared_mem_str);
++		unlink (priv->shared_mem_str);
+ 		g_free (priv->shared_mem_str);
+ 		priv->shared_mem_str = NULL;
+ 	}
+@@ -5834,12 +5834,12 @@ symbol_db_engine_update_buffer_symbols (
+ 		 * target buffer one */
+ 		base_filename = g_filename_display_basename (relative_path);
+ 		
+-		shared_temp_file = g_strdup_printf ("/anjuta-%d-%ld-%s", getpid (),
+-						 time (NULL), base_filename);
++		shared_temp_file = g_strdup_printf ("%s/anjuta-%d-%ld-%s", SHARED_MEMORY_PREFIX, getpid (),
++						 (long) time (NULL), base_filename);
+ 		g_free (base_filename);
+ 		
+ 		if ((buffer_mem_fd = 
+-			 shm_open (shared_temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0)
++			 open (shared_temp_file, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) < 0)
+ 		{
+ 			g_warning ("Error while trying to open a shared memory file. Be"
+ 					   "sure to have "SHARED_MEMORY_PREFIX" mounted with tmpfs");
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h
new file mode 100644
index 000000000000..cecb81021faf
--- /dev/null
+++ b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h
@@ -0,0 +1,11 @@
+--- plugins/symbol-db/symbol-db-engine-priv.h.orig	2009-04-15 19:40:20.000000000 -0400
++++ plugins/symbol-db/symbol-db-engine-priv.h	2009-04-15 19:40:34.000000000 -0400
+@@ -47,7 +47,7 @@
+ 
+ #define CTAGS_MARKER	"#_#\n"
+ 
+-#define SHARED_MEMORY_PREFIX		"/dev/shm"
++#define SHARED_MEMORY_PREFIX		"/tmp"
+ 
+ #define THREADS_MAX_CONCURRENT			2
+ #define TRIGGER_SIGNALS_DELAY			100
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h
new file mode 100644
index 000000000000..3d9398a872c1
--- /dev/null
+++ b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-prefs.h
@@ -0,0 +1,11 @@
+--- plugins/symbol-db/symbol-db-prefs.h.orig	2009-04-17 01:06:07.000000000 -0400
++++ plugins/symbol-db/symbol-db-prefs.h	2009-04-17 01:06:34.000000000 -0400
+@@ -40,7 +40,7 @@ typedef struct _SymbolDBPrefsPriv Symbol
+ #include "symbol-db-system.h"
+ 
+ 
+-#define CTAGS_PREFS			 "preferences_entry:text:/usr/bin/ctags:0:symboldb.ctags"
++#define CTAGS_PREFS			 "preferences_entry:text:%%LOCALBASE%%/bin/exctags:0:symboldb.ctags"
+ #define CTAGS_PREFS_KEY		 "symboldb.ctags"
+ #define PROJECT_AUTOSCAN	 "symboldb.scan_prj_pkgs"
+ #define PARALLEL_SCAN		 "symboldb.parallel_scan"