Mercurial Mercurial > upstream > spec-files-extra / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/qt-01-use_bash.diff
changeset 1742 2eaed8c84923
parent 1519 c11b1c0589ac
child 3018 7949b316d9d4 
--- a/patches/qt-01-use_bash.diff	Sat Mar 14 21:20:08 2009 +0000
+++ b/patches/qt-01-use_bash.diff	Sat Mar 14 21:22:02 2009 +0000
@@ -1,120 +1,81 @@
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/mac/dwarf2.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/mac/dwarf2.test
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/mac/dwarf2.test	2008-09-27 10:58:41.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/mac/dwarf2.test	2008-11-24 09:02:33.253802603 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- DWARF2_SUPPORT=no
- COMPILER=$1
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/bsymbolic_functions.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/bsymbolic_functions.test
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/bsymbolic_functions.test	2008-09-27 10:58:41.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/bsymbolic_functions.test	2008-11-24 09:02:33.333810266 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- BSYMBOLIC_FUNCTIONS_SUPPORT=no
- COMPILER=$1
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/compile.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/compile.test
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/compile.test	2008-09-27 10:58:41.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/compile.test	2008-11-24 09:02:33.342654826 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- SUCCESS=no
- QMKSPEC=$1
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/doubleformat.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/doubleformat.test
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/doubleformat.test	2008-09-27 10:58:41.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/doubleformat.test	2008-11-24 09:02:33.298452923 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- QMKSPEC=$1
- VERBOSE=$2
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/endian.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/endian.test
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/endian.test	2008-09-27 10:58:41.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/endian.test	2008-11-24 09:02:33.307157996 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- QMKSPEC=$1
- VERBOSE=$2
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/fvisibility.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/fvisibility.test
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/fvisibility.test	2008-09-27 10:58:41.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/fvisibility.test	2008-11-24 09:02:33.288763411 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- FVISIBILITY_SUPPORT=no
- COMPILER=$1
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/makeabs /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/makeabs
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/makeabs	2008-09-27 10:58:41.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/makeabs	2008-11-24 09:02:33.271326461 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- FILE="$1"
- RES="$FILE"
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/objcopy.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/objcopy.test
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/objcopy.test	2008-09-27 10:58:41.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/objcopy.test	2008-11-24 09:02:33.324931256 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- TEST_PATH=`dirname $0`
- SEP_DEBUG_SUPPORT=no
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/padstring /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/padstring
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/padstring	2008-09-27 10:58:41.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/padstring	2008-11-24 09:02:33.351450722 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- LEN="$1"
- STR="$2"
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/precomp.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/precomp.test
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/precomp.test	2008-09-27 10:58:41.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/precomp.test	2008-11-24 09:02:33.315708268 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- PRECOMP_SUPPORT=no
- COMPILER=$1
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/ptrsize.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/ptrsize.test
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/ptrsize.test	2008-09-27 10:58:41.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/ptrsize.test	2008-11-24 09:02:33.359890415 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- QMKSPEC=$1
- VERBOSE=$2
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/which.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/which.test
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/which.test	2008-09-27 10:58:41.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/which.test	2008-11-24 09:02:33.279702219 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- HOME=/dev/null
- export HOME
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/x11/notype.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/x11/notype.test
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/x11/notype.test	2008-09-27 10:58:41.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/x11/notype.test	2008-11-24 09:02:33.262332934 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- QMKSPEC=$1
- XPLATFORM=`basename $1`
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/configure /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/configure
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/configure	2008-09-27 10:58:41.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/configure	2008-11-24 09:02:33.377355914 +0100
@@ -145,7 +106,7 @@
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/autogen.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/autogen.sh
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/autogen.sh	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/autogen.sh	2008-11-24 09:02:33.140634197 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
  
@@ -154,165 +115,111 @@
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.guess /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.guess
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.guess	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.guess	2008-11-24 09:02:33.208987503 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
- # 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
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.sub /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.sub
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.sub	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.sub	2008-11-24 09:02:33.198106789 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/configure /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/configure
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/configure	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/configure	2008-11-24 09:02:33.186318744 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.62 for FreeType 2.3.6.
- #
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/freetype-config.in /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/freetype-config.in
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/freetype-config.in	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/freetype-config.in	2008-11-24 09:02:33.218018602 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
- #
- # Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2008 by
- # David Turner, Robert Wilhelm, and Werner Lemberg.
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/install-sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/install-sh
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/install-sh	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/install-sh	2008-11-24 09:02:33.150200976 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- # install - install a program, script, or datafile
- 
- scriptversion=2006-12-25.00
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/mkinstalldirs /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/mkinstalldirs
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/mkinstalldirs	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/mkinstalldirs	2008-11-24 09:02:33.158972305 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
- # mkinstalldirs --- make directory hierarchy
- 
- scriptversion=2006-05-11.19
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/configure /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/configure
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/configure	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/configure	2008-11-24 09:02:33.131796789 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- #
- # Copyright 2002, 2003, 2004, 2005, 2006 by
- # David Turner, Robert Wilhelm, and Werner Lemberg.
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/harfbuzz/autogen.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/harfbuzz/autogen.sh
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/harfbuzz/autogen.sh	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/harfbuzz/autogen.sh	2008-11-24 09:02:33.087773395 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- # Run this to generate all the initial makefiles, etc.
- 
- set -e
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/kdelibs/phonon/preprocessandextract.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/kdelibs/phonon/preprocessandextract.sh
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/kdelibs/phonon/preprocessandextract.sh	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/kdelibs/phonon/preprocessandextract.sh	2008-11-24 09:02:32.964675528 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- EXTRACT="`dirname $0`/extractmethodcalls.rb"
- IGNORE="^\(path\|platform\|iodevicestream\|medianode\|streaminterface\|mediasource\|abstractmediastream\|audioplayer\|globalconfig\|objectdescriptionmodel\|audiooutputadaptor\|effectwidget\|videoplayer\|seekslider\|volumeslider\).cpp$"
- 
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/configure /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/configure
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/configure	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/configure	2008-11-24 09:02:32.955400176 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- echo "
-   There is no \"configure\" script in this distribution of
-   libpng-1.2.29.
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config-head.in /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config-head.in
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config-head.in	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config-head.in	2008-11-24 09:02:32.946702882 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
- 
- # libpng-config
- # provides configuration info for libpng.
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config.in /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config.in
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config.in	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config.in	2008-11-24 09:02:32.938212197 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
- 
- # libpng-config
- # provides configuration info for libpng.
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/autogen.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/autogen.sh
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/autogen.sh	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/autogen.sh	2008-11-24 09:02:33.043075526 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- set -x
- #libtoolize --force --copy
- aclocal -I ./m4
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/compile /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/compile
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/compile	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/compile	2008-11-24 09:02:32.974245808 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
- # Wrapper for compilers which do not understand `-c -o'.
- 
- scriptversion=2005-05-14.22
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.guess /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.guess
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.guess	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.guess	2008-11-24 09:02:33.034069805 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.sub /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.sub
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.sub	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.sub	2008-11-24 09:02:32.994937427 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/depcomp /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/depcomp
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/depcomp	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/depcomp	2008-11-24 09:02:33.014195475 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
- # depcomp - compile a program generating dependencies as side-effects
- 
- scriptversion=2005-07-09.11
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/install-sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/install-sh
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/install-sh	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/install-sh	2008-11-24 09:02:33.023778896 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- # install - install a program, script, or datafile
- 
- scriptversion=2005-05-14.22
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/missing /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/missing
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/missing	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/missing	2008-11-24 09:02:33.004261846 +0100
@@ -334,21 +241,15 @@
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/mkinstalldirs /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/mkinstalldirs
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/mkinstalldirs	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/mkinstalldirs	2008-11-24 09:02:32.983340474 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
- # mkinstalldirs --- make directory hierarchy
- 
- scriptversion=2004-02-15.20
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/configure /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/configure
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/configure	2008-09-27 10:58:44.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/configure	2008-11-24 09:02:33.078569342 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.59 for LibTIFF Software 3.8.2.
- #
 @@ -87,7 +87,7 @@
  
  # The user is always right.
@@ -370,72 +271,48 @@
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/JavaScriptCore/make-generated-sources.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/JavaScriptCore/make-generated-sources.sh
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/JavaScriptCore/make-generated-sources.sh	2008-09-27 10:58:45.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/JavaScriptCore/make-generated-sources.sh	2008-11-24 09:02:33.096504351 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- export SRCROOT=$PWD
- export WebCore=$PWD
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/make-generated-sources.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/make-generated-sources.sh
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/make-generated-sources.sh	2008-09-27 10:58:46.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/make-generated-sources.sh	2008-11-24 09:02:33.114238243 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- export SOURCE_ROOT=$PWD
- export SRCROOT=$PWD
- export WebCore=$PWD
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/move-js-headers.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/move-js-headers.sh
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/move-js-headers.sh	2008-09-27 10:58:46.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/move-js-headers.sh	2008-11-24 09:02:33.105567198 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- mkdir -p include/JavaScriptCore
- find ../JavaScriptCore/ -name \*.h -exec cp -f -p {} include/JavaScriptCore/. \;
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/zlib/configure /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/zlib/configure
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/zlib/configure	2008-09-27 10:58:46.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/zlib/configure	2008-11-24 09:02:33.123219985 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- # configure script for zlib. This script is needed only if
- # you wish to build a shared library and your system supports them,
- # of if you need special compiler, flags or install directory.
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/corelib/xml/make-parser.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/corelib/xml/make-parser.sh
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/corelib/xml/make-parser.sh	2008-09-27 10:58:47.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/corelib/xml/make-parser.sh	2008-11-24 09:02:33.236683174 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- 
- me=$(dirname $0)
- mkdir -p $me/out
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/opengl/util/glsl_to_include.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/opengl/util/glsl_to_include.sh
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/opengl/util/glsl_to_include.sh	2008-09-27 10:58:47.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/opengl/util/glsl_to_include.sh	2008-11-24 09:02:32.929003012 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
- 
- # Compile a .glsl file to a file that can be included in a C++ program
- USAGE="Usage: $0 <file.glsl>"
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/tools/moc/util/generate.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/tools/moc/util/generate.sh
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/tools/moc/util/generate.sh	2008-09-27 10:58:48.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/tools/moc/util/generate.sh	2008-11-24 09:02:33.245212242 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- p4 edit ../keywords.cpp
- p4 edit ../ppkeywords.cpp
- qmake
 diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/xmlpatterns/environment/createReportContext.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/xmlpatterns/environment/createReportContext.sh
 --- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/xmlpatterns/environment/createReportContext.sh	2008-09-27 10:58:48.000000000 +0200
 +++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/xmlpatterns/environment/createReportContext.sh	2008-11-24 09:02:33.227441886 +0100
-@@ -1,4 +1,4 @@
+@@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
- # Generate ReportContext.h by invoking createReportContext.xsl, which
- # in turns performs a transformation on the specs, fetched from http://www.w3.org/.
-
upstream/spec-files-extra