summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-11 08:30:25 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-11 08:30:53 +0200
commitf0bd75d79c4b390ddd3fb4288065e58fb674497d (patch)
tree9cb41de3d6c5b08694f0b43c826b9795c63f9c50 /package
parentb5d320a1e8d3d20b0d287b1c9cd5b2539f0aa8f8 (diff)
ignore config.sub/config.guess, do not create backup and restore it on update-patches, fix some minor issues. PIE can only be used for binaries and need support in a package
Diffstat (limited to 'package')
-rw-r--r--package/exmap/Makefile1
-rw-r--r--package/libsoup/patches/patch-build-aux_config_guess447
-rw-r--r--package/libsoup/patches/patch-build-aux_config_sub183
-rw-r--r--package/libsoup/patches/patch-build-aux_depcomp682
-rw-r--r--package/libsoup/patches/patch-build-aux_missing440
5 files changed, 1 insertions, 1752 deletions
diff --git a/package/exmap/Makefile b/package/exmap/Makefile
index 1ea6177a7..a09b708df 100644
--- a/package/exmap/Makefile
+++ b/package/exmap/Makefile
@@ -20,6 +20,7 @@ DISTFILES:= ${PKG_NAME}-console-${PKG_VERSION}.tgz
WRKDIST= ${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
+include ${TOPDIR}/mk/kernel-ver.mk
$(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libsoup/patches/patch-build-aux_config_guess b/package/libsoup/patches/patch-build-aux_config_guess
deleted file mode 100644
index a3a438b4f..000000000
--- a/package/libsoup/patches/patch-build-aux_config_guess
+++ /dev/null
@@ -1,447 +0,0 @@
---- libsoup-2.44.2.orig/build-aux/config.guess 2013-10-18 00:01:48.000000000 +0200
-+++ libsoup-2.44.2/build-aux/config.guess 2014-04-14 17:21:42.176934834 +0200
-@@ -1,10 +1,8 @@
- #! /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, 2007, 2008, 2009, 2010,
--# 2011, 2012, 2013 Free Software Foundation, Inc.
-+# Copyright 1992-2014 Free Software Foundation, Inc.
-
--timestamp='2012-12-29'
-+timestamp='2014-01-25'
-
- # 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
-@@ -26,7 +24,7 @@ timestamp='2012-12-29'
- # program. This Exception is an additional permission under section 7
- # of the GNU General Public License, version 3 ("GPLv3").
- #
--# Originally written by Per Bothner.
-+# Originally written by Per Bothner.
- #
- # You can get the latest version of this script from:
- # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-@@ -52,9 +50,7 @@ version="\
- 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, 2006, 2007, 2008, 2009, 2010, 2011,
--2012, 2013 Free Software Foundation, Inc.
-+Copyright 1992-2014 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."
-@@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
- UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-+case "${UNAME_SYSTEM}" in
-+Linux|GNU|GNU/*)
-+ # If the system lacks a compiler, then just pick glibc.
-+ # We could probably try harder.
-+ LIBC=gnu
-+
-+ eval $set_cc_for_build
-+ cat <<-EOF > $dummy.c
-+ #include <features.h>
-+ #if defined(__UCLIBC__)
-+ LIBC=uclibc
-+ #elif defined(__dietlibc__)
-+ LIBC=dietlibc
-+ #else
-+ LIBC=gnu
-+ #endif
-+ EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+ ;;
-+esac
-+
- # Note: order is significant - the case branches are not exclusive.
-
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -857,21 +874,21 @@ EOF
- exit ;;
- *:GNU:*:*)
- # the GNU system
-- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- 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
-+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
- exit ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit ;;
- aarch64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- aarch64_be:Linux:*:*)
- UNAME_MACHINE=aarch64_be
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -884,59 +901,54 @@ EOF
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- 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}
-+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ exit ;;
-+ arc:Linux:*:* | arceb:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- 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
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- else
- if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_PCS_VFP
- then
-- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
- else
-- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
- fi
- fi
- exit ;;
- avr32*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- cris:Linux:*:*)
-- echo ${UNAME_MACHINE}-axis-linux-gnu
-+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
- exit ;;
- crisv32:Linux:*:*)
-- echo ${UNAME_MACHINE}-axis-linux-gnu
-+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
- exit ;;
- frv:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- hexagon:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- i*86:Linux:*:*)
-- LIBC=gnu
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #ifdef __dietlibc__
-- LIBC=dietlibc
-- #endif
--EOF
-- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
- exit ;;
- ia64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- m32r*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- m68*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
-@@ -955,54 +967,63 @@ EOF
- #endif
- EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
- ;;
-+ or1k:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-+ exit ;;
- or32:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- padre:Linux:*:*)
-- echo sparc-unknown-linux-gnu
-+ echo sparc-unknown-linux-${LIBC}
- exit ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
-- echo hppa64-unknown-linux-gnu
-+ echo hppa64-unknown-linux-${LIBC}
- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-- PA7*) echo hppa1.1-unknown-linux-gnu ;;
-- PA8*) echo hppa2.0-unknown-linux-gnu ;;
-- *) echo hppa-unknown-linux-gnu ;;
-+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-+ *) echo hppa-unknown-linux-${LIBC} ;;
- esac
- exit ;;
- ppc64:Linux:*:*)
-- echo powerpc64-unknown-linux-gnu
-+ echo powerpc64-unknown-linux-${LIBC}
- exit ;;
- ppc:Linux:*:*)
-- echo powerpc-unknown-linux-gnu
-+ echo powerpc-unknown-linux-${LIBC}
-+ exit ;;
-+ ppc64le:Linux:*:*)
-+ echo powerpc64le-unknown-linux-${LIBC}
-+ exit ;;
-+ ppcle:Linux:*:*)
-+ echo powerpcle-unknown-linux-${LIBC}
- exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
-- echo ${UNAME_MACHINE}-ibm-linux
-+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
- exit ;;
- sh64*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- sh*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- sparc:Linux:*:* | sparc64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- tile*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- vax:Linux:*:*)
-- echo ${UNAME_MACHINE}-dec-linux-gnu
-+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
- exit ;;
- x86_64:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- xtensa*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
- exit ;;
- i*86:DYNIX/ptx:4*:*)
- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-@@ -1235,19 +1256,31 @@ EOF
- exit ;;
- *:Darwin:*:*)
- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-- case $UNAME_PROCESSOR in
-- i386)
-- eval $set_cc_for_build
-- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-- grep IS_64BIT_ARCH >/dev/null
-- then
-- UNAME_PROCESSOR="x86_64"
-- fi
-- fi ;;
-- unknown) UNAME_PROCESSOR=powerpc ;;
-- esac
-+ eval $set_cc_for_build
-+ if test "$UNAME_PROCESSOR" = unknown ; then
-+ UNAME_PROCESSOR=powerpc
-+ fi
-+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ grep IS_64BIT_ARCH >/dev/null
-+ then
-+ case $UNAME_PROCESSOR in
-+ i386) UNAME_PROCESSOR=x86_64 ;;
-+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
-+ esac
-+ fi
-+ fi
-+ elif test "$UNAME_PROCESSOR" = i386 ; then
-+ # Avoid executing cc on OS X 10.9, as it ships with a stub
-+ # that puts up a graphical alert prompting to install
-+ # developer tools. Any system running Mac OS X 10.7 or
-+ # later (Darwin 11 and later) is required to have a 64-bit
-+ # processor. This is not true of the ARM version of Darwin
-+ # that Apple uses in portable devices.
-+ UNAME_PROCESSOR=x86_64
-+ fi
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit ;;
- *:procnto*:*:* | *:QNX:[0123456789]*:*)
-@@ -1338,154 +1371,6 @@ EOF
- exit ;;
- esac
-
--eval $set_cc_for_build
--cat >$dummy.c <<EOF
--#ifdef _SEQUENT_
--# include <sys/types.h>
--# include <sys/utsname.h>
--#endif
--main ()
--{
--#if defined (sony)
--#if defined (MIPSEB)
-- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
-- I don't know.... */
-- printf ("mips-sony-bsd\n"); exit (0);
--#else
--#include <sys/param.h>
-- printf ("m68k-sony-newsos%s\n",
--#ifdef NEWSOS4
-- "4"
--#else
-- ""
--#endif
-- ); exit (0);
--#endif
--#endif
--
--#if defined (__arm) && defined (__acorn) && defined (__unix)
-- printf ("arm-acorn-riscix\n"); exit (0);
--#endif
--
--#if defined (hp300) && !defined (hpux)
-- printf ("m68k-hp-bsd\n"); exit (0);
--#endif
--
--#if defined (NeXT)
--#if !defined (__ARCHITECTURE__)
--#define __ARCHITECTURE__ "m68k"
--#endif
-- int version;
-- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-- if (version < 4)
-- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-- else
-- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-- exit (0);
--#endif
--
--#if defined (MULTIMAX) || defined (n16)
--#if defined (UMAXV)
-- printf ("ns32k-encore-sysv\n"); exit (0);
--#else
--#if defined (CMU)
-- printf ("ns32k-encore-mach\n"); exit (0);
--#else
-- printf ("ns32k-encore-bsd\n"); exit (0);
--#endif
--#endif
--#endif
--
--#if defined (__386BSD__)
-- printf ("i386-pc-bsd\n"); exit (0);
--#endif
--
--#if defined (sequent)
--#if defined (i386)
-- printf ("i386-sequent-dynix\n"); exit (0);
--#endif
--#if defined (ns32000)
-- printf ("ns32k-sequent-dynix\n"); exit (0);
--#endif
--#endif
--
--#if defined (_SEQUENT_)
-- struct utsname un;
--
-- uname(&un);
--
-- if (strncmp(un.version, "V2", 2) == 0) {
-- printf ("i386-sequent-ptx2\n"); exit (0);
-- }
-- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-- printf ("i386-sequent-ptx1\n"); exit (0);
-- }
-- printf ("i386-sequent-ptx\n"); exit (0);
--
--#endif
--
--#if defined (vax)
--# if !defined (ultrix)
--# include <sys/param.h>
--# if defined (BSD)
--# if BSD == 43
-- printf ("vax-dec-bsd4.3\n"); exit (0);
--# else
--# if BSD == 199006
-- printf ("vax-dec-bsd4.3reno\n"); exit (0);
--# else
-- printf ("vax-dec-bsd\n"); exit (0);
--# endif
--# endif
--# else
-- printf ("vax-dec-bsd\n"); exit (0);
--# endif
--# else
-- printf ("vax-dec-ultrix\n"); exit (0);
--# endif
--#endif
--
--#if defined (alliant) && defined (i860)
-- printf ("i860-alliant-bsd\n"); exit (0);
--#endif
--
-- exit (1);
--}
--EOF
--
--$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; }
--
--# Convex versions that predate uname can use getsysinfo(1)
--
--if [ -x /usr/convex/getsysinfo ]
--then
-- case `getsysinfo -f cpu_type` in
-- c1*)
-- echo c1-convex-bsd
-- exit ;;
-- c2*)
-- if getsysinfo -f scalar_acc
-- then echo c32-convex-bsd
-- else echo c2-convex-bsd
-- fi
-- exit ;;
-- c34*)
-- echo c34-convex-bsd
-- exit ;;
-- c38*)
-- echo c38-convex-bsd
-- exit ;;
-- c4*)
-- echo c4-convex-bsd
-- exit ;;
-- esac
--fi
--
- cat >&2 <<EOF
- $0: unable to guess system type
-
diff --git a/package/libsoup/patches/patch-build-aux_config_sub b/package/libsoup/patches/patch-build-aux_config_sub
deleted file mode 100644
index 623cd9420..000000000
--- a/package/libsoup/patches/patch-build-aux_config_sub
+++ /dev/null
@@ -1,183 +0,0 @@
---- libsoup-2.44.2.orig/build-aux/config.sub 2013-10-18 00:01:48.000000000 +0200
-+++ libsoup-2.44.2/build-aux/config.sub 2014-04-14 17:21:42.176934834 +0200
-@@ -1,10 +1,8 @@
- #! /bin/sh
- # Configuration validation subroutine script.
--# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
--# 2011, 2012, 2013 Free Software Foundation, Inc.
-+# Copyright 1992-2014 Free Software Foundation, Inc.
-
--timestamp='2012-12-29'
-+timestamp='2014-01-01'
-
- # 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
-@@ -70,9 +68,7 @@ Report bugs and patches to <config-patch
- version="\
- GNU config.sub ($timestamp)
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
--2012, 2013 Free Software Foundation, Inc.
-+Copyright 1992-2014 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."
-@@ -256,12 +252,12 @@ case $basic_machine in
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
-- | arc \
-+ | arc | arceb \
- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
- | avr | avr32 \
- | be32 | be64 \
- | bfin \
-- | c4x | clipper \
-+ | c4x | c8051 | clipper \
- | d10v | d30v | dlx | dsp16xx \
- | epiphany \
- | fido | fr30 | frv \
-@@ -269,6 +265,7 @@ case $basic_machine in
- | hexagon \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-+ | k1om \
- | le32 | le64 \
- | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
-@@ -290,16 +287,17 @@ case $basic_machine in
- | mipsisa64r2 | mipsisa64r2el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
-+ | mipsr5900 | mipsr5900el \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
- | moxie \
- | mt \
- | msp430 \
- | nds32 | nds32le | nds32be \
-- | nios | nios2 \
-+ | nios | nios2 | nios2eb | nios2el \
- | ns16k | ns32k \
- | open8 \
-- | or32 \
-+ | or1k | or32 \
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle \
- | pyramid \
-@@ -327,7 +325,7 @@ case $basic_machine in
- c6x)
- basic_machine=tic6x-unknown
- ;;
-- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
-+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
- basic_machine=$basic_machine-unknown
- os=-none
- ;;
-@@ -369,13 +367,13 @@ case $basic_machine in
- | aarch64-* | aarch64_be-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* | avr32-* \
- | be32-* | be64-* \
- | bfin-* | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* \
-- | clipper-* | craynv-* | cydra-* \
-+ | c8051-* | clipper-* | craynv-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-@@ -384,6 +382,7 @@ case $basic_machine in
- | hexagon-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-+ | k1om-* \
- | le32-* | le64-* \
- | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
-@@ -407,12 +406,13 @@ case $basic_machine in
- | mipsisa64r2-* | mipsisa64r2el-* \
- | mipsisa64sb1-* | mipsisa64sb1el-* \
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+ | mipsr5900-* | mipsr5900el-* \
- | mipstx39-* | mipstx39el-* \
- | mmix-* \
- | mt-* \
- | msp430-* \
- | nds32-* | nds32le-* | nds32be-* \
-- | nios-* | nios2-* \
-+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
- | none-* | np1-* | ns16k-* | ns32k-* \
- | open8-* \
- | orion-* \
-@@ -796,7 +796,7 @@ case $basic_machine in
- os=-mingw64
- ;;
- mingw32)
-- basic_machine=i386-pc
-+ basic_machine=i686-pc
- os=-mingw32
- ;;
- mingw32ce)
-@@ -832,7 +832,7 @@ case $basic_machine in
- basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- ;;
- msys)
-- basic_machine=i386-pc
-+ basic_machine=i686-pc
- os=-msys
- ;;
- mvs)
-@@ -1008,7 +1008,7 @@ case $basic_machine in
- ;;
- ppc64) basic_machine=powerpc64-unknown
- ;;
-- ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
- basic_machine=powerpc64le-unknown
-@@ -1354,7 +1354,7 @@ case $os in
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-- | -sym* | -kopensolaris* \
-+ | -sym* | -kopensolaris* | -plan9* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* | -aros* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-@@ -1500,9 +1500,6 @@ case $os in
- -aros*)
- os=-aros
- ;;
-- -kaos*)
-- os=-kaos
-- ;;
- -zvmoe)
- os=-zvmoe
- ;;
-@@ -1551,6 +1548,9 @@ case $basic_machine in
- c4x-* | tic4x-*)
- os=-coff
- ;;
-+ c8051-*)
-+ os=-elf
-+ ;;
- hexagon-*)
- os=-elf
- ;;
-@@ -1594,6 +1594,9 @@ case $basic_machine in
- mips*-*)
- os=-elf
- ;;
-+ or1k-*)
-+ os=-elf
-+ ;;
- or32-*)
- os=-coff
- ;;
diff --git a/package/libsoup/patches/patch-build-aux_depcomp b/package/libsoup/patches/patch-build-aux_depcomp
deleted file mode 100644
index 730162b43..000000000
--- a/package/libsoup/patches/patch-build-aux_depcomp
+++ /dev/null
@@ -1,682 +0,0 @@
---- libsoup-2.44.2.orig/build-aux/depcomp 2013-10-18 00:01:49.000000000 +0200
-+++ libsoup-2.44.2/build-aux/depcomp 2014-04-14 17:21:42.708937363 +0200
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # depcomp - compile a program generating dependencies as side-effects
-
--scriptversion=2013-05-30.07; # UTC
-+scriptversion=2012-03-27.16; # UTC
-
--# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-+# Copyright (C) 1999-2012 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
-@@ -27,9 +27,9 @@ scriptversion=2013-05-30.07; # UTC
-
- case $1 in
- '')
-- echo "$0: No command. Try '$0 --help' for more information." 1>&2
-- exit 1;
-- ;;
-+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
-+ exit 1;
-+ ;;
- -h | --h*)
- cat <<\EOF
- Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-@@ -56,65 +56,11 @@ EOF
- ;;
- esac
-
--# Get the directory component of the given path, and save it in the
--# global variables '$dir'. Note that this directory component will
--# be either empty or ending with a '/' character. This is deliberate.
--set_dir_from ()
--{
-- case $1 in
-- */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
-- *) dir=;;
-- esac
--}
--
--# Get the suffix-stripped basename of the given path, and save it the
--# global variable '$base'.
--set_base_from ()
--{
-- base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
--}
--
--# If no dependency file was actually created by the compiler invocation,
--# we still have to create a dummy depfile, to avoid errors with the
--# Makefile "include basename.Plo" scheme.
--make_dummy_depfile ()
--{
-- echo "#dummy" > "$depfile"
--}
--
--# Factor out some common post-processing of the generated depfile.
--# Requires the auxiliary global variable '$tmpdepfile' to be set.
--aix_post_process_depfile ()
--{
-- # If the compiler actually managed to produce a dependency file,
-- # post-process it.
-- if test -f "$tmpdepfile"; then
-- # Each line is of the form 'foo.o: dependency.h'.
-- # Do two passes, one to just change these to
-- # $object: dependency.h
-- # and one to simply output
-- # dependency.h:
-- # which is needed to avoid the deleted-header problem.
-- { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
-- sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
-- } > "$depfile"
-- rm -f "$tmpdepfile"
-- else
-- make_dummy_depfile
-- fi
--}
--
- # A tabulation character.
- tab=' '
- # A newline character.
- nl='
- '
--# Character ranges might be problematic outside the C locale.
--# These definitions help.
--upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
--lower=abcdefghijklmnopqrstuvwxyz
--digits=0123456789
--alpha=${upper}${lower}
-
- if test -z "$depmode" || test -z "$source" || test -z "$object"; then
- echo "depcomp: Variables source, object and depmode must be set" 1>&2
-@@ -128,9 +74,6 @@ tmpdepfile=${tmpdepfile-`echo "$depfile"
-
- rm -f "$tmpdepfile"
-
--# Avoid interferences from the environment.
--gccflag= dashmflag=
--
- # Some modes work just like other modes, but use different flags. We
- # parameterize here, but still list the modes in the big case below,
- # to make depend.m4 easier to write. Note that we *cannot* use a case
-@@ -142,32 +85,32 @@ if test "$depmode" = hp; then
- fi
-
- if test "$depmode" = dashXmstdout; then
-- # This is just like dashmstdout with a different argument.
-- dashmflag=-xM
-- depmode=dashmstdout
-+ # This is just like dashmstdout with a different argument.
-+ dashmflag=-xM
-+ depmode=dashmstdout
- fi
-
- cygpath_u="cygpath -u -f -"
- if test "$depmode" = msvcmsys; then
-- # This is just like msvisualcpp but w/o cygpath translation.
-- # Just convert the backslash-escaped backslashes to single forward
-- # slashes to satisfy depend.m4
-- cygpath_u='sed s,\\\\,/,g'
-- depmode=msvisualcpp
-+ # This is just like msvisualcpp but w/o cygpath translation.
-+ # Just convert the backslash-escaped backslashes to single forward
-+ # slashes to satisfy depend.m4
-+ cygpath_u='sed s,\\\\,/,g'
-+ depmode=msvisualcpp
- fi
-
- if test "$depmode" = msvc7msys; then
-- # This is just like msvc7 but w/o cygpath translation.
-- # Just convert the backslash-escaped backslashes to single forward
-- # slashes to satisfy depend.m4
-- cygpath_u='sed s,\\\\,/,g'
-- depmode=msvc7
-+ # This is just like msvc7 but w/o cygpath translation.
-+ # Just convert the backslash-escaped backslashes to single forward
-+ # slashes to satisfy depend.m4
-+ cygpath_u='sed s,\\\\,/,g'
-+ depmode=msvc7
- fi
-
- if test "$depmode" = xlc; then
-- # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
-- gccflag=-qmakedep=gcc,-MF
-- depmode=gcc
-+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
-+ gccflag=-qmakedep=gcc,-MF
-+ depmode=gcc
- fi
-
- case "$depmode" in
-@@ -190,7 +133,8 @@ gcc3)
- done
- "$@"
- stat=$?
-- if test $stat -ne 0; then
-+ if test $stat -eq 0; then :
-+ else
- rm -f "$tmpdepfile"
- exit $stat
- fi
-@@ -198,17 +142,13 @@ gcc3)
- ;;
-
- gcc)
--## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
--## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
--## (see the conditional assignment to $gccflag above).
- ## There are various ways to get dependency output from gcc. Here's
- ## why we pick this rather obscure method:
- ## - Don't want to use -MD because we'd like the dependencies to end
- ## up in a subdir. Having to rename by hand is ugly.
- ## (We might end up doing this anyway to support other compilers.)
- ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
--## -MM, not -M (despite what the docs say). Also, it might not be
--## supported by the other compilers which use the 'gcc' depmode.
-+## -MM, not -M (despite what the docs say).
- ## - Using -M directly means running the compiler twice (even worse
- ## than renaming).
- if test -z "$gccflag"; then
-@@ -216,14 +156,15 @@ gcc)
- fi
- "$@" -Wp,"$gccflag$tmpdepfile"
- stat=$?
-- if test $stat -ne 0; then
-+ if test $stat -eq 0; then :
-+ else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
-- # The second -e expression handles DOS-style file names with drive
-- # letters.
-+ alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-+## The second -e expression handles DOS-style file names with drive letters.
- sed -e 's/^[^:]*: / /' \
- -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
- ## This next piece of magic avoids the "deleted header file" problem.
-@@ -232,15 +173,15 @@ gcc)
- ## typically no way to rebuild the header). We avoid this by adding
- ## dummy dependencies for each header file. Too bad gcc doesn't do
- ## this for us directly.
-+ tr ' ' "$nl" < "$tmpdepfile" |
- ## Some versions of gcc put a space before the ':'. On the theory
- ## that the space means something, we add a space to the output as
- ## well. hp depmode also adds that space, but also prefixes the VPATH
- ## to the object. Take care to not repeat it in the output.
- ## Some versions of the HPUX 10.20 sed can't process this invocation
- ## correctly. Breaking it into two sed invocations is a workaround.
-- tr ' ' "$nl" < "$tmpdepfile" \
-- | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-- | sed -e 's/$/ :/' >> "$depfile"
-+ sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-+ | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-@@ -258,7 +199,8 @@ sgi)
- "$@" -MDupdate "$tmpdepfile"
- fi
- stat=$?
-- if test $stat -ne 0; then
-+ if test $stat -eq 0; then :
-+ else
- rm -f "$tmpdepfile"
- exit $stat
- fi
-@@ -266,6 +208,7 @@ sgi)
-
- if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
- echo "$object : \\" > "$depfile"
-+
- # Clip off the initial element (the dependent). Don't try to be
- # clever and replace this with sed code, as IRIX sed won't handle
- # lines with more than a fixed number of characters (4096 in
-@@ -273,15 +216,19 @@ sgi)
- # the IRIX cc adds comments like '#:fec' to the end of the
- # dependency line.
- tr ' ' "$nl" < "$tmpdepfile" \
-- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
-- | tr "$nl" ' ' >> "$depfile"
-+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-+ tr "$nl" ' ' >> "$depfile"
- echo >> "$depfile"
-+
- # The second pass generates a dummy entry for each header file.
- tr ' ' "$nl" < "$tmpdepfile" \
-- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-- >> "$depfile"
-+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-+ >> "$depfile"
- else
-- make_dummy_depfile
-+ # The sourcefile does not contain any dependencies, so just
-+ # store a dummy comment line, to avoid errors with the Makefile
-+ # "include basename.Plo" scheme.
-+ echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile"
- ;;
-@@ -299,8 +246,9 @@ aix)
- # current directory. Also, the AIX compiler puts '$object:' at the
- # start of each line; $object doesn't have directory information.
- # Version 6 uses the directory in both cases.
-- set_dir_from "$object"
-- set_base_from "$object"
-+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+ test "x$dir" = "x$object" && dir=
-+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.u
- tmpdepfile2=$base.u
-@@ -313,7 +261,9 @@ aix)
- "$@" -M
- fi
- stat=$?
-- if test $stat -ne 0; then
-+
-+ if test $stat -eq 0; then :
-+ else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
- exit $stat
- fi
-@@ -322,113 +272,65 @@ aix)
- do
- test -f "$tmpdepfile" && break
- done
-- aix_post_process_depfile
-- ;;
--
--tcc)
-- # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
-- # FIXME: That version still under development at the moment of writing.
-- # Make that this statement remains true also for stable, released
-- # versions.
-- # It will wrap lines (doesn't matter whether long or short) with a
-- # trailing '\', as in:
-- #
-- # foo.o : \
-- # foo.c \
-- # foo.h \
-- #
-- # It will put a trailing '\' even on the last line, and will use leading
-- # spaces rather than leading tabs (at least since its commit 0394caf7
-- # "Emit spaces for -MD").
-- "$@" -MD -MF "$tmpdepfile"
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile"
-- exit $stat
-+ if test -f "$tmpdepfile"; then
-+ # Each line is of the form 'foo.o: dependent.h'.
-+ # Do two passes, one to just change these to
-+ # '$object: dependent.h' and one to simply 'dependent.h:'.
-+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+ else
-+ # The sourcefile does not contain any dependencies, so just
-+ # store a dummy comment line, to avoid errors with the Makefile
-+ # "include basename.Plo" scheme.
-+ echo "#dummy" > "$depfile"
- fi
-- rm -f "$depfile"
-- # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
-- # We have to change lines of the first kind to '$object: \'.
-- sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
-- # And for each line of the second kind, we have to emit a 'dep.h:'
-- # dummy dependency, to avoid the deleted-header problem.
-- sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
--## The order of this option in the case statement is important, since the
--## shell code in configure will try each of these formats in the order
--## listed in this file. A plain '-MD' option would be understood by many
--## compilers, so we must ensure this comes after the gcc and icc options.
--pgcc)
-- # Portland's C compiler understands '-MD'.
-- # Will always output deps to 'file.d' where file is the root name of the
-- # source file under compilation, even if file resides in a subdirectory.
-- # The object file name does not affect the name of the '.d' file.
-- # pgcc 10.2 will output
-+icc)
-+ # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
-+ # However on
-+ # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-+ # ICC 7.0 will fill foo.d with something like
-+ # foo.o: sub/foo.c
-+ # foo.o: sub/foo.h
-+ # which is wrong. We want
-+ # sub/foo.o: sub/foo.c
-+ # sub/foo.o: sub/foo.h
-+ # sub/foo.c:
-+ # sub/foo.h:
-+ # ICC 7.1 will output
- # foo.o: sub/foo.c sub/foo.h
-- # and will wrap long lines using '\' :
-+ # and will wrap long lines using '\':
- # foo.o: sub/foo.c ... \
- # sub/foo.h ... \
- # ...
-- set_dir_from "$object"
-- # Use the source, not the object, to determine the base name, since
-- # that's sadly what pgcc will do too.
-- set_base_from "$source"
-- tmpdepfile=$base.d
--
-- # For projects that build the same source file twice into different object
-- # files, the pgcc approach of using the *source* file root name can cause
-- # problems in parallel builds. Use a locking strategy to avoid stomping on
-- # the same $tmpdepfile.
-- lockdir=$base.d-lock
-- trap "
-- echo '$0: caught signal, cleaning up...' >&2
-- rmdir '$lockdir'
-- exit 1
-- " 1 2 13 15
-- numtries=100
-- i=$numtries
-- while test $i -gt 0; do
-- # mkdir is a portable test-and-set.
-- if mkdir "$lockdir" 2>/dev/null; then
-- # This process acquired the lock.
-- "$@" -MD
-- stat=$?
-- # Release the lock.
-- rmdir "$lockdir"
-- break
-- else
-- # If the lock is being held by a different process, wait
-- # until the winning process is done or we timeout.
-- while test -d "$lockdir" && test $i -gt 0; do
-- sleep 1
-- i=`expr $i - 1`
-- done
-- fi
-- i=`expr $i - 1`
-- done
-- trap - 1 2 13 15
-- if test $i -le 0; then
-- echo "$0: failed to acquire lock after $numtries attempts" >&2
-- echo "$0: check lockdir '$lockdir'" >&2
-- exit 1
-- fi
--
-- if test $stat -ne 0; then
-+ # tcc 0.9.26 (FIXME still under development at the moment of writing)
-+ # will emit a similar output, but also prepend the continuation lines
-+ # with horizontal tabulation characters.
-+ "$@" -MD -MF "$tmpdepfile"
-+ stat=$?
-+ if test $stat -eq 0; then :
-+ else
- rm -f "$tmpdepfile"
- exit $stat
- fi
- rm -f "$depfile"
-- # Each line is of the form `foo.o: dependent.h',
-- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-+ # Each line is of the form 'foo.o: dependent.h',
-+ # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
- # Do two passes, one to just change these to
-- # `$object: dependent.h' and one to simply `dependent.h:'.
-- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-- # Some versions of the HPUX 10.20 sed can't process this invocation
-- # correctly. Breaking it into two sed invocations is a workaround.
-- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
-- | sed -e 's/$/ :/' >> "$depfile"
-+ # '$object: dependent.h' and one to simply 'dependent.h:'.
-+ sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
-+ < "$tmpdepfile" > "$depfile"
-+ sed '
-+ s/[ '"$tab"'][ '"$tab"']*/ /g
-+ s/^ *//
-+ s/ *\\*$//
-+ s/^[^:]*: *//
-+ /^$/d
-+ /:$/d
-+ s/$/ :/
-+ ' < "$tmpdepfile" >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-@@ -439,8 +341,9 @@ hp2)
- # 'foo.d', which lands next to the object file, wherever that
- # happens to be.
- # Much of this is similar to the tru64 case; see comments there.
-- set_dir_from "$object"
-- set_base_from "$object"
-+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+ test "x$dir" = "x$object" && dir=
-+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir.libs/$base.d
-@@ -451,7 +354,8 @@ hp2)
- "$@" +Maked
- fi
- stat=$?
-- if test $stat -ne 0; then
-+ if test $stat -eq 0; then :
-+ else
- rm -f "$tmpdepfile1" "$tmpdepfile2"
- exit $stat
- fi
-@@ -461,61 +365,76 @@ hp2)
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
-- sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
-+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add 'dependent.h:' lines.
- sed -ne '2,${
-- s/^ *//
-- s/ \\*$//
-- s/$/:/
-- p
-- }' "$tmpdepfile" >> "$depfile"
-+ s/^ *//
-+ s/ \\*$//
-+ s/$/:/
-+ p
-+ }' "$tmpdepfile" >> "$depfile"
- else
-- make_dummy_depfile
-+ echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile" "$tmpdepfile2"
- ;;
-
- tru64)
-- # The Tru64 compiler uses -MD to generate dependencies as a side
-- # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-- # dependencies in 'foo.d' instead, so we check for that too.
-- # Subdirectories are respected.
-- set_dir_from "$object"
-- set_base_from "$object"
-+ # The Tru64 compiler uses -MD to generate dependencies as a side
-+ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-+ # dependencies in 'foo.d' instead, so we check for that too.
-+ # Subdirectories are respected.
-+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+ test "x$dir" = "x$object" && dir=
-+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-- if test "$libtool" = yes; then
-- # Libtool generates 2 separate objects for the 2 libraries. These
-- # two compilations output dependencies in $dir.libs/$base.o.d and
-- # in $dir$base.o.d. We have to check for both files, because
-- # one of the two compilations can be disabled. We should prefer
-- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-- # automatically cleaned when .libs/ is deleted, while ignoring
-- # the former would cause a distcleancheck panic.
-- tmpdepfile1=$dir$base.o.d # libtool 1.5
-- tmpdepfile2=$dir.libs/$base.o.d # Likewise.
-- tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
-- "$@" -Wc,-MD
-- else
-- tmpdepfile1=$dir$base.d
-- tmpdepfile2=$dir$base.d
-- tmpdepfile3=$dir$base.d
-- "$@" -MD
-- fi
-+ if test "$libtool" = yes; then
-+ # With Tru64 cc, shared objects can also be used to make a
-+ # static library. This mechanism is used in libtool 1.4 series to
-+ # handle both shared and static libraries in a single compilation.
-+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-+ #
-+ # With libtool 1.5 this exception was removed, and libtool now
-+ # generates 2 separate objects for the 2 libraries. These two
-+ # compilations output dependencies in $dir.libs/$base.o.d and
-+ # in $dir$base.o.d. We have to check for both files, because
-+ # one of the two compilations can be disabled. We should prefer
-+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-+ # automatically cleaned when .libs/ is deleted, while ignoring
-+ # the former would cause a distcleancheck panic.
-+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
-+ tmpdepfile2=$dir$base.o.d # libtool 1.5
-+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
-+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
-+ "$@" -Wc,-MD
-+ else
-+ tmpdepfile1=$dir$base.o.d
-+ tmpdepfile2=$dir$base.d
-+ tmpdepfile3=$dir$base.d
-+ tmpdepfile4=$dir$base.d
-+ "$@" -MD
-+ fi
-
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-- exit $stat
-- fi
-+ stat=$?
-+ if test $stat -eq 0; then :
-+ else
-+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+ exit $stat
-+ fi
-
-- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-- do
-- test -f "$tmpdepfile" && break
-- done
-- # Same post-processing that is required for AIX mode.
-- aix_post_process_depfile
-- ;;
-+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+ do
-+ test -f "$tmpdepfile" && break
-+ done
-+ if test -f "$tmpdepfile"; then
-+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+ else
-+ echo "#dummy" > "$depfile"
-+ fi
-+ rm -f "$tmpdepfile"
-+ ;;
-
- msvc7)
- if test "$libtool" = yes; then
-@@ -526,7 +445,8 @@ msvc7)
- "$@" $showIncludes > "$tmpdepfile"
- stat=$?
- grep -v '^Note: including file: ' "$tmpdepfile"
-- if test $stat -ne 0; then
-+ if test "$stat" = 0; then :
-+ else
- rm -f "$tmpdepfile"
- exit $stat
- fi
-@@ -552,7 +472,6 @@ $ {
- G
- p
- }' >> "$depfile"
-- echo >> "$depfile" # make sure the fragment doesn't end with a backslash
- rm -f "$tmpdepfile"
- ;;
-
-@@ -604,14 +523,13 @@ dashmstdout)
- # in the target name. This is to cope with DOS-style filenames:
- # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
- "$@" $dashmflag |
-- sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
-+ sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
- rm -f "$depfile"
- cat < "$tmpdepfile" > "$depfile"
-- # Some versions of the HPUX 10.20 sed can't process this sed invocation
-- # correctly. Breaking it into two sed invocations is a workaround.
-- tr ' ' "$nl" < "$tmpdepfile" \
-- | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-- | sed -e 's/$/ :/' >> "$depfile"
-+ tr ' ' "$nl" < "$tmpdepfile" | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly. Breaking it into two sed invocations is a workaround.
-+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
-@@ -664,12 +582,10 @@ makedepend)
- # makedepend may prepend the VPATH from the source file name to the object.
- # No need to regex-escape $object, excess matching of '.' is harmless.
- sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-- # Some versions of the HPUX 10.20 sed can't process the last invocation
-- # correctly. Breaking it into two sed invocations is a workaround.
-- sed '1,2d' "$tmpdepfile" \
-- | tr ' ' "$nl" \
-- | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-- | sed -e 's/$/ :/' >> "$depfile"
-+ sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly. Breaking it into two sed invocations is a workaround.
-+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
- rm -f "$tmpdepfile" "$tmpdepfile".bak
- ;;
-
-@@ -705,10 +621,10 @@ cpp)
- esac
- done
-
-- "$@" -E \
-- | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-- | sed '$ s: \\$::' > "$tmpdepfile"
-+ "$@" -E |
-+ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+ sed '$ s: \\$::' > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
- cat < "$tmpdepfile" >> "$depfile"
-@@ -740,15 +656,15 @@ msvisualcpp)
- shift
- ;;
- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-- set fnord "$@"
-- shift
-- shift
-- ;;
-+ set fnord "$@"
-+ shift
-+ shift
-+ ;;
- *)
-- set fnord "$@" "$arg"
-- shift
-- shift
-- ;;
-+ set fnord "$@" "$arg"
-+ shift
-+ shift
-+ ;;
- esac
- done
- "$@" -E 2>/dev/null |
diff --git a/package/libsoup/patches/patch-build-aux_missing b/package/libsoup/patches/patch-build-aux_missing
deleted file mode 100644
index d51cb4f26..000000000
--- a/package/libsoup/patches/patch-build-aux_missing
+++ /dev/null
@@ -1,440 +0,0 @@
---- libsoup-2.44.2.orig/build-aux/missing 2013-10-18 00:01:48.000000000 +0200
-+++ libsoup-2.44.2/build-aux/missing 2014-04-14 17:21:42.180934853 +0200
-@@ -1,10 +1,10 @@
- #! /bin/sh
--# Common wrapper for a few potentially missing GNU programs.
-+# Common stub for a few missing GNU programs while installing.
-
--scriptversion=2012-06-26.16; # UTC
-+scriptversion=2012-01-06.18; # UTC
-
--# Copyright (C) 1996-2013 Free Software Foundation, Inc.
--# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
- # 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
-@@ -29,33 +29,61 @@ if test $# -eq 0; then
- exit 1
- fi
-
--case $1 in
-+run=:
-+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-- --is-lightweight)
-- # Used by our autoconf macros to check whether the available missing
-- # script is modern enough.
-- exit 0
-- ;;
-+# In the cases where this matters, 'missing' is being run in the
-+# srcdir already.
-+if test -f configure.ac; then
-+ configure_ac=configure.ac
-+else
-+ configure_ac=configure.in
-+fi
-
-- --run)
-- # Back-compat with the calling convention used by older automake.
-- shift
-- ;;
-+msg="missing on your system"
-+
-+case $1 in
-+--run)
-+ # Try to run requested program, and just exit if it succeeds.
-+ run=
-+ shift
-+ "$@" && exit 0
-+ # Exit code 63 means version mismatch. This often happens
-+ # when the user try to use an ancient version of a tool on
-+ # a file that requires a minimum version. In this case we
-+ # we should proceed has if the program had been absent, or
-+ # if --run hadn't been passed.
-+ if test $? = 63; then
-+ run=:
-+ msg="probably too old"
-+ fi
-+ ;;
-
- -h|--h|--he|--hel|--help)
- echo "\
- $0 [OPTION]... PROGRAM [ARGUMENT]...
-
--Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
--to PROGRAM being missing or too old.
-+Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-+error status if there is no known handling for PROGRAM.
-
- Options:
- -h, --help display this help and exit
- -v, --version output version information and exit
-+ --run try to run the given command, and emulate it if it fails
-
- Supported PROGRAM values:
-- aclocal autoconf autoheader autom4te automake makeinfo
-- bison yacc flex lex help2man
-+ aclocal touch file 'aclocal.m4'
-+ autoconf touch file 'configure'
-+ autoheader touch file 'config.h.in'
-+ autom4te touch the output file, or create a stub one
-+ automake touch all 'Makefile.in' files
-+ bison create 'y.tab.[ch]', if possible, from existing .[ch]
-+ flex create 'lex.yy.c', if possible, from existing .c
-+ help2man touch the output file
-+ lex create 'lex.yy.c', if possible, from existing .c
-+ makeinfo touch the output file
-+ yacc create 'y.tab.[ch]', if possible, from existing .[ch]
-
- Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
- 'g' are ignored when checking the name.
-@@ -70,141 +98,228 @@ Send bug reports to <bug-automake@gnu.or
- ;;
-
- -*)
-- echo 1>&2 "$0: unknown '$1' option"
-+ echo 1>&2 "$0: Unknown '$1' option"
- echo 1>&2 "Try '$0 --help' for more information"
- exit 1
- ;;
-
- esac
-
--# Run the given program, remember its exit status.
--"$@"; st=$?
-+# normalize program name to check for.
-+program=`echo "$1" | sed '
-+ s/^gnu-//; t
-+ s/^gnu//; t
-+ s/^g//; t'`
-
--# If it succeeded, we are done.
--test $st -eq 0 && exit 0
-+# Now exit if we have it, but it failed. Also exit now if we
-+# don't have it and --version was passed (most likely to detect
-+# the program). This is about non-GNU programs, so use $1 not
-+# $program.
-+case $1 in
-+ lex*|yacc*)
-+ # Not GNU programs, they don't have --version.
-+ ;;
-
--# Also exit now if we it failed (or wasn't found), and '--version' was
--# passed; such an option is passed most likely to detect whether the
--# program is present and works.
--case $2 in --version|--help) exit $st;; esac
-+ *)
-+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+ # We have it, but it failed.
-+ exit 1
-+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+ # Could not run --version or --help. This is probably someone
-+ # running '$TOOL --version' or '$TOOL --help' to check whether
-+ # $TOOL exists and not knowing $TOOL uses missing.
-+ exit 1
-+ fi
-+ ;;
-+esac
-
--# Exit code 63 means version mismatch. This often happens when the user
--# tries to use an ancient version of a tool on a file that requires a
--# minimum version.
--if test $st -eq 63; then
-- msg="probably too old"
--elif test $st -eq 127; then
-- # Program was missing.
-- msg="missing on your system"
--else
-- # Program was found and executed, but failed. Give up.
-- exit $st
--fi
-+# If it does not exist, or fails to run (possibly an outdated version),
-+# try to emulate it.
-+case $program in
-+ aclocal*)
-+ echo 1>&2 "\
-+WARNING: '$1' is $msg. You should only need it if
-+ you modified 'acinclude.m4' or '${configure_ac}'. You might want
-+ to install the Automake and Perl packages. Grab them from
-+ any GNU archive site."
-+ touch aclocal.m4
-+ ;;
-
--perl_URL=http://www.perl.org/
--flex_URL=http://flex.sourceforge.net/
--gnu_software_URL=http://www.gnu.org/software
-+ autoconf*)
-+ echo 1>&2 "\
-+WARNING: '$1' is $msg. You should only need it if
-+ you modified '${configure_ac}'. You might want to install the
-+ Autoconf and GNU m4 packages. Grab them from any GNU
-+ archive site."
-+ touch configure
-+ ;;
-
--program_details ()
--{
-- case $1 in
-- aclocal|automake)
-- echo "The '$1' program is part of the GNU Automake package:"
-- echo "<$gnu_software_URL/automake>"
-- echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
-- echo "<$gnu_software_URL/autoconf>"
-- echo "<$gnu_software_URL/m4/>"
-- echo "<$perl_URL>"
-- ;;
-- autoconf|autom4te|autoheader)
-- echo "The '$1' program is part of the GNU Autoconf package:"
-- echo "<$gnu_software_URL/autoconf/>"
-- echo "It also requires GNU m4 and Perl in order to run:"
-- echo "<$gnu_software_URL/m4/>"
-- echo "<$perl_URL>"
-- ;;
-- esac
--}
-+ autoheader*)
-+ echo 1>&2 "\
-+WARNING: '$1' is $msg. You should only need it if
-+ you modified 'acconfig.h' or '${configure_ac}'. You might want
-+ to install the Autoconf and GNU m4 packages. Grab them
-+ from any GNU archive site."
-+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-+ test -z "$files" && files="config.h"
-+ touch_files=
-+ for f in $files; do
-+ case $f in
-+ *:*) touch_files="$touch_files "`echo "$f" |
-+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-+ *) touch_files="$touch_files $f.in";;
-+ esac
-+ done
-+ touch $touch_files
-+ ;;
-
--give_advice ()
--{
-- # Normalize program name to check for.
-- normalized_program=`echo "$1" | sed '
-- s/^gnu-//; t
-- s/^gnu//; t
-- s/^g//; t'`
-+ automake*)
-+ echo 1>&2 "\
-+WARNING: '$1' is $msg. You should only need it if
-+ you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
-+ You might want to install the Automake and Perl packages.
-+ Grab them from any GNU archive site."
-+ find . -type f -name Makefile.am -print |
-+ sed 's/\.am$/.in/' |
-+ while read f; do touch "$f"; done
-+ ;;
-
-- printf '%s\n' "'$1' is $msg."
-+ autom4te*)
-+ echo 1>&2 "\
-+WARNING: '$1' is needed, but is $msg.
-+ You might have modified some files without having the
-+ proper tools for further handling them.
-+ You can get '$1' as part of Autoconf from any GNU
-+ archive site."
-
-- configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
-- case $normalized_program in
-- autoconf*)
-- echo "You should only need it if you modified 'configure.ac',"
-- echo "or m4 files included by it."
-- program_details 'autoconf'
-- ;;
-- autoheader*)
-- echo "You should only need it if you modified 'acconfig.h' or"
-- echo "$configure_deps."
-- program_details 'autoheader'
-- ;;
-- automake*)
-- echo "You should only need it if you modified 'Makefile.am' or"
-- echo "$configure_deps."
-- program_details 'automake'
-- ;;
-- aclocal*)
-- echo "You should only need it if you modified 'acinclude.m4' or"
-- echo "$configure_deps."
-- program_details 'aclocal'
-- ;;
-- autom4te*)
-- echo "You might have modified some maintainer files that require"
-- echo "the 'automa4te' program to be rebuilt."
-- program_details 'autom4te'
-- ;;
-- bison*|yacc*)
-- echo "You should only need it if you modified a '.y' file."
-- echo "You may want to install the GNU Bison package:"
-- echo "<$gnu_software_URL/bison/>"
-- ;;
-- lex*|flex*)
-- echo "You should only need it if you modified a '.l' file."
-- echo "You may want to install the Fast Lexical Analyzer package:"
-- echo "<$flex_URL>"
-- ;;
-- help2man*)
-- echo "You should only need it if you modified a dependency" \
-- "of a man page."
-- echo "You may want to install the GNU Help2man package:"
-- echo "<$gnu_software_URL/help2man/>"
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+ if test -f "$file"; then
-+ touch $file
-+ else
-+ test -z "$file" || exec >$file
-+ echo "#! /bin/sh"
-+ echo "# Created by GNU Automake missing as a replacement of"
-+ echo "# $ $@"
-+ echo "exit 0"
-+ chmod +x $file
-+ exit 1
-+ fi
- ;;
-- makeinfo*)
-- echo "You should only need it if you modified a '.texi' file, or"
-- echo "any other file indirectly affecting the aspect of the manual."
-- echo "You might want to install the Texinfo package:"
-- echo "<$gnu_software_URL/texinfo/>"
-- echo "The spurious makeinfo call might also be the consequence of"
-- echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
-- echo "want to install GNU make:"
-- echo "<$gnu_software_URL/make/>"
-- ;;
-- *)
-- echo "You might have modified some files without having the proper"
-- echo "tools for further handling them. Check the 'README' file, it"
-- echo "often tells you about the needed prerequisites for installing"
-- echo "this package. You may also peek at any GNU archive site, in"
-- echo "case some other package contains this missing '$1' program."
-- ;;
-- esac
--}
-
--give_advice "$1" | sed -e '1s/^/WARNING: /' \
-- -e '2,$s/^/ /' >&2
-+ bison*|yacc*)
-+ echo 1>&2 "\
-+WARNING: '$1' $msg. You should only need it if
-+ you modified a '.y' file. You may need the Bison package
-+ in order for those modifications to take effect. You can get
-+ Bison from any GNU archive site."
-+ rm -f y.tab.c y.tab.h
-+ if test $# -ne 1; then
-+ eval LASTARG=\${$#}
-+ case $LASTARG in
-+ *.y)
-+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-+ if test -f "$SRCFILE"; then
-+ cp "$SRCFILE" y.tab.c
-+ fi
-+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-+ if test -f "$SRCFILE"; then
-+ cp "$SRCFILE" y.tab.h
-+ fi
-+ ;;
-+ esac
-+ fi
-+ if test ! -f y.tab.h; then
-+ echo >y.tab.h
-+ fi
-+ if test ! -f y.tab.c; then
-+ echo 'main() { return 0; }' >y.tab.c
-+ fi
-+ ;;
-
--# Propagate the correct exit status (expected to be 127 for a program
--# not found, 63 for a program that failed due to version mismatch).
--exit $st
-+ lex*|flex*)
-+ echo 1>&2 "\
-+WARNING: '$1' is $msg. You should only need it if
-+ you modified a '.l' file. You may need the Flex package
-+ in order for those modifications to take effect. You can get
-+ Flex from any GNU archive site."
-+ rm -f lex.yy.c
-+ if test $# -ne 1; then
-+ eval LASTARG=\${$#}
-+ case $LASTARG in
-+ *.l)
-+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-+ if test -f "$SRCFILE"; then
-+ cp "$SRCFILE" lex.yy.c
-+ fi
-+ ;;
-+ esac
-+ fi
-+ if test ! -f lex.yy.c; then
-+ echo 'main() { return 0; }' >lex.yy.c
-+ fi
-+ ;;
-+
-+ help2man*)
-+ echo 1>&2 "\
-+WARNING: '$1' is $msg. You should only need it if
-+ you modified a dependency of a manual page. You may need the
-+ Help2man package in order for those modifications to take
-+ effect. You can get Help2man from any GNU archive site."
-+
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+ if test -f "$file"; then
-+ touch $file
-+ else
-+ test -z "$file" || exec >$file
-+ echo ".ab help2man is required to generate this page"
-+ exit $?
-+ fi
-+ ;;
-+
-+ makeinfo*)
-+ echo 1>&2 "\
-+WARNING: '$1' is $msg. You should only need it if
-+ you modified a '.texi' or '.texinfo' file, or any other file
-+ indirectly affecting the aspect of the manual. The spurious
-+ call might also be the consequence of using a buggy 'make' (AIX,
-+ DU, IRIX). You might want to install the Texinfo package or
-+ the GNU make package. Grab either from any GNU archive site."
-+ # The file to touch is that specified with -o ...
-+ file=`echo "$*" | sed -n "$sed_output"`
-+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+ if test -z "$file"; then
-+ # ... or it is the one specified with @setfilename ...
-+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+ file=`sed -n '
-+ /^@setfilename/{
-+ s/.* \([^ ]*\) *$/\1/
-+ p
-+ q
-+ }' $infile`
-+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
-+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-+ fi
-+ # If the file does not exist, the user really needs makeinfo;
-+ # let's fail without touching anything.
-+ test -f $file || exit 1
-+ touch $file
-+ ;;
-+
-+ *)
-+ echo 1>&2 "\
-+WARNING: '$1' is needed, and is $msg.
-+ You might have modified some files without having the
-+ proper tools for further handling them. Check the 'README' file,
-+ it often tells you about the needed prerequisites for installing
-+ this package. You may also peek at any GNU archive site, in case
-+ some other package would contain this missing '$1' program."
-+ exit 1
-+ ;;
-+esac
-+
-+exit 0
-
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)