--- a/ChangeLog	Mon Mar 16 22:36:52 2009 +0000
+++ b/ChangeLog	Tue Apr 28 09:49:26 2009 +0000
@@ -1,3 +1,7 @@
+2009-04-28 Lukas (Luc) Oboril <[email protected]>
+	* bump pkgbuild to latest version 1.3.98.4
+	* add Sun Studio Express 03/09 as known compiler
+
 2009-03-16 Lukas (Luc) Oboril <[email protected]>
 	* bump cmake to 2.6.3 (fix many issues)
 	* bump pkgbuild to latest stable release 1.3.3

--- a/cbe-install	Mon Mar 16 22:36:52 2009 +0000
+++ b/cbe-install	Tue Apr 28 09:49:26 2009 +0000
@@ -32,7 +32,7 @@
 
 # this is listed separately because we are using the spec file
 # included in the pkgbuild tarball
-PKGBUILD_VERSION=1.3.3
+PKGBUILD_VERSION=1.3.98.4
 
 # Modules needed for building GNOME:
 GNOME_MODULES="ant m4 autoconf automake libtool bison coreutils diff flex gettext make subversion"
@@ -357,7 +357,7 @@
     # FIXME: if CC = gcc, set CFLAGS to -std=c99
     msg "Locating compilers..."
     arch=$(uname -p)
-    known_compilers="/sgnome/onnv-tools/$arch/SS12/bin/cc /sgnome/onnv-tools/$arch/SS11/bin/cc /ws/onnv-tools/SUNWspro/SS12/bin/cc /ws/onnv-tools/SUNWspro/SS11/bin/cc /opt/SUNWspro/bin/cc /opt/SS12/SUNWspro/bin /opt/Studio12/bin /usr/bin/cc /opt/SunStudioExpress/bin/cc /usr/bin/gcc /usr/sfw/bin/gcc /usr/gnu/bin/gcc"
+    known_compilers="/sgnome/onnv-tools/$arch/SS12/bin/cc /sgnome/onnv-tools/$arch/SS11/bin/cc /ws/onnv-tools/SUNWspro/SS12/bin/cc /ws/onnv-tools/SUNWspro/SS11/bin/cc /opt/SUNWspro/bin/cc /opt/SS12/SUNWspro/bin/cc /opt/Studio12/bin/cc /opt/SSX0903/bin/cc /usr/bin/cc /opt/SunStudioExpress/bin/cc /usr/bin/gcc /usr/sfw/bin/gcc /usr/gnu/bin/gcc"
     if [ "x$orig_CC" != x ]; then
 	if [ -x $orig_CC ]; then
 	    echo " $known_compilers " | grep " $orig_CC " > /dev/null || \
@@ -1272,6 +1272,7 @@
     msg "Now rebuilding pkgbuild using itself..."
     logrun mkdir -p $tmp_build_dir/packages/SOURCES || return 1
     logrun ln -s $tardir/pkgbuild-$PKGBUILD_VERSION.tar.bz2 $tmp_build_dir/packages/SOURCES/ || return 1
+    logrun cp -pr $tmp_build_dir/src/pkgbuild-$PKGBUILD_VERSION/COPYING $tmp_build_dir/packages/SOURCES/gpl-2.0.txt || return 1
     logrun_quiet bash -c "$tmp_build_dir/bin/pkgbuild --define \"pkgbuild_prefix $cbe_prefix\" --define \"_topdir $tmp_build_dir/packages\" -ba $tmp_build_dir/src/pkgbuild-$PKGBUILD_VERSION/pkgbuild.spec" || return 1
     make_admin_file $tempdir/pkgadd.admin.$$ pkgadd
     logrun pfexec /usr/sbin/pkgadd -R $rootdir -n -a $tempdir/pkgadd.admin.$$ -d "$tmp_build_dir/packages/PKGS" SFpkgbuild || return 1