Fix build with gcc-4 using the patches suggested by Makoto Fujiwara in

PR pkg/32895.

3 files changed, 97 insertions, 1 deletions

diff --git a/print/ja-vflib-lib/distinfo b/print/ja-vflib-lib/distinfo
index c94ff7c0a25..f51cd95d3e3 100644
--- a/print/ja-vflib-lib/distinfo
+++ b/print/ja-vflib-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 12:51:43 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/02/24 21:01:23 minskim Exp $
 
 SHA1 (VFlib2-2.24.2.tar.gz) = 970ab8e18e50f10763af27ebcfee135bbfdbcda5
 RMD160 (VFlib2-2.24.2.tar.gz) = d27353348612316826200ca0bab4e397cea21478
@@ -10,3 +10,5 @@ SHA1 (patch-ad) = 329c265785f4e3134b67f37c1e1d1f7f6aa60337
 SHA1 (patch-ae) = 6b2512548bc122b915c15067791aeecfcb2ef8a6
 SHA1 (patch-af) = daae96f7c5218eb9fd22d297121a93f5bd266bed
 SHA1 (patch-ag) = 909528fb09ac340f4b26b9a76d098ce185fd74a1
+SHA1 (patch-ah) = 594a4916c1a0d2c0292e702a7e11ac11cd1bcbba
+SHA1 (patch-ai) = cc7043ee2b807bed57c6ef6649af80a53736e57a
diff --git a/print/ja-vflib-lib/patches/patch-ah b/print/ja-vflib-lib/patches/patch-ah
new file mode 100644
index 00000000000..018f49cb4b7
--- /dev/null
+++ b/print/ja-vflib-lib/patches/patch-ah
@@ -0,0 +1,47 @@
+$NetBSD: patch-ah,v 1.1 2006/02/24 21:01:23 minskim Exp $
+
+--- src/fman.c.orig	1998-06-10 03:54:17.000000000 -0700
++++ src/fman.c
+@@ -471,6 +471,8 @@ CacheCheck(port)
+ }
+ 
+ 
++Private void  ReturnCache();
++
+ /*
+  * CacheIt() --- cache it.  The cache slot is moved into
+  *   the head of the LRU list.
+@@ -480,7 +482,6 @@ CacheIt(port)
+      int port;
+ {
+   CACHE         *cptr;
+-  Private void  ReturnCache();
+ 
+   if ((cptr = RequireCache()) == (CACHE*)NULL){
+     fprintf(stderr, "VFlib: CacheIt() - error\n");
+@@ -534,6 +535,8 @@ ReturnCache(cptr)
+  ** LRU LIST  
+  **/
+ 
++Private int LRUPutTop2();
++
+ /* LRUMoveTop()  - moves a cache block into the top of LRU list.
+  *   THE CACHE *MUST* BE IN LRU LIST.
+  */
+@@ -542,7 +545,6 @@ LRUMoveTop(cptr)
+   CACHE  *cptr;
+ {
+   CACHE       *cptr_b, *cptr_f;
+-  Private int LRUPutTop2();
+ 
+   cptr_b         = cptr->l_back;
+   cptr_f         = cptr->l_forw;
+@@ -558,8 +560,6 @@ Private int  
+ LRUPutTop(cptr)
+   CACHE  *cptr;
+ {
+-  Private int LRUPutTop2();
+-
+   return LRUPutTop2(cptr, TRUE);
+ }
+   
diff --git a/print/ja-vflib-lib/patches/patch-ai b/print/ja-vflib-lib/patches/patch-ai
new file mode 100644
index 00000000000..25cec4e7660
--- /dev/null
+++ b/print/ja-vflib-lib/patches/patch-ai
@@ -0,0 +1,47 @@
+$NetBSD: patch-ai,v 1.1 2006/02/24 21:01:23 minskim Exp $
+
+--- src/VF_FNTWV.c.orig	1998-07-09 02:33:43.000000000 -0700
++++ src/VF_FNTWV.c
+@@ -176,6 +176,7 @@ Private int    read_word();
+ Private long   read_long();
+ 
+ 
++Private int  ReadCapa();
+ 
+ Public FontObj*
+ CreateFont_FontWave(ent)
+@@ -183,7 +184,6 @@ CreateFont_FontWave(ent)
+ {
+   Font     *font;
+   FontObj  *fobj;
+-  Private int  ReadCapa();
+ 
+   if ((font = (Font*) malloc(sizeof(Font))) == NULL){
+     printf("in CreateFont malloc() Error!\n");
+@@ -217,22 +217,22 @@ CreateFont_FontWave(ent)
+ }
+        
+ 
++Private int   FNTWVOpenFont();
++
+ Private int
+ OpenFont(obj)
+   FontObj *obj;
+ {
+-  Private int   FNTWVOpenFont();
+-
+   return FNTWVOpenFont((Font*) obj->Locals);
+ }
+ 
+ 
++Private int   FNTWVCloseFont();
++
+ Private int
+ CloseFont(obj)
+   FontObj  *obj;
+ {
+-  Private int   FNTWVCloseFont();
+-
+   return FNTWVCloseFont((Font*) obj->Locals);
+ }
+