Pullup ticket #4983 - requested by joerg

devel/anjuta: build fix

Revisions pulled up:
- devel/anjuta/Makefile                                         1.125
- devel/anjuta/distinfo                                         1.28
- devel/anjuta/patches/patch-plugins_build-basic-autotools_build.c 1.3
- devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-callbacks.c 1.1
- devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-execute.c   1.1

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Sat May  7 09:55:21 UTC 2016

   Modified Files:
   	pkgsrc/devel/anjuta: Makefile distinfo
   	pkgsrc/devel/anjuta/patches:
   	    patch-plugins_build-basic-autotools_build.c
   Added Files:
   	pkgsrc/devel/anjuta/patches: patch-plugins_cvs-plugin_cvs-callbacks.c
   	    patch-plugins_cvs-plugin_cvs-execute.c

   Log Message:
   Drop extra format string arguments. Disable zero length format string
   warning from GCC.

5 files changed, 44 insertions, 4 deletions

diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index bea3575a28a..ec524a58425 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2016/03/05 11:28:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.123.2.1 2016/05/11 15:33:29 bsiegert Exp $
 
 DISTNAME=	anjuta-3.10.0
 PKGREVISION=	14
@@ -67,6 +67,8 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
 CPPFLAGS+=	-Dshm_open=open -Dshm_unlink=unlink
 .endif
 
+CFLAGS+=	-Wno-error=format-zero-length
+
 .include "../../databases/libgda/buildlink3.mk"
 #.include "../../devel/devhelp/buildlink3.mk"
 .include "../../devel/gdl/buildlink3.mk"
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index fedcb5e2690..b660ef011da 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2015/11/03 03:27:13 agc Exp $
+$NetBSD: distinfo,v 1.27.4.1 2016/05/11 15:33:29 bsiegert Exp $
 
 SHA1 (anjuta-3.10.0.tar.xz) = bfa975641b3e25818b7eda34905c4d65eeb01152
 RMD160 (anjuta-3.10.0.tar.xz) = 871dbb7e6174296729eeefae6b8766591fff2ad0
@@ -11,9 +11,11 @@ SHA1 (patch-libanjuta_anjuta-utils.c) = 6659d7a9bf6912f4fd96045cb326d4619f635fb6
 SHA1 (patch-libanjuta_anjuta-utils.h) = bc42909f3ea4afd2ca426fc614742e4063d9ba6c
 SHA1 (patch-libanjuta_tests_Makefile.in) = 7ad52876516f3a07a59fc21e12b94caf54b51146
 SHA1 (patch-plugins_am-project_projectparser.c) = 7502510bc4c6d564aecca76c4f7b68779b34aecd
-SHA1 (patch-plugins_build-basic-autotools_build.c) = 336c5811a2b3fde30e5c4539eadc1cf9ebd71854
+SHA1 (patch-plugins_build-basic-autotools_build.c) = 39387934df248c281e5ea2e25213b1db9b3e8cb6
 SHA1 (patch-plugins_build-basic-autotools_executer.c) = 4e89ea52eaaf41aa8804681cfc9bb6f407526748
 SHA1 (patch-plugins_build-basic-autotools_program.h) = 72247949ddbfa0b41acd934f566ffd80d7841db7
+SHA1 (patch-plugins_cvs-plugin_cvs-callbacks.c) = daef25e5f07c47affba5621e631b1f7ebaa19f21
+SHA1 (patch-plugins_cvs-plugin_cvs-execute.c) = a6b7258b83b6efd6a4436e12fae6d0f381c7fb1a
 SHA1 (patch-plugins_cvs-plugin_cvs-interface.c) = 19541f4ab3bd70245461d317ac6c182a7e0f7633
 SHA1 (patch-plugins_debug-manager_breakpoints.c) = 7ea483aeca934f1b105efac07a5ff1a29e6ed56f
 SHA1 (patch-plugins_debug-manager_queue.c) = a39e5adcc739f4eaff29138a21ad0e5375573f6d
diff --git a/devel/anjuta/patches/patch-plugins_build-basic-autotools_build.c b/devel/anjuta/patches/patch-plugins_build-basic-autotools_build.c
index 7b3a27feb46..b5495460fa9 100644
--- a/devel/anjuta/patches/patch-plugins_build-basic-autotools_build.c
+++ b/devel/anjuta/patches/patch-plugins_build-basic-autotools_build.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-plugins_build-basic-autotools_build.c,v 1.2 2013/12/07 23:47:02 dholland Exp $
+$NetBSD: patch-plugins_build-basic-autotools_build.c,v 1.2.20.1 2016/05/11 15:33:29 bsiegert Exp $
 
 --- plugins/build-basic-autotools/build.c.orig	2013-08-09 00:30:17.000000000 +0000
 +++ plugins/build-basic-autotools/build.c
@@ -11,3 +11,12 @@ $NetBSD: patch-plugins_build-basic-autotools_build.c,v 1.2 2013/12/07 23:47:02 d
  {
  	va_list args;
  	gchar *str;
+@@ -524,7 +524,7 @@ build_save_distclean_and_execute_command
+ 
+ 		// Need to run make clean before
+ 		if (!anjuta_util_dialog_boolean_question (GTK_WINDOW (ANJUTA_PLUGIN (bplugin)->shell), FALSE,
+-		    _("Before using this new configuration, the default one needs to be removed. Do you want to do that ?"), NULL))
++		    _("Before using this new configuration, the default one needs to be removed. Do you want to do that ?")))
+ 		{
+ 			if (err)
+ 				*err = g_error_new (ianjuta_builder_error_quark (),
diff --git a/devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-callbacks.c b/devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-callbacks.c
new file mode 100644
index 00000000000..d96e6f549a2
--- /dev/null
+++ b/devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-callbacks.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugins_cvs-plugin_cvs-callbacks.c,v 1.1.2.2 2016/05/11 15:33:29 bsiegert Exp $
+
+--- plugins/cvs-plugin/cvs-callbacks.c.orig	2016-05-06 12:59:32.000000000 +0000
++++ plugins/cvs-plugin/cvs-callbacks.c
+@@ -149,7 +149,7 @@ on_cvs_remove_response(GtkDialog* dialog
+ 		if (!g_file_delete(file, NULL, NULL))
+ 		{
+ 			anjuta_util_dialog_error
+-				(GTK_WINDOW(dialog),_("Unable to delete file"), NULL);
++				(GTK_WINDOW(dialog),_("Unable to delete file"));
+ 			gtk_widget_destroy(GTK_WIDGET(dialog));
+ 			cvs_data_free(data);
+ 			break;
diff --git a/devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-execute.c b/devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-execute.c
new file mode 100644
index 00000000000..45e0e92f79d
--- /dev/null
+++ b/devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-execute.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_cvs-plugin_cvs-execute.c,v 1.1.2.2 2016/05/11 15:33:29 bsiegert Exp $
+
+--- plugins/cvs-plugin/cvs-execute.c.orig	2016-05-06 12:59:57.000000000 +0000
++++ plugins/cvs-plugin/cvs-execute.c
+@@ -218,8 +218,7 @@ cvs_execute_common (CVSPlugin* plugin, c
+ 	if (plugin->executing_command)
+ 	{
+ 		anjuta_util_dialog_error
+-			(NULL,_("CVS command is running — please wait until it finishes!"),
+-			 NULL);
++			(NULL,_("CVS command is running — please wait until it finishes!"));
+ 		return;
+ 	}
+