diff -urN desktop-cbe-mini-1.8.0.orig/mini-cbe-install desktop-cbe-mini-1.8.0/mini-cbe-install

--- desktop-cbe-mini-1.8.0.orig/mini-cbe-install	2011-05-06 15:14:34.000000000 +0200

+++ desktop-cbe-mini-1.8.0/mini-cbe-install	2011-05-06 15:16:46.000000000 +0200

@@ -919,8 +919,11 @@

     msg "Please be patient, this may take a couple of minutes."

     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 $mydir/patches/pkgbuild-*.patch $tmp_build_dir/packages/SOURCES/ || return 1

+    logrun patch -p1 < $mydir/pkgbuild-add-patches.patch || return 1

+    logrun bash -c 'perl_package="$(pkg search -l -H -o pkg.name "link::/usr/bin/perl OR file::/usr/bin/perl" 2>/dev/null)"; sed "s|^Requires:     SUNWperl584core|Requires: ${perl_package:-SUNWperl584core}|" pkgbuild.spec > pkgbuild.spec.$$ && mv pkgbuild.spec.$$ pkgbuild.spec' || 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/pkgtool --src $tmp_build_dir/packages/SOURCES --nonotify --define \"pkgbuild_prefix /usr\" --define \"_topdir $tmp_build_dir/packages\" build --update-if-newer $tmp_build_dir/src/pkgbuild-$PKGBUILD_VERSION/pkgbuild.spec" || return 1

+    logrun_quiet bash -c "$tmp_build_dir/bin/pkgtool --src $tmp_build_dir/packages/SOURCES --patches $tmp_build_dir/packages/SOURCES --nonotify --define \"pkgbuild_prefix /usr\" --define \"_topdir $tmp_build_dir/packages\" build --update-if-newer $tmp_build_dir/src/pkgbuild-$PKGBUILD_VERSION/pkgbuild.spec" || return 1

     pkgbuild_topdir=`/usr/bin/pkgbuild -bp /usr/lib/pkgbuild-$PKGBUILD_VERSION/get_rpm_topdir 2>&1 | grep '^TOPDIR=' | cut -f2- -d=`

     logrun mkdir -p "$rootdir/$pkgbuild_topdir/PKGS" "$rootdir/$pkgbuild_topdir/SPKGS"

     cd /tmp || return 1

diff -urN desktop-cbe-mini-1.8.0.orig/patches/pkgbuild-01-add-unknown-dependencies.patch desktop-cbe-mini-1.8.0/patches/pkgbuild-01-add-unknown-dependencies.patch

--- desktop-cbe-mini-1.8.0.orig/patches/pkgbuild-01-add-unknown-dependencies.patch	1970-01-01 01:00:00.000000000 +0100

+++ desktop-cbe-mini-1.8.0/patches/pkgbuild-01-add-unknown-dependencies.patch	2011-05-06 15:15:00.000000000 +0200

@@ -0,0 +1,13 @@

+diff -ur pkgbuild-1.3.103.orig/pkgbuild.pl.in pkgbuild-1.3.103/pkgbuild.pl.in

+--- pkgbuild-1.3.103.orig/pkgbuild.pl.in	2010-07-12 04:56:34.000000000 +0200

++++ pkgbuild-1.3.103/pkgbuild.pl.in	2010-10-24 11:47:20.000000000 +0200

+@@ -995,7 +995,8 @@

+ 	if (defined ($pkg) and defined($pkgname)) {

+ 	    print $fhandle "P $pkg $pkgname\n"; 

+ 	} else {

+-	    print "WARNING: omitting $dep from the SVr4 depend file\n";

++	    print "WARNING: unknown dependency $dep\n";

++	    print $fhandle "P $dep\n"; 

+ 	}

+     }

+ 

diff -urN desktop-cbe-mini-1.8.0.orig/patches/pkgbuild-02-nopkg.patch desktop-cbe-mini-1.8.0/patches/pkgbuild-02-nopkg.patch

--- desktop-cbe-mini-1.8.0.orig/patches/pkgbuild-02-nopkg.patch	1970-01-01 01:00:00.000000000 +0100

+++ desktop-cbe-mini-1.8.0/patches/pkgbuild-02-nopkg.patch	2011-05-06 15:15:00.000000000 +0200

@@ -0,0 +1,182 @@

+diff -ur pkgbuild-1.3.103.orig/pkgtool.pl pkgbuild-1.3.103/pkgtool.pl

+--- pkgbuild-1.3.103.orig/pkgtool.pl	2010-07-14 13:03:12.000000000 +0200

++++ pkgbuild-1.3.103/pkgtool.pl	2010-11-02 13:44:16.000000000 +0100

+@@ -98,6 +98,7 @@

+ # Which package mechanism are we going to install by default?

+ my $ips;

+ my $svr4;

++my $nopkg;

+ 

