From 0339195bbca17883e96a5a916928bf7e70e21b7c Mon Sep 17 00:00:00 2001 From: Jun-ichiro itojun Hagino Date: Fri, 13 Feb 1998 09:27:49 +0000 Subject: updated some patches. next time please explicitly say that you've added patches/patch-ab. that will save committer's time. PR: 5727 Submitted by: sanpei --- japanese/oleo/Makefile | 4 +-- japanese/oleo/files/patch-aa | 85 +++++++++++++++++++++++++++++++++----------- japanese/oleo/files/patch-ab | 11 ++++++ japanese/oleo/pkg-descr | 21 ++++++++--- 4 files changed, 93 insertions(+), 28 deletions(-) create mode 100644 japanese/oleo/files/patch-ab (limited to 'japanese') diff --git a/japanese/oleo/Makefile b/japanese/oleo/Makefile index f48a43d62549..17d23f902b08 100644 --- a/japanese/oleo/Makefile +++ b/japanese/oleo/Makefile @@ -3,7 +3,7 @@ # Date created: 2 March 1997 # Whom: Yoshiro MIHIRA # -# $Id: Makefile,v 1.3 1997/07/21 06:44:13 max Exp $ +# $Id: Makefile,v 1.4 1997/09/14 21:35:37 max Exp $ # DISTNAME= oleo-1.6 @@ -15,10 +15,10 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} oleo-doc.tar.gz PATCH_SITES= http://www.hh.iij4u.or.jp/%7Ehayasida/oleo/ PATCHFILES= oleo-1.6-1.6jb2.diff.gz +PATCH_DIST_STRIP= -p1 MAINTAINER= sanpei@yy.cs.keio.ac.jp -PATCH_DIST_STRIP= -p1 GNU_CONFIGURE=yes post-install: diff --git a/japanese/oleo/files/patch-aa b/japanese/oleo/files/patch-aa index 0756a41d567b..7897302ab25a 100644 --- a/japanese/oleo/files/patch-aa +++ b/japanese/oleo/files/patch-aa @@ -1,26 +1,69 @@ ---- io-utils.c.orig Wed Jun 11 19:48:27 1997 -+++ io-utils.c Wed Jun 11 19:55:10 1997 -@@ -85,12 +85,23 @@ - init_infinity () +--- io-term.c.org Thu Feb 12 16:59:47 1998 ++++ io-term.c Thu Feb 12 17:23:06 1998 +@@ -23,6 +23,10 @@ the Free Software Foundation, 675 Mass A + #else + #include #endif - { ++/* Related to fpsetmask */ +#ifdef __FreeBSD__ -+ /* Imprimentation of 'Divide by 0' on FreeBSD is difference -+ from NetBSD, Solaris, Linux. */ -+ (void)signal (SIGFPE, ignore_sig); -+ __plinf = 1./0.; -+ (void)signal (SIGFPE, ignore_sig); -+ __neinf = -1.0/0.; -+ (void)signal (SIGFPE, ignore_sig); -+ __nan = 0./0.; -+#else - (void)signal (SIGFPE, ignore_sig); - __plinf = divide (1., 0.); - (void)signal (SIGFPE, ignore_sig); - __neinf = divide (-1., 0.); - (void)signal (SIGFPE, ignore_sig); - __nan = __plinf + __neinf; ++#include +#endif - } + #include "global.h" +@@ -1011,6 +1015,36 @@ main (argc, argv) + volatile int init_fpc = 0; + int command_line_file = 0; /* was there one? */ + ++#ifdef EUC_JP ++ if ((getenv("DISPLAY") != NULL) && ++ ((getenv("LANG") == NULL) || (strcmp(getenv("LANG"), "C") == 0))) { ++ fprintf(stderr, "==============================================\n"); ++ fprintf(stderr, " ja-oleo enviroment problem report \n"); ++ fprintf(stderr, "==============================================\n"); ++ fprintf(stderr, " Sorry, ja-oleo has some locale and X problem.\n"); ++ fprintf(stderr, "\n"); ++ fprintf(stderr, " If you want to use as X client,\n"); ++ fprintf(stderr, " set enviroment variable LANG ja_JP.EUC\n"); ++ fprintf(stderr, " cf) under csh/tcsh\n"); ++ fprintf(stderr, " setenv LANG ja_JP.EUC\n"); ++ fprintf(stderr, " If you want under LANG=C or LANG is not set:\n"); ++ fprintf(stderr, " you can't execute X client program as:\n"); ++ fprintf(stderr, " unset enviroment variable DISPLAY\n"); ++ fprintf(stderr, " cf) under csh/tcsh\n"); ++ fprintf(stderr, " unsetenv DISPLAY\n"); ++ fprintf(stderr, "----------------------------------------------\n"); ++ fprintf(stderr, " If you have a fix or comments, you are welcome\n"); ++ fprintf(stderr, " to mail me \n"); ++ fprintf(stderr, "Thank you.\n"); ++ exit(1); ++ } ++#endif /* EUC_JP */ ++ ++ ++ /* oleo needs IEEE default behaviour under FreeBSD */ ++#ifdef __FreeBSD__ ++ fpsetmask(0); ++#endif + argv_name = argv[0]; + __make_backups = 1; + +@@ -1106,6 +1140,18 @@ main (argc, argv) + FD_ZERO (&exception_pending_fd_set); + + if( setlocale(LC_ALL,"") == NULL ) { ++#ifdef EUC_JP ++ if (strcmp(getenv("LANG"), "ja_JP.EUC") == 0) { ++ fprintf(stderr, "----------------------------------------------\n"); ++ fprintf(stderr, " If you run with ja_JP.EUC LOCALE, you need\n"); ++ fprintf(stderr, " LC_COLLATE and LC_TIME file in\n"); ++ fprintf(stderr, " /usr/share/locale/ja_JP.EUC directory.\n"); ++ fprintf(stderr, " cd /usr/share/locale/ja_JP.EUC\n"); ++ fprintf(stderr, " ln -s /usr/share/locale/lt_LN.ISO_8859-1/LC_COLLATE\n"); ++ fprintf(stderr, " ln -s /usr/share/locale/en_US.ISO_8859-1/LC_TIME\n"); ++ fprintf(stderr, "----------------------------------------------\n"); ++ } ++#endif /* EUC_JP */ + panic("Can not set locale."); + } + #ifdef HAVE_X11_X_H diff --git a/japanese/oleo/files/patch-ab b/japanese/oleo/files/patch-ab new file mode 100644 index 000000000000..591c8a9f22cc --- /dev/null +++ b/japanese/oleo/files/patch-ab @@ -0,0 +1,11 @@ +--- Makefile.in.org Sat Jan 17 23:11:44 1998 ++++ Makefile.in Sat Jan 17 23:12:55 1998 +@@ -28,7 +28,7 @@ + # Directory to install `oleo' in. + bindir = $(exec_prefix)/bin + +-CFLAGS = @CFLAGS@ -DEUC_JP #-DDISABLE_CURSOR #-DGHOSTSCRIPT ++CFLAGS = @CFLAGS@ -DEUC_JP -DGHOSTSCRIPT #-DDISABLE_CURSOR + BISONFLAGS = + optional_libs = @LIBS@ + extra_objs =@LIBOBJS@ @ALLOCA@ diff --git a/japanese/oleo/pkg-descr b/japanese/oleo/pkg-descr index 60176c9642b1..0c4de69c3a5b 100644 --- a/japanese/oleo/pkg-descr +++ b/japanese/oleo/pkg-descr @@ -13,12 +13,23 @@ setenv LANG C setenv DISPLAY localhost:0.0 - when start oleo, X11 is too heavy load to operate X clients. - - ---- please use under.... ----- - o set enviroment variable LANG ja_JP.EUC + when start oleo, X11 is too heavy to operate X clients. + + ---- So, please use under.... ----- + A) set enviroment variable LANG ja_JP.EUC and also + need /usr/share/locale/ja_JP.EUC/LC_TIME,LC_COLLATE + file. + If you use before 19971219-version of FreeBSD, + 1) get these file from current/releng SNAPSHOT + or + 2) create symbolic-links as below: + cd /usr/share/locale/ja_JP.EUC + ln -s /usr/share/locale/lt_LN.ISO_8859-1/LC_COLLATE + ln -s /usr/share/locale/en_US.ISO_8859-1/LC_TIME or - o non window client mode(unset DISPLAY variable) + B. non window client mode(unset DISPLAY variable) + + o Output PostScript file has some problems. * Tips Oleo default editing mode is like Emacs(Ctrl-h is call -- cgit v1.2.3