Remove default arguments from a friend definition that is not a

declaration.

6 files changed, 47 insertions, 3 deletions

diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo
index 0f1c5e3f1f5..5379c62a61a 100644
--- a/x11/fltk/distinfo
+++ b/x11/fltk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2011/03/01 09:53:16 wiz Exp $
+$NetBSD: distinfo,v 1.24 2013/07/13 19:44:54 joerg Exp $
 
 SHA1 (fltk-1.1.10-source.tar.bz2) = 0d2b34fede91fa78eeaefb893dd70282f73908a8
 RMD160 (fltk-1.1.10-source.tar.bz2) = f8fc4371811efcc0d6fc73edd0525d8ff87a4faa
@@ -11,3 +11,4 @@ SHA1 (patch-ae) = de29d1be1219c3b17707216a7c54c25a9adb746c
 SHA1 (patch-af) = 791ba33cfc85e41e0f2b75ce0d1b0d6a378d9d0b
 SHA1 (patch-ag) = aaeb376acf79b695e8376e7610534d125dff6a86
 SHA1 (patch-ah) = 876f79b4d0523035307ecc7d76460cad44b40704
+SHA1 (patch-fluid_Fl__Type.h) = b2ea0bebf152ab0755135fbe8cc6179d2f6d79e1
diff --git a/x11/fltk/patches/patch-fluid_Fl__Type.h b/x11/fltk/patches/patch-fluid_Fl__Type.h
new file mode 100644
index 00000000000..8d7f90fac96
--- /dev/null
+++ b/x11/fltk/patches/patch-fluid_Fl__Type.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-fluid_Fl__Type.h,v 1.1 2013/07/13 19:44:54 joerg Exp $
+
+--- fluid/Fl_Type.h.orig	2008-01-04 21:45:49.000000000 +0000
++++ fluid/Fl_Type.h
+@@ -44,7 +44,7 @@ void set_modflag(int mf);
+ class Fl_Type {
+ 
+   friend class Widget_Browser;
+-  friend Fl_Widget *make_type_browser(int,int,int,int,const char *l=0);
++  friend Fl_Widget *make_type_browser(int,int,int,int,const char *l);
+   friend class Fl_Window_Type;
+   virtual void setlabel(const char *); // virtual part of label(char*)
+ 
diff --git a/x11/fltk13/distinfo b/x11/fltk13/distinfo
index c042d561e1c..7e6c5556529 100644
--- a/x11/fltk13/distinfo
+++ b/x11/fltk13/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2013/06/09 16:09:35 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2013/07/13 19:44:54 joerg Exp $
 
 SHA1 (fltk-1.3.2-source.tar.gz) = 25071d6bb81cc136a449825bfd574094b48f07fb
 RMD160 (fltk-1.3.2-source.tar.gz) = 5d697cb582cb80a1eca50c35696731eea5591768
@@ -11,4 +11,5 @@ SHA1 (patch-ad) = 01a25d7265784572fbd0c7d2c6f029d45333ad21
 SHA1 (patch-ae) = e043676f7e111e343bccd6e49f83d11a018fa431
 SHA1 (patch-af) = a4154e31fca9ecf125922a84ac39771bc71dcb0f
 SHA1 (patch-ag) = 87e890ac44b864c224855611942d58dd0ba4b2c9
+SHA1 (patch-fluid_Fl__Type.h) = b404853054a148781af8e8b92cba081154c09686
 SHA1 (patch-test_Makefile) = 708decc3be69a9a4db82ab6fe473cf3417c969f2
diff --git a/x11/fltk13/patches/patch-fluid_Fl__Type.h b/x11/fltk13/patches/patch-fluid_Fl__Type.h
new file mode 100644
index 00000000000..35ae26e0e23
--- /dev/null
+++ b/x11/fltk13/patches/patch-fluid_Fl__Type.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-fluid_Fl__Type.h,v 1.1 2013/07/13 19:44:54 joerg Exp $
+
+Friends may not declare default arguments with being a definition.
+
+--- fluid/Fl_Type.h.orig	2013-07-12 17:49:55.000000000 +0000
++++ fluid/Fl_Type.h
+@@ -36,7 +36,7 @@ void set_modflag(int mf);
+ class Fl_Type {
+ 
+   friend class Widget_Browser;
+-  friend Fl_Widget *make_type_browser(int,int,int,int,const char *l=0);
++  friend Fl_Widget *make_type_browser(int,int,int,int,const char *l);
+   friend class Fl_Window_Type;
+   virtual void setlabel(const char *); // virtual part of label(char*)
+ 
diff --git a/x11/fltk2/distinfo b/x11/fltk2/distinfo
index 6558be9a352..443cd6a8504 100644
--- a/x11/fltk2/distinfo
+++ b/x11/fltk2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2013/04/30 22:31:52 joerg Exp $
+$NetBSD: distinfo,v 1.8 2013/07/13 19:44:54 joerg Exp $
 
 SHA1 (fltk-2.0.x-r6129.tar.bz2) = fafb9e5309127e5dd3e127ecf83f410312a427b5
 RMD160 (fltk-2.0.x-r6129.tar.bz2) = a43d9603fdbf12fd0deefbad7e5ef5dd8f0a1c6f
@@ -11,3 +11,4 @@ SHA1 (patch-ae) = 8711184bfcbc2882d115e06cb9716c37349b04c3
 SHA1 (patch-af) = ff5648e8c6b935bccb77a8afe09d247f3313c76a
 SHA1 (patch-ag) = de60c4a5a2c9ad28e35eebe83a8f06fc298be748
 SHA1 (patch-ah) = 6e098dbcecb3bd307312d94842f5f80fabf2c75f
+SHA1 (patch-fluid_FluidType.h) = 9fe195316f12794c0fc1a38f47a48e1168437153
diff --git a/x11/fltk2/patches/patch-fluid_FluidType.h b/x11/fltk2/patches/patch-fluid_FluidType.h
new file mode 100644
index 00000000000..c73d1a8d8e8
--- /dev/null
+++ b/x11/fltk2/patches/patch-fluid_FluidType.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-fluid_FluidType.h,v 1.1 2013/07/13 19:44:54 joerg Exp $
+
+--- fluid/FluidType.h.orig	2013-07-13 18:18:38.000000000 +0000
++++ fluid/FluidType.h
+@@ -42,7 +42,7 @@
+ class FLUID_API FluidType {
+ 
+   friend class Widget_Browser;
+-  friend fltk::Widget *make_type_browser(int,int,int,int,const char *l=0);
++  friend fltk::Widget *make_type_browser(int,int,int,int,const char *l);
+   friend class WindowType;
+   virtual void setlabel(const char *); // virtual part of label(char*)
+