From e2bc0d7216c13968b9cfcb79e34536da95aca245 Mon Sep 17 00:00:00 2001
From: Matthew Hunt <mph@FreeBSD.org>
Date: Wed, 7 Oct 1998 21:17:42 +0000
Subject: Eliminate warnings on systems not equipped for Japanese characters.
 The Japanese or multilingual functionality will be in japanese/xv and
 graphics/xv-m17n when those are committed.

PR:		8185
Submitted by:	Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
---
 graphics/xv/files/patch-ac | 13 +++++++++++--
 graphics/xv/files/patch-ad | 11 ++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'graphics/xv/files')

diff --git a/graphics/xv/files/patch-ac b/graphics/xv/files/patch-ac
index 8222f54f6a6b..e9764e62e719 100644
--- a/graphics/xv/files/patch-ac
+++ b/graphics/xv/files/patch-ac
@@ -51,6 +51,15 @@
  
  
  /***************************************************************************
+@@ -216,7 +216,7 @@
+  * 'undef' to 'define' in the following line.
+  */
+ 
+-#undef TV_L10N
++/* #undef TV_L10N */
+ 
+ #ifdef TV_L10N
+ /*
 @@ -259,7 +259,7 @@
   * magic number or suffix in "~/.xv_mgcsfx" .
   * To enable this feature, change 'undef' to 'define' in the following line.
@@ -77,12 +86,12 @@
  /* #    define MGCSFX_PREPROCESSOR "cc -E" */
  
  #  endif /* USE_MGCSFX_PREPROCESSOR */
-@@ -320,7 +320,7 @@
+@@ -325,7 +325,7 @@
   * 'undef' to 'define' in the following line.
   */
  
 -#undef TV_MULTILINGUAL
-+#define TV_MULTILINGUAL
++/* #undef TV_MULTILINGUAL */
  
  #define TV_DEFAULT_CODESET TV_EUC_JAPAN
  
diff --git a/graphics/xv/files/patch-ad b/graphics/xv/files/patch-ad
index 72fb0c1bf26b..72deb1629eb2 100644
--- a/graphics/xv/files/patch-ad
+++ b/graphics/xv/files/patch-ad
@@ -1,5 +1,5 @@
---- Imakefile.orig	Thu Aug 27 04:53:33 1998
-+++ Imakefile	Thu Aug 27 04:54:22 1998
+--- Imakefile.orig	Wed Oct  7 22:24:59 1998
++++ Imakefile	Wed Oct  7 22:27:00 1998
 @@ -6,13 +6,15 @@
  /* if, for whatever reason, you're unable to get the JPEG library to compile
   * on your machine, *COMMENT OUT* the following line
@@ -49,7 +49,7 @@
  #ifdef HavePDS
  PDS = -DDOPDS
  #endif
-@@ -149,8 +165,8 @@
+@@ -149,12 +165,12 @@
  #endif
  
  
@@ -60,6 +60,11 @@
  
  DEFINES= $(SCO) $(UNIX) $(NODIRENT) $(VPRINTF) $(TIMERS) \
  	$(HPUX7) $(JPEG) $(TIFF) $(PDS) $(DXWM) $(RAND) \
+-	$(BACKING_STORE) $(BSDTYPES) $(SGI) $(MGCSFX)
++	$(BACKING_STORE) $(BSDTYPES) $(SGI) $(MGCSFX) $(LOCALE_EXTENSION)
+ 
+ INCLUDES = $(JPEGINCLUDE) $(TIFFINCLUDE)
+ 
 @@ -254,10 +270,10 @@
  #endif
  
-- 
cgit v1.2.3