From 45da42e95e453ea36429f700dd37fe8c168ccb09 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Wed, 1 Oct 2003 11:19:18 +0000
Subject: [PATCH] fixed xjdic23 to build correclty and for random return value
 e.g. PowerPC

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1575 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE       |  4 ++
 .../xjdic23/no-random-return-value.patch      | 37 +++++++++++++++
 package/blindcoder/xjdic23/xjdic23.conf       | 45 +++++++++----------
 3 files changed, 62 insertions(+), 24 deletions(-)
 create mode 100644 package/blindcoder/xjdic23/no-random-return-value.patch

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index 4336619da..686e1feaa 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -1,4 +1,8 @@
 
+*) 2003-10-01 (2.0.0-rc1 - 2.0.0-rc2)
+
+ - fixed xjdic23 to build correclty and for random return value e.g. PowerPC
+
 *) 2003-09-30 (2.0.0-rc1 - 2.0.0-rc2)
 
  - Dimitar Zhekov: xfree86 xfs.init installation name fix
diff --git a/package/blindcoder/xjdic23/no-random-return-value.patch b/package/blindcoder/xjdic23/no-random-return-value.patch
new file mode 100644
index 000000000..75d92e838
--- /dev/null
+++ b/package/blindcoder/xjdic23/no-random-return-value.patch
@@ -0,0 +1,37 @@
+# --- 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 <rene@rocklinux.org>
+
+--- ./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 9d965098d..a7caa3716 100644
--- a/package/blindcoder/xjdic23/xjdic23.conf
+++ b/package/blindcoder/xjdic23/xjdic23.conf
@@ -20,45 +20,42 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
+if [ $prefix_auto = 1 ] ; then
+	prefix="opt/xjdic"
+	set_confopt
+fi
+
 xjdic_main() {
 	for x in edict kanjidic; do
-		bunzip2 -c $archdir/$(echo $desc_D | cut -d' ' -f2 | grep $x) \
-			> $x
+		bunzip2 -c $archdir/$(echo "$desc_D" | cut -d' ' -f2 | \
+		grep $x | sed 's/\.gz/.bz2/' ) > $x
 	done
-	make all
+	eval $MAKE all
 	./xjdxgen edict
 	./xjdxgen kanjidic
-	mkdir -p /opt/xjdic/bin
-	mv exjdxgen xjdic_cl xjdic_sa xjdserver xjdxgen edict edict.xjdx \
+
+	mv -v exjdxgen xjdic_cl xjdic_sa xjdserver xjdxgen edict edict.xjdx \
 		kanjidic kanjidic.xjdx gnu_licence \
-		kanjstroke radicals.tm vconj radkfile romkana.cnv /opt/xjdic
-	cat > /opt/xjdic/bin/xjdic << EOF
-cd /opt/xjdic/
+		kanjstroke radicals.tm vconj radkfile romkana.cnv $bindir/
+	cat > $bindir/xjdic << EOF
+cd $bindir
 ./xjdic_sa
 EOF
-	cat > /opt/xjdic/bin/xjdic_client << EOF
-cd /opt/xjdic/
+	cat > $bindir/xjdic_client << EOF
+cd $bindir
 ./xjdic_cl
 EOF
-	cat > /opt/xjdic/bin/xjdic_server << EOF
-cd /opt/xjdic/
+	cat > $bindir/xjdic_server << EOF
+cd $bindir
 ./xjdserver
 EOF
-	cat > /opt/xjdic/bin/xjdic_indexgen << EOF
-cd /opt/xjdic/
+	cat > $bindir/xjdic_indexgen << EOF
+cd $bindir
 ./xjdxgen
 EOF
-	chmod a+x /opt/xjdic/bin/*
-	rm -rf Makefile dotar23 exjdxgen.c exjdxgen.o gnu_licence \
-		makekanjstroke.c xjdclient.c xjdclient.o xjdcomm.c \
-		xjdcomm_cl.o xjdcomm_sa.o xjdcomm_sv.o xjdfrontend.c \
-		xjdfrontend_cl.o xjdfrontend_sa.o xjdic.1 \
-		xjdic.h xjdic22.WHATSNEW xjdic23.WHATSNEW xjdic23.inf \
-		xjdic23.install xjdic23.tbz2 xjdrad.c xjdsa.c \
-		xjdsa.o xjdservcomm.c xjdservcomm_sa.o xjdservcomm_sv.o \
-		xjdserver.c xjdserver.o xjdxgen xjdxgen.c xjdxgen.o
-																					     
+	chmod a+x $bindir/{xjdic,xjdic_client,xjdic_server,xjdic_indexgen}
 }
 
 custmain="xjdic_main"
 srcdir="."
+