Date: Thu, 12 Feb 1998 18:08:34 +0900 (JST) From: sanpei@yy.ics.keio.ac.jp To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/5727: Update port: ja-oleo (japanese/oleo) Message-ID: <199802120908.SAA22862@lavender.yy.cs.keio.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 5727
>Category: ports
>Synopsis: Update port: ja-oleo (japanese/oleo)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 12 01:20:01 PST 1998
>Last-Modified:
>Originator: MIHIRA Yoshiro
>Organization:
Keio UNIV.
>Release: FreeBSD 2.2.5-RELEASE i386
>Environment:
2.2.5-RELEASE
>Description:
I'm maintainer of ja-oleo. I update as below.
Fix two problems:
1) 1/1 problem is fixed by `fpsetmask' from math/oleo,
not by experimental-quick-hack code.
2) ja-oleo can't execute some enviroments variables,
check and trap these variables.
o check and trap illegal enviroment variables.
o add useful informations about japanese locale files.
Minner changes:
o add -DGHOSTSCRIPT option for print-out-JAPANESE-PS file.
(but experimental)
Yoshiro MIHIRA
>How-To-Repeat:
>Fix:
apply this patch to japanese/oleo
diff -uNr ja-oleo.orig/Makefile ja-oleo/Makefile
--- ja-oleo.orig/Makefile Mon Sep 15 06:35:37 1997
+++ ja-oleo/Makefile Mon Jan 19 23:42:38 1998
@@ -15,10 +15,10 @@
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 -uNr ja-oleo.orig/patches/patch-aa ja-oleo/patches/patch-aa
--- ja-oleo.orig/patches/patch-aa Mon Jul 21 02:32:30 1997
+++ ja-oleo/patches/patch-aa Thu Feb 12 17:26:52 1998
@@ -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 <locale.h>
#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 <floatingpoint.h>
+#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 <sanpei@yy.cs.keio.ac.jp>\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 -uNr ja-oleo.orig/patches/patch-ab ja-oleo/patches/patch-ab
--- ja-oleo.orig/patches/patch-ab Thu Jan 1 09:00:00 1970
+++ ja-oleo/patches/patch-ab Sat Jan 17 23:15:19 1998
@@ -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 -uNr ja-oleo.orig/pkg/DESCR ja-oleo/pkg/DESCR
--- ja-oleo.orig/pkg/DESCR Thu Sep 25 05:14:40 1997
+++ ja-oleo/pkg/DESCR Thu Feb 12 16:45:21 1998
@@ -13,12 +13,23 @@
setenv LANG C
setenv DISPLAY localhost:0.0
- when start oleo, X11 is too heavy load to operate X clients.
+ when start oleo, X11 is too heavy to operate X clients.
- ---- please use under.... -----
- o set enviroment variable LANG ja_JP.EUC
+ ---- 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
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199802120908.SAA22862>