+ sub process_defaults () {

+     my $default_spec_dir = "$topdir/SPECS";

+@@ -363,9 +364,11 @@

+ 	(defined ($ips_utils) and $ips_utils->is_depotd_enabled())) {

+ 	$ips = 1;

+ 	$svr4 = undef;

++	$nopkg = undef;

+     } else {

+ 	$ips = undef;

+ 	$svr4 = 1;

++	$nopkg = undef;

+     }

+ }

+ 

+@@ -764,12 +767,22 @@

+ 	}

+ 	$ips = shift;

+ 	$svr4 = undef;

++	$nopkg = undef;

+ }

+ 

+ sub set_svr4($) {

+ 	msg_info (0,"SVr4 packages will be installed by default");

+ 	$svr4 = shift;

+ 	$ips = undef;

++	$nopkg = undef;

++}

++

++sub set_nopkg($) {

++	msg_info (0,"Packages will be copied into the filesystem without using a package system");

++	msg_warning (0,"This may break your system!");

++	$ips = undef;

++	$svr4 = undef;

++	$nopkg = shift;

+ }

+ 

+ sub process_options {

+@@ -868,6 +881,7 @@

+ 		},

+ 		'ips' => sub { set_ips(1); },

+ 		'svr4' => sub { set_svr4(1); },

++		'nopkg' => sub { set_nopkg(1); },

+                 'rmlog' => sub { shift; $defaults->set ('rmlog', shift); },

+ 		'<>' => \&process_args);

+ 

+@@ -945,6 +959,11 @@

+ 

+ 		  Install SVr4 packages by default.

+ 

++    --nopkg

++

++		  Don't install any packages, simply copy the files.

++		  WARNING: This may break your system!

++

+     --rmlog

+ 

+                   Automatically remove the log file with each build

+@@ -1511,6 +1530,95 @@

+     return 1;

+ }

+ 

++sub install_pkgs_nopkg ($) {

++    my $spec_id = shift;

++    my $spec = $specs_to_build[$spec_id];

++    

++    my @pkgs = $spec->get_package_names ($ds);

++    my $verbose = $defaults->get ('verbose');

++    if ($verbose > 0) {

++	map msg_info (0, "Installing $_\n"), @pkgs;

++    }

++    

++    my $pkgsdir = $spec->get_value_of ("_topdir") . "/PKGS";

++    

++    my $adminfile = "/tmp/pkg.admin.$$";

++    make_admin_file ($adminfile);

++

++# FIXME: should install in dependency order

++    foreach my $pkg (@pkgs) {

++	my $msg;

++	

++	# Only install SVr4 package if --svr4 is defined

++	if (defined $nopkg) {

++		my $nopkgdir = "/tmp/.pkgtool-pkg.tmp.$$";

++            if (-e $nopkgdir) {

++		    `rm -rf $nopkgdir`;

++	    }

++	    `mkdir $nopkgdir`;

++

++	    if (defined ($ds)) {

++		$msg=`/usr/bin/pkgtrans $pkgsdir/$pkg $nopkgdir all 2>&1`;

++	    } else {

++		$msg=`/usr/bin/pkgtrans $pkgsdir $nopkgdir $pkg 2>&1`;

++	    }

++	    

++	    if ($? > 0) {

++		unlink ($adminfile);

++		msg_error "failed to install package: $msg";

++		$build_status[$spec_id] = 'FAILED';

++		$status_details[$spec_id] = $msg;

++		return 0;

++	    }

++

++	    my $basedir = `grep '^BASEDIR=' $nopkgdir/$pkg/pkginfo |cut -d = -f 2`;

++	    chomp $basedir;

++

++	    my $pkgmap = `cat $nopkgdir/$pkg/pkgmap`;

++

++	    # Install directories first.

++	    while ($pkgmap =~ /^\S+ [dx] \S+ (\S+) (\S+)/mg) {

++		my ($path, $mode) = ($1, $2);

++

++		if (! -d "$basedir/$path") {

++		    `pfexec mkdir -m $mode -p $basedir/$path`;

++		}

++	    }

++

++	    # Install files. Skip editable/volatile files that already exist.

++	    while ($pkgmap =~ /^\S+ ([fev]) \S+ (\S+) (\S+)/mg) {

++		my ($type, $path, $mode) = ($1, $2, $3);

++

++		if ($type !~ /^[ev]$/ || ! -e "$basedir/$path") {

++		    `pfexec cp -Ppf $nopkgdir/$pkg/reloc/$path $basedir/$path`;

++		    `pfexec chmod $mode $basedir/$path`;

++		}

++	    }

++

++	    # Install links.

++	    while ($pkgmap =~ /^\S+ ([sl]) \S+ (\S+)=(\S+)/mg) {

++		my ($type, $path, $dest) = ($1, $2, $3);

++

++		# Make sure the last argument to ln won't be interpreted as a

++		# directory name by removing existing directories and symlinks

++		# to directories first.

++		if (-e "$basedir/$path") {

++			`pfexec rm -rf $basedir/$path`;

++		}

++

++		if ($type eq 'l') {

++			`pfexec ln -f $dest $basedir/$path`;

++		} else {

++			`pfexec ln -sf $dest $basedir/$path`;

++		}

++	    }

++	}

++    }

++    

++    unlink ($adminfile);

++    return 1;

++}

++

+ my %all_incorporations;

+ my %incorporated;

+ 

+@@ -2594,6 +2702,8 @@

+ 		install_pkgs_ips ($spec_id) || return 0;

+ 	    } elsif (defined ($svr4)) {

+ 		install_pkgs_svr4 ($spec_id) || return 0;

++            } elsif (defined ($nopkg)) {

++                install_pkgs_nopkg ($spec_id) || return 0;

+ 	    } else {

+ 		msg_error ("Internal error: either IPS or SVr4 should be selected");

+ 		return 0;

+@@ -2673,6 +2783,10 @@

+ 	$the_command = "$the_command --nodeps";

+     }

+ 

++    if ($nopkg) {

++	$the_command = "$the_command --nodeps";

++    }

++

+ # FIXME: ExclusiveArch?

+     my $rpm_target = $defaults->get ('target');

+     if (defined($rpm_target)) {

diff -urN desktop-cbe-mini-1.8.0.orig/patches/pkgbuild-03-forcefully-copy-docs.patch desktop-cbe-mini-1.8.0/patches/pkgbuild-03-forcefully-copy-docs.patch

--- desktop-cbe-mini-1.8.0.orig/patches/pkgbuild-03-forcefully-copy-docs.patch	1970-01-01 01:00:00.000000000 +0100

+++ desktop-cbe-mini-1.8.0/patches/pkgbuild-03-forcefully-copy-docs.patch	2011-05-06 15:15:00.000000000 +0200

@@ -0,0 +1,13 @@

+diff -ur pkgbuild-1.3.103.orig/pkgbuild.pl.in pkgbuild-1.3.103/pkgbuild.pl.in

+--- pkgbuild-1.3.103.orig/pkgbuild.pl.in	2010-11-02 13:39:24.000000000 +0100

++++ pkgbuild-1.3.103/pkgbuild.pl.in	2010-11-02 13:46:09.000000000 +0100

+@@ -1172,7 +1172,7 @@

+     # %doc foo/bar/COPYING

+     my $fname_basedir = dirname ($fname);

+     mkdir_p ("./$basedir/$docdir/$fname_basedir") or fatal ("Failed to create directory $mydir/$docdir/$fname_basedir");

+-    system ("cp -p '$blddir/$bsdirname/$doc_subdir$fname' './$basedir/$docdir/$fname_basedir'");

++    system ("cp -fp '$blddir/$bsdirname/$doc_subdir$fname' './$basedir/$docdir/$fname_basedir'");

+     if ($? != 0) {

+ 	fatal ("ERROR: failed to copy $fname to $mydir/$basedir/$docdir/$fname_basedir");

+ 	return undef;

+Only in pkgbuild-1.3.103: pkgbuild.pl.in.orig

diff -urN desktop-cbe-mini-1.8.0.orig/pkgbuild-add-patches.patch desktop-cbe-mini-1.8.0/pkgbuild-add-patches.patch

--- desktop-cbe-mini-1.8.0.orig/pkgbuild-add-patches.patch	1970-01-01 01:00:00.000000000 +0100

+++ desktop-cbe-mini-1.8.0/pkgbuild-add-patches.patch	2011-05-06 15:15:00.000000000 +0200

@@ -0,0 +1,23 @@

+diff -ur pkgbuild-1.3.103.orig/pkgbuild.spec pkgbuild-1.3.103/pkgbuild.spec

+--- pkgbuild-1.3.103.orig/pkgbuild.spec	2010-07-14 12:53:27.000000000 +0200

++++ pkgbuild-1.3.103/pkgbuild.spec	2010-11-02 13:54:32.000000000 +0100

+@@ -16,6 +16,9 @@

+ Vendor:	      OpenSolaris Community

+ Summary:      pkgbuild - rpmbuild-like tool for building Solaris packages

+ Source:       http://prdownloads.sourceforge.net/pkgbuild/pkgbuild-%{version}.tar.bz2

++Patch1:       pkgbuild-01-add-unknown-dependencies.patch

++Patch2:       pkgbuild-02-nopkg.patch

++Patch3:       pkgbuild-03-forcefully-copy-docs.patch

+ BuildRoot:    %{_tmppath}/%{name}-%{version}-build

+ 

+ %if %_is_pkgbuild

+@@ -45,6 +48,9 @@

+ 

+ %prep

+ %setup -q -n pkgbuild-%version

++%patch1 -p1

++%patch2 -p1

++%patch3 -p1

+ 

+ %build

+ ./configure --prefix=%{pkgbuild_prefix}