From a2aace2ec4ed10097db357f9e8e5432a11c20bf1 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Fri, 2 Jan 2004 22:03:36 +0000
Subject: [PATCH] fix for gcc3. naddy@ says this still builds with 2.95.

---
 japanese/Wnn/Makefile                         |  5 +++--
 .../Wnn/patches/patch-config_Project_tmpl     | 20 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/japanese/Wnn/Makefile b/japanese/Wnn/Makefile
index 643be34e083..3ac33c94fa8 100644
--- a/japanese/Wnn/Makefile
+++ b/japanese/Wnn/Makefile
@@ -1,7 +1,7 @@
 # From FreeBSD:		Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
 #
 # $FreeBSD: Makefile,v 1.19 1997/09/23 02:17:58 max Exp $
-# $OpenBSD: Makefile,v 1.45 2003/06/23 19:11:10 sturm Exp $
+# $OpenBSD: Makefile,v 1.46 2004/01/02 22:03:36 espie Exp $
 
 COMMENT= 	"Japanese input method"
 COMMENT-dict=	"dictionaries for Japanese Wnn"
@@ -134,7 +134,8 @@ do-configure:
 
 
 # Xfree4 believes it can build html documentation, fat chance...
-MAKE_FLAGS=IMAKE='imake -DBuildHtmlManPages=0 -DPorts' WNNOWNER_INDIRECT=_wnn
+#MAKE_FLAGS=IMAKE='imake -DBuildHtmlManPages=0 -DPorts' WNNOWNER_INDIRECT=_wnn
+MAKE_FLAGS=IMAKE='imake -DPorts' WNNOWNER_INDIRECT=_wnn
 FAKE_FLAGS=DESTDIR=${WRKINST} WNNOWNER_INDIRECT=bin
 
 MAKE_ENV=IMAKEINCLUDE=-I${WRKSRC}/config
diff --git a/japanese/Wnn/patches/patch-config_Project_tmpl b/japanese/Wnn/patches/patch-config_Project_tmpl
index 9e67b80ccf6..2e1701a641c 100644
--- a/japanese/Wnn/patches/patch-config_Project_tmpl
+++ b/japanese/Wnn/patches/patch-config_Project_tmpl
@@ -1,6 +1,5 @@
-$OpenBSD: patch-config_Project_tmpl,v 1.6 2000/04/22 12:05:58 espie Exp $
---- config/Project.tmpl.orig	Mon Aug 29 10:40:17 1994
-+++ config/Project.tmpl	Fri Apr 21 18:04:48 2000
+--- config/Project.tmpl.orig	1994-08-29 10:40:17.000000000 +0200
++++ config/Project.tmpl	2004-01-02 20:21:26.000000000 +0100
 @@ -14,6 +14,20 @@ XCOMM $XConsortium: Project.tmpl,v 1.242
   *                                                                          *
   ***************************************************************************/
@@ -27,16 +26,23 @@ $OpenBSD: patch-config_Project_tmpl,v 1.6 2000/04/22 12:05:58 espie Exp $
  #define BuildXKB		NO
  #endif
 -#ifndef BuildXKBlib
-+# needed for correct link
++XCOMM needed for correct link
 +#undef  BuildXKBlib
  #define BuildXKBlib		NO	/* not yet a standard part of Xlib */
 -#endif
  #ifndef BuildFresco
  #if HasCplusplus && !HasGcc2ForCplusplus
  #define BuildFresco		YES
-@@ -1085,13 +1099,8 @@ clean::									@@\
- /* */# OMRON INPUT MATHOD MAKE ENV
- /* */#
+@@ -1081,17 +1095,12 @@ clean::									@@\
+ 	$(RM) index.troff index.pageno file.idx.nPS file.idx.PS
+ #endif
+ 
+-/* */#
+-/* */# OMRON INPUT MATHOD MAKE ENV
+-/* */#
++XCOMM 
++XCOMM  OMRON INPUT MATHOD MAKE ENV
++XCOMM 
  
 -#if defined(uniosu) || (defined(SVR4) && !defined(DGUX)) || defined(hpux)
  #define termLibrary -lcurses