--- zhcon-0.2.6.orig/doc/Makefile.in
+++ zhcon-0.2.6/doc/Makefile.in
@@ -161,7 +161,7 @@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
-mandir = @mandir@
+mandir = $(DESTDIR)/@mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
--- zhcon-0.2.6.orig/src/Makefile.in
+++ zhcon-0.2.6/src/Makefile.in
@@ -197,7 +197,7 @@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
-libdir = @libdir@
+libdir = $(DESTDIR)/@libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
@@ -602,11 +602,11 @@
install-exec-local:
- chmod 4755 $(bindir)/zhcon
+ chmod 4755 $(DESTDIR)/$(bindir)/zhcon
install-data-local:
- $(mkinstalldirs) $(prefix)/etc
- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf
+ $(mkinstalldirs) $(DESTDIR)/etc
+ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)/etc/zhcon.conf
uninstall-local:
-rm -f $(prefix)/etc/zhcon.conf
--- zhcon-0.2.6.orig/src/winime.cpp
+++ zhcon-0.2.6/src/winime.cpp
@@ -250,7 +250,7 @@
if (p == (char *) 0xffffffff)
found = false;
- p = (unsigned int) p + mpText;
+ p += mpText - (char *)0;
} //2nd level index
else if (mNum == 1) {
int l = strlen(mHead.mCodeSet);
@@ -271,7 +271,7 @@
if (p == (char *) 0xffffffff)
found = false;
- p = (unsigned int) p + mpText;
+ p += mpText - (char *)0;
} else if (mNum < mHead.mMaxCodes) {
p = mpOffset[mNum - 1];
if (p == (char *) 0xffffffff)
--- zhcon-0.2.6.orig/src/zhcon.cpp
+++ zhcon-0.2.6/src/zhcon.cpp
@@ -123,7 +123,7 @@
string cfgfile = getenv("HOME");
cfgfile += "/.zhconrc";
if (access(cfgfile.c_str(), R_OK) != 0)
- cfgfile = PREFIX "/etc/zhcon.conf";
+ cfgfile = "/etc/zhcon.conf";
//for debug,a pause enable us to attach zhcon's pid in gdb
//char c;cin>>c;
--- zhcon-0.2.6.orig/src/zhcon.conf
+++ zhcon-0.2.6/src/zhcon.conf
@@ -2,7 +2,7 @@
#it can be named as ~/.zhconrc or /etc/zhcon.conf
#you can edit it manually
-#zhconpath = /usr/local/lib/zhcon/
+zhconpath = /usr/lib/zhcon/
#unicon(3.x) path
uniconpath = /usr/lib/unicon/
@@ -95,6 +95,7 @@
#table :=
#encode := gb2312 | gbk | big5
#type := native | unicon
+ime = 智能拼音,modules/cce/cce_pinyin.so,modules/cce/dict,gb2312,unicon
ime = 全拼,,input/winpy.mb,gb2312,native
ime = 五笔,,input/wb.mb,gb2312,native
ime = 双拼,,input/winsp.mb,gb2312,native
@@ -102,12 +103,11 @@
ime = 緀,,input/big5-cj.mb,big5,native
ime = 猔,,input/big5-phone.mb,big5,native
ime = 礚郊μ,,input/big5-liu5.mb,big5,native
-ime = 智能拼音,cce_pinyin.so,cce,gb2312,unicon
-ime = GBK拼音,TL_hzinput.so,gbk/gbkpy_mb.tab,gbk,unicon
-ime = 自然码,TL_hzinput.so,gb/zrm-2.tab,gb2312,unicon
-ime = 惧块な,TL_hzinput.so,big5/pinyin.tab,big5,unicon
-ime = 緀块,TL_hzinput.so,big5/cj.tab,big5,unicon
-ime = 虏块,TL_hzinput.so,big5/simplex.tab,big5,unicon
+ime = GBK拼音,modules/turbo/TL_hzinput.so,modules/turbo/dict/gbk/gbkpy_mb.tab,gbk,unicon
+ime = 自然码,modules/turbo/TL_hzinput.so,modules/turbo/dict/gb/zrm-2.tab,gb2312,unicon
+ime = 惧块な,modules/turbo/TL_hzinput.so,modules/turbo/dict/big5/pinyin.tab,big5,unicon
+ime = 緀块,modules/turbo/TL_hzinput.so,modules/turbo/dict/big5/cj.tab,big5,unicon
+ime = 虏块,modules/turbo/TL_hzinput.so,modules/turbo/dict/big5/simplex.tab,big5,unicon
ime = 全拼2,,input/py.mb,gb2312,native
ime = 双拼2,,input/py.mb,gb2312,native
ime = 大众,,input/dzm.mb,gb2312,native
--- zhcon-0.2.6.orig/font/Makefile.in
+++ zhcon-0.2.6/font/Makefile.in
@@ -155,7 +155,7 @@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
-libdir = @libdir@
+libdir = $(DESTDIR)/@libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
--- zhcon-0.2.6.orig/missfont.log
+++ zhcon-0.2.6/missfont.log
@@ -0,0 +1,98 @@
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1409
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1412
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1407
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1414
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1413
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1414
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1416
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1415
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1420
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1406
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1410
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1419
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1418
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1419
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1421
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1409
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1406
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1425
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1411
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1406
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1410
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1413
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1411
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1421
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1412
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1417
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1420
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1407
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1418
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1401
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1408
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1415
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1414
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1409
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1419
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1416
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1418
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1408
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1410
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1417
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1416
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1420
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1412
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1415
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1411
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+120/600 --dpi 720 gsfs1407
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+120/600 --dpi 720 gsfs1416
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+120/600 --dpi 720 gsfs1410
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+120/600 --dpi 720 gsfs1419
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1409
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1412
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1407
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1414
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1413
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1414
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1416
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1415
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1420
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1406
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1410
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1419
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1418
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1419
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1421
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1409
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1406
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1425
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1411
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1406
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1410
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1413
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1411
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1421
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1412
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1417
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1420
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1407
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1418
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1401
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1408
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1415
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1414
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1409
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1419
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+417/600 --dpi 417 gsfs1416
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1418
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1408
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1410
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1417
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1416
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1420
+mktexpk --mfmode ljfour --bdpi 600 --mag 0+500/600 --dpi 500 gsfs1412
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1415
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+0/600 --dpi 600 gsfs1411
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+120/600 --dpi 720 gsfs1407
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+120/600 --dpi 720 gsfs1416
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+120/600 --dpi 720 gsfs1410
+mktexpk --mfmode ljfour --bdpi 600 --mag 1+120/600 --dpi 720 gsfs1419
--- zhcon-0.2.6.orig/input/Makefile.in
+++ zhcon-0.2.6/input/Makefile.in
@@ -155,7 +155,7 @@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
-libdir = @libdir@
+libdir = $(DESTDIR)/@libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
--- zhcon-0.2.6.orig/config.guess
+++ zhcon-0.2.6/config.guess
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2001-08-21'
+timestamp='2003-01-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -24,8 +24,9 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Written by Per Bothner .
-# Please send patches to .
+# Originally written by Per Bothner .
+# Please send patches to . Submit a context
+# diff and a properly formatted ChangeLog entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
@@ -87,30 +88,41 @@
exit 1
fi
+trap 'exit 1' 1 2 15
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
-# CC_FOR_BUILD -- compiler used by this script.
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int dummy(){}" > $dummy.c ;
- for c in cc gcc c89 ; do
- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
- if test $? = 0 ; then
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,) echo "int x;" > $dummy.c ;
+ for c in cc gcc c89 c99 ; do
+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
- rm -f $dummy.c $dummy.o $dummy.rel ;
if test x"$CC_FOR_BUILD" = x ; then
CC_FOR_BUILD=no_compiler_found ;
fi
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac'
+esac ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 1994-08-24)
@@ -127,29 +139,30 @@
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
- # Netbsd (nbsd) targets should (where applicable) match one or
+ # NetBSD (nbsd) targets should (where applicable) match one or
# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
# compatibility and a consistent mechanism for selecting the
# object file format.
- # Determine the machine/vendor (is the vendor relevant).
- case "${UNAME_MACHINE}" in
- amiga) machine=m68k-unknown ;;
- arm32) machine=arm-unknown ;;
- atari*) machine=m68k-atari ;;
- sun3*) machine=m68k-sun ;;
- mac68k) machine=m68k-apple ;;
- macppc) machine=powerpc-apple ;;
- hp3[0-9][05]) machine=m68k-hp ;;
- ibmrt|romp-ibm) machine=romp-ibm ;;
- *) machine=${UNAME_MACHINE}-unknown ;;
+ #
+ # Note: NetBSD doesn't particularly care about the vendor
+ # portion of the name. We always set it to "unknown".
+ sysctl="sysctl -n hw.machine_arch"
+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ case "${UNAME_MACHINE_ARCH}" in
+ armeb) machine=armeb-unknown ;;
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future.
- case "${UNAME_MACHINE}" in
- i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+ case "${UNAME_MACHINE_ARCH}" in
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep __ELF__ >/dev/null
@@ -166,12 +179,65 @@
;;
esac
# The OS release
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ # Debian GNU/NetBSD machines have a different userland, and
+ # thus, need a distinct triplet. However, they do not need
+ # kernel version information, so it can be replaced with a
+ # suitable tag, in the style of linux-gnu.
+ case "${UNAME_VERSION}" in
+ Debian*)
+ release='-gnu'
+ ;;
+ *)
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ ;;
+ esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit 0 ;;
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ arc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ hp300:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mac68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ macppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvmeppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ pmax:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sgi:OpenBSD:*:*)
+ echo mipseb-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sun3:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ wgrisc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:MicroBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
+ exit 0 ;;
alpha:OSF1:*:*)
if test $UNAME_RELEASE = "V4.0"; then
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -180,6 +246,7 @@
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
+ eval $set_cc_for_build
cat <$dummy.s
.data
\$Lformat:
@@ -205,10 +272,9 @@
jsr \$26,exit
.end main
EOF
- eval $set_cc_for_build
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+ $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
if test "$?" = 0 ; then
- case `./$dummy` in
+ case `$dummy` in
0-0)
UNAME_MACHINE="alpha"
;;
@@ -230,9 +296,11 @@
2-1307)
UNAME_MACHINE="alphaev68"
;;
+ 3-1307)
+ UNAME_MACHINE="alphaev7"
+ ;;
esac
fi
- rm -f $dummy.s $dummy
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
Alpha\ *:Windows_NT*:*)
@@ -247,29 +315,11 @@
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
exit 0;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
exit 0 ;;
- arc64:OpenBSD:*:*)
- echo mips64el-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- hkmips:OpenBSD:*:*)
- echo mips-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mips-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ *:[Mm]orph[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-morphos
exit 0 ;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -291,6 +341,10 @@
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
exit 0 ;;
+ DRS?6000:UNIX_SV:4.2*:7*)
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7 && exit 0 ;;
+ esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;
@@ -319,7 +373,7 @@
echo m68k-sun-sunos${UNAME_RELEASE}
exit 0 ;;
sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
@@ -333,12 +387,6 @@
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
exit 0 ;;
- sparc*:NetBSD:*)
- echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
- exit 0 ;;
- atari*:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -365,18 +413,6 @@
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
exit 0 ;;
- sun3*:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
exit 0 ;;
@@ -393,6 +429,7 @@
echo clipper-intergraph-clix${UNAME_RELEASE}
exit 0 ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#ifdef __cplusplus
#include /* for printf() prototype */
@@ -414,16 +451,20 @@
exit (-1);
}
EOF
- eval $set_cc_for_build
- $CC_FOR_BUILD $dummy.c -o $dummy \
- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
+ $CC_FOR_BUILD -o $dummy $dummy.c \
+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+ && exit 0
echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
exit 0 ;;
+ Motorola:*:4.3:PL8-*)
+ echo powerpc-harris-powermax
+ exit 0 ;;
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ echo powerpc-harris-powermax
+ exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
exit 0 ;;
@@ -484,6 +525,7 @@
exit 0 ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include
@@ -495,9 +537,7 @@
exit(0);
}
EOF
- eval $set_cc_for_build
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
@@ -506,7 +546,7 @@
fi
exit 0 ;;
*:AIX:*:[45])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
@@ -546,10 +586,8 @@
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
- case "${HPUX_REV}" in
- 11.[0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -558,12 +596,13 @@
case "${sc_kernel_bits}" in
32) HP_ARCH="hppa2.0n" ;;
64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
esac ;;
esac
- fi ;;
- esac
- if [ "${HP_ARCH}" = "" ]; then
- sed 's/^ //' << EOF >$dummy.c
+ fi
+ if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
#define _HPUX_SOURCE
#include
@@ -596,12 +635,21 @@
exit (0);
}
EOF
- eval $set_cc_for_build
- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
- rm -f $dummy.c $dummy
- fi ;;
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
+ fi ;;
esac
+ if [ ${HP_ARCH} = "hppa2.0w" ]
+ then
+ # avoid double evaluation of $set_cc_for_build
+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ then
+ HP_ARCH="hppa2.0w"
+ else
+ HP_ARCH="hppa64"
+ fi
+ fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;;
ia64:HP-UX:*:*)
@@ -609,6 +657,7 @@
echo ia64-hp-hpux${HPUX_REV}
exit 0 ;;
3050*:HI-UX:*:*)
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include
int
@@ -634,9 +683,7 @@
exit (0);
}
EOF
- eval $set_cc_for_build
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
echo unknown-hitachi-hiuxwe2
exit 0 ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -664,9 +711,6 @@
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
exit 0 ;;
- hppa*:OpenBSD:*:*)
- echo hppa-unknown-openbsd
- exit 0 ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
exit 0 ;;
@@ -685,9 +729,6 @@
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
exit 0 ;;
- CRAY*X-MP:*:*:*)
- echo xmp-cray-unicos
- exit 0 ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
@@ -700,27 +741,21 @@
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
- CRAY*T3D:*:*:*)
- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
- CRAY-2:*:*:*)
- echo cray2-cray-unicos
- exit 0 ;;
+ *:UNICOS/mp:*:*)
+ echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
@@ -731,10 +766,18 @@
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
*:FreeBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
- *:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ # Determine whether the default compiler uses glibc.
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include
+ #if __GLIBC__ >= 2
+ LIBC=gnu
+ #else
+ LIBC=
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
exit 0 ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -745,11 +788,17 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit 0 ;;
+ x86:Interix*:3*)
+ echo i586-pc-interix3
+ exit 0 ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
- echo i386-pc-interix
+ echo i586-pc-interix
exit 0 ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
@@ -770,16 +819,48 @@
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
mips:Linux:*:*)
- case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
- big) echo mips-unknown-linux-gnu && exit 0 ;;
- little) echo mipsel-unknown-linux-gnu && exit 0 ;;
- esac
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips
+ #undef mipsel
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mipsel
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ ;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips64
+ #undef mips64el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mips64el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips64
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
@@ -828,7 +909,8 @@
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
# problems with other programs or directories called `ld' in the path.
- ld_supported_targets=`cd /; ld --help 2>&1 \
+ # Set LC_ALL=C to ensure ld outputs messages in English.
+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
| sed -ne '/supported targets:/!d
s/[ ][ ]*/ /g
s/.*supported targets: *//
@@ -840,7 +922,7 @@
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0 ;;
+ exit 0 ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
exit 0 ;;
@@ -851,33 +933,29 @@
exit 0 ;;
esac
# Determine whether the default compiler is a.out or elf
- cat >$dummy.c <
-#ifdef __cplusplus
-#include /* for printf() prototype */
- int main (int argc, char *argv[]) {
-#else
- int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-# if __GLIBC__ >= 2
- printf ("%s-pc-linux-gnu\n", argv[1]);
-# else
- printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-# endif
-# else
- printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-# endif
-#else
- printf ("%s-pc-linux-gnuaout\n", argv[1]);
-#endif
- return 0;
-}
-EOF
eval $set_cc_for_build
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
+ sed 's/^ //' << EOF >$dummy.c
+ #include
+ #ifdef __ELF__
+ # ifdef __GLIBC__
+ # if __GLIBC__ >= 2
+ LIBC=gnu
+ # else
+ LIBC=gnulibc1
+ # endif
+ # else
+ LIBC=gnulibc1
+ # endif
+ #else
+ #ifdef __INTEL_COMPILER
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
;;
i*86:DYNIX/ptx:4*:*)
@@ -894,6 +972,23 @@
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit 0 ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
+ exit 0 ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+ exit 0 ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ exit 0 ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -915,22 +1010,19 @@
UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then
- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586
- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
&& UNAME_MACHINE=i686
- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
exit 0 ;;
- i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -954,9 +1046,15 @@
# "miniframe"
echo m68010-convergent-sysv
exit 0 ;;
+ mc68k:UNIX:SYSTEM5:3.51m)
+ echo m68k-convergent-sysv
+ exit 0 ;;
+ M680?0:D-NIX:5.3:*)
+ echo m68k-diab-dnix
+ exit 0 ;;
M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -973,9 +1071,6 @@
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit 0 ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
@@ -1047,6 +1142,9 @@
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
exit 0 ;;
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
@@ -1054,18 +1152,24 @@
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
*:Darwin:*:*)
- echo `uname -p`-apple-darwin${UNAME_RELEASE}
+ case `uname -p` in
+ *86) UNAME_PROCESSOR=i686 ;;
+ powerpc) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
- if test "${UNAME_MACHINE}" = "x86pc"; then
+ UNAME_PROCESSOR=`uname -p`
+ if test "$UNAME_PROCESSOR" = "x86"; then
+ UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
- echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
exit 0 ;;
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
- NSR-[KW]:NONSTOP_KERNEL:*:*)
+ NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
*:NonStop-UX:*:*)
@@ -1088,11 +1192,6 @@
fi
echo ${UNAME_MACHINE}-unknown-plan9
exit 0 ;;
- i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
- # is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
exit 0 ;;
@@ -1111,14 +1210,12 @@
*:ITS:*:*)
echo pdp10-unknown-its
exit 0 ;;
- i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
- exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+eval $set_cc_for_build
cat >$dummy.c <
@@ -1233,9 +1330,7 @@
}
EOF
-eval $set_cc_for_build
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
# Apollos put the system type in the environment.
--- zhcon-0.2.6.orig/config.sub
+++ zhcon-0.2.6/config.sub
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2001-08-13'
+timestamp='2003-01-03'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Please send patches to .
+# Please send patches to . Submit a context
+# diff and a properly formatted ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -117,7 +118,7 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+ nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -226,31 +227,44 @@
1750a | 580 \
| a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
- | c4x | clipper \
- | d10v | d30v | dsp16xx \
- | fr30 \
+ | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+ | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
+ | ip2k \
| m32r | m68000 | m68k | m88k | mcore \
- | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
- | mips64vr4100 | mips64vr4100el | mips64vr4300 \
- | mips64vr4300el | mips64vr5000 | mips64vr5000el \
- | mipsbe | mipsel | mipsle | mipstx39 | mipstx39el \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+ | mips64vr | mips64vrel \
+ | mips64orion | mips64orionel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | msp430 \
| ns16k | ns32k \
- | openrisc \
+ | openrisc | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | s390 | s390x \
- | sh | sh[34] | sh[34]eb | shbe | shle \
- | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+ | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
| strongarm \
| tahoe | thumb | tic80 | tron \
- | v850 \
+ | v850 | v850e \
| we32k \
- | x86 | xscale \
+ | x86 | xscale | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -277,38 +291,53 @@
580-* \
| a29k-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alphapca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armv*-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* \
| bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c54x-* \
- | clipper-* | cray2-* | cydra-* \
- | d10v-* | d30v-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
+ | clipper-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | fx80-* \
+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* \
| m32r-* \
- | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | mcore-* \
- | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
- | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \
- | mipsle-* | mipstx39-* | mipstx39el-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+ | mips64vr-* | mips64vrel-* \
+ | mips64orion-* | mips64orionel-* \
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa64-* | mipsisa64el-* \
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipstx39-* | mipstx39el-* \
+ | msp430-* \
+ | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | s390-* | s390x-* \
- | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclite-* \
- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
- | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
- | v850-* | vax-* \
+ | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
+ | v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+ | xtensa-* \
| ymp-* \
| z8k-*)
;;
@@ -373,6 +402,10 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -393,16 +426,8 @@
basic_machine=c38-convex
os=-bsd
;;
- cray | ymp)
- basic_machine=ymp-cray
- os=-unicos
- ;;
- cray2)
- basic_machine=cray2-cray
- os=-unicos
- ;;
- [cjt]90)
- basic_machine=${basic_machine}-cray
+ cray | j90)
+ basic_machine=j90-cray
os=-unicos
;;
crds | unos)
@@ -417,6 +442,14 @@
decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
basic_machine=mips-dec
;;
+ decsystem10* | dec10*)
+ basic_machine=pdp10-dec
+ os=-tops10
+ ;;
+ decsystem20* | dec20*)
+ basic_machine=pdp10-dec
+ os=-tops20
+ ;;
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
basic_machine=m68k-motorola
@@ -597,14 +630,6 @@
basic_machine=m68k-atari
os=-mint
;;
- mipsel*-linux*)
- basic_machine=mipsel-unknown
- os=-linux-gnu
- ;;
- mips*-linux*)
- basic_machine=mips-unknown
- os=-linux-gnu
- ;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
@@ -619,6 +644,10 @@
basic_machine=m68k-rom68k
os=-coff
;;
+ morphos)
+ basic_machine=powerpc-unknown
+ os=-morphos
+ ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -691,6 +720,10 @@
np1)
basic_machine=np1-gould
;;
+ nv1)
+ basic_machine=nv1-cray
+ os=-unicosmp
+ ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -698,6 +731,10 @@
basic_machine=hppa1.1-oki
os=-proelf
;;
+ or32 | or32-*)
+ basic_machine=or32-unknown
+ os=-coff
+ ;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
@@ -720,19 +757,19 @@
pbb)
basic_machine=m68k-tti
;;
- pc532 | pc532-*)
+ pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
- pentium | p5 | k5 | k6 | nexgen)
+ pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
- pentiumpro | p6 | 6x86 | athlon)
+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
basic_machine=i686-pc
;;
pentiumii | pentium2)
basic_machine=i686-pc
;;
- pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
@@ -747,22 +784,22 @@
power) basic_machine=power-ibm
;;
ppc) basic_machine=powerpc-unknown
- ;;
+ ;;
ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
- ;;
+ ;;
ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64) basic_machine=powerpc64-unknown
- ;;
+ ;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
- ;;
+ ;;
ppc64le-* | powerpc64little-*)
basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
@@ -783,10 +820,22 @@
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
+ s390 | s390-*)
+ basic_machine=s390-ibm
+ ;;
+ s390x | s390x-*)
+ basic_machine=s390x-ibm
+ ;;
sa29200)
basic_machine=a29k-amd
os=-udi
;;
+ sb1)
+ basic_machine=mipsisa64sb1-unknown
+ ;;
+ sb1el)
+ basic_machine=mipsisa64sb1el-unknown
+ ;;
sequent)
basic_machine=i386-sequent
;;
@@ -794,7 +843,7 @@
basic_machine=sh-hitachi
os=-hms
;;
- sparclite-wrs)
+ sparclite-wrs | simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
;;
@@ -861,9 +910,17 @@
os=-dynix
;;
t3e)
- basic_machine=t3e-cray
+ basic_machine=alphaev5-cray
os=-unicos
;;
+ t90)
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
+ tic4x | c4x*)
+ basic_machine=tic4x-unknown
+ os=-coff
+ ;;
tic54x | c54x*)
basic_machine=tic54x-unknown
os=-coff
@@ -874,6 +931,10 @@
tx39el)
basic_machine=mipstx39el-unknown
;;
+ toad1)
+ basic_machine=pdp10-xkl
+ os=-tops20
+ ;;
tower | tower-32)
basic_machine=m68k-ncr
;;
@@ -898,8 +959,8 @@
os=-vms
;;
vpp*|vx|vx-*)
- basic_machine=f301-fujitsu
- ;;
+ basic_machine=f301-fujitsu
+ ;;
vxworks960)
basic_machine=i960-wrs
os=-vxworks
@@ -920,17 +981,13 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
- windows32)
- basic_machine=i386-pc
- os=-windows32-msvcrt
+ xps | xps100)
+ basic_machine=xps100-honeywell
;;
- xmp)
- basic_machine=xmp-cray
+ ymp)
+ basic_machine=ymp-cray
os=-unicos
;;
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
z8k-*-coff)
basic_machine=z8k-unknown
os=-sim
@@ -951,13 +1008,6 @@
op60c)
basic_machine=hppa1.1-oki
;;
- mips)
- if [ x$os = x-linux-gnu ]; then
- basic_machine=mips-unknown
- else
- basic_machine=mips-mips
- fi
- ;;
romp)
basic_machine=romp-ibm
;;
@@ -977,13 +1027,16 @@
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh3eb | sh4eb)
+ sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
basic_machine=sh-unknown
;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
sparc | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
- cydra)
+ cydra)
basic_machine=cydra-cydrome
;;
orion)
@@ -998,10 +1051,6 @@
pmac | pmac-mpw)
basic_machine=powerpc-apple
;;
- c4x*)
- basic_machine=c4x-none
- os=-coff
- ;;
*-unknown)
# Make sure to match an already-canonicalized machine name.
;;
@@ -1064,10 +1113,12 @@
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- | -os2* | -vos*)
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -microbsd*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1079,8 +1130,10 @@
;;
esac
;;
+ -nto-qnx*)
+ ;;
-nto*)
- os=-nto-qnx
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1119,14 +1172,20 @@
-acis*)
os=-aos
;;
+ -atheos*)
+ os=-atheos
+ ;;
-386bsd)
os=-bsd
;;
-ctix* | -uts*)
os=-sysv
;;
+ -nova*)
+ os=-rtmk-nova
+ ;;
-ns2 )
- os=-nextstep2
+ os=-nextstep2
;;
-nsk*)
os=-nsk
@@ -1165,8 +1224,8 @@
-xenix)
os=-xenix
;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ os=-mint
;;
-none)
;;
@@ -1199,10 +1258,11 @@
arm*-semi)
os=-aout
;;
+ # This must come before the *-dec entry.
pdp10-*)
os=-tops20
;;
- pdp11-*)
+ pdp11-*)
os=-none
;;
*-dec | vax-*)
@@ -1229,6 +1289,9 @@
mips*-*)
os=-elf
;;
+ or32-*)
+ os=-coff
+ ;;
*-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3
;;
@@ -1292,19 +1355,19 @@
*-next)
os=-nextstep3
;;
- *-gould)
+ *-gould)
os=-sysv
;;
- *-highlevel)
+ *-highlevel)
os=-bsd
;;
*-encore)
os=-bsd
;;
- *-sgi)
+ *-sgi)
os=-irix
;;
- *-siemens)
+ *-siemens)
os=-sysv4
;;
*-masscomp)
@@ -1376,7 +1439,7 @@
-ptx*)
vendor=sequent
;;
- -vxsim* | -vxworks*)
+ -vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
-aux*)
--- zhcon-0.2.6.orig/debian/po/templates.pot
+++ zhcon-0.2.6/debian/po/templates.pot
@@ -0,0 +1,39 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-08 23:08+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid "You MUST rebuild the kernel with framebuffer support"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"Please read README.Debian and README. zhcon needs a kernel supporting the "
+"framebuffer. You have to build it by yourself."
+msgstr ""
--- zhcon-0.2.6.orig/debian/po/ca.po
+++ zhcon-0.2.6/debian/po/ca.po
@@ -0,0 +1,32 @@
+# zhcon (debconf) translation to Catalan.
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# Aleix Badia i Bosch , 2004
+# Josep Lladonosa i Capell , 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zhcon_1_0.2.3-7_templates\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-08 23:08+0100\n"
+"PO-Revision-Date: 2004-03-05 19:46GMT\n"
+"Last-Translator: Aleix Badia i Bosch \n"
+"Language-Team: Catalan \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid "You MUST rebuild the kernel with framebuffer support"
+msgstr "Heu de tornar a muntar el nucli amb el suport de framebuffer."
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"Please read README.Debian and README. zhcon needs a kernel supporting the "
+"framebuffer. You have to build it by yourself."
+msgstr ""
+"Llegiu el fitxer README.Debian i el README. El zhcon necessita un nucli que "
+"suporti framebuffer i caldr脿 que el munteu vosaltres."
--- zhcon-0.2.6.orig/debian/po/da.po
+++ zhcon-0.2.6/debian/po/da.po
@@ -0,0 +1,29 @@
+# Danish translation of the po-template file for zhcon.
+# Morten Bo Johansen , 2004
+msgid ""
+msgstr ""
+"Project-Id-Version: zhcon_1:0.2.3-8_da.po\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-08 23:08+0100\n"
+"PO-Revision-Date: 2004-12-16 13:45+0100\n"
+"Last-Translator: Morten Bo Johansen \n"
+"Language-Team: Danish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid "You MUST rebuild the kernel with framebuffer support"
+msgstr "En ny kerne med underst鴗telse af framebuffer SKAL bygges."
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"Please read README.Debian and README. zhcon needs a kernel supporting the "
+"framebuffer. You have to build it by yourself."
+msgstr ""
+"L鎠 venlist README.Debian og README: zhcon kr鎣er at kernen underst鴗ter "
+"framebuffer, og du m selv s鴕ge for dette."
--- zhcon-0.2.6.orig/debian/po/de.po
+++ zhcon-0.2.6/debian/po/de.po
@@ -0,0 +1,41 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-08 23:08+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Sebastian Feltel \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid "You MUST rebuild the kernel with framebuffer support"
+msgstr ""
+"Sie M躍SEN einen neuen Kernel mit Framebuffer-Unterst黷zung kompilieren."
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"Please read README.Debian and README. zhcon needs a kernel supporting the "
+"framebuffer. You have to build it by yourself."
+msgstr ""
+"Bitte lesen Sie die Dateien README.Debian und README. Zhcon ben鰐igt einen "
+"Kernel mit Framebuffer-Unterst黷zung, den Sie selber erstellen m黶sen."
--- zhcon-0.2.6.orig/debian/po/cs.po
+++ zhcon-0.2.6/debian/po/cs.po
@@ -0,0 +1,40 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zhcon\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-08 23:08+0100\n"
+"PO-Revision-Date: 2004-12-28 18:35+0100\n"
+"Last-Translator: Miroslav Kure \n"
+"Language-Team: Czech \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid "You MUST rebuild the kernel with framebuffer support"
+msgstr "MUS蚑E sestavit j醖ro s podporou framebufferu."
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"Please read README.Debian and README. zhcon needs a kernel supporting the "
+"framebuffer. You have to build it by yourself."
+msgstr ""
+"P鴈鑤靦e si README a README.Debian. zhcon vy綼duje j醖ro s podporou "
+"framebufferu, co znamen 緀 si j醖ro mus韙e sestavit sami."
--- zhcon-0.2.6.orig/debian/po/es.po
+++ zhcon-0.2.6/debian/po/es.po
@@ -0,0 +1,41 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-08 23:08+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Carlos Valdivia Yag黣 \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid "You MUST rebuild the kernel with framebuffer support"
+msgstr "Debe recompilar el n鷆leo con soporte de framebuffer."
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"Please read README.Debian and README. zhcon needs a kernel supporting the "
+"framebuffer. You have to build it by yourself."
+msgstr ""
+"Por favor, lea los ficheros README.Debian y README. zhcon necesita que el "
+"n鷆leo incluya soporte de framebuffer, por lo que tendr?que recompilarlo."
--- zhcon-0.2.6.orig/debian/po/fr.po
+++ zhcon-0.2.6/debian/po/fr.po
@@ -0,0 +1,52 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zhcon_0.2.6-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-08 23:08+0100\n"
+"PO-Revision-Date: 2006-07-09 22:19+0200\n"
+"Last-Translator: Michel Grentzinger \n"
+"Language-Team: French \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid "You MUST rebuild the kernel with framebuffer support"
+msgstr ""
+"Vous DEVEZ recompiler votre noyau avec la gestion du tampon vid閛 "
+"(珷framebuffer牷)."
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"Please read README.Debian and README. zhcon needs a kernel supporting the "
+"framebuffer. You have to build it by yourself."
+msgstr ""
+"Veuillez consulter les fichiers README.Debian et README. Zhcon a besoin d'un "
+"noyau g閞ant le tampon vid閛 (珷framebuffer牷) et c'est vous de le "
+"compiler."
+
+#~ msgid "You MUST rebuild kernel with framebuffer support."
+#~ msgstr "Noyau compil sans la gestion du tampon vid閛 (珷framebuffer牷)"
+
+#~ msgid ""
+#~ "Please read README.Debian and README. zhcon need a kernel supporting "
+#~ "framebuffer, you have to build it by yourself."
+#~ msgstr ""
+#~ "Veuillez consulter les fichiers README.Debian et README. Zhcon a besoin "
+#~ "d'un noyau g閞ant le tampon vid閛 (珷framebuffer牷) et c'est vous de le "
+#~ "compiler."
--- zhcon-0.2.6.orig/debian/po/ja.po
+++ zhcon-0.2.6/debian/po/ja.po
@@ -0,0 +1,44 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zhcon 1:0.2.3-7\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-08 23:08+0100\n"
+"PO-Revision-Date: 2004-07-05 7:30+0900\n"
+"Last-Translator: Hideki Yamane \n"
+"Language-Team: Japanese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid "You MUST rebuild the kernel with framebuffer support"
+msgstr ""
+"カ〖ネルを、フレ〖ムバッファのサポ〖トを铜跟にして浩菇蜜≈しなければなりませ"
+"ん∽。"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"Please read README.Debian and README. zhcon needs a kernel supporting the "
+"framebuffer. You have to build it by yourself."
+msgstr ""
+"README.Debian と README を徊救してください。zhcon は、カ〖ネルがフレ〖ムバッ"
+"ファをサポ〖トしている涩妥があるので、极尸で カ〖ネルをビルドする涩妥がありま"
+"す。"
--- zhcon-0.2.6.orig/debian/po/pt.po
+++ zhcon-0.2.6/debian/po/pt.po
@@ -0,0 +1,33 @@
+# Portuguese translation of zhcon
+# This file is distributed under the same license as the zhcon package
+# Ricardo Silva , 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zhcon 1:0.2.6-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-06 05:04-0600\n"
+"PO-Revision-Date: 2006-08-02 15:34+0100\n"
+"Last-Translator: Ricardo Silva \n"
+"Language-Team: Native Portuguese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. Type: note
+#. Description
+#: ../templates:1001
+msgid "You MUST rebuild kernel with framebuffer support."
+msgstr "DEVE reconstruir o kernel com suporte para framebuffer."
+
+#. Type: note
+#. Description
+#: ../templates:1002
+msgid ""
+"Please read README.Debian and README. zhcon need a kernel supporting "
+"framebuffer, you have to build it by yourself."
+msgstr ""
+"Por favor leia README.Debian e README. O zhcon necessita de um kernel que "
+"suporte framebuffer, Ter谩 que o contruir por si mesmo."
+
+
--- zhcon-0.2.6.orig/debian/po/ru.po
+++ zhcon-0.2.6/debian/po/ru.po
@@ -0,0 +1,40 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-08 23:08+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: ilgiz@bashtelecom.ru (Ilgiz Kalmetev)\n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=KOI8-R\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid "You MUST rebuild the kernel with framebuffer support"
+msgstr "髻 滹祧铢 信遗釉蚁稍 涯蚁 邢哪乓炙鲜 framebuffer."
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"Please read README.Debian and README. zhcon needs a kernel supporting the "
+"framebuffer. You have to build it by yourself."
+msgstr ""
+"鹣至陶视粤, 幸限陨耘 README.Debian README. zhcon 闻下认纳土 涯乓瘟 "
+"邢哪乓炙 framebuffer, 踪 南讨钨 子砸仙载 排 恿蜕."
--- zhcon-0.2.6.orig/debian/po/sv.po
+++ zhcon-0.2.6/debian/po/sv.po
@@ -0,0 +1,39 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zhcon 1:0.2.3-8.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-08 23:08+0100\n"
+"PO-Revision-Date: 2005-09-28 23:39-0700\n"
+"Last-Translator: Daniel Nylander \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid "You MUST rebuild the kernel with framebuffer support"
+msgstr "Du M臩TE bygga om kerneln med framebuffer-st鰀."
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"Please read README.Debian and README. zhcon needs a kernel supporting the "
+"framebuffer. You have to build it by yourself."
+msgstr ""
+"V鋘ligen l鋝 README.Debian och README. zhcon beh鰒er en kernel med st鰀 f鰎 "
+"framebuffer, den m錽te du bygga sj鋖v."
--- zhcon-0.2.6.orig/debian/po/vi.po
+++ zhcon-0.2.6/debian/po/vi.po
@@ -0,0 +1,33 @@
+# Vietnamese translation for zhcon.
+# Copyright 漏 2005 Free Software Foundation, Inc.
+# Clytie Siddall , 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zhcon 1/0.2.3-8.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-08 23:08+0100\n"
+"PO-Revision-Date: 2005-08-21 22:00+0930\n"
+"Last-Translator: Clytie Siddall \n"
+"Language-Team: Vietnamese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: LocFactoryEditor 1.2.2\n"
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid "You MUST rebuild the kernel with framebuffer support"
+msgstr "B岷 鈥 ph岷 鈥 x芒y d峄g l岷 h岷 nh芒n v峄沬 s峄 h峄 tr峄 b峄 膽峄噈 khung."
+
+#. Type: note
+#. Description
+#: ../templates:3
+msgid ""
+"Please read README.Debian and README. zhcon needs a kernel supporting the "
+"framebuffer. You have to build it by yourself."
+msgstr ""
+"B岷 h茫y 膽峄峜 hai t岷璸 tin 膼峄峜 膼i v脿 . Tr矛nh zhcon c岷 "
+"m峄檛 b峄 膽峄噈 khung c贸 h峄 tr峄 h岷 nh膬n: b岷 c岷 ph岷 t峄 x膬y d峄g n贸."
--- zhcon-0.2.6.orig/debian/po/POTFILES.in
+++ zhcon-0.2.6/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
--- zhcon-0.2.6.orig/debian/control
+++ zhcon-0.2.6/debian/control
@@ -2,12 +2,12 @@
Section: utils
Priority: optional
Maintainer: Yu Guanghui
-Build-Depends: debhelper (>= 4.1.16), libggi2-dev, unicon-im (>=3.0.4-9), libpth-dev, libncurses5-dev
-Standards-Version: 3.5.8
+Build-Depends: debhelper (>= 4.1.16), libggi2-dev (>= 1:2.2.1-4), unicon-imc2, libpth-dev, libncurses5-dev
+Standards-Version: 3.7.2
Package: zhcon
Architecture: any
-Depends: ${shlibs:Depends}, debconf, libpth2
+Depends: ${shlibs:Depends}, debconf, libpth20
Conflicts: unicon-im (<< 3.0.4-9)
Description: A Fast Console CJK System Using FrameBuffer
Zhcon is a fast Linux Console Chinese System which supports framebuffer
--- zhcon-0.2.6.orig/debian/patch/zhcon-patch2
+++ zhcon-0.2.6/debian/patch/zhcon-patch2
@@ -0,0 +1,120 @@
+diff -u --recursive zhcon-0.2.3.orig/src/display/fblinear16.cpp zhcon-0.2.3/src/display/fblinear16.cpp
+--- zhcon-0.2.3.orig/src/display/fblinear16.cpp 2002-05-11 20:58:28.000000000 -0700
++++ zhcon-0.2.3/src/display/fblinear16.cpp 2004-01-14 09:24:23.000000000 -0800
+@@ -18,11 +18,16 @@
+ ***************************************************************************/
+
+ #include
++#include
+ #include "global.h"
+ #include "fblinear16.h"
+
+ __u32 FBLinear16::tab_cfb16[] = {
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 0x00000000, 0xffff0000, 0x0000ffff, 0xffffffff
++#else
++0x00000000, 0x0000ffff, 0xffff0000, 0xffffffff
++#endif
+ };
+
+ FBLinear16::FBLinear16() {
+diff -u --recursive zhcon-0.2.3.orig/src/display/fblinear24.cpp zhcon-0.2.3/src/display/fblinear24.cpp
+--- zhcon-0.2.3.orig/src/display/fblinear24.cpp 2002-05-11 20:58:28.000000000 -0700
++++ zhcon-0.2.3/src/display/fblinear24.cpp 2004-01-14 09:27:14.000000000 -0800
+@@ -18,6 +18,7 @@
+ ***************************************************************************/
+
+ #include
++#include
+ #include "global.h"
+ #include "debug.h"
+ #include "fblinear24.h"
+@@ -35,18 +36,29 @@
+ green = green16[i];
+ blue = blue16[i];
+
+- cfb24[i] = ((red & 0xff00) << 8) |
+- (green & 0xff00) |
+- (blue >> 8);
++ ((__u8 *)&(cfb24[i]))[3] = 0;
++ ((__u8 *)&(cfb24[i]))[2] = red >> 8;
++ ((__u8 *)&(cfb24[i]))[1] = green >> 8;
++ ((__u8 *)&(cfb24[i]))[0] = blue >> 8;
+ }
+ }
+
++#if BYTE_ORDER == LITTLE_ENDIAN
+ #define convert4to3(in1, in2, in3, in4, out1, out2, out3) \
+ do { \
+ out1 = in1 | (in2<<24); \
+ out2 = (in2>> 8) | (in3<<16); \
+ out3 = (in3>>16) | (in4<< 8); \
+ } while (0);
++#else
++#define convert4to3(in1, in2, in3, in4, out1, out2, out3) \
++ do { \
++ out1 = in1 | (in2>>24); \
++ out2 = (in2<< 8) | (in3>>16); \
++ out3 = (in3<<16) | (in4>> 8); \
++ } while (0);
++#endif
++
+ inline void FBLinear24::store4pixels(__u32 d1, __u32 d2, __u32 d3, __u32 d4, __u32 *dest) {
+ __u32 o1, o2, o3;
+ convert4to3(d1, d2, d3, d4, o1, o2, o3);
+diff -u --recursive zhcon-0.2.3.orig/src/display/fblinear4.cpp zhcon-0.2.3/src/display/fblinear4.cpp
+--- zhcon-0.2.3.orig/src/display/fblinear4.cpp 2002-05-11 20:58:28.000000000 -0700
++++ zhcon-0.2.3/src/display/fblinear4.cpp 2004-01-14 09:07:36.000000000 -0800
+@@ -18,18 +18,22 @@
+ ***************************************************************************/
+
+ #include
++#include
+ #include "global.h"
+ #include "fblinear4.h"
+
+ __u16 FBLinear4::nibbletab_cfb4[] = {
+-// 0x0000,0x000f,0x00f0,0x00ff,
+-// 0x0f00,0x0f0f,0x0ff0,0x0fff,
+-// 0xf000,0xf00f,0xf0f0,0xf0ff,
+-// 0xff00,0xff0f,0xfff0,0xffff
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 0x0000,0xf000,0x0f00,0xff00,
+ 0x00f0,0xf0f0,0x0ff0,0xfff0,
+ 0x000f,0xf00f,0x0f0f,0xff0f,
+ 0x00ff,0xf0ff,0x0fff,0xffff
++#else
++0x0000,0x000f,0x00f0,0x00ff,
++0x0f00,0x0f0f,0x0ff0,0x0fff,
++0xf000,0xf00f,0xf0f0,0xf0ff,
++0xff00,0xff0f,0xfff0,0xffff
++#endif
+ };
+
+ FBLinear4::FBLinear4() {
+diff -u --recursive zhcon-0.2.3.orig/src/display/fblinear8.cpp zhcon-0.2.3/src/display/fblinear8.cpp
+--- zhcon-0.2.3.orig/src/display/fblinear8.cpp 2002-05-11 20:58:28.000000000 -0700
++++ zhcon-0.2.3/src/display/fblinear8.cpp 2004-01-14 01:38:04.000000000 -0800
+@@ -18,14 +18,22 @@
+ ***************************************************************************/
+
+ #include
++#include
+ #include "global.h"
+ #include "fblinear8.h"
+
+ __u32 FBLinear8::nibbletab_cfb8[] = {
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 0x00000000,0xff000000,0x00ff0000,0xffff0000,
+ 0x0000ff00,0xff00ff00,0x00ffff00,0xffffff00,
+ 0x000000ff,0xff0000ff,0x00ff00ff,0xffff00ff,
+ 0x0000ffff,0xff00ffff,0x00ffffff,0xffffffff
++#else
++0x00000000,0x000000ff,0x0000ff00,0x0000ffff,
++0x00ff0000,0x00ff00ff,0x00ffff00,0x00ffffff,
++0xff000000,0xff0000ff,0xff00ff00,0xff00ffff,
++0xffff0000,0xffff00ff,0xffffff00,0xffffffff
++#endif
+ };
+
+ FBLinear8::FBLinear8() {
--- zhcon-0.2.6.orig/debian/patch/gcc-3.4.patch
+++ zhcon-0.2.6/debian/patch/gcc-3.4.patch
@@ -0,0 +1,32 @@
+diff -urN ../tmp-orig/zhcon-0.2.3/src/display/fblinear24.cpp ./src/display/fblinear24.cpp
+--- ../tmp-orig/zhcon-0.2.3/src/display/fblinear24.cpp 2004-08-07 12:53:30.981966364 +0200
++++ ./src/display/fblinear24.cpp 2004-08-07 12:52:22.249289057 +0200
+@@ -215,11 +215,13 @@
+ d1 = (-(*cdat >> 3 & 1) & eorx) ^ bgx;
+ d2 = (-(*cdat >> 2 & 1) & eorx) ^ bgx;
+ fb_writel(d1 | (d2<<24), dest32++);
+- fb_writew(d2>>8, ((__u16*)dest32)++);
++ fb_writew(d2>>8, ((__u16*)dest32));
++ dest32++;
+ }
+ if (pFont->w & 1) {
+ d3 = (-(*cdat >> 1 & 1) & eorx) ^ bgx;
+- fb_writew(d3, ((__u16*)dest32)++);
++ fb_writew(d3, ((__u16*)dest32));
++ dest32++;
+ fb_writeb(d3>>16, (__u8*)dest32);
+ }
+ cdat++;
+diff -urN ../tmp-orig/zhcon-0.2.3/src/display/fblinear8.cpp ./src/display/fblinear8.cpp
+--- ../tmp-orig/zhcon-0.2.3/src/display/fblinear8.cpp 2004-08-07 12:53:30.982966170 +0200
++++ ./src/display/fblinear8.cpp 2004-08-07 12:52:46.294628227 +0200
+@@ -110,7 +110,8 @@
+ fb_writel((nibbletab_cfb8[*cdat >> 4] & eorx) ^ bgx, dest32++);
+ }
+ if (pFont->w & 2) {
+- fb_writew((nibbletab_cfb8[*cdat & 0xc] & eorx) ^ bgx, ((__u16*)dest32)++);
++ fb_writew((nibbletab_cfb8[*cdat & 0xc] & eorx) ^ bgx, ((__u16*)dest32));
++ dest32++;
+ }
+ if (pFont->w & 1) {
+ fb_writeb((*cdat & 2) ? fg : bg, (__u8*)dest32);
--- zhcon-0.2.6.orig/debian/rules
+++ zhcon-0.2.6/debian/rules
@@ -5,9 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
configure: configure-stamp
configure-stamp:
dh_testdir
--- zhcon-0.2.6.orig/debian/changelog
+++ zhcon-0.2.6/debian/changelog
@@ -1,3 +1,50 @@
+zhcon (1:0.2.6-2ubuntu1) edgy; urgency=low
+
+ * Merge from debian unstable. Remaining changes:
+ - Change libpth2 dependency to libpth20.
+
+ -- William Alexander Grant Tue, 12 Sep 2006 12:34:17 +1000
+
+zhcon (1:0.2.6-2) unstable; urgency=low
+
+ * French templates translation update. (Closes:Bug#378224)
+ * Portuguese templates translation. (Closes:Bug#381198)
+ * zhcon doesn't depend on libgii0 (Closes:Bug#382116)
+ * Closed old bugs, it was fixed ago. (Closes:Bug#323419)
+ * Cleanup NMU fixed bugs.(Closes:Bug#292210,Bug#200071,Bug#293324,
+ Bug#356438,Bug#112355,Bug#136609,Bug#332164,Bug#355948,Bug#198270,
+ Bug#198751,Bug#250139,Bug#285970,Bug#287695,Bug#324284,Bug#324285,
+ Bug#330619)
+
+ -- Yu Guanghui Fri, 09 Aug 2006 15:38:19 +0800
+
+zhcon (1:0.2.6-1.1) unstable; urgency=medium
+
+ * NMU as part of the libgii/libggi transition.
+ * Changed build-dependency on libggi2-dev to libggi2-dev
+ (>= 1:2.2.1-4). Closes: #381649.
+
+ -- Anibal Monsalve Salazar Wed, 09 Aug 2006 10:10:31 +1000
+
+zhcon (1:0.2.6-1ubuntu1) edgy; urgency=low
+
+ * Switch libpth2 to libpth20 in Depends
+
+ -- Hou ZhengPeng Mon, 31 Jul 2006 22:21:09 +0800
+
+zhcon (1:0.2.6-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Yu Guanghui Thu, 6 Jul 2006 02:21:02 +0800
+
+zhcon (1:0.2.4-1) unstable; urgency=low
+
+ * New upstream release
+ * already build with gcc-4.0. Closes: #323419
+
+ -- Yu Guanghui Tue, 25 Apr 2006 00:27:56 +0800
+
zhcon (1:0.2.3-8.1) unstable; urgency=HIGH
* NMU
@@ -161,3 +208,4 @@
Local variables:
mode: debian-changelog
End:
+
--- zhcon-0.2.6.orig/debian/compat
+++ zhcon-0.2.6/debian/compat
@@ -0,0 +1 @@
+4
--- zhcon-0.2.6.orig/debian/config
+++ zhcon-0.2.6/debian/config
@@ -4,5 +4,5 @@
. /usr/share/debconf/confmodule
-db_input high zhcon/rebuild_kernel || true
+db_input low zhcon/rebuild_kernel || true
db_go