Date: Thu, 18 Aug 2005 13:39:25 +0300 From: Vasil Dimov <vd@datamax.bg> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/85084: Update and Unbreak port: japanese/oleo Message-ID: <20050818103924.GA44937@sinanica.bg.datamax> Resent-Message-ID: <200508181040.j7IAeEOX089453@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85084 >Category: ports >Synopsis: Update and Unbreak port: japanese/oleo >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Aug 18 10:40:14 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Vasil Dimov >Release: FreeBSD 5.4-STABLE i386 >Organization: DataMax >Environment: >Description: Update oleo from 1.6 to 1.99.16 and force the new version to compile and install. >How-To-Repeat: >Fix: --- oleo.diff begins here --- diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/Makefile oleo/Makefile --- /usr/ports/japanese/oleo/Makefile Fri Jul 23 22:10:14 2004 +++ oleo/Makefile Thu Aug 18 12:46:37 2005 @@ -6,7 +6,7 @@ # PORTNAME= oleo -PORTVERSION= 1.6 +PORTVERSION= 1.99.16 CATEGORIES= japanese math MASTER_SITES= http://www.hh.iij4u.or.jp/~hayasida/oleo/ \ ${MASTER_SITE_GNU} @@ -14,31 +14,32 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}-doc.tar.gz -PATCH_SITES= http://www.hh.iij4u.or.jp/%7Ehayasida/oleo/ -PATCHFILES= ${DISTNAME}-${PORTVERSION}jb2.diff.gz -PATCH_DIST_STRIP= -p1 - MAINTAINER= ports@FreeBSD.org COMMENT= A Spreadsheet Program + Japanese patches # xmkmf is for configure script, not for USE_IMAKE. -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} \ + bison:${PORTSDIR}/devel/bison + +.if defined(WITH_MOTIF) +BUILD_DEPENDS+= ${LOCALBASE}/include/Xbae/Matrix.h:${PORTSDIR}/x11-toolkits/xbae +.else +CONFIGURE_ARGS+=--without-motif +.endif CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -GNU_CONFIGURE=yes +GNU_CONFIGURE= yes USE_XLIB= yes .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile" -.endif - post-install: .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/oleo/ja_JP.EUC - @${INSTALL_DATA} ${WRKDIR}/USING.eucJP ${PREFIX}/share/doc/oleo/ja_JP.EUC/ + @${MKDIR} ${DOCSDIR}/ja_JP.EUC + @${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/FAQ ${DOCSDIR} + @${INSTALL_DATA} ${WRKDIR}/USING.eucJP ${DOCSDIR}/ja_JP.EUC .endif .include <bsd.port.post.mk> diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/distinfo oleo/distinfo --- /usr/ports/japanese/oleo/distinfo Fri Jan 30 13:18:44 2004 +++ oleo/distinfo Wed Aug 17 16:50:11 2005 @@ -1,6 +1,4 @@ -MD5 (oleo-1.6.tar.gz) = 03e525717cd65e152fc1ffa0f2808448 -SIZE (oleo-1.6.tar.gz) = 437483 +MD5 (oleo-1.99.16.tar.gz) = d59801055b8ba6c6980ed1247a603f5f +SIZE (oleo-1.99.16.tar.gz) = 797945 MD5 (oleo-doc.tar.gz) = ac970895b334f50a0eb85eea6bec0331 SIZE (oleo-doc.tar.gz) = 23233 -MD5 (oleo-1.6-1.6jb2.diff.gz) = 2a32dc5e86961c40fa0c7fdbe339c1ad -SIZE (oleo-1.6-1.6jb2.diff.gz) = 85038 diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/files/patch-Makefile.in.diff oleo/files/patch-Makefile.in.diff --- /usr/ports/japanese/oleo/files/patch-Makefile.in.diff Thu Jan 1 02:00:00 1970 +++ oleo/files/patch-Makefile.in.diff Thu Aug 18 09:11:02 2005 @@ -0,0 +1,19 @@ +--- Makefile.in.orig Sat Mar 10 16:32:45 2001 ++++ Makefile.in Thu Aug 18 09:10:51 2005 +@@ -207,16 +207,6 @@ + + install-docDATA: $(doc_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(docdir) +- @list='$(doc_DATA)'; for p in $$list; do \ +- if test -f $(srcdir)/$$p; then \ +- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p"; \ +- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \ +- else if test -f $$p; then \ +- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \ +- $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \ +- fi; fi; \ +- done + + uninstall-docDATA: + @$(NORMAL_UNINSTALL) diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/files/patch-aa oleo/files/patch-aa --- /usr/ports/japanese/oleo/files/patch-aa Fri Feb 13 11:27:47 1998 +++ oleo/files/patch-aa Thu Jan 1 02:00:00 1970 @@ -1,69 +0,0 @@ ---- 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__ -+#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 -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/files/patch-ab oleo/files/patch-ab --- /usr/ports/japanese/oleo/files/patch-ab Fri Feb 13 11:27:48 1998 +++ oleo/files/patch-ab Thu Jan 1 02:00:00 1970 @@ -1,11 +0,0 @@ ---- 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 -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/files/patch-ac oleo/files/patch-ac --- /usr/ports/japanese/oleo/files/patch-ac Mon Dec 2 16:29:00 2002 +++ oleo/files/patch-ac Thu Jan 1 02:00:00 1970 @@ -1,12 +0,0 @@ ---- utils.c.org Mon Dec 2 23:28:08 2002 -+++ utils.c Mon Dec 2 23:28:26 2002 -@@ -68,7 +68,9 @@ - #endif - #endif /* _DEBUG_MALLOC_INC */ - -+#if __FreeBSD_version < 500038 - extern int sys_nerr; -+#endif - #if !(defined(BSD) && ((BSD)>=199306)) - extern char *sys_errlist[]; - #endif /* !(defined(BSD) && ((BSD)>=199306)) */ diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/files/patch-configure.diff oleo/files/patch-configure.diff --- /usr/ports/japanese/oleo/files/patch-configure.diff Thu Jan 1 02:00:00 1970 +++ oleo/files/patch-configure.diff Thu Aug 18 13:07:16 2005 @@ -0,0 +1,11 @@ +--- configure.orig Thu Aug 18 13:06:24 2005 ++++ configure Thu Aug 18 13:06:39 2005 +@@ -8472,7 +8472,7 @@ + s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g + s%@CATALOGS@%$CATALOGS%g + s%@CATOBJEXT@%$CATOBJEXT%g +-s%@DATADIRNAME@%$DATADIRNAME%g ++s%@DATADIRNAME@%share%g + s%@GMOFILES@%$GMOFILES%g + s%@INSTOBJEXT@%$INSTOBJEXT%g + s%@INTLDEPS@%$INTLDEPS%g diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/files/patch-src::cmd.c.diff oleo/files/patch-src::cmd.c.diff --- /usr/ports/japanese/oleo/files/patch-src::cmd.c.diff Thu Jan 1 02:00:00 1970 +++ oleo/files/patch-src::cmd.c.diff Wed Aug 17 17:58:58 2005 @@ -0,0 +1,11 @@ +--- src/cmd.c.orig Wed Aug 17 17:43:43 2005 ++++ src/cmd.c Wed Aug 17 17:44:07 2005 +@@ -31,7 +31,7 @@ + #include <stdarg.h> + #include "sysdef.h" + #include <termios.h> +-#include <malloc.h> ++#include <stdlib.h> + + #ifdef HAVE_MOTIF + #include "io-motif.h" diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/files/patch-src::eval.c.diff oleo/files/patch-src::eval.c.diff --- /usr/ports/japanese/oleo/files/patch-src::eval.c.diff Thu Jan 1 02:00:00 1970 +++ oleo/files/patch-src::eval.c.diff Wed Aug 17 17:58:58 2005 @@ -0,0 +1,38 @@ +--- src/eval.c.orig Wed Aug 17 17:26:29 2005 ++++ src/eval.c Wed Aug 17 17:27:12 2005 +@@ -78,7 +78,7 @@ + RETSIGTYPE math_sig (); + #endif + +-int fls (long); ++int flS_ (long); + #ifdef SMALLEVAL + int __to_flt (struct value *); + int __to_int (struct value *); +@@ -141,7 +141,7 @@ + + #define I_MOD(i1,i2) {itmp=(i1)%(i2);/* ... */;p->Int=itmp;} + +-#define I_MUL(i1,i2) { if(fls(i1)+fls(i2)>32) { \ ++#define I_MUL(i1,i2) { if(flS_(i1)+flS_(i2)>32) { \ + p->Float=(double)(i1)*(double)(i2); \ + p->type=TYP_FLT; \ + } else \ +@@ -565,7 +565,7 @@ + case CONST_NINF: + case CONST_NAN: + p->type = TYP_FLT; +- p->Float = (byte == CONST_INF) ? __plinf : ((byte == CONST_NINF) ? __neinf : __nan); ++ p->Float = (byte == CONST_INF) ? __plinf : ((byte == CONST_NINF) ? __neinf : __naN_); + break; + + case VAR: +@@ -1540,7 +1540,7 @@ + } + + int +-fls (num) ++flS_ (num) + long num; + { + int ret = 1; diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/files/patch-src::global.h.diff oleo/files/patch-src::global.h.diff --- /usr/ports/japanese/oleo/files/patch-src::global.h.diff Thu Jan 1 02:00:00 1970 +++ oleo/files/patch-src::global.h.diff Wed Aug 17 17:58:58 2005 @@ -0,0 +1,11 @@ +--- src/global.h.orig Wed Aug 17 17:25:42 2005 ++++ src/global.h Wed Aug 17 17:25:57 2005 +@@ -208,7 +208,7 @@ + extern char nname[]; + + extern VOIDSTAR parse_hash; +-extern double __plinf, __neinf, __nan; ++extern double __plinf, __neinf, __naN_; + + /* These have two uses. During parsing, these contain the + * base address of all relative references. During evaluation, diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/files/patch-src::io-utils.c.diff oleo/files/patch-src::io-utils.c.diff --- /usr/ports/japanese/oleo/files/patch-src::io-utils.c.diff Thu Jan 1 02:00:00 1970 +++ oleo/files/patch-src::io-utils.c.diff Wed Aug 17 17:58:58 2005 @@ -0,0 +1,20 @@ +--- src/io-utils.c.orig Wed Aug 17 17:29:39 2005 ++++ src/io-utils.c Wed Aug 17 17:29:55 2005 +@@ -71,7 +71,7 @@ + + double __plinf; + double __neinf; +-double __nan; ++double __naN_; + + char nname[] = "#NOT_A_NUMBER"; + char iname[] = "#INFINITY"; +@@ -125,7 +125,7 @@ + __neinf = divide (-1., 0.); + (void) signal (SIGFPE, ignore_sig); + #endif +- __nan = __plinf + __neinf; ++ __naN_ = __plinf + __neinf; + } + + diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/files/patch-src::io-x11.c.diff oleo/files/patch-src::io-x11.c.diff --- /usr/ports/japanese/oleo/files/patch-src::io-x11.c.diff Thu Jan 1 02:00:00 1970 +++ oleo/files/patch-src::io-x11.c.diff Wed Aug 17 17:58:58 2005 @@ -0,0 +1,11 @@ +--- src/io-x11.c.orig Wed Aug 17 17:42:04 2005 ++++ src/io-x11.c Wed Aug 17 17:43:17 2005 +@@ -34,7 +34,7 @@ + #include <stdio.h> + #include <ctype.h> + #include <sys/param.h> +-#define NeedFunctionPrototypes 0 ++#include <X11/Xfuncproto.h> + #include <X11/X.h> + #include <X11/Xlib.h> + #include <X11/Xutil.h> diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/files/patch-src::posixtm.y.diff oleo/files/patch-src::posixtm.y.diff --- /usr/ports/japanese/oleo/files/patch-src::posixtm.y.diff Thu Jan 1 02:00:00 1970 +++ oleo/files/patch-src::posixtm.y.diff Wed Aug 17 17:58:58 2005 @@ -0,0 +1,10 @@ +--- src/posixtm.y.orig Wed Aug 17 17:44:35 2005 ++++ src/posixtm.y Wed Aug 17 17:44:59 2005 +@@ -85,6 +85,7 @@ + YYABORT; + } + } ++; + + year : digitpair { + t.tm_year = $1; diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/files/patch-src::ref.c.diff oleo/files/patch-src::ref.c.diff --- /usr/ports/japanese/oleo/files/patch-src::ref.c.diff Thu Jan 1 02:00:00 1970 +++ oleo/files/patch-src::ref.c.diff Wed Aug 17 17:58:58 2005 @@ -0,0 +1,20 @@ +--- src/ref.c.orig Wed Aug 17 17:27:40 2005 ++++ src/ref.c Wed Aug 17 17:27:53 2005 +@@ -263,7 +263,7 @@ + read_new_value (CELLREF row, CELLREF col, char *form, char *val) + { + unsigned char *new_bytes; +- extern double __plinf, __neinf, __nan; ++ extern double __plinf, __neinf, __naN_; + + cur_row = row; + cur_col = col; +@@ -348,7 +348,7 @@ + else if (!stricmp (nname, val)) + { + SET_TYP (my_cell, TYP_FLT); +- my_cell->cell_flt = __nan; ++ my_cell->cell_flt = __naN_; + } + else + { diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/files/patch-src::utils.c.diff oleo/files/patch-src::utils.c.diff --- /usr/ports/japanese/oleo/files/patch-src::utils.c.diff Thu Jan 1 02:00:00 1970 +++ oleo/files/patch-src::utils.c.diff Wed Aug 17 17:58:58 2005 @@ -0,0 +1,11 @@ +--- src/utils.c.orig Wed Aug 17 17:28:16 2005 ++++ src/utils.c Wed Aug 17 17:29:19 2005 +@@ -66,7 +66,7 @@ + #define _IOSTRG 0 + #endif + +-extern int sys_nerr; ++extern const int sys_nerr; + + struct id + { diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/files/patch-src::xrdb.c.diff oleo/files/patch-src::xrdb.c.diff --- /usr/ports/japanese/oleo/files/patch-src::xrdb.c.diff Thu Jan 1 02:00:00 1970 +++ oleo/files/patch-src::xrdb.c.diff Wed Aug 17 17:58:58 2005 @@ -0,0 +1,11 @@ +--- src/xrdb.c.orig Wed Aug 17 17:46:06 2005 ++++ src/xrdb.c Wed Aug 17 17:46:41 2005 +@@ -57,7 +57,7 @@ + /* This should be included before the X include files; otherwise, we get + warnings about redefining NULL under BSD 4.3. */ + #include <sys/param.h> +-#define NeedFunctionPrototypes 0 ++#include <X11/Xfuncproto.h> + #include <X11/X.h> + #include <X11/Xlib.h> + #include <X11/Xutil.h> diff -urN --exclude=CVS --exclude=README.html /usr/ports/japanese/oleo/pkg-plist oleo/pkg-plist --- /usr/ports/japanese/oleo/pkg-plist Wed Aug 2 03:46:21 2000 +++ oleo/pkg-plist Thu Aug 18 09:28:50 2005 @@ -1,4 +1,35 @@ bin/oleo -share/doc/oleo/ja_JP.EUC/USING.eucJP -@dirrm share/doc/oleo/ja_JP.EUC -@dirrm share/doc/oleo +info/oleo.info +info/oleo.info-1 +info/oleo.info-2 +info/oleo.info-3 +info/oleo.info-4 +share/afm/Courier-Bold.afm +share/afm/Courier-BoldOblique.afm +share/afm/Courier-Oblique.afm +share/afm/Courier.afm +share/afm/Helvetica-Bold.afm +share/afm/Helvetica-BoldOblique.afm +share/afm/Helvetica-Oblique.afm +share/afm/Helvetica.afm +share/afm/Symbol.afm +share/afm/Times-Bold.afm +share/afm/Times-BoldItalic.afm +share/afm/Times-Italic.afm +share/afm/Times-Roman.afm +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/FAQ +%%PORTDOCS%%%%DOCSDIR%%/ja_JP.EUC/USING.eucJP +share/locale/en/LC_MESSAGES/oleo.mo +share/locale/fr/LC_MESSAGES/oleo.mo +share/locale/nl/LC_MESSAGES/oleo.mo +share/oleo/Oleo +share/oleo/fr/Oleo +share/oleo/nl/Oleo +share/oleo/oleo.html +%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja_JP.EUC +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm share/afm +@dirrm share/oleo/fr +@dirrm share/oleo/nl +@dirrm share/oleo --- oleo.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050818103924.GA44937>