--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/create-pkgbuild	Thu Jun 30 19:07:43 2011 +0100
@@ -0,0 +1,25 @@
+#!/usr/bin/bash
+pfexec pkg set-publisher --enable oi-extras
+echo 'Installing pkgbuild from oi-extras...'
+pfexec pkg install pkgbuild
+pushd /usr/lib/pkgbuild-1.3.104
+sed 's/`uname -v`/"oi_151"/' rpm_package.pm > /var/tmp/pkgbuild-herzen/rpm_package.pm
+pfexec mv /var/tmp/pkgbuild-herzen/rpm_package.pm .
+sed 's/-ba/-bb/' pkgtool.pl > /var/tmp/pkgbuild-herzen/pkgtool.pl
+pfexec mv /var/tmp/pkgbuild-herzen/pkgtool.pl .
+popd
+echo 'Building SFEperl-xml-parser and perl/SFEperl-xml-xpath...'
+mkdir -p ../logs/$1
+# Might as well build xz now, so as not to disturb the ordering in packages.xml
+pkgtool build --update --logdir=/export/home/herzen/logs/$1 perl/SFEperl-xml-parser.spec perl/SFEperl-xml-xpath.spec SFExz.spec
+echo 'Building pkgbuild...'
+pkgtool build-only --logdir=/export/home/herzen/logs/$1 --patches=/export/home/herzen/spec-files-extra-oi/pkgbuild/patches ../spec-files-extra-oi/pkgbuild/pkgbuild.spec
+echo 'Unistalling oi-extras' pkgbuild and xz and installing our pkgbuild
+pfexec pkg uninstall pkgbuild xz
+pfexec pkg set-publisher --disable oi-extras
+pfexec pkg install pkgbuild
+pushd /usr/lib/pkgbuild-1.3.103
+sed 's/`uname -v`/"oi_151"/' rpm_package.pm > /var/tmp/pkgbuild-herzen/rpm_package.pm
+pfexec mv /var/tmp/pkgbuild-herzen/rpm_package.pm .
+pfexec chown root:bin rpm_package.pm
+popd

--- a/packages.xml	Wed Jun 29 03:37:33 2011 +0100
+++ b/packages.xml	Thu Jun 30 19:07:43 2011 +0100
@@ -21,33 +21,13 @@
 	 symlinks from /usr/gnu/bin/gcc to /usr/gcc/4.5/bin/gcc,
 	 and analogously for libraries. -->
     <name>SFEgccruntime</name>
-    <ips_package_name>system/library/gcc-45-runtime</ips_package_name>
+    <ips_package_name>runtime/gcc</ips_package_name>
     <group>System/Libraries</group>
-    <pkg>
-      <name>SFEgcc</name>
-      <ips_package_name>developer/gcc-45</ips_package_name>
-      <group>Development/C</group>
-    </pkg>
-    <pkg>
-      <name>SFEgcc-l10n</name>
-      <ips_package_name>system/library/gcc-45/locale</ips_package_name>
-      <group>System/Libraries</group>
-    </pkg>
   </pkg>
   <pkg filename="SFEgcc-46.spec">
     <name>SFEgcc-46-runtime</name>
-    <ips_package_name>system/library/gcc-46-runtime</ips_package_name>
+    <ips_package_name>runtime/gcc-46</ips_package_name>
     <group>System/Libraries</group>
-    <pkg>
-      <name>SFEgcc-46</name>
-      <ips_package_name>developer/gcc-46</ips_package_name>
-      <group>Development/C</group>
-    </pkg>
-    <pkg>
-      <name>SFEgcc-46-l10n</name>
-      <ips_package_name>system/library/gcc-46/locale</ips_package_name>
-      <group>System/Libraries</group>
-    </pkg>
   </pkg>
   <pkg>
     <name>SFEyasm</name>
@@ -91,6 +71,10 @@
     <group>Development/Perl</group>
   </pkg>
   <pkg>
+    <name>SFEpython3</name>
+    <ips_package_name>runtime/python-32</ips_package_name>
+  </pkg>
+  <pkg>
     <name>SFEvala</name>
     <ips_package_name>developer/vala</ips_package_name>
     <group>Development/Other Languages</group>
@@ -131,7 +115,7 @@
     <ips_package_name>library/libiconv</ips_package_name>
     <group>System/Libraries</group>
   </pkg>
-  <pkg>
+  <pkg> <!-- hunspell displays Cyrillic characters incorrectly with ncurses -->
     <name>SFEncursesw</name>
     <ips_package_name>library/ncursesw</ips_package_name>
     <group>System/Libraries</group>
@@ -154,7 +138,7 @@
   </pkg>
   <pkg>
     <name>SFEfreeglut</name>
-    <ips_package_name>image/library/freeglut</ips_package_name>
+    <ips_package_name>x11/library/freeglut</ips_package_name>
     <group>System/Multimedia Libraries</group>
   </pkg>
   <pkg>