--- a/buildrepo	Mon Jun 27 23:37:44 2011 +0100
+++ b/buildrepo	Tue Jun 28 20:12:43 2011 +0100
@@ -2,5 +2,5 @@
 mkdir -p ~/logs/$1
 # g++ sometimes picks up libstdcxx4 if it is present
 pfexec pkg uninstall -r stdcxx
-time pkgtool --nonotify --prodname="$2" --report=/export/home/herzen/reports/$1-gcc-first.html --logdir=/export/home/herzen/logs/$1 --autodeps --download build SFEgcc
-time pkgtool --nonotify --prodname="$2" --report=/export/home/herzen/reports/$1.html --logdir=/export/home/herzen/logs/$1 --autodeps --download build `xsltproc ../spec-files-extra-oi/specfiles.xsl ../spec-files-extra-oi/packages.xml`
+time pkgtool --nonotify --report=/export/home/herzen/reports/$1-gcc-first.html --logdir=/export/home/herzen/logs/$1 --autodeps --download build SFEgcc
+time pkgtool --nonotify --report=/export/home/herzen/reports/$1.html --logdir=/export/home/herzen/logs/$1 --autodeps --download build `xsltproc ../spec-files-extra-oi/specfiles.xsl ../spec-files-extra-oi/packages.xml`

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/initialize-repo	Tue Jun 28 20:12:43 2011 +0100
@@ -0,0 +1,7 @@
+#!/usr/bin/bash
+pfexec svcadm disable pkg/server
+pfexec zfs rollback -r rpool/zones/sfebuilda.uk.openindiana.org/ROOT/ipsrepo@clean
+pfexec svcadm enable pkg/server
+pfexec pkgsend -s file:///export/repo create-repository --set-property publisher.prefix=sfebuild
+pfexec svcadm refresh pkg/server
+pfexec svcadm restart pkg/server

--- a/packages.xml	Mon Jun 27 23:37:44 2011 +0100
+++ b/packages.xml	Tue Jun 28 20:12:43 2011 +0100
@@ -69,6 +69,12 @@
     <ips_package_name>developer/llvm</ips_package_name>
     <group>Development/C</group>
   </pkg>
+  <pkg>
+    <name>SFEgawk</name>
+    <ips_package_name>text/gawk</ips_package_name>
+    <group>Applications/System Utilities</group>
+    <summary>GNU implementation of awk, a pattern scanning and processing filter</summary>
+  </pkg>
   <pkg filename="haskell/SFEghc.spec">
     <name>SFEghc</name>
     <ips_package_name>runtime/ghc</ips_package_name>
@@ -147,6 +153,11 @@
     <group>System/Libraries</group>
   </pkg>
   <pkg>
+    <name>SFEfreeglut</name>
+    <ips_package_name>image/library/freeglut</ips_package_name>
+    <group>System/Multimedia Libraries</group>
+  </pkg>
+  <pkg>
     <name>SFEbullet</name>
     <ips_package_name>library/bullet</ips_package_name>
     <group>System/Libraries</group>
@@ -333,12 +344,6 @@
     <group>System/File System</group>
   </pkg>
   <pkg>
-    <name>SFEgawk</name>
-    <ips_package_name>text/gawk</ips_package_name>
-    <group>Applications/System Utilities</group>
-    <summary>GNU implementation of awk, a pattern scanning and processing filter</summary>
-  </pkg>
-  <pkg>
     <name>SFEgnugetopt</name>
     <ips_package_name>shell/gnu-getopt</ips_package_name>
     <group>Applications/System Utilities</group>
@@ -357,6 +362,7 @@
     <name>SFEvpnc</name>
     <ips_package_name>system/network/vpnc</ips_package_name>
     <group>Applications/Internet</group>
+    <summary>Client for Cisco VPN concentrator</summary>
   </pkg>
   <pkg>
     <name>SFExerces-c-gpp</name>
@@ -374,7 +380,7 @@
   </pkg>
 
   <!-- Qt -->
-  <pkg>
+  <pkg skip="true">
     <name>SFEqt47</name>
     <ips_package_name>library/desktop/c++/qt</ips_package_name>
     <group>Desktop (GNOME)/Libraries</group>
@@ -393,7 +399,7 @@
     <name>SFEscribus</name>
     <ips_package_name>desktop/publishing/scribus</ips_package_name>
   </pkg>
-  <pkg>
+  <pkg skip="true">
     <name>SFEarora</name>
     <ips_package_name>web/browser/arora</ips_package_name>
     <group>Applications/Internet</group>
@@ -721,11 +727,6 @@
     <summary>An ASCII art graphics library</summary>
   </pkg>
   <pkg>
-    <name>SFEfreeglut</name>
-    <ips_package_name>image/library/freeglut</ips_package_name>
-    <group>System/Multimedia Libraries</group>
-  </pkg>
-  <pkg>
     <name>SFEjasper</name>
     <ips_package_name>codec/jasper</ips_package_name>
     <group>System/Multimedia Libraries</group>
@@ -955,7 +956,7 @@
   </pkg>
   <pkg>
     <name>SFEwxwidgets-gpp</name>
-    <ips_package_name>library/desktop/g++/wxwidgets</ips_package_name>
+    <ips_package_name>library/graphics/g++/wxwidgets</ips_package_name>
   </pkg>
   <pkg>
     <name>SFEopenbox</name>

--- a/pkgbuild/patches/distro-redefine-tags.diff	Mon Jun 27 23:37:44 2011 +0100
+++ b/pkgbuild/patches/distro-redefine-tags.diff	Tue Jun 28 20:12:43 2011 +0100
@@ -93,9 +93,9 @@
      $line = $self->_get_next_line ($fhandle);
      if (defined ($line)) {
  	return $self->_process_top_level ($fhandle, $line);
---- pkgbuild-1.3.103/pkgdb.pm.in.orig	2011-06-26 22:13:37.000000000 +0100
-+++ pkgbuild-1.3.103/pkgdb.pm.in	2011-06-27 19:53:05.075770939 +0100
-@@ -408,6 +408,15 @@
+--- pkgbuild-1.3.103/pkgdb.pm.in.orig	2010-06-28 01:21:14.000000000 +0100
++++ pkgbuild-1.3.103/pkgdb.pm.in	2011-06-28 03:39:54.793511431 +0100
+@@ -392,6 +392,15 @@
  	return $self->{ips_pkgname_cache}->{$pkg};
      }
  
@@ -108,6 +108,6 @@
 +	}
 +    }
 +
-     # No local package found, search remote repos
-     if (not $search_remote) {
- 	$self->msg_info (0, "No local match found for $pkg, searching remote repos");
+     # search for local or remote matches using pkg search
+ 
+     # file2pkgs works for package names, too