svn commit: r459643 - in head/japanese/edict: . files

[Alexey Dokuchaev]

Author: danfe
Date: Mon Jan 22 11:49:15 2018
New Revision: 459643
URL: https://svnweb.freebsd.org/changeset/ports/459643

Log:
  Exit from main() function properly on success to fix weird installation
  problem observed on sparc64.

Modified:
  head/japanese/edict/Makefile
  head/japanese/edict/files/patch-exjdxgen.c
  head/japanese/edict/files/patch-xjdxgen.c

Modified: head/japanese/edict/Makefile
==============================================================================
--- head/japanese/edict/Makefile	Mon Jan 22 09:45:32 2018	(r459642)
+++ head/japanese/edict/Makefile	Mon Jan 22 11:49:15 2018	(r459643)
@@ -47,8 +47,6 @@ DOCSDIR=	${PREFIX}/share/doc/xjdic
 
 NO_WRKSUBDIR=	yes
 
-BROKEN_sparc64=	Fails on sparc64 during installation with error 2
-
 OPTIONS_DEFINE=	DOCS
 
 post-patch:

Modified: head/japanese/edict/files/patch-exjdxgen.c
==============================================================================
--- head/japanese/edict/files/patch-exjdxgen.c	Mon Jan 22 09:45:32 2018	(r459642)
+++ head/japanese/edict/files/patch-exjdxgen.c	Mon Jan 22 11:49:15 2018	(r459643)
@@ -1,5 +1,5 @@
---- exjdxgen.c.orig	1998-05-24 08:43:37.000000000 -0700
-+++ exjdxgen.c	2008-03-06 11:39:23.000000000 -0800
+--- exjdxgen.c.orig	1998-05-24 15:43:37 UTC
++++ exjdxgen.c
 @@ -22,7 +22,7 @@
  #include <sys/stat.h>
  
@@ -9,3 +9,11 @@
  #include <ctype.h>
  #include <string.h>
  #include "xjdic.h"
+@@ -229,6 +229,7 @@ unsigned char **argv;
+   jindex[0] = diclen+jiver;
+   fwrite(jindex,sizeof(long),indptr+2,fp);
+   fclose(fp);
++  return (0);
+ }
+ /*======function to sort jindex table====================*/
+ 

Modified: head/japanese/edict/files/patch-xjdxgen.c
==============================================================================
--- head/japanese/edict/files/patch-xjdxgen.c	Mon Jan 22 09:45:32 2018	(r459642)
+++ head/japanese/edict/files/patch-xjdxgen.c	Mon Jan 22 11:49:15 2018	(r459643)
@@ -1,5 +1,5 @@
---- xjdxgen.c.orig	1998-09-11 05:04:21.000000000 +0200
-+++ xjdxgen.c	2008-07-27 20:39:29.000000000 +0200
+--- xjdxgen.c.orig	1998-09-11 03:04:21 UTC
++++ xjdxgen.c
 @@ -23,7 +23,7 @@
  #include <sys/stat.h>
  
@@ -9,7 +9,7 @@
  #include <ctype.h>
  #include <string.h>
  #include "xjdic.h"
-@@ -154,7 +154,7 @@
+@@ -154,7 +154,7 @@ unsigned char **argv;
    db[diclen] = 10;
    db[0] = 10;
    printf("Dictionary size: %ld bytes.\n",dbyte);
@@ -18,3 +18,11 @@
    jindex = (unsigned long *)malloc(indlen);
    if(jindex == NULL)
    {
+@@ -273,6 +273,7 @@ unsigned char **argv;
+   jindex[0] = diclen+jiver;
+   fwrite(jindex,sizeof(long),indptr+1,fp);
+   fclose(fp);
++  return (0);
+ }
+ /*======function to sort jindex table====================*/
+ void jqsort(long lhs, long rhs)