Make this build with gcc4.

Add definitions of friend functions to outside of class scope.

5 files changed, 57 insertions, 1 deletions

diff --git a/textproc/ja-groff/distinfo b/textproc/ja-groff/distinfo
index 6703b2d2d61..7440fed87ab 100644
--- a/textproc/ja-groff/distinfo
+++ b/textproc/ja-groff/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2006/03/21 17:30:00 yyamano Exp $
+$NetBSD: distinfo,v 1.4 2006/06/23 16:29:02 hira Exp $
 
 SHA1 (groff-1.10.tar.gz) = 032eeb221aff1a621019374646819e8741c11d39
 RMD160 (groff-1.10.tar.gz) = 3dafd992282ef8bf1b71d908acc45ede575b177f
@@ -22,3 +22,7 @@ SHA1 (patch-am) = 4d0a6a4e76691d2baa17e7a0784659668977a9a6
 SHA1 (patch-an) = 3af3af89d799d968d64cfa8ba89f6b549db17bdb
 SHA1 (patch-ao) = 0e209fb57d849ac670ad2a635b7b78114203e705
 SHA1 (patch-ap) = 54949929ca91fcfb090c2d570d754d347a1923fd
+SHA1 (patch-aq) = 6ba046f7ce8d7c9de57420558801b32768dd9792
+SHA1 (patch-ar) = cddbf3b845ae009e0786d23b777724b8e1ff9a87
+SHA1 (patch-as) = a55fbc854e23782211cd0924cffadb570c57652b
+SHA1 (patch-at) = b13bd824610c39e5e02df364933c334ed07af484
diff --git a/textproc/ja-groff/patches/patch-aq b/textproc/ja-groff/patches/patch-aq
new file mode 100644
index 00000000000..34d3d47f2e6
--- /dev/null
+++ b/textproc/ja-groff/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2006/06/23 16:29:02 hira Exp $
+
+--- troff/node.cc.orig	2006-06-16 16:58:35.000000000 +0900
++++ troff/node.cc	2006-06-16 16:58:59.000000000 +0900
+@@ -172,6 +172,8 @@
+   friend tfont *make_tfont(tfont_spec &);
+ };
+ 
++tfont *make_tfont(tfont_spec &);
++
+ inline int env_definite_font(environment *env)
+ {
+   return env->get_family()->make_definite(env->get_font());
diff --git a/textproc/ja-groff/patches/patch-ar b/textproc/ja-groff/patches/patch-ar
new file mode 100644
index 00000000000..027d233f28f
--- /dev/null
+++ b/textproc/ja-groff/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2006/06/23 16:29:02 hira Exp $
+
+--- troff/token.h.orig	2006-06-16 17:00:17.000000000 +0900
++++ troff/token.h	2006-06-16 17:00:32.000000000 +0900
+@@ -98,6 +98,8 @@
+   friend void process_input_stack();
+ };
+ 
++void process_input_stack();
++
+ extern token tok;		// the current token
+ 
+ extern symbol get_name(int required = 0);
diff --git a/textproc/ja-groff/patches/patch-as b/textproc/ja-groff/patches/patch-as
new file mode 100644
index 00000000000..0e639e9561a
--- /dev/null
+++ b/textproc/ja-groff/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2006/06/23 16:29:02 hira Exp $
+
+--- troff/div.h.orig	2006-06-16 17:01:30.000000000 +0900
++++ troff/div.h	2006-06-16 17:02:47.000000000 +0900
+@@ -48,6 +48,8 @@
+   virtual void copy_file(const char *filename) = 0;
+ };
+ 
++void end_diversions();
++
+ class macro;
+ 
+ class macro_diversion : public diversion {
diff --git a/textproc/ja-groff/patches/patch-at b/textproc/ja-groff/patches/patch-at
new file mode 100644
index 00000000000..bd314ae4c77
--- /dev/null
+++ b/textproc/ja-groff/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2006/06/23 16:29:02 hira Exp $
+
+--- troff/env.h.orig	2006-06-16 17:17:59.000000000 +0900
++++ troff/env.h	2006-06-16 17:18:17.000000000 +0900
+@@ -336,6 +336,8 @@
+   friend void stretch_threshold_request();
+ #endif
+ };
++
++void title();
+ 	
+ extern environment *curenv;
+ extern void pop_env();