Apply patches for OmniOS build

Author: citrus-it

Diff for: build.sh

@@ -11,6 +11,7 @@ done
 PNGDIR="${PWD}/libpng-1.5.4"
 PNGINC="${PNGDIR}/proto/usr/local/include"
 PNGLIB="${PNGDIR}/proto/usr/local/lib"
+PREFIX="${PREFIX:-/smartdc}"
 
 if [[ ! -d ${PNGDIR} ]]; then
     (curl -k https://download.joyent.com/pub/kvm-cmd/libpng-1.5.4.tar.gz | \
@@ -39,12 +40,14 @@ CC="${CC:-${DESTDIR}/usr/bin/gcc}"
 XCFLAGS="-fno-builtin -I${PNGINC} -isystem ${DESTDIR}/usr/include -msave-args"
 XLDFLAGS="-nodefaultlibs -L${PNGLIB} -L${DESTDIR}/usr/lib/amd64 -L${DESTDIR}/lib/amd64"
 XLDFLAGS="${XLDFLAGS} -Wl,-zfatal-warnings -Wl,-zassert-deflib"
-XLDFLAGS="${XLDFLAGS} -lz -lm -lc -lvnd"
+XLDFLAGS="${XLDFLAGS} -lz -lm -lc"
 ./configure \
     --cc=$CC \
     --extra-cflags="${XCFLAGS}" \
     --extra-ldflags="${XLDFLAGS}" \
-    --prefix=/smartdc \
+    --prefix=$PREFIX \
+    --sysconfdir=/etc \
+    --install=/usr/gnu/bin/install \
     --audio-card-list= \
     --audio-drv-list= \
     --disable-bluez \
@@ -75,6 +78,7 @@ fi
 #
 KERNEL_SOURCE="${KERNEL_SOURCE:-$(pwd)/../../illumos}"
 CTFBINDIR="$KERNEL_SOURCE"/usr/src/tools/proto/root_i386-nd/opt/onbld/bin/i386
+export CTFBINDIR
 export PATH="$PATH:$CTFBINDIR"
 
 if [[ -z "$CONFIGURE_ONLY" ]]; then

Diff for: configure

@@ -1796,7 +1796,7 @@ EOF
       if has awk && has grep; then
         kvmerr=`LANG=C $cc $QEMU_CFLAGS -o $TMPE $kvm_cflags $TMPC 2>&1 \
 	| grep "error: " \
-	| awk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'`
+	| gawk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'`
         if test "$kvmerr" != "" ; then
           echo -e "${kvmerr}\n\
 NOTE: To enable KVM support, update your kernel to 2.6.29+ or install \