--- gettext-0.17.orig/gettext-runtime/libasprintf/Makefile.in +++ gettext-0.17/gettext-runtime/libasprintf/Makefile.in @@ -866,8 +866,7 @@ done; \ done @$(POST_INSTALL) - @if (install-info --version && \ - install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ + @if false; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ --- gettext-0.17.orig/gettext-runtime/po/Makefile.in.in +++ gettext-0.17/gettext-runtime/po/Makefile.in.in @@ -418,9 +418,13 @@ update-gmo: Makefile $(GMOFILES) @: +# Recreate Makefile by invoking config.status. Explicitly invoke the shell, +# because execution permission bits may not work on the current file system. +# Use @SHELL@, which is the shell determined by autoconf for the use by its +# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ - && $(SHELL) ./config.status $(subdir)/$@.in po-directories + && @SHELL@ ./config.status $(subdir)/$@.in po-directories force: --- gettext-0.17.orig/build-aux/config.guess +++ gettext-0.17/build-aux/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. -timestamp='2006-07-02' +timestamp='2009-06-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 @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -161,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -169,7 +170,7 @@ 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 + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -323,14 +324,30 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -531,7 +548,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) 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 @@ -639,7 +656,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -780,7 +797,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,15 +807,24 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd | genuineintel) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; 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 @@ -829,7 +855,14 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -852,40 +885,17 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #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 | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - 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 + CPU=${UNAME_MACHINE} #else CPU= #endif @@ -917,10 +927,13 @@ EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -950,6 +963,9 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # 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 @@ -965,17 +981,6 @@ elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -1041,7 +1046,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1085,8 +1090,11 @@ pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1124,6 +1132,16 @@ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1136,7 +1154,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) @@ -1199,6 +1217,9 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1208,6 +1229,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1298,6 +1328,9 @@ i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1458,9 +1491,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- gettext-0.17.orig/build-aux/config.sub +++ gettext-0.17/build-aux/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. -timestamp='2006-09-20' +timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -122,6 +122,7 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -152,6 +153,9 @@ os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -245,17 +249,20 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -268,6 +275,7 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -277,7 +285,7 @@ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -286,7 +294,7 @@ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -324,19 +332,22 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -358,20 +369,24 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -435,6 +450,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -443,10 +462,26 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -475,8 +510,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -514,6 +549,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -668,6 +707,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -683,6 +730,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -809,6 +860,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -925,6 +984,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1014,6 +1076,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1089,6 +1155,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1127,7 +1197,7 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1197,10 +1267,11 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1209,7 +1280,7 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1219,7 +1290,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1349,6 +1420,9 @@ -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) @@ -1414,6 +1488,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1543,7 +1620,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) --- gettext-0.17.orig/debian/my-shlibdeps +++ gettext-0.17/debian/my-shlibdeps @@ -0,0 +1,10 @@ +#!/bin/sh +l="" +for f in $@; do + case "`file $f`" in + *ELF*) + l="$l $f" + ;; + esac +done +dpkg-shlibdeps $l --- gettext-0.17.orig/debian/postinst-el +++ gettext-0.17/debian/postinst-el @@ -0,0 +1,10 @@ +#!/bin/sh +set -e +if [ -x /usr/lib/emacsen-common/emacs-package-install ]; then + if [ ! -f /var/lib/emacsen-common/installed-flavors ]; then + echo Warning: /var/lib/emacsen-common/installed-flavors does not exist. + echo Creating an empty one. + touch /var/lib/emacsen-common/installed-flavors + fi + /usr/lib/emacsen-common/emacs-package-install gettext-el +fi --- gettext-0.17.orig/debian/README.Debian +++ gettext-0.17/debian/README.Debian @@ -0,0 +1,17 @@ +Notes about the Debian gettext package +====================================== + +The gettext package contains a tool called autopoint which needs cvs. +If you use autopoint, you will need to install cvs. If you don't use +autopoint, you don't need to install cvs. Because autopoint is just a +single tool among a lot of other programs in gettext, and not everybody +who install the gettext package will use autopoint, the gettext package +does not depend on cvs. This will give people the freedom to *not* +install cvs if they don't really need it. + +Because of this, a package which uses autopoint in its build process +*must* have the cvs package in its Build-Depends field or else it will +have a FTBFS-type bug. + + +Santiago Vila --- gettext-0.17.orig/debian/gettext-base.postinst +++ gettext-0.17/debian/gettext-base.postinst @@ -0,0 +1,5 @@ +#!/bin/sh +set -e +if [ "$1" = "configure" ]; then + ldconfig +fi --- gettext-0.17.orig/debian/conffiles +++ gettext-0.17/debian/conffiles @@ -0,0 +1 @@ +/etc/emacs/site-start.d/50gettext.el --- gettext-0.17.orig/debian/glibc-test.c +++ gettext-0.17/debian/glibc-test.c @@ -0,0 +1,19 @@ +#include +int main () { +#ifdef __GLIBC__ + if (__GLIBC_MINOR__ >= 2) { + return 0; + } + else { + printf("Error: You need glibc >= 2.2 at least.\n"); + return 1; + } +#else + printf("Warning: You are not using glibc.\n"); + printf("This architecture is not officially supported.\n"); + printf("Consider yourself lucky if it works for you.\n"); + printf("Please do not complain if it does not.\n"); + return 0; +#endif + +} --- gettext-0.17.orig/debian/gettext-doc.doc-base +++ gettext-0.17/debian/gettext-doc.doc-base @@ -0,0 +1,12 @@ +Document: gettext-doc +Title: GNU gettext manual +Author: François Pinard +Abstract: This manual documents GNU gettext. + GNU gettext offers to programmers, translators and even users, a well + integrated set of tools and documentation that provides a framework within + which other free packages may produce multi-lingual messages. +Section: Programming + +Format: HTML +Index: /usr/share/doc/gettext-doc/index.html +Files: /usr/share/doc/gettext-doc/*.html --- gettext-0.17.orig/debian/gettext.shlibs +++ gettext-0.17/debian/gettext.shlibs @@ -0,0 +1 @@ +libgettextpo 0 libgettextpo0 --- gettext-0.17.orig/debian/prerm-el +++ gettext-0.17/debian/prerm-el @@ -0,0 +1,8 @@ +#!/bin/sh +set -e +if [ "$1" = "failed-upgrade" ]; then + exit 0 +fi +if [ -x /usr/lib/emacsen-common/emacs-package-install ]; then + /usr/lib/emacsen-common/emacs-package-remove gettext-el +fi --- gettext-0.17.orig/debian/50gettext.el +++ gettext-0.17/debian/50gettext.el @@ -0,0 +1,10 @@ +(setq auto-mode-alist +(cons '("\\.po[tx]?\\'\\|\\.po\\." . po-mode) auto-mode-alist)) +(autoload 'po-mode "gettext/po-mode" + "Major mode for translators to edit PO files" t) +(autoload 'po-find-file-coding-system "gettext/po-mode") +(unless (featurep 'po-find-file-coding-system) + (autoload 'po-find-file-coding-system "gettext/po-compat")) +(if (fboundp 'modify-coding-system-alist) + (modify-coding-system-alist 'file "\\.po[tx]?\\'\\|\\.po\\." + 'po-find-file-coding-system)) --- gettext-0.17.orig/debian/gettext-base.shlibs +++ gettext-0.17/debian/gettext-base.shlibs @@ -0,0 +1 @@ +libasprintf 0 libasprintf0c2 --- gettext-0.17.orig/debian/remove +++ gettext-0.17/debian/remove @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +FLAVOR=$1 +PACKAGE=gettext + +if [ ${FLAVOR} != emacs ]; then + echo remove/${PACKAGE}: Purging byte-compiled files for ${FLAVOR} + rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} +fi --- gettext-0.17.orig/debian/install +++ gettext-0.17/debian/install @@ -0,0 +1,24 @@ +#!/bin/sh +set -e + +FLAVOR=$1 +PACKAGE=gettext + +ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} +ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} +files="po-mode.el po-compat.el" +flags="-batch -no-site-file -l path.el -f batch-byte-compile" + +if [ ${FLAVOR} != emacs ]; then + echo install/${PACKAGE}: Byte-compiling for ${FLAVOR} + + install -m 755 -d ${ELCDIR} + cd ${ELDIR} + cp ${files} ${ELCDIR} + cd ${ELCDIR} + cat << EOF > path.el +(setq load-path (cons "." load-path) byte-compile-warnings nil) +EOF + ${FLAVOR} ${flags} ${files} + rm -f *.el path.el +fi --- gettext-0.17.orig/debian/watch +++ gettext-0.17/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnu.org/gnu/gettext/gettext-(.*)\.tar\.gz --- gettext-0.17.orig/debian/copyright +++ gettext-0.17/debian/copyright @@ -0,0 +1,69 @@ +This is the Debian prepackaged version of the GNU gettext utilities. +GNU gettext was written by Ulrich Drepper . +emacs po-mode was written by François Pinard . + +This package was first created by Erick Branderhorst , +and is currently maintained by Santiago Vila . + +This release has been built using the sources from: + +http://ftp.gnu.org/pub/gnu/gettext/gettext-0.17.tar.gz + +The changes were fairly minimal, and consisted solely of adding +various debian/* files to the distribution. + + +Copyright and license for the gettext tools: + +Copyright (C) 1995-2007 Free Software Foundation, Inc. + +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 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +Copyright and license for the libintl library: + +Copyright (C) 1995-2007 Free Software Foundation, Inc. + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU Library General Public License as published +by the Free Software Foundation; either version 2, or (at your option) +any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +Copyright and license for gettext documentation: + + Copyright (C) 1995-1998, 2001-2007 Free Software Foundation, Inc. + + This manual is free documentation. It is dually licensed under the +GNU FDL and the GNU GPL. This means that you can redistribute this +manual under either of these two licenses, at your choice. + + This manual is covered by the GNU FDL. Permission is granted to +copy, distribute and/or modify this document under the terms of the GNU +Free Documentation License (FDL), either version 1.2 of the License, or +(at your option) any later version published by the Free Software +Foundation (FSF); with no Invariant Sections, with no Front-Cover Text, +and with no Back-Cover Texts. + + This manual is covered by the GNU GPL. You can redistribute it +and/or modify it under the terms of the GNU General Public License +(GPL), either version 2 of the License, or (at your option) any later +version published by the Free Software Foundation (FSF). + + +On Debian systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/GPL', the complete text of +the GNU Library General Public License can be found in +`/usr/share/common-licenses/LGPL', and the complete text of the GNU +Free Documentation License can be found in `/usr/share/common-licenses/GFDL' --- gettext-0.17.orig/debian/rules +++ gettext-0.17/debian/rules @@ -0,0 +1,217 @@ +#!/usr/bin/make -f + +package = gettext + +CC = gcc +CFLAGS = -g -Wall -D_REENTRANT +INSTALL_PROGRAM = install +INSTALL_SCRIPT = install + +STRIP = true +ATRIP = true + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s + STRIP=strip --strip-unneeded --remove-section=.comment --remove-section=.note + ATRIP=strip --strip-debug +endif + +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) + +# PNET_ARCHS = %alpha%amd64%hppa%i386%ia64%mips%mipsel%powerpc%s390%sparc% +# ifneq (,$(findstring %$(DEB_HOST_ARCH)%,$(PNET_ARCHS))) +# CSHARP = --enable-csharp=pnet +# endif + +# MONO_ARCHS = %amd64%arm%i386%ia64%lpia%powerpc% +# ifneq (,$(findstring %$(DEB_HOST_ARCH)%,$(MONO_ARCHS))) +# CSHARP = --enable-csharp=mono +# endif + +CSHARP = --disable-csharp + +NOJAVA_ARCHS = %hppa% + +build: + cd debian && $(CC) glibc-test.c + debian/a.out + ./configure --prefix=/usr $(CSHARP) \ + CC="$(CC)" CFLAGS="$(CFLAGS)" \ + JAVAC=/usr/lib/jvm/default-java/bin/javac \ + CPPFLAGS=-I/usr/include/libxml2 + $(MAKE) + $(MAKE) install DESTDIR=`pwd`/debian/tmp \ + INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \ + INSTALL_SCRIPT="$(INSTALL_SCRIPT)" + touch build + +clean: + rm -f build + [ ! -f Makefile ] || $(MAKE) distclean + rm -f `find . -name "*~"` + rm -rf debian/tmp debian/files* core debian/substvars debian/a.out + cd debian && rm -rf gettext-base gettext gettext-el gettext-doc + +binary-arch: build + debian/rules gettext-base + debian/rules gettext + +binary-indep: build + debian/rules gettext-el + debian/rules gettext-doc + +gettext-base: build + rm -rf debian/$@ + install -d debian/$@/DEBIAN debian/$@/usr/share/doc/$@ + cd debian/$@ && install -d usr/share/man/man1 usr/bin usr/lib + cp -p debian/tmp/usr/share/man/man1/gettext.1 \ + debian/$@/usr/share/man/man1 + cp -p debian/tmp/usr/share/man/man1/ngettext.1 \ + debian/$@/usr/share/man/man1 + cp -p debian/tmp/usr/share/man/man1/envsubst.1 \ + debian/$@/usr/share/man/man1 + cp -a debian/tmp/usr/share/man/man3 debian/$@/usr/share/man + cd debian/$@/usr/share/man/man3 && \ + rm -f dcgettext.3 dcngettext.3 dgettext.3 dngettext.3 + cp -p debian/tmp/usr/bin/gettext debian/$@/usr/bin + cp -p debian/tmp/usr/bin/ngettext debian/$@/usr/bin + cp -p debian/tmp/usr/bin/envsubst debian/$@/usr/bin + cp -p debian/tmp/usr/bin/gettext.sh debian/$@/usr/bin + cp -a debian/tmp/usr/share/locale debian/$@/usr/share + if [ -f debian/tmp/usr/lib/GNU.Gettext.dll ]; then \ + cp -p debian/tmp/usr/lib/GNU.Gettext.dll debian/$@/usr/lib; \ + fi + cp -a debian/tmp/usr/lib/libasprintf.so.0* debian/$@/usr/lib + cd debian/$@/usr/lib && chmod 644 libasprintf.so.* + $(STRIP) debian/$@/usr/lib/libasprintf.so.* + find debian/$@/usr/share/locale | grep gettext-tools | xargs rm +ifeq (,$(findstring %$(DEB_HOST_ARCH)%,$(NOJAVA_ARCHS))) + install -d debian/$@/usr/share/java + cp -p debian/tmp/usr/share/gettext/libintl.jar \ + debian/$@/usr/share/java +endif + cp -p gettext-tools/ABOUT-NLS debian/$@/usr/share/doc/$@ + cp -p debian/copyright debian/$@/usr/share/doc/$@ + install -m 644 debian/$@.shlibs debian/$@/DEBIAN/shlibs + install -m 755 debian/$@.postinst debian/$@/DEBIAN/postinst + cp -p ChangeLog debian/$@/usr/share/doc/$@/changelog + cp -p debian/changelog debian/$@/usr/share/doc/$@/changelog.Debian + cd debian/$@/usr/share/doc/$@ && gzip -9 changelog changelog.Debian + gzip -r9 debian/$@/usr/share/man + ln -s gettext.3.gz debian/$@/usr/share/man/man3/dcgettext.3.gz + ln -s gettext.3.gz debian/$@/usr/share/man/man3/dgettext.3.gz + ln -s ngettext.3.gz debian/$@/usr/share/man/man3/dcngettext.3.gz + ln -s ngettext.3.gz debian/$@/usr/share/man/man3/dngettext.3.gz + sh debian/my-shlibdeps debian/$@/usr/bin/* debian/$@/usr/lib/* + dpkg-gencontrol -p$@ -Pdebian/$@ + cd debian/$@ && \ + md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums + chown -R root:root debian/$@ + chmod -R u+w,go=rX debian/$@ + dpkg --build debian/$@ .. + +gettext: build + rm -rf debian/$@ + install -d debian/$@/DEBIAN debian/$@/usr/share/doc/$@ + cd debian/$@ && install -d usr/share/man usr/share/java + cd debian && install -m 644 $@.shlibs $@/DEBIAN/shlibs + cd debian && install -m 755 postinst $@/DEBIAN + cp -p gettext-runtime/BUGS gettext-tools/misc/DISCLAIM NEWS README \ + debian/copyright debian/$@/usr/share/doc/$@ + cp -p debian/README.Debian debian/$@/usr/share/doc/$@ + cp -p ChangeLog debian/$@/usr/share/doc/$@/changelog + cp -p debian/changelog debian/$@/usr/share/doc/$@/changelog.Debian + cd debian/$@/usr/share/doc/$@ && ln -s ../../$(package)/ABOUT-NLS + cd debian/$@/usr/share/doc/$@ && gzip -9 changelog changelog.Debian + cp -a debian/tmp/usr/bin debian/$@/usr + cp -a debian/tmp/usr/lib debian/$@/usr + cp -a debian/tmp/usr/include debian/$@/usr + cp -a debian/tmp/usr/share/info debian/$@/usr/share + cp -a debian/tmp/usr/share/aclocal debian/$@/usr/share + cp -a debian/tmp/usr/share/gettext debian/$@/usr/share + rm -f debian/$@/usr/lib/gettext/gnu.gettext* + rm -f debian/$@/usr/share/gettext/libintl.jar + rm -f debian/$@/usr/lib/GNU.Gettext.dll + cp -a debian/tmp/usr/share/man/man1 debian/$@/usr/share/man + cp -a debian/tmp/usr/share/locale debian/$@/usr/share + find debian/$@/usr/share/locale | grep gettext-runtime | xargs rm + cd debian/$@/usr/bin && rm -f gettext ngettext envsubst gettext.sh + cd debian/$@/usr/lib && rm -f libasprintf.so.* *.la + cd debian/$@/usr/share/man/man1 && \ + rm -f gettext.1 ngettext.1 envsubst.1 + cd debian/$@/usr/lib && chmod 644 libgettextlib* libgettextsrc* \ + libgettextpo* + $(STRIP) debian/$@/usr/lib/preloadable_libintl.so + $(STRIP) debian/$@/usr/lib/libgettextlib*.so + $(STRIP) debian/$@/usr/lib/libgettextsrc*.so + $(STRIP) debian/$@/usr/lib/libgettextpo.so.* + $(ATRIP) debian/$@/usr/lib/libasprintf.a + $(ATRIP) debian/$@/usr/lib/libgettextpo.a + gzip -9 debian/$@/usr/share/info/* + gzip -r9 debian/$@/usr/share/man + sh debian/my-shlibdeps debian/$@/usr/bin/* debian/$@/usr/lib/gettext/* + dpkg-gencontrol -p$@ -Pdebian/$@ + cd debian/$@ && \ + md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums + chown -R root:root debian/$@ + chmod -R u+w,go=rX debian/$@ + dpkg --build debian/$@ .. + +gettext-el: build + rm -rf debian/$@ + install -d debian/$@/DEBIAN debian/$@/usr/share/doc/$@ + cd debian/$@ && install -d \ + etc/emacs/site-start.d \ + usr/share/emacs/site-lisp/$(package) \ + usr/lib/emacsen-common/packages/install \ + usr/lib/emacsen-common/packages/remove + install -m 644 gettext-tools/misc/po-mode.el \ + debian/$@/usr/share/emacs/site-lisp/$(package) + install -m 644 gettext-tools/misc/po-compat.el \ + debian/$@/usr/share/emacs/site-lisp/$(package) + cd debian && install -m 755 install \ + $@/usr/lib/emacsen-common/packages/install/$@ + cd debian && install -m 755 remove \ + $@/usr/lib/emacsen-common/packages/remove/$@ + install -m 755 debian/prerm-el debian/$@/DEBIAN/prerm + install -m 755 debian/postinst-el debian/$@/DEBIAN/postinst + install -m 644 debian/conffiles debian/$@/DEBIAN + install -m 644 debian/50gettext.el debian/$@/etc/emacs/site-start.d + cp -p debian/copyright debian/$@/usr/share/doc/$@ + cp -p ChangeLog debian/$@/usr/share/doc/$@/changelog + cp -p debian/changelog debian/$@/usr/share/doc/$@/changelog.Debian + cd debian/$@/usr/share/doc/$@ && gzip -9 changelog changelog.Debian + dpkg-gencontrol -p$@ -Pdebian/$@ + cd debian/$@ && \ + md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums + chown -R root:root debian/$@ + chmod -R u+w,go=rX debian/$@ + dpkg --build debian/$@ .. + +gettext-doc: build + rm -rf debian/$@ + install -d debian/$@/DEBIAN debian/$@/usr/share/doc/$@ + install -d debian/$@/usr/share/doc-base + install -m 644 debian/$@.doc-base debian/$@/usr/share/doc-base/$@ + cp -a debian/tmp/usr/share/doc/gettext/* debian/$@/usr/share/doc/$@ + cp -a debian/tmp/usr/share/doc/libasprintf/* debian/$@/usr/share/doc/$@ + rm -f debian/$@/usr/share/doc/$@/javadoc2/package-list + ln -s $(package)_toc.html debian/$@/usr/share/doc/$@/index.html + cp -p debian/copyright debian/$@/usr/share/doc/$@ + cp -p ChangeLog debian/$@/usr/share/doc/$@/changelog + cp -p debian/changelog debian/$@/usr/share/doc/$@/changelog.Debian + cd debian/$@/usr/share/doc/$@ && gzip -9 changelog changelog.Debian + dpkg-gencontrol -p$@ -Pdebian/$@ + cd debian/$@ && \ + md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums + chown -R root:root debian/$@ + chmod -R u+w,go=rX debian/$@ + dpkg --build debian/$@ .. + +binary: binary-indep binary-arch + +.PHONY: binary binary-arch binary-indep clean +.PHONY: gettext-base gettext gettext-el gettext-doc --- gettext-0.17.orig/debian/control +++ gettext-0.17/debian/control @@ -0,0 +1,45 @@ +Source: gettext +Section: devel +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Santiago Vila +Standards-Version: 3.8.3 +Build-Depends: libexpat1-dev, fastjar, default-jdk [!hppa], file, libncurses5-dev, libxml2-dev, libglib2.0-dev, libcroco3-dev + +Package: gettext-base +Section: utils +Priority: standard +Architecture: any +Depends: ${shlibs:Depends} +Replaces: gettext (<= 0.12.1-1) +Provides: libasprintf0c2 +Description: GNU Internationalization utilities for the base system + This package includes the gettext and ngettext programs which allow + other packages to internationalize the messages given by shell scripts. + +Package: gettext +Architecture: any +Depends: ${shlibs:Depends}, gettext-base, dpkg (>= 1.15.4) | install-info +Recommends: curl | wget | lynx, cvs +Suggests: gettext-doc +Replaces: gettext-base (<= 0.14.4-1) +Provides: libgettextpo0, libasprintf-dev, libgettextpo-dev +Description: GNU Internationalization utilities + Interesting for authors or maintainers of other packages or programs + which they want to see internationalized. + +Package: gettext-el +Section: lisp +Architecture: all +Depends: gettext, emacs22 | emacsen +Replaces: gettext (<= 0.10.40-3) +Description: Emacs po-mode for editing gettext .po files + This package contains po-mode.el for easy .po editing using emacs. + +Package: gettext-doc +Section: doc +Priority: optional +Architecture: all +Description: Documentation for GNU gettext + This package contains the HTML documentation for GNU gettext, as well as + simple "hello world" examples in several programming languages. --- gettext-0.17.orig/debian/changelog +++ gettext-0.17/debian/changelog @@ -0,0 +1,1051 @@ +gettext (0.17-8ubuntu3) lucid; urgency=low + + * rebuild rest of main for armel armv7/thumb2 optimization; + UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 + + -- Alexander Sack Fri, 05 Mar 2010 04:34:20 +0100 + +gettext (0.17-8ubuntu2) karmic; urgency=low + + * No change rebuild to fix misbuilt binaries on armel. + + -- Loïc Minier Wed, 21 Oct 2009 14:42:47 +0200 + +gettext (0.17-8ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Build Java components with gcj. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - gettext-tools/src/write-catalog.c: + - add missing "mode" parameter to fix FTBFS (from upstream CVS) + - Build-depend on default-jre/-jdk. + - debian/rules: Configure with JAVAC pointing to default-jdk. + - Use autoconf's preferred shell when invoking config.status. + * Explicitly configure with --disable-csharp. + + -- Colin Watson Tue, 06 Oct 2009 16:28:09 +0100 + +gettext (0.17-8) unstable; urgency=low + + * Modified Makefile.in files to avoid /usr/share/info/dir.gz. + * Handle info files as indicated by policy 3.8.3. + * Removed useless calls to install-docs. + * Updated config.guess and config.sub. + * Removed useless .la files. + + -- Santiago Vila Sun, 30 Aug 2009 16:25:06 +0200 + +gettext (0.17-7) unstable; urgency=low + + * Moved gettext-el to section lisp. + * Disabled mono stuff, as compilation now fails in squeeze. + * Moved cvs from Suggests to Recommends, as indicated by DEPENDENCIES + document in source, for the benefit of people who tell apt to treat + recommends as depends and just want to play with gettext. People building + Debian packages should still read README.Debian. Closes: #506022. + * Recognize the perl 5.10 operator '//'. Closes: #519759. + * Build-Depends on openjdk-6-jdk, not jikes-classpath. Closes: #529496. + * Really depend on libxml2 instead of using the embedded version. + + -- Santiago Vila Mon, 17 Aug 2009 18:08:54 +0200 + +gettext (0.17-6ubuntu2) jaunty; urgency=low + + * Cherry-pick df8857c0472c33bd786a967569c4b3c9c4c177b2 from upstream to use + autoconf's preferred shell when invoking config.status; LP: #332840. + + -- Loic Minier Tue, 03 Mar 2009 10:04:46 +0100 + +gettext (0.17-6ubuntu1) jaunty; urgency=low + + * Merge with Debian; remaining changes: + - Java components built with gcj instead of jikes-classpath + - Set GCJFLAGS to -fjni -findirect-dispatch. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - add lpia to list of mono-using arches, adjust build-deps + - remove hppa from list of java-using arches, adjust build-deps + - gettext-tools/src/write-catalog.c: + - add missing "mode" parameter to fix FTBFS (from upstream CVS) + - (Build-)depend on default-jre/-jdk. + - debian/rules: Configure with JAVAC pointing to default-jdk. + - debian/rules: Don't set GCJFLAGS. + + -- Matthias Klose Tue, 02 Dec 2008 01:43:19 +0000 + +gettext (0.17-6) unstable; urgency=low + + * Added libncurses5-dev, libxml2-dev, libglib2.0-dev and libcroco3-dev + to Build-Depends, needed for the --color option of the various programs. + Otherwise, an embedded version is used, which is forbidden by policy. + * Standards-Version: 3.8.0. + + -- Santiago Vila Fri, 28 Nov 2008 12:49:56 +0100 + +gettext (0.17-5) unstable; urgency=low + + * Changed gettext-el dependency from emacsen to "emacs22 | emacsen". + * Run "make distclean" only if Makefile exists, but do not ignore errors. + * po-mode: Do not duplicate headers with emacs23. Closes: #504356. + + -- Santiago Vila Fri, 28 Nov 2008 11:12:15 +0100 + +gettext (0.17-4ubuntu1) jaunty; urgency=low + + * Merge with Debian; remaining changes: + - Java components built with gcj instead of jikes-classpath + - Set GCJFLAGS to -fjni -findirect-dispatch. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - add lpia to list of mono-using arches, adjust build-deps + - remove hppa from list of java-using arches, adjust build-deps + - gettext-tools/src/write-catalog.c: + - add missing "mode" parameter to fix FTBFS (from upstream CVS) + - (Build-)depend on default-jre/-jdk. + - debian/rules: Configure with JAVAC pointing to default-jdk. + - debian/rules: Don't set GCJFLAGS. + + -- Matthias Klose Mon, 17 Nov 2008 09:28:48 +0000 + +gettext (0.17-4) unstable; urgency=low + + * Fixed xgettext crash with some unicode chars. Closes: #493218. + * Fixed wrong updating of POT-Creation-Date by msgmerge. Closes: #496282. + * Both patches by the author. + + -- Santiago Vila Wed, 27 Aug 2008 18:42:00 +0200 + +gettext (0.17-3ubuntu2) intrepid; urgency=low + + * (Build-)depend on default-jre/-jdk. + * debian/rules: Configure with JAVAC pointing to default-jdk. + * debian/rules: Don't set GCJFLAGS. + + -- Matthias Klose Thu, 31 Jul 2008 06:55:28 +0000 + +gettext (0.17-3ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Java components built with gcj instead of jikes-classpath + - Set GCJFLAGS to -fjni -findirect-dispatch. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - add lpia to list of mono-using arches, adjust build-deps + - remove hppa from list of java-using arches, adjust build-deps + * gettext-tools/src/write-catalog.c: + - add missing "mode" parameter to fix FTBFS (from upstream CVS) + + -- Michael Vogt Mon, 23 Jun 2008 10:02:11 +0200 + +gettext (0.17-3) unstable; urgency=low + + * Added lpia to the list of supported mono archs. Closes: #455842. + Requested by Ubuntu, but completely harmless for Debian. + * Added --disable-native-java to ./configure call to prevent gcj from + being used even if it's installed. This avoids a Build-Conflicts: gcj + and fixes a "FTBFS in unclean chroot" bug. Closes: #474901. + * Changed po-mode.el to save buffer when PO-Revision-Date is hold. + Approved by the author. Thanks to Kobayashi Noritada. Closes: #482364. + * Converted doc-base file to UTF-8. Moved to "Programming" section. + + -- Santiago Vila Thu, 12 Jun 2008 18:48:44 +0200 + +gettext (0.17-2ubuntu1) hardy; urgency=low + + * Merge with Debian; remaining changes: + * Remaining Ubuntu changes: + - Java components built with gcj instead of jikes-classpath + - Set GCJFLAGS to -fjni -findirect-dispatch. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + - add lpia to list of mono-using arches, adjust build-deps + - remove hppa from list of java-using arches, adjust build-deps + + -- LaMont Jones Wed, 12 Dec 2007 21:12:04 -0700 + +gettext (0.17-2) unstable; urgency=medium + + * Changed po-mode.el to use new-style backquotes. Closes: #453103. + Thanks to Agustin Martin for the report. + + -- Santiago Vila Fri, 7 Dec 2007 20:13:01 +0100 + +gettext (0.17-1) unstable; urgency=low + + * New upstream release. Closes: #451091. See the NEWS for details. + * Public domain files are clearly marked as such. Closes: #412310. + * Fixed xgettext problem with python unicode strings. Closes: #433743. + * Added file to Build-Depends, as it's used by debian/rules. This was + probably dropped in 0.12.1-6 after the build problem on ARM was fixed + the right way by using the latest libtool. Previously, the old libtool + used "file" on the ARM architecture. + * gettext tools are now under GPL version 3. + + -- Santiago Vila Sun, 25 Nov 2007 11:35:30 +0100 + +gettext (0.16.1-2ubuntu3) gutsy; urgency=low + + * Drop hppa from the list of java-using archs + + -- LaMont Jones Mon, 13 Aug 2007 15:35:45 -0600 + +gettext (0.16.1-2ubuntu2) gutsy; urgency=low + + * Add lpia to the list of mono-using arches, and adjust build-deps. + + -- Adam Conrad Tue, 31 Jul 2007 14:55:22 +1000 + +gettext (0.16.1-2ubuntu1) gutsy; urgency=low + + * Merge with Debian; remaining changes: + * Remaining Ubuntu changes: + - Build-depend on file, + - Java components built with gcj instead of jikes-classpath + - Set GCJFLAGS to -fjni -findirect-dispatch. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + + -- Matthias Klose Mon, 9 Jul 2007 16:22:21 +0200 + +gettext (0.16.1-2) unstable; urgency=low + + * Fixed po-check-file-header bug in po-mode.el. Closes: #385005. + * Modified description of gettext-el package. Closes: #422649. + * Moved java files to /usr/share/java. Closes: #376601. + * Added missing library dependencies to gettext-base. + * Fixed name for zh-cn team. Closes: #428594. + * Fixed typo in po-mode.el. Closes: #412656. + + -- Santiago Vila Mon, 2 Jul 2007 20:29:14 +0200 + +gettext (0.16.1-1ubuntu2) feisty; urgency=low + + * Rebuild for changes in the amd64 toolchain. + * Set Ubuntu maintainer address. + + -- Matthias Klose Mon, 5 Mar 2007 01:16:25 +0000 + +gettext (0.16.1-1ubuntu1) feisty; urgency=low + + * Merge to Debian unstable to bring in 0.16.1. This version is compatible + with automake 1.10 and also fixes the segfaults with lisp files. + * Remaining Ubuntu changes: + - Build-depend on file, + - Java components built with gcj instead of jikes-classpath + - Set GCJFLAGS to -fjni -findirect-dispatch. + - Install libintl.jar in /usr/share/java, keep a symlink in + /usr/share/gettext. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + + -- Martin Pitt Wed, 6 Dec 2006 11:16:41 +0100 + +gettext (0.16.1-1) unstable; urgency=low + + * New upstream release. See the NEWS file for details. + * Use -no-site-file instead of --no-site-file, to make xemacs happy. + Thanks to Luis Rodrigo Gallardo for the report. Closes: #399284. + * Fixed xgettext segfault with lisp files, which made other packages + to FTBFS. Thanks to Martin Pitt for the report. Closes: #400187. + + -- Santiago Vila Mon, 27 Nov 2006 23:31:08 +0100 + +gettext (0.15-3) unstable; urgency=medium + + * Fixed perl parser by updating x-perl.c from CVS (Closes: #386912). + * Build C# stuff using mono, not pnet. This fixes a FTBFS bug, as pnet + is currently uninstallable. + + -- Santiago Vila Fri, 3 Nov 2006 17:19:02 +0100 + +gettext (0.15-2ubuntu2) feisty; urgency=low + + * Rebuild for ldbl128 change on powerpc and sparc. + + -- Matthias Klose Thu, 2 Nov 2006 09:59:15 +0000 + +gettext (0.15-2ubuntu1) edgy; urgency=low + + * Merge from debian unstable, to fix #65063. Remaining changes: + - Build-depend on file, + - Mono components built with mono-mcs instead of pnet, + - Java components built with gcj instead of jikes-classpath + - Set GCJFLAGS to -fjni -findirect-dispatch. + - Install libintl.jar in /usr/share/java, keep a symlink in + /usr/share/gettext. + - Throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + + * Build-depend on java-gcj-compat-dev instead of gcj to get around bad + gcj detection in configure script. + + -- Scott James Remnant Thu, 12 Oct 2006 14:56:58 +0100 + +gettext (0.15-2) unstable; urgency=low + + * Fixed xgettext segfault on certain scheme input (Closes: #384698). + Patch by Bruno Haible. + + -- Santiago Vila Thu, 31 Aug 2006 19:35:04 +0200 + +gettext (0.15-1) unstable; urgency=low + + * New upstream release (Closes: #381534). + * Improved msgmerge error message (Closes: #305703). + * Recognize Bash process substitution syntax (Closes: #374483). + * The 'mkinstalldirs' shell script is no longer needed and no longer + installed by gettextize (Closes: #378239). + * The manual is now dual-licensed as GNU GPL and GNU FDL with no + Invariant Sections, no Front-Cover Text, and no Back-Cover Texts, + so we can distribute it in main in either case. + * Applied patch from Bruno Haible to fix a bug in xgettext. + See gnu.utils.bug for details. + + -- Santiago Vila Mon, 21 Aug 2006 18:45:14 +0200 + +gettext (0.14.6-1ubuntu6) edgy; urgency=low + + * Re-add build-dependency on gcj. + * Do not compile the native java binaries directly from the sources, + but from the class files. + * Set GCJFLAGS to -fjni -findirect-dispatch. + * Install libintl.jar in /usr/share/java, keep a symlink in + /usr/share/gettext. + * Finally, throw away /usr/lib/gettext/gnu.gettext*; we don't need them. + + -- Matthias Klose Fri, 18 Aug 2006 11:38:31 +0000 + +gettext (0.14.6-1ubuntu5) edgy; urgency=low + + * Build-depend on file; the build dependency is mentioned in + 0.12.1-3, but apparently missing. + + -- Matthias Klose Tue, 15 Aug 2006 07:21:57 +0000 + +gettext (0.14.6-1ubuntu4) edgy; urgency=low + + * Do not try to install libintl.jar. + + -- Matthias Klose Tue, 15 Aug 2006 01:47:47 +0000 + +gettext (0.14.6-1ubuntu3) edgy; urgency=low + + * Temporarily remove build-dependency on gcj. + + -- Matthias Klose Tue, 15 Aug 2006 00:35:23 +0000 + +gettext (0.14.6-1ubuntu2) edgy; urgency=low + + * debian/control: + - replace pnet build dependency with mono as we won't have pnet in main + at least for edgy + * debian/rules: + - build GNU.Gettext.dll with mono instead of pnet + + -- Sebastian Dröge Mon, 10 Jul 2006 00:15:41 +0200 + +gettext (0.14.6-1ubuntu1) edgy; urgency=low + + * Resynchronize with Debian unstable. + + -- Matthias Klose Tue, 4 Jul 2006 11:53:33 +0000 + +gettext (0.14.6-1) unstable; urgency=low + + * New upstream release. From the NEWS file: + - Updated the meaning of 'gcc-internal-format' to match GCC 4.1. + * Changed x-php.c to fix xgettext problem with PHP (Closes: #366131). + + -- Santiago Vila Fri, 23 Jun 2006 17:39:10 +0200 + +gettext (0.14.5-4) unstable; urgency=low + + * Reverted change made to gettext.m4, as it breaks autopoint. + The change will be made in the next upstream version anyway. + Thanks a lot to Ben Pfaff for the report (Closes: #367263). + * Added C# support for architectures having a recent pnet. + * gettext now contains msgfmt.net.exe and msgunfmt.net.exe. + * gettext-base now contains GNU.Gettext.dll. + + -- Santiago Vila Mon, 15 May 2006 18:01:08 +0200 + +gettext (0.14.5-3) unstable; urgency=low + + * Modified po-mode.el so that po-validate loads compile.el (Closes: #316852). + * Modified gettext.sh to be more friendly to zsh (Closes: #343354). + * Modified gettext.m4 to avoid calling AM_NLS twice (Closes: #353435). + * Put gettext-base in section utils, following the override file. + * Removed no longer required Build-Depends-Indep: texi2html. + + -- Santiago Vila Mon, 1 May 2006 19:11:56 +0200 + +gettext (0.14.5-2ubuntu3) dapper; urgency=low + + * Rebuild using gcj-4.1. + + -- Matthias Klose Wed, 22 Feb 2006 11:36:30 +0000 + +gettext (0.14.5-2ubuntu2) breezy; urgency=low + + * Build-depend on libgcj-dev. + + -- Matthias Klose Mon, 18 Jul 2005 20:26:07 +0200 + +gettext (0.14.5-2ubuntu1) breezy; urgency=low + + * Resynchronize with Debian. Ubuntu 12479. + * Reenable building the java bits using gcj. Ubuntu 10940. + + -- Matthias Klose Mon, 18 Jul 2005 16:59:36 +0000 + +gettext (0.14.5-2) unstable; urgency=low + + * New C++ ABI. gettext-base now Provides: libasprintf0c2. + * Changed shlibs file accordingly. + + -- Santiago Vila Wed, 6 Jul 2005 17:30:10 +0200 + +gettext (0.14.5-1ubuntu2) breezy; urgency=low + + * No change build to cleanup erroneous /usr/share/info/dir.gz on hppa + + -- LaMont Jones Fri, 8 Jul 2005 11:57:19 -0600 + +gettext (0.14.5-1ubuntu1) breezy; urgency=low + + * Resynchronise with Debian, unscramble changelog. + + -- Martin Pitt Thu, 7 Jul 2005 08:55:35 +0000 + +gettext (0.14.5-1) unstable; urgency=low + + * New upstream release. + + -- Santiago Vila Mon, 6 Jun 2005 19:02:50 +0200 + +gettext (0.14.4-2ubuntu1) breezy; urgency=low + + * Disable jikes-classpath and gcj dependancies for now. Will + reenable these when they're available in main. + + -- Jeff Bailey Wed, 18 May 2005 19:48:40 +0000 + +gettext (0.14.4-2) unstable; urgency=medium + + * Moved libgettextpo from gettext-base to gettext, where it belongs. + As libgettextpo depends on libgettextlib, which is in gettext, this + should remove an undeclared (and undesired) dependency of + gettext-base on gettext (Closes: #307749). The blender package + should work again if their dependencies are installed. + Thanks to Steve Langasek for the report. + * Moved Provides: libgettextpo0 from gettext-base to gettext. + * gettext now Replaces: gettext-base (<= 0.14.4-1). + * Moved the libgettextpo bit of shlibs in gettext-base to gettext. + + -- Santiago Vila Thu, 5 May 2005 17:02:08 +0200 + +gettext (0.14.4-1) unstable; urgency=low + + * New upstream release. + + -- Santiago Vila Thu, 14 Apr 2005 16:00:18 +0200 + +gettext (0.14.3-1) unstable; urgency=low + + * New upstream release. + * Added watch file. + + -- Santiago Vila Thu, 31 Mar 2005 19:11:02 +0200 + +gettext (0.14.2-1) unstable; urgency=low + + * New upstream (bugfix) release. + * The Debian diff is small again. + * The copyright file is now in UTF-8. + * A lot of files have relaxed licensing terms. + * Improved manual about eval_gettext (Closes: #279992). + * gettext.sh is now both a shell function library and a shell script, + so /usr/share/gettext/gettext.sh is dropped (Closes: #292759). + + -- Santiago Vila Tue, 8 Mar 2005 15:16:28 +0100 + +gettext (0.14.1-10) unstable; urgency=low + + * Removed dependency on libgcj4 by not using gcj anymore (Closes: #292988). + * Added "curl | wget | lynx" to the Recommends field and disabled GetURL + call from urlget.c. This should be a better fix for Bug#244215. + * gettext now includes gettext.jar for java development. + For this to work, you will need a Java Virtual Machine. + + -- Santiago Vila Thu, 3 Feb 2005 18:18:22 +0100 + +gettext (0.14.1-9) unstable; urgency=low + + * Changed gettext.sh to be a symlink to /usr/share/gettext/gettext.sh. + * Changed architecture-dependent build-dependencies to be inclusive + rather than exclusive, to not break unreleased architectures. + + -- Santiago Vila Tue, 1 Feb 2005 18:29:02 +0100 + +gettext (0.14.1-8) unstable; urgency=low + + * Added java support, using jikes-classpath and also gcj when available. + * Weird java error from msginit should now be gone (Closes: #244215). + * gettext-base now provides libintl.jar (Closes: #259730). + * Debian changelog is now in UTF-8. + + -- Santiago Vila Sat, 22 Jan 2005 20:21:12 +0100 + +gettext (0.14.1-7) unstable; urgency=medium + + * Fixed remaining vulnerability in autopoint, where temporary directories + were created using an unknown umask (Closes: #286392). + Patch by Bruno Haible. Thanks to Javier for the report. + + -- Santiago Vila Tue, 11 Jan 2005 17:55:30 +0100 + +gettext (0.14.1-6) unstable; urgency=high + + * Fixed xgettext misparsing of perl source (Closes: #269059). + Patch by Guido Flohr, approved by Bruno Haible. + * Added Suggests: gettext-doc to gettext (Closes: #270886). + * Improved description of gettext-doc (Bug #270886 also). + * Fixed gettextize and autopoint insecure behaviour regarding + temp files (Closes: #278283). This is CAN-2004-0966. + Patch by Mark J. Cox, slightly modified by Martin Pitt. + The patch hardcodes `:' as the PATH separator, so it will not work + on non-Unix Debian architectures (sorry), but should be good enough + for the 11 architectures in sarge, the Hurd and the *BSDs. + + -- Santiago Vila Wed, 27 Oct 2004 19:21:30 +0200 + +gettext (0.14.1-5) unstable; urgency=low + + * Fixed Tag Table in info file. If this does not fix Bug #260048, + install-info should find a better excuse to fail. + + -- Santiago Vila Sun, 18 Jul 2004 18:36:10 +0200 + +gettext (0.14.1-4) unstable; urgency=low + + * Fixed info file (Closes: #260048). + + -- Santiago Vila Sun, 18 Jul 2004 13:39:06 +0200 + +gettext (0.14.1-3) unstable; urgency=low + + * Simplified Build-Depends. Now glibc is required to be >= 2.2 by using + a run-time test. This will break autobuilders still running potato. + * Improved ABOUT-NLS wording (Closes: #239456). + * Updated manual regarding python bug (Closes: #246334). + * Updated gettext-tools/projects/TP/teams.html (Closes: #248224). + * Relibtoolized with libtool 1.5.6-1 (Closes: #258178). + * Added README.Debian (Closes: #258433). + + -- Santiago Vila Sat, 17 Jul 2004 19:11:02 +0200 + +gettext (0.14.1-2) unstable; urgency=low + + * Added libexpat1-dev to Build-Depends, for glade support. + * Added libc0.1-dev to Build-Depends, for GNU/kFreeBSD. + * Removed special-casing of knetbsd-gnu in debian/rules. + + -- Santiago Vila Sun, 14 Mar 2004 17:40:02 +0100 + +gettext (0.14.1-1) unstable; urgency=low + + * New upstream release, relibtoolized with libtool 1.5.2-1, + autoconf 2.59-2 and automake 1.8.2-1. + * Added --disable-csharp to ./configure call, just in case. + + -- Santiago Vila Sat, 14 Feb 2004 17:31:34 +0100 + +gettext (0.13.1-2) unstable; urgency=low + + * Fixed xgettext, which sometimes does not print comments found in + source files. Patch by Bruno Haible (Closes: #227339). + * Fixed msginit, which segfaults if input file has no header. + Patch by Bruno Haible (Closes: #227652). + + -- Santiago Vila Thu, 15 Jan 2004 19:47:48 +0100 + +gettext (0.13.1-1) unstable; urgency=low + + * New upstream release. + * Relibtoolized with libtool 1.5-8, autoconf 2.59-1 and automake 1.7.9-3. + This should ensure a correct build under all architectures, but it also + prevents libgettextsrc being linked against the previously installed + libgettextlib, otherwise we would need a Build-Conflicts: gettext. + * Added libc1-dev (>= 2.2) to Build-Depends, for GNU/K*BSD systems. + + -- Santiago Vila Mon, 5 Jan 2004 14:24:04 +0100 + +gettext (0.12.1-8) unstable; urgency=medium + + * gettext-base now Replaces: gettext (<= 0.12.1-1), since libasprintf + shared library was present on gettext_0.12.1-1 (Closes: #216406). + + -- Santiago Vila Mon, 20 Oct 2003 19:04:48 +0200 + +gettext (0.12.1-7) unstable; urgency=low + + * Modified two Makefile.in files so that install-info is never called + during the build, to prevent /usr/share/info/dir.gz to appear. + * Added -D_REENTRANT to CFLAGS, since there are libraries here. + + -- Santiago Vila Thu, 9 Oct 2003 13:03:06 +0200 + +gettext (0.12.1-6) unstable; urgency=low + + * Updated libtool stuff using Debian libtool_1.5-2, required by ARM. + Version 1.5-1 used in gettext_0.12.1-4 did not really work. + + -- Santiago Vila Sat, 13 Sep 2003 12:10:36 +0200 + +gettext (0.12.1-5) unstable; urgency=low + + * Strip static libraries using --strip-debug. + * Strategically touch files in the build target to convince make that + no file does really need to be regenerated using automake or autoconf. + * While we are at it, the warning about autoheader should disappear too. + + -- Santiago Vila Fri, 12 Sep 2003 22:54:34 +0200 + +gettext (0.12.1-4) unstable; urgency=low + + * Reorganized debian/rules almost entirely. + * Added ABOUT-NLS to /usr/share/doc/gettext-base. + * Updated libtool stuff using Debian libtool. I expected this would allow + the build-dependency on file to be removed, but I was wrong, see 0.12.1-6. + Note: The size of the diff is not an error, it's the result of updating + everything to not build-depend on autoconf either. + * autopoint should now parse intl/VERSION correctly (Closes: #204384). + Patch by Denis Barbier. + * Restored libasprintf and libgettextpo shared libraries (closes: #209398), + which should now be handled in a more orthodox way, namely: + - Added a shlibs file to gettext-base. + - gettext-base provides libasprintf0 and libgettextpo0. + - gettext provides libasprintf-dev and libgettextpo-dev. + + -- Santiago Vila Fri, 12 Sep 2003 17:13:08 +0200 + +gettext (0.12.1-3) unstable; urgency=medium + + * Added file to Build-Depends. This should now build under ARM. + + -- Santiago Vila Tue, 15 Jul 2003 13:11:04 +0200 + +gettext (0.12.1-2) unstable; urgency=low + + * Modified autoconf-lib-link/m4/lib-prefix.m4 to prevent a duplicate + macro definition problem. Patch by Bruno Haible (Closes: #196648). + * Added build-dependency on automake1.7, because of the above. + * Removed shared libraries libasprintf and libgettextpo. For now, only + the static libraries will be supported. + + -- Santiago Vila Sun, 6 Jul 2003 19:00:18 +0200 + +gettext (0.12.1-1) unstable; urgency=low + + * New upstream release. gettext is now two packages in one. + Debian gettext-base is upstream gettext-runtime, and Debian gettext + is upstream gettext-tools (approximately). BTW, gettext-base is much + smaller than before because message catalogs have been splitted. + * Moved section 3 manpages from gettext to gettext-base, as recommended + by PACKAGING. Updated Replaces: field accordingly. + * mkinstalldirs is now in sync with archive.tar.gz (Closes: #157097). + * autopoint uses func_fatal_error, not fatal_error (Closes: #158383). + * autopoint needs cvs, so gettext Suggests: it (Closes: #166477). + * If the m4 dir is an absolute path, ignore it (Closes: #192159). + + -- Santiago Vila Fri, 6 Jun 2003 21:47:08 +0200 + +gettext (0.11.5-1) unstable; urgency=low + + * New upstream release. Noteworthy changes: + - There are now two shared libraries on which many of the tools depend, + but there will be no shlibs file, or -dev package, or static libraries + because the libraries are undocumented and for internal use only. + - A file called libintl.jar was supposed to be created during the build, + but gcj is excluded as a valid Java compiler, so to ensure that the + package is built in exactly the same way on every architecture, there + is now a Build-Conflicts: java-compiler. Sorry. + - There is now a much improved manual. Interested parties are strongly + encouraged to (re-)read it. In particular, people using gettextize on a + regular basis should consider using the new `autopoint' tool instead. + - Since there are now upstream manpages, the old ones are removed from + the debian directory. + * The following bugs in 0.10.40 are now fixed: + - po-mode can now open a new .po file using emacs21 (Bug #137353). + - xgettext -D does no longer break -j (Bug #147341). + - Manual is clarified about xgettext and .pot extension (Bug #147624). + - po-mode accepts mailing lists not at @li.org (Bugs #149137 and #154580). + * More info at /usr/share/doc/gettext/NEWS. + + -- Santiago Vila Wed, 14 Aug 2002 11:30:28 +0200 + +gettext (0.10.40-8) unstable; urgency=low + + * Made gettext-el prerm and postinst fault-tolerant, since emacsen-common + is not. Should allow upgrades from woody. + + -- Santiago Vila Mon, 22 Jul 2002 18:20:02 +0200 + +gettext (0.10.40-7) unstable; urgency=low + + * gettext does no longer depend on gettext-el. + * gettext-el now depends on emacsen. + + -- Santiago Vila Sat, 20 Jul 2002 13:21:24 +0200 + +gettext (0.10.40-6) unstable; urgency=low + + * New Hurd ABI. Changed libc0.2-dev to libc0.3-dev in Build-Depends. + Closes: #144562. + + -- Santiago Vila Sat, 27 Apr 2002 13:45:18 +0200 + +gettext (0.10.40-5) unstable; urgency=medium + + * Modified /etc/emacs/site-start.d/50gettext.el so that it only uses + modify-coding-system-alist when it's actually ok to do so. + This closes: #110416 (xemacs21) and also closes: #141446 (emacs19). + + -- Santiago Vila Wed, 10 Apr 2002 13:17:42 +0200 + +gettext (0.10.40-4) unstable; urgency=medium + + * Moved po-mode support to a new package, gettext-el. For now, gettext + depends on it to ensure smooth upgrades from potato regardless of + the upgrade method, but this dependency will be dropped after the + release of woody. + * Removed the dependency on emacsen-common while gettext still depends + on gettext-el. This should be safe enough because emacsen-common is + now more robust, but it is some sort of compromise. After the release + of woody, gettext-el will depend on emacsen (not emacsen-common), + to be in full compliance with debian emacs policy. + + -- Santiago Vila Sat, 9 Mar 2002 13:00:12 +0100 + +gettext (0.10.40-3) unstable; urgency=low + + * Modified prerm to be fault-tolerant regarding prerm scripts in + previous gettext releases which did not depend on emacsen-common yet. + This is possible because dpkg executes the new prerm if the old one fails. + Should fix a bug which has been reported a lot of times. + + -- Santiago Vila Mon, 4 Feb 2002 17:44:42 +0100 + +gettext (0.10.40-2) unstable; urgency=low + + * Added support for DEB_BUILD_OPTIONS. The normal install target + is used again, passing both INSTALL_PROGRAM and INSTALL_SCRIPT. + * Moved ngettext and ngettext(1) to gettext-base. Updated Replaces. + * Added dependency on emacsen-common (Closes: #48681, #65320). + + -- Santiago Vila Sat, 2 Feb 2002 16:24:28 +0100 + +gettext (0.10.40-1) unstable; urgency=low + + * New upstream release. libintl is now under LGPL, not GPL. + + -- Santiago Vila Sun, 16 Sep 2001 14:26:02 +0200 + +gettext (0.10.39-2) unstable; urgency=medium + + * Put new manpages where they belong (Closes: #107651). + + -- Santiago Vila Sat, 4 Aug 2001 18:25:55 +0200 + +gettext (0.10.39-1) unstable; urgency=low + + * New upstream release. + + -- Santiago Vila Fri, 27 Jul 2001 18:45:26 +0200 + +gettext (0.10.38-4) unstable; urgency=medium + + * According to the Debian diff, aclocal.m4 is modified and then some files + in the `m4' subdirectory, in that order. This may make aclocal.m4 to be + regenerated during the build, but the `missing' script is unable to handle + that if automake is not present. Instead of adding a Build-Depends, + debian/rules now touches aclocal.m4 in the build target (Closes: #104746). + + -- Santiago Vila Sat, 14 Jul 2001 16:43:30 +0200 + +gettext (0.10.38-3) unstable; urgency=medium + + * Added libc6.1-dev (>= 2.2) to Build-Depends for alpha and ia64. + Thanks to Matt Taggart for the report. + * Rightly refer to the GNU *General* Public License in the documentation. + Reported by André Dahlqvist (Closes: #102237). + * Modified 50gettext.el to tell Emacs how to determine automatically the + coding system of every PO file. (Closes: #103530). + Thanks to Gaute B Strokkenes for the report. + + -- Santiago Vila Fri, 13 Jul 2001 08:07:16 +0200 + +gettext (0.10.38-2) unstable; urgency=medium + + * Made gettext.m4 to work in packages which use autoconf-2.50. + Patch by Bruno Haible (Closes: #99732). + + -- Santiago Vila Sat, 23 Jun 2001 17:14:49 +0200 + +gettext (0.10.38-1) unstable; urgency=low + + * New upstream release. + * gettext.m4 syntax should be really fixed this time (Closes: #94362). + * gettextize now installs plural.c (Closes: #98163). + + -- Santiago Vila Sat, 26 May 2001 16:15:08 +0200 + +gettext (0.10.37-1) unstable; urgency=low + + * New upstream release. + * Fixes gettext.m4 syntax (Closes: #94362). + + -- Santiago Vila Tue, 24 Apr 2001 18:39:19 +0200 + +gettext (0.10.36-2) unstable; urgency=low + + * Registered HTML docs using doc-base (Closes: #63379). + * Added manpages for every executable (Closes: #92200, #92201). + Thanks a lot to Michael Piefel for contributing them. + * Applied two patches from Bruno Haible: + - Workaround an automake-1.4 bug (Closes: #93119). + - Removed undeclared build-dependency on itself (Closes: #93275). + + -- Santiago Vila Fri, 13 Apr 2001 17:42:20 +0200 + +gettext (0.10.36-1) unstable; urgency=low + + * New upstream release. It should fix the following bugs: + - Documentation is now more accurate (Closes: #28696). + - DESTDIR is now supported (Closes: #38414, #41823, #52571, #85311). + - gettextize now prints the right aclocal directory (Closes: #38935, #52858). + - intl/Makefile.in removes libintl.h upon clean (Closes: #56039). + - gettextize now checks for $gettext_dir before using it (Closes: #69519). + - Norwegian Nynorsk is now "nn" (Closes: #87735). + * Added the file NEWS to the doc directory. + * Removed build-dependency on texinfo, since the .texi is now untouched. + * glibc >= 2.2 is now required for the build, to avoid the creation of + a shared libintl library with features not included in libc. + * No more ./configure --with-included-gettext. This is also required + to avoid the shared library. + + -- Santiago Vila Tue, 3 Apr 2001 10:43:23 +0200 + +gettext (0.10.35-17) unstable; urgency=low + + * Build-Depends-Indep: texi2html, not tetex-bin. + * Updated config.guess and config.sub for ia64 (Closes: #81900). + * Modified autoload invocation to pass a 4th argument (Closes: #83521). + + -- Santiago Vila Tue, 30 Jan 2001 18:06:09 +0100 + +gettext (0.10.35-16) unstable; urgency=low + + * Build-Depends: texinfo, since the .texi source is modified (Bug #77977). + * Build-Depends-Indep: tetex-bin (for texi2html). + * Fixed Bug #79027: gettextize --force --copy destroys intl/CVS. + Patch from Bruno Haible . + + -- Santiago Vila Sat, 9 Dec 2000 18:09:42 +0100 + +gettext (0.10.35-15) unstable; urgency=low + + * Updated po-mode.el to latest version (Closes: #64093). + * Added missing `\' to intl/Makefile.in uninstall target (Closes: #67308). + + -- Santiago Vila Wed, 19 Jul 2000 12:02:39 +0200 + +gettext (0.10.35-14) unstable; urgency=low + + * Applied patch from GCC developers to support --keyword=id:argnum. + This is required to regenerate the .po file for GCC (Bug #57136). + * debian/rules: Install po-mode.el by hand, so that we do not need + to Build-Depends on emacsen (Bug #62621). + * Standards-Version: 3.1.1. + + -- Santiago Vila Mon, 24 Apr 2000 16:41:50 +0200 + +gettext (0.10.35-13) frozen unstable; urgency=low + + * intl/explodename.c: Rewrite _nl_find_language so that it compiles + with a K&R compiler (Bug #56030, reported by Kevin Dalley). + + -- Santiago Vila Tue, 25 Jan 2000 18:42:36 +0100 + +gettext (0.10.35-12) unstable; urgency=low + + * Use install-strip target instead of just overriding INSTALL_PROGRAM. + Should make strip happy about shell scripts (Bug #54000). + + -- Santiago Vila Tue, 11 Jan 2000 19:21:14 +0100 + +gettext (0.10.35-11) unstable; urgency=low + + * Added Japanese message catalog from ja-trans_0.5-3. + + -- Santiago Vila Fri, 22 Oct 1999 13:00:04 +0200 + +gettext (0.10.35-10) unstable; urgency=low + + * Added a Replaces field to gettext-base for smooth upgrading from + version 0.10.35-8 or earlier (Bug #40690). + + -- Santiago Vila Mon, 5 Jul 1999 20:43:48 +0200 + +gettext (0.10.35-9) unstable; urgency=low + + * Created gettext-base, containing the gettext binary. + + -- Santiago Vila Mon, 28 Jun 1999 18:23:05 +0200 + +gettext (0.10.35-8) unstable; urgency=low + + * Moved to base section. + * Use autoload for emacs po-mode (Bug #32745). + + -- Santiago Vila Sun, 7 Mar 1999 17:25:23 +0100 + +gettext (0.10.35-7) frozen unstable; urgency=high + + * Applied patch (from glibc-2.1.111) to fix security problem (Bug #28850). + NMU made by Vincent Renardias. + * By popular demand, make byte-compiling less verbose. + + -- Santiago Vila Mon, 25 Jan 1999 19:47:17 +0100 + +gettext (0.10.35-6) frozen unstable; urgency=low + + * Applied a patch to compile under alpha (fixes bug #30748). + + -- Santiago Vila Thu, 17 Dec 1998 19:23:08 +0100 + +gettext (0.10.35-5) frozen unstable; urgency=low + + * Moved info unregistering from postrm to prerm. + * Added a manpage for gettext, it tells the user to read the info files + or the HTML docs in the gettext-doc package (Bug #6287). + * Follow emacsen policy to byte-compile po-mode.el (Bug #29953). + (Thanks to Mitsuru Oka for the hints). + + -- Santiago Vila Mon, 30 Nov 1998 20:37:28 +0100 + +gettext (0.10.35-4) unstable; urgency=low + + * Updated config.guess and config.sub from automake 1.3 for the ARM + architecture (Bug#26283). NMU made by Jim Pick . + * Added HTML docs, in a separate package. + + -- Santiago Vila Tue, 20 Oct 1998 18:20:03 +0200 + +gettext (0.10.35-3) frozen unstable; urgency=medium + + * Added --with-included-gettext to the configure command line. + Without this option, if gettext is installed while it is being built, + the resulting gettext segfaults under certain locales. + * Suggests: emacsen, according to latest policy (Bug #23378). + + -- Santiago Vila Thu, 2 Jul 1998 18:32:31 +0200 + +gettext (0.10.35-2) frozen unstable; urgency=high + + * First upload for hamm, after approval from upstream author. + + -- Santiago Vila Tue, 26 May 1998 22:14:21 +0200 + +gettext (0.10.35-1) experimental; urgency=low + + * New upstream release. The Texinfo manual have been clarified and + this should fix Bug #20072 (gettext ignores "xgettext:c-format" in the + same line). The comment must be before the string to be translated. + + -- Santiago Vila Sat, 2 May 1998 18:09:01 +0200 + +gettext (0.10.32-1) experimental; urgency=low + + * Removed libintl.h and libintl.a by hand. + * More detailed copyright file. + * Removed debstd dependency. + + -- Santiago Vila Wed, 12 Nov 1997 11:47:25 +0100 + +gettext (0.10.32-0) experimental; urgency=low + + * New upstream release. + + -- Santiago Vila Wed, 10 Sep 1997 21:15:29 +0200 + +gettext (0.10.31-0) experimental; urgency=low + + * New upstream release. Fixes the info bug. + + -- Santiago Vila Thu, 28 Aug 1997 11:07:11 +0200 + +gettext (0.10.27-0) experimental; urgency=low + + * Added MD5 sums. + * First libc6 release. + * Some minor debian/rules changes. + * Untouched pristine tar.gz source. + * New upstream version (using new files ltconfig and ltmain.sh taken + from libtool 1.0 to make it build and install properly). + * debian/tmp/usr/share/locale/locale.alias removed by hand to avoid + conflict with the one in the `locales' package. + * Removed "--with-included-gettext" from the configure command line. + + -- Santiago Vila Tue, 29 Jul 1997 20:25:03 +0200 + +gettext (0.10.26-1) experimental; urgency=low + + * Converted to Standards-Version 2.1.2.2. + * New upstream version. + * Added updated translations for "sv", "es" and "ko". + * Moved to experimental. + * New maintainer. + + -- Santiago Vila Wed, 5 Feb 1997 20:24:45 +0100 + +Mon Sep 16 17:15:48 1996 Erick Branderhorst + + * upgraded to mainstream 0.10.24 (not dsc yet) + +Wed Jul 17 14:58:30 1996 Erick Branderhorst + + * debian.rules (d): 2 + * debian.rules: install unstripped libintl.a (reported by + J.H.M. Dassen) + +Mon Jul 8 19:44:27 1996 Erick Branderhorst + + * upgraded to alpha 0.10.23 + +Mon Jul 1 19:44:27 1996 Erick Branderhorst + + * Semi public releases drove up the revision number to 3 (Sorry) + * debian.rules (binary): for this moment back to static libs + only, because this gettext code seems to be implemented with glibc + right now and will probably find its way in libc6. + * debian.control: a gettext package entry + * only package been provided right now from the gettext + sources is the gettext package. + +Sat Jun 22 11:18:48 1996 Erick Branderhorst + + * debian.rules (binary): install so lib and symlinks + * debian.rules (build): CFLAGS = -O2 -fPIC, so lib + * debian.rules (build): no static -N linking + +Fri Jun 21 15:02:24 1996 Erick Branderhorst + + * mainstream alpha version 0.10.20 + +Tue Jun 11 11:24:53 1996 Erick Branderhorst + + * mainstream alpha version 0.10.19 + +Tue Jun 11 11:24:53 1996 Erick Branderhorst + + * updated nl.po + * mainstream alpha version 0.10.16 + * added README-alpha message in debian.README + +Mon Jun 10 09:46:57 1996 Erick Branderhorst + + * Initial debian release --- gettext-0.17.orig/debian/postinst +++ gettext-0.17/debian/postinst @@ -0,0 +1,5 @@ +#!/bin/sh +set -e +if [ "$1" = "configure" ]; then + ldconfig +fi --- gettext-0.17.orig/gettext-tools/misc/po-mode.el +++ gettext-0.17/gettext-tools/misc/po-mode.el @@ -101,7 +101,7 @@ (defmacro defgroup (&rest args) nil) (defmacro defcustom (var value doc &rest args) - (` (defvar (, var) (, value) (, doc)))))) + `(defvar ,var ,value ,doc)))) ;;; Customisation. @@ -1343,7 +1343,7 @@ (progn ;; There is at least one entry. (goto-char (match-beginning 0)) - (previous-line 1) + (forward-line -1) (setq end-of-header (match-end 0)) (if (looking-at "msgid \"\"\n") ;; There is indeed a PO file header. @@ -1392,7 +1392,8 @@ zone "\\n\"") t t)))) (message "")) - (message (_"PO-Revision-Date should be adjusted...")))) + (message (_"PO-Revision-Date should be adjusted..."))) + nil) ;;; Handling span of entry, entry type and entry attributes. --- gettext-0.17.orig/gettext-tools/src/urlget.c +++ gettext-0.17/gettext-tools/src/urlget.c @@ -240,7 +240,7 @@ fetch (const char *url, const char *file) { /* First try: using Java. */ - { + if (0) { const char *class_name = "gnu.gettext.GetURL"; const char *gettextjexedir; const char *gettextjar; --- gettext-0.17.orig/gettext-tools/src/write-po.c +++ gettext-0.17/gettext-tools/src/write-po.c @@ -1496,6 +1496,7 @@ true, /* supports_multiple_domains */ true, /* supports_contexts */ true, /* supports_plurals */ + true, /* sorts_obsoletes_to_end */ false, /* alternative_is_po */ false /* alternative_is_java_class */ }; --- gettext-0.17.orig/gettext-tools/src/write-stringtable.c +++ gettext-0.17/gettext-tools/src/write-stringtable.c @@ -1,5 +1,5 @@ /* Writing NeXTstep/GNUstep .strings files. - Copyright (C) 2003, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -319,6 +319,7 @@ false, /* supports_multiple_domains */ false, /* supports_contexts */ false, /* supports_plurals */ + false, /* sorts_obsoletes_to_end */ false, /* alternative_is_po */ false /* alternative_is_java_class */ }; --- gettext-0.17.orig/gettext-tools/src/write-properties.c +++ gettext-0.17/gettext-tools/src/write-properties.c @@ -1,5 +1,5 @@ /* Writing Java .properties files. - Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc. + Copyright (C) 2003, 2005-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -299,6 +299,7 @@ false, /* supports_multiple_domains */ false, /* supports_contexts */ false, /* supports_plurals */ + false, /* sorts_obsoletes_to_end */ true, /* alternative_is_po */ true /* alternative_is_java_class */ }; --- gettext-0.17.orig/gettext-tools/src/msgmerge.c +++ gettext-0.17/gettext-tools/src/msgmerge.c @@ -151,6 +151,7 @@ #endif ; static void compendium (const char *filename); +static void msgdomain_list_stablesort_by_obsolete (msgdomain_list_ty *mdlp); static msgdomain_list_ty *merge (const char *fn1, const char *fn2, catalog_input_format_ty input_syntax, msgdomain_list_ty **defp); @@ -396,6 +397,11 @@ if (update_mode) { + /* Before comparing result with def, sort the result into the same order + as would be done implicitly by output_syntax->print. */ + if (output_syntax->sorts_obsoletes_to_end) + msgdomain_list_stablesort_by_obsolete (result); + /* Do nothing if the original file and the result are equal. Also do nothing if the original file and the result differ only by the POT-Creation-Date in the header entry; this is needed for projects @@ -606,6 +612,50 @@ } +/* Sorts obsolete messages to the end, for every domain. */ +static void +msgdomain_list_stablesort_by_obsolete (msgdomain_list_ty *mdlp) +{ + size_t k; + + for (k = 0; k < mdlp->nitems; k++) + { + message_list_ty *mlp = mdlp->item[k]->messages; + + /* Sort obsolete messages to the end. */ + if (mlp->nitems > 0) + { + message_ty **l1 = XNMALLOC (mlp->nitems, message_ty *); + size_t n1; + message_ty **l2 = XNMALLOC (mlp->nitems, message_ty *); + size_t n2; + size_t j; + + /* Sort the non-obsolete messages into l1 and the obsolete messages + into l2. */ + n1 = 0; + n2 = 0; + for (j = 0; j < mlp->nitems; j++) + { + message_ty *mp = mlp->item[j]; + + if (mp->obsolete) + l2[n2++] = mp; + else + l1[n1++] = mp; + } + if (n1 > 0 && n2 > 0) + { + memcpy (mlp->item, l1, n1 * sizeof (message_ty *)); + memcpy (mlp->item + n1, l2, n2 * sizeof (message_ty *)); + } + free (l2); + free (l1); + } + } +} + + /* Data structure representing the messages with known translations. They are composed of - A message list from def.po, --- gettext-0.17.orig/gettext-tools/src/x-python.c +++ gettext-0.17/gettext-tools/src/x-python.c @@ -923,6 +923,11 @@ if (c >= UNICODE (0xd800) && c < UNICODE (0xdc00)) bp->utf16_surr = UNICODE_VALUE (c); + else if (c >= UNICODE (0xdc00) && c < UNICODE (0xe000)) + { + /* A half surrogate is invalid, therefore use U+FFFD instead. */ + mixed_string_buffer_append_unicode (bp, 0xfffd); + } else mixed_string_buffer_append_unicode (bp, UNICODE_VALUE (c)); } --- gettext-0.17.orig/gettext-tools/src/write-catalog.h +++ gettext-0.17/gettext-tools/src/write-catalog.h @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-1998, 2000-2003, 2006 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2003, 2006, 2008 Free Software Foundation, Inc. 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 @@ -50,6 +50,9 @@ /* Whether the format supports plurals. */ bool supports_plurals; + /* Whether the formats sorts obsolete messages at the end. */ + bool sorts_obsoletes_to_end; + /* Whether the PO file format is a suitable alternative output format for this one. */ bool alternative_is_po; --- gettext-0.17.orig/gettext-tools/src/x-perl.c +++ gettext-0.17/gettext-tools/src/x-perl.c @@ -45,7 +45,9 @@ /* The Perl syntax is defined in perlsyn.pod. Try the command "man perlsyn" or "perldoc perlsyn". Also, the syntax after the 'sub' keyword is specified in perlsub.pod. - Try the command "man perlsub" or "perldoc perlsub". */ + Try the command "man perlsub" or "perldoc perlsub". + Perl 5.10 has new operators '//' and '//=', see + . */ #define DEBUG_PERL 0 @@ -2523,12 +2525,20 @@ phase1_ungetc (c); return; } + /* Recognize operator '//'. */ + if (c == '/') + { + c = phase1_getc (); + if (c != '/') + phase1_ungetc (c); + } /* FALLTHROUGH */ default: /* We could carefully recognize each of the 2 and 3 character - operators, but it is not necessary, as we only need to recognize - gettext invocations. Don't bother. */ + operators, but it is not necessary, except for the '//' operator, + as we only need to recognize gettext invocations. Don't + bother. */ tp->type = token_type_other; prefer_division_over_regexp = false; return; --- gettext-0.17.orig/gettext-tools/src/write-catalog.c +++ gettext-0.17/gettext-tools/src/write-catalog.c @@ -220,7 +220,9 @@ /* Open the output file. */ if (!to_stdout) { - fd = open (filename, O_WRONLY | O_CREAT); + fd = open (filename, O_WRONLY | O_CREAT, + /* 0666 in portable POSIX notation: */ + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); if (fd < 0) { const char *errno_description = strerror (errno); --- gettext-0.17.orig/gettext-tools/po/Makefile.in.in +++ gettext-0.17/gettext-tools/po/Makefile.in.in @@ -418,9 +418,13 @@ update-gmo: Makefile $(GMOFILES) @: +# Recreate Makefile by invoking config.status. Explicitly invoke the shell, +# because execution permission bits may not work on the current file system. +# Use @SHELL@, which is the shell determined by autoconf for the use by its +# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ - && $(SHELL) ./config.status $(subdir)/$@.in po-directories + && @SHELL@ ./config.status $(subdir)/$@.in po-directories force: --- gettext-0.17.orig/gettext-tools/examples/hello-c++-kde/admin/config.guess +++ gettext-0.17/gettext-tools/examples/hello-c++-kde/admin/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. -timestamp='2002-10-21' +timestamp='2009-06-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 @@ -17,13 +18,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -53,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -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, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -66,11 +69,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -98,14 +101,18 @@ # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -# This shell variable is my proudest work .. or something. --bje +# Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; -(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) - || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; -dummy=$tmpdir/dummy ; -files="$dummy.c $dummy.o $dummy.rel $dummy" ; -trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; +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 "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { 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 @@ -113,15 +120,13 @@ CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $files ; 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 ; -unset files' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -156,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -164,7 +170,7 @@ 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 + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -178,144 +184,128 @@ ;; 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 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # 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: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null - if test "$?" = 0 ; then - case `$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; - esac - fi - rm -f $dummy.s $dummy && rmdir $tmpdir - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -323,29 +313,48 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -354,10 +363,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -369,10 +378,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # 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 @@ -383,37 +392,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -437,33 +449,33 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS) + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -479,29 +491,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -509,7 +521,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -524,16 +536,19 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:[45]) + exit ;; + *:AIX:*:[456]) 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 @@ -546,28 +561,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -624,16 +639,36 @@ } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy && rmdir $tmpdir + test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -661,172 +696,227 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; 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 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; 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 ;; + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) - # 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=` - rm -f $dummy.c && rmdir $tmpdir - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:3*) - echo i386-pc-interix3 - exit 0 ;; + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd | genuineintel) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; 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 - exit 0 ;; + echo i586-pc-interix + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir - test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit 0 ;; + exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit 0 ;; + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -837,10 +927,13 @@ EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -848,22 +941,31 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit 0 ;; + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # 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 @@ -879,17 +981,6 @@ elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -906,24 +997,33 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -931,7 +1031,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; + 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 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; 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 @@ -939,15 +1059,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - 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 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*: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 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; 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 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1042,64 +1173,84 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} - exit 0 ;; + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1107,22 +1258,25 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1133,36 +1287,50 @@ UNAME_MACHINE="$cputype" 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 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1194,7 +1362,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1283,12 +1451,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 -rm -f $dummy.c $dummy && rmdir $tmpdir +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1297,22 +1465,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1323,7 +1491,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +and + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- gettext-0.17.orig/gettext-tools/examples/hello-c++-kde/admin/config.sub +++ gettext-0.17/gettext-tools/examples/hello-c++-kde/admin/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. -timestamp='2002-09-05' +timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,14 +22,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # 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 . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -70,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -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, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -83,11 +85,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +101,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,7 +120,10 @@ # 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* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -144,10 +149,13 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -169,6 +177,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -185,6 +197,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -228,42 +244,57 @@ | 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 \ - | clipper \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ + | ip2k | iq2000 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic80 | tron \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ - | z8k) + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -273,6 +304,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -292,50 +326,67 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ - | clipper-* | cydra-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ + | ip2k-* | iq2000-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39 | mipstx39el \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | 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-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -353,6 +404,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -367,6 +421,12 @@ basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -390,6 +450,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -398,10 +462,26 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -426,12 +506,27 @@ basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16) + basic_machine=cr16-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -454,6 +549,14 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -604,6 +707,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -619,6 +730,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -632,10 +747,6 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -648,6 +759,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -723,9 +837,12 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson @@ -743,6 +860,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -752,24 +877,36 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; + pentium4) + basic_machine=i786-pc + ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; @@ -802,6 +939,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -828,6 +969,14 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -835,6 +984,12 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks @@ -901,10 +1056,6 @@ basic_machine=i386-sequent os=-dynix ;; - t3d) - basic_machine=alpha-cray - os=-unicos - ;; t3e) basic_machine=alphaev5-cray os=-unicos @@ -913,14 +1064,22 @@ basic_machine=t90-cray os=-unicos ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -934,6 +1093,10 @@ tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -977,9 +1140,9 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt + xbox) + basic_machine=i686-pc + os=-mingw32 ;; xps | xps100) basic_machine=xps100-honeywell @@ -992,6 +1155,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1011,6 +1178,9 @@ romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1027,13 +1197,10 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1100,24 +1267,30 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*) + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1129,16 +1302,21 @@ ;; 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* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1151,6 +1329,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1172,6 +1353,9 @@ -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1194,6 +1378,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1224,6 +1411,18 @@ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; -none) ;; *) @@ -1246,6 +1445,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1255,6 +1460,9 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1280,6 +1488,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1298,9 +1509,15 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1403,7 +1620,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) @@ -1433,9 +1650,15 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; @@ -1460,7 +1683,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) --- gettext-0.17.orig/gettext-tools/doc/gettext.info +++ gettext-0.17/gettext-tools/doc/gettext.info @@ -1,7 +1,8 @@ +This is gettext.info, produced by makeinfo version 4.11 from +gettext.texi. + INFO-DIR-SECTION GNU Gettext Utilities START-INFO-DIR-ENTRY -This is gettext.info, produced by makeinfo version 4.11 from gettext.texi. - * gettext: (gettext). GNU gettext utilities. * autopoint: (gettext)autopoint Invocation. Copy gettext infrastructure. * envsubst: (gettext)envsubst Invocation. Expand environment variables. --- gettext-0.17.orig/gettext-tools/doc/Makefile.in +++ gettext-0.17/gettext-tools/doc/Makefile.in @@ -1080,8 +1080,7 @@ done; \ done @$(POST_INSTALL) - @if (install-info --version && \ - install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ + @if false; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \