Fix build with modern GCC

9 files changed, 112 insertions, 21 deletions

diff --git a/devel/gcvs/distinfo b/devel/gcvs/distinfo
index 041382fc0b2..b857f4864a3 100644
--- a/devel/gcvs/distinfo
+++ b/devel/gcvs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2011/10/02 02:25:42 dholland Exp $
+$NetBSD: distinfo,v 1.10 2011/11/25 21:42:44 joerg Exp $
 
 SHA1 (gcvs-1.0.tar.gz) = 42b2469d0a9acc0e69a127b44000cd1b11bb895e
 RMD160 (gcvs-1.0.tar.gz) = 195698283848cd1f22d00eb37df7dd0f6b52cffc
@@ -24,10 +24,15 @@ SHA1 (patch-ao) = 0c34855297bd4c8aa32d5f6ef14695c58f6d3e8c
 SHA1 (patch-ap) = c14228e74fc433b06cf25b23aece71dfe74587aa
 SHA1 (patch-aq) = 544d6b2d44cba7ab31fea66c13ff391d0cd81932
 SHA1 (patch-ar) = 05244267342a031e5470e4c2641ac359985c6334
-SHA1 (patch-as) = db6412aee518e989cca0d3b288513a718d6eee8c
-SHA1 (patch-at) = 02343059426fabe3ef50bfe7bc61bb6214b10a47
-SHA1 (patch-au) = f413e66cd0bf438c1fba83dc1632543a84507f8d
+SHA1 (patch-as) = c56bf78b4b72ff39eabc6011dce65c2e5650baa2
+SHA1 (patch-at) = 9ab6cef9e6122b2f2b4148be1610948f9764b387
+SHA1 (patch-au) = 62e0a709039fc73ea131a975fd4a4cbd9e5b134e
+SHA1 (patch-common_AppGlue.h) = 3ddf2f3cb842cd159407a232bc2122c2c89a5863
+SHA1 (patch-common_Persistent.h) = 4df5170a64a6d3135cb4bb5aad90b4f86f2ed1b9
+SHA1 (patch-common_UCvsConsole.cpp) = 2c5a6e9d8759b7d6160865f4ccddbe02dbe7a0ac
 SHA1 (patch-common_getline_c) = 038fb5200c692e4b4d82041008b762a2bec55be2
 SHA1 (patch-common_getline_h) = ea1153a559b349da6083de7cd913840802c8caa9
+SHA1 (patch-cvstree_CvsLog.h) = 4f6dae8bb52b0f6b0e226dac985bbc098177acb6
+SHA1 (patch-cvstree_main.cpp) = 0b45151fe355dc3b2fa50013389511c10ed30740
 SHA1 (patch-cvsunix_lib_getline_c) = 502b5967beb579bbbd5ebab7ee8824136e24f3fd
 SHA1 (patch-cvsunix_lib_getline_h) = c717385903f2f36e992213cbc8f010d683858d5a
diff --git a/devel/gcvs/patches/patch-as b/devel/gcvs/patches/patch-as
index 7e7cabf7cc1..20c900a7e53 100644
--- a/devel/gcvs/patches/patch-as
+++ b/devel/gcvs/patches/patch-as
@@ -1,11 +1,19 @@
-$NetBSD: patch-as,v 1.1 2008/08/17 04:01:37 dholland Exp $
+$NetBSD: patch-as,v 1.2 2011/11/25 21:42:44 joerg Exp $
 
 This may or may not work, but appears to be the best possible
 approach; the code is doing gross marshalling/closure stuff.
 
---- rf/uevent.cpp~	2001-09-19 01:13:09.000000000 -0400
-+++ rf/uevent.cpp	2008-08-16 23:50:15.000000000 -0400
-@@ -375,7 +375,7 @@ dispatch:
+--- rf/uevent.cpp.orig	2011-11-25 17:58:42.000000000 +0000
++++ rf/uevent.cpp
+@@ -34,6 +34,7 @@
+ #  include <time.h>
+ # endif
+ #endif
++#include <inttypes.h>
+ 
+ #include "umain.h"
+ #include "uconsole.h"
+@@ -375,7 +376,7 @@ dispatch:
  		(this->*mmf.pfnV_ii)(ULOWORD(arg1), UHIWORD(arg1));
  		break;
  	case epV_iii:
diff --git a/devel/gcvs/patches/patch-at b/devel/gcvs/patches/patch-at
index 609c36855e8..78e3c7182d7 100644
--- a/devel/gcvs/patches/patch-at
+++ b/devel/gcvs/patches/patch-at
@@ -1,8 +1,18 @@
-$NetBSD: patch-at,v 1.1 2008/08/17 04:01:37 dholland Exp $
+$NetBSD: patch-at,v 1.2 2011/11/25 21:42:44 joerg Exp $
 
---- rf/uwidget.cpp~	2003-01-14 13:07:42.000000000 -0500
-+++ rf/uwidget.cpp	2008-08-16 23:58:08.000000000 -0400
-@@ -231,23 +231,23 @@ extern "C"
+--- rf/uwidget.cpp.orig	2003-01-14 18:07:42.000000000 +0000
++++ rf/uwidget.cpp
+@@ -24,7 +24,9 @@
+ #include "config.h"
+ #endif
+ 
++#include <inttypes.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #include "uwidget.h"
+ #include "uconsole.h"
+@@ -231,23 +233,23 @@ extern "C"
  
  	static void gtkclicked(GtkButton *button, gpointer user_data)
  	{
@@ -32,7 +42,7 @@ $NetBSD: patch-at,v 1.1 2008/08/17 04:01:37 dholland Exp $
  		gchar *text;
  		gtk_clist_get_text(GTK_CLIST(clist), row, column, &text);
  		UEventSendMessage(widid, EV_LIST_SELECTING, UMAKEINT(cmdid, row), text);
-@@ -255,15 +255,15 @@ extern "C"
+@@ -255,15 +257,15 @@ extern "C"
  
  	static void gtkselectclistcolumn(GtkCList *clist, gint column, gpointer user_data)
  	{
@@ -52,7 +62,7 @@ $NetBSD: patch-at,v 1.1 2008/08/17 04:01:37 dholland Exp $
  		if (event->type == GDK_2BUTTON_PRESS)
  		{
  			UEventSendMessage(widid, EV_LIST_DBLCLICK, cmdid, 0L);
-@@ -274,8 +274,8 @@ extern "C"
+@@ -274,8 +276,8 @@ extern "C"
  
  	static void gtkcomboclicked(GtkWidget *widget, gpointer user_data)
  	{
@@ -63,7 +73,7 @@ $NetBSD: patch-at,v 1.1 2008/08/17 04:01:37 dholland Exp $
  
  		GtkList *list = GTK_LIST(widget->parent);
  		GList *selection = list->selection;
-@@ -320,8 +320,8 @@ extern "C"
+@@ -320,8 +322,8 @@ extern "C"
  
  	static void gtkmenuactivated(GtkWidget *widget, gpointer user_data)
  	{
@@ -74,7 +84,7 @@ $NetBSD: patch-at,v 1.1 2008/08/17 04:01:37 dholland Exp $
  
  		UStr selTxt;
  
-@@ -392,7 +392,7 @@ extern "C"
+@@ -392,7 +394,7 @@ extern "C"
  	static void dataForeach(GQuark key_id, gpointer data, gpointer user_data)
  	{
  		const char *str = g_quark_to_string(key_id);
@@ -83,7 +93,7 @@ $NetBSD: patch-at,v 1.1 2008/08/17 04:01:37 dholland Exp $
  		int cmd;
  		if(matchToken(str, cmd))
  		{
-@@ -514,32 +514,32 @@ extern "C"
+@@ -514,32 +516,32 @@ extern "C"
  
  	static void gtktreeexpand(GtkWidget *item, gpointer user_data)
  	{
@@ -124,7 +134,7 @@ $NetBSD: patch-at,v 1.1 2008/08/17 04:01:37 dholland Exp $
  		g_assert(GTK_IS_TREE_ITEM(item));
  		UEventSendMessage(widid, EV_TREE_SELECTING, UMAKEINT(cmdid, 1), item);
  	}
-@@ -661,8 +661,8 @@ extern "C"
+@@ -661,8 +663,8 @@ extern "C"
  				  gint             page_num,
  				  gpointer         data)
  	{
@@ -135,7 +145,7 @@ $NetBSD: patch-at,v 1.1 2008/08/17 04:01:37 dholland Exp $
  		
  		UEventSendMessage(widid, EV_PAGE_CHANGED, UMAKEINT(cmdid, page_num), 0L);
  	}
-@@ -682,8 +682,8 @@ extern "C"
+@@ -682,8 +684,8 @@ extern "C"
  
  	static gint gtkexposeevent(GtkWidget *widget, GdkEvent *event, gpointer user_data)
  	{
diff --git a/devel/gcvs/patches/patch-au b/devel/gcvs/patches/patch-au
index 7d2b05eeeef..eff13387016 100644
--- a/devel/gcvs/patches/patch-au
+++ b/devel/gcvs/patches/patch-au
@@ -1,6 +1,6 @@
-$NetBSD: patch-au,v 1.1 2010/02/01 00:24:37 joerg Exp $
+$NetBSD: patch-au,v 1.2 2011/11/25 21:42:44 joerg Exp $
 
---- cvsunix/Makefile.in.orig	2010-02-01 00:11:27.000000000 +0000
+--- cvsunix/Makefile.in.orig	2000-09-26 13:25:17.000000000 +0000
 +++ cvsunix/Makefile.in
 @@ -46,7 +46,7 @@ LDFLAGS = @LDFLAGS@
  MAKEINFO = makeinfo
diff --git a/devel/gcvs/patches/patch-common_AppGlue.h b/devel/gcvs/patches/patch-common_AppGlue.h
new file mode 100644
index 00000000000..e8c02a5da0c
--- /dev/null
+++ b/devel/gcvs/patches/patch-common_AppGlue.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-common_AppGlue.h,v 1.1 2011/11/25 21:42:44 joerg Exp $
+
+--- common/AppGlue.h.orig	2011-11-25 17:56:08.000000000 +0000
++++ common/AppGlue.h
+@@ -30,8 +30,8 @@
+ class CCvsConsole
+ {
+ public:
+-	virtual long cvs_out(char *txt, long len) = 0L;
+-	virtual long cvs_err(char *txt, long len) = 0L;
++	virtual long cvs_out(char *txt, long len) = 0;
++	virtual long cvs_err(char *txt, long len) = 0;
+ };
+ 
+ #define errInternal -99
diff --git a/devel/gcvs/patches/patch-common_Persistent.h b/devel/gcvs/patches/patch-common_Persistent.h
new file mode 100644
index 00000000000..d4b804e4354
--- /dev/null
+++ b/devel/gcvs/patches/patch-common_Persistent.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-common_Persistent.h,v 1.1 2011/11/25 21:42:44 joerg Exp $
+
+--- common/Persistent.h.orig	2011-11-25 17:55:49.000000000 +0000
++++ common/Persistent.h
+@@ -47,9 +47,9 @@ public:
+ 	CPersistent(const char *uniqueName, kClassPersistent pclass);
+ 	virtual ~CPersistent();
+ 
+-	virtual unsigned int SizeOf(void) const = 0L;
+-	virtual const void *GetData(void) const = 0L;
+-	virtual void SetData(const void *ptr, unsigned int size) = 0L;
++	virtual unsigned int SizeOf(void) const = 0;
++	virtual const void *GetData(void) const = 0;
++	virtual void SetData(const void *ptr, unsigned int size) = 0;
+ 		// virtual access
+ 	
+ 	static void SaveAll(void);
diff --git a/devel/gcvs/patches/patch-common_UCvsConsole.cpp b/devel/gcvs/patches/patch-common_UCvsConsole.cpp
new file mode 100644
index 00000000000..50985bb0cbd
--- /dev/null
+++ b/devel/gcvs/patches/patch-common_UCvsConsole.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-common_UCvsConsole.cpp,v 1.1 2011/11/25 21:42:44 joerg Exp $
+
+--- common/UCvsConsole.cpp.orig	2011-11-25 17:57:07.000000000 +0000
++++ common/UCvsConsole.cpp
+@@ -22,6 +22,7 @@
+  * 
+  */
+ 
++#include <cstdlib>
+ #include "stdafx.h"
+ 
+ #if qGTK
diff --git a/devel/gcvs/patches/patch-cvstree_CvsLog.h b/devel/gcvs/patches/patch-cvstree_CvsLog.h
new file mode 100644
index 00000000000..cf86aae99ce
--- /dev/null
+++ b/devel/gcvs/patches/patch-cvstree_CvsLog.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-cvstree_CvsLog.h,v 1.1 2011/11/25 21:42:44 joerg Exp $
+
+--- cvstree/CvsLog.h.orig	2011-11-25 17:57:38.000000000 +0000
++++ cvstree/CvsLog.h
+@@ -28,6 +28,7 @@
+ #include <vector>
+ #include <time.h>
+ #include <stdio.h>
++#include <cstring>
+ 
+ #if defined(_MSC_VER) && _MSC_VER < 0x514 // VC7
+ #	include <iostream.h>
diff --git a/devel/gcvs/patches/patch-cvstree_main.cpp b/devel/gcvs/patches/patch-cvstree_main.cpp
new file mode 100644
index 00000000000..cb9e1b31441
--- /dev/null
+++ b/devel/gcvs/patches/patch-cvstree_main.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-cvstree_main.cpp,v 1.1 2011/11/25 21:42:44 joerg Exp $
+
+--- cvstree/main.cpp.orig	2011-11-25 17:57:49.000000000 +0000
++++ cvstree/main.cpp
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include "getopt.h"
+ #include <errno.h>
++#include <cstdlib>
+ using namespace std;
+ 
+ #if defined(_MSC_VER) && _MSC_VER < 0x514 && __GNUC__<3  // VC7  and gcc 3