diff --git a/package/blindcoder/xjdic23/errno.patch b/package/blindcoder/xjdic23/errno.patch index 22d47680f..320ddbd47 100644 --- a/package/blindcoder/xjdic23/errno.patch +++ b/package/blindcoder/xjdic23/errno.patch @@ -1,27 +1,28 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/blindcoder/xjdic23/errno.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./xjdclient.c.old 2003-03-30 20:04:13.000000000 +0100 -+++ ./xjdclient.c 2003-03-30 20:05:12.000000000 +0100 +diff -pruN tmp_orig/exjdxgen.c tmp/exjdxgen.c +--- tmp_orig/exjdxgen.c 1998-05-24 17:43:37.000000000 +0200 ++++ tmp/exjdxgen.c 2004-09-24 21:36:17.785523480 +0200 +@@ -25,6 +25,7 @@ + /*#include */ + #include + #include ++#include + #include "xjdic.h" + + #define TRUE 1 +diff -pruN tmp_orig/makekanjstroke.c tmp/makekanjstroke.c +--- tmp_orig/makekanjstroke.c 1996-01-20 06:38:30.000000000 +0100 ++++ tmp/makekanjstroke.c 2004-09-24 21:36:20.687082376 +0200 +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + + FILE *fi,*fo,*fopen(); + unsigned char instr[1000],*ptr; +diff -pruN tmp_orig/xjdclient.c tmp/xjdclient.c +--- tmp_orig/xjdclient.c 1998-08-31 12:56:56.000000000 +0200 ++++ tmp/xjdclient.c 2004-09-24 21:36:24.014576520 +0200 @@ -36,6 +36,7 @@ #include #include @@ -30,8 +31,20 @@ #include "xjdic.h" #define CVERBOSE 0 ---- ./xjdserver.c.old 2003-03-30 20:04:22.000000000 +0100 -+++ ./xjdserver.c 2003-03-30 20:05:31.000000000 +0100 +diff -pruN tmp_orig/xjdsa.c tmp/xjdsa.c +--- tmp_orig/xjdsa.c 1998-08-30 02:31:20.000000000 +0200 ++++ tmp/xjdsa.c 2004-09-24 21:36:36.367698560 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include "xjdic.h" + + unsigned char Dnamet[10][100],XJDXnamet[10][100]; +diff -pruN tmp_orig/xjdserver.c tmp/xjdserver.c +--- tmp_orig/xjdserver.c 2003-05-28 07:58:02.000000000 +0200 ++++ tmp/xjdserver.c 2004-09-24 21:36:43.778571936 +0200 @@ -28,6 +28,7 @@ #include #include @@ -40,3 +53,14 @@ #include "xjdic.h" #define SVERBOSE 0 +diff -pruN tmp_orig/xjdxgen.c tmp/xjdxgen.c +--- tmp_orig/xjdxgen.c 2003-05-28 07:58:29.000000000 +0200 ++++ tmp/xjdxgen.c 2004-09-24 21:36:46.786114720 +0200 +@@ -26,6 +26,7 @@ + /*#include */ + #include + #include ++#include + #include "xjdic.h" + + #define TRUE 1 diff --git a/package/blindcoder/xjdic23/no-random-return-value.patch b/package/blindcoder/xjdic23/no-random-return-value.patch deleted file mode 100644 index 75d92e838..000000000 --- a/package/blindcoder/xjdic23/no-random-return-value.patch +++ /dev/null @@ -1,37 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/blindcoder/xjdic23/no-random-return-value.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - - -The package failed on PowerPC since it returned a random value in main. - - - Rene Rebe - ---- ./xjdxgen.c.orig 2003-10-01 09:18:58.000000000 +0200 -+++ ./xjdxgen.c 2003-10-01 09:47:06.000000000 +0200 -@@ -273,6 +273,7 @@ - jindex[0] = diclen+jiver; - fwrite(jindex,sizeof(long),indptr+1,fp); - fclose(fp); -+ exit(0); - } - /*======function to sort jindex table====================*/ - void jqsort(long lhs, long rhs) diff --git a/package/blindcoder/xjdic23/xjdic23.conf b/package/blindcoder/xjdic23/xjdic23.conf index a7caa3716..5a494b510 100644 --- a/package/blindcoder/xjdic23/xjdic23.conf +++ b/package/blindcoder/xjdic23/xjdic23.conf @@ -26,10 +26,20 @@ if [ $prefix_auto = 1 ] ; then fi xjdic_main() { + cd ${builddir} + mkdir xjdic-src + cd xjdic-src + tar --use-compress-program=bzip2 -xf ${archdir}/xjdic24.tbz2 + srcdir=${builddir}/xjdic-src + for x in ${patchfiles} ; do + patch -p1 -i ${x} + done + for x in edict kanjidic; do bunzip2 -c $archdir/$(echo "$desc_D" | cut -d' ' -f2 | \ grep $x | sed 's/\.gz/.bz2/' ) > $x done + eval $MAKE all ./xjdxgen edict ./xjdxgen kanjidic @@ -57,5 +67,5 @@ EOF } custmain="xjdic_main" -srcdir="." +autoextract=0 diff --git a/package/blindcoder/xjdic23/xjdic23.desc b/package/blindcoder/xjdic23/xjdic23.desc index 213519906..94e3d76e6 100644 --- a/package/blindcoder/xjdic23/xjdic23.desc +++ b/package/blindcoder/xjdic23/xjdic23.desc @@ -30,12 +30,12 @@ [L] GPL [S] Stable -[V] 2.3 +[V] 2.4 [P] X -?---5---9 165.600 [C] extra/office -[D] 3438117969 xjdic23.tgz ftp://ftp.cc.monash.edu.au/pub/nihongo/ -[D] 318754664 edict-20030819.gz !ftp://ftp.cc.monash.edu.au/pub/nihongo/edict.gz -[D] 3104518404 kanjidic-20030901.gz !ftp://ftp.cc.monash.edu.au/pub/nihongo/kanjidic.gz +[D] 2861449735 xjdic24.tgz ftp://ftp.cc.monash.edu.au/pub/nihongo/ +[D] 3098415716 edict-20040814.gz !ftp://ftp.cc.monash.edu.au/pub/nihongo/edict.gz +[D] 3472617919 kanjidic-20040814.gz !ftp://ftp.cc.monash.edu.au/pub/nihongo/kanjidic.gz