--- a/buildrepo	Mon Jul 25 18:11:39 2011 +0100
+++ b/buildrepo	Tue Aug 02 18:48:16 2011 +0100
@@ -3,4 +3,4 @@
 # g++ sometimes picks up libstdcxx4 if it is present
 pfexec pkg uninstall -r stdcxx
 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`
+time pkgtool --nonotify --report=/export/home/herzen/reports/$1.html --logdir=/export/home/herzen/logs/$1 --autodeps --download build `xsltproc ../oi-sfe-tools/specfiles.xsl ../oi-sfe-tools/packages.xml`

--- a/create-pkgbuild	Mon Jul 25 18:11:39 2011 +0100
+++ b/create-pkgbuild	Tue Aug 02 18:48:16 2011 +0100
@@ -10,12 +10,12 @@
 pfexec mv /var/tmp/pkgbuild-herzen/pkgtool.pl .
 popd
 
-echo 'Building and perl/SFEperl-xml-xpath...'
+echo 'Building perl/SFEperl-xml-xpath...'
 mkdir -p ../logs/$1
 pkgtool build --update --logdir=/export/home/herzen/logs/$1 SFEperl-xml-xpath.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
+pkgtool build-only --logdir=/export/home/herzen/logs/$1 --patches=/export/home/herzen/oi-sfe-tools/pkgbuild/patches ../oi-sfe-tools/pkgbuild/pkgbuild.spec
 
 echo 'Unistalling oi-extras' pkgbuild and installing our pkgbuild
 pfexec pkg uninstall pkgbuild
@@ -30,5 +30,5 @@
 # Might as well build xz now, so as not to disturb the ordering in packages.xml
 echo 'Building SFExz ...'
 pkgtool build-only --logdir=/export/home/herzen/logs/$1 SFExz.spec
-pfexec pkg uninstall SFExz
+pfexec pkg uninstall xz
 pfexec pkg install xz

--- a/packages.xml	Mon Jul 25 18:11:39 2011 +0100
+++ b/packages.xml	Tue Aug 02 18:48:16 2011 +0100
@@ -24,7 +24,7 @@
     <ips_package_name>runtime/gcc</ips_package_name>
     <group>Development/C</group>
   </pkg>
-  <pkg filename="SFEgcc-45.spec">
+  <pkg filename="SFEgcc-45.spec" skip="true">
     <name>SFEgcc-45-runtime</name>
     <ips_package_name>runtime/gcc-45</ips_package_name>
     <group>Development/C</group>
@@ -44,7 +44,7 @@
     <ips_package_name>developer/physfs</ips_package_name>
     <group>Development/Other Languages</group>
   </pkg>
-  <pkg>
+  <pkg filename="experimental/SFEllvm-svn.spec">
     <name>SFEllvm</name>
     <ips_package_name>runtime/llvm</ips_package_name>
     <group>Development/C</group>
@@ -223,6 +223,10 @@
     <group>Development/Distribution Tools</group>
   </pkg>
   <pkg>
+    <name>SFEgob</name>
+    <ips_package_name>developer/build/gob2</ips_package_name>
+  </pkg>
+  <pkg>
     <name>SFEasciidoc</name>
     <ips_package_name>developer/documentation-tool/asciidoc</ips_package_name>
     <group>Development/Distribution Tools</group>
@@ -377,7 +381,7 @@
   </pkg>
   <pkg>
     <name>SFEtun</name>
-    <ips_package_name>system/network/tun</ips_package_name>
+    <ips_package_name>system/network/tuntap</ips_package_name>
     <group>System/Core</group>
   </pkg>
   <pkg>
@@ -395,6 +399,10 @@
     <ips_package_name>library/lzo</ips_package_name>
   </pkg>
   <pkg>
+    <name>SFEnetatalk</name>
+    <ips_package_name>system/library/netatalk</ips_package_name>
+  </pkg>
+  <pkg>
     <name>SFEwordpress</name>
     <ips_package_name>web/service/wordpress</ips_package_name>
     <group>Web Services/Portals</group>
@@ -418,7 +426,7 @@
     <group>Desktop (GNOME)/Libraries</group>
   </pkg>
   <pkg>
-    <name>SFEqt47-gpp</name>
+    <name>SFEqt-gpp</name>
     <ips_package_name>library/desktop/g++/qt</ips_package_name>
     <group>Desktop (GNOME)/Libraries</group>
   </pkg>
@@ -431,7 +439,7 @@
     <name>SFEscribus</name>
     <ips_package_name>desktop/publishing/scribus</ips_package_name>
   </pkg>
-  <pkg skip="true">
+  <pkg>
     <name>SFEarora</name>
     <ips_package_name>web/browser/arora</ips_package_name>
     <group>Applications/Internet</group>
@@ -636,6 +644,10 @@
     <summary>Gnome Music Player Daemon client</summary>
   </pkg>
   <pkg>
+    <name>SFEqmpdclient</name>
+    <ips_package_name>media/qmpdclient</ips_package_name>
+  </pkg>
+  <pkg>
     <name>SFEpython26-mpd</name>
     <ips_package_name>library/python2/python-mpd-26</ips_package_name>
   </pkg>
@@ -875,7 +887,7 @@
     <name>SFExcircuit</name>
     <ips_package_name>image/xcircuit</ips_package_name>
   </pkg>
-  <pkg>
+  <pkg filename="SFEstellarium-gpp.spec">
     <name>SFEstellarium</name>
     <ips_package_name>image/stellarium</ips_package_name>
     <group>Applications/Graphics and Imaging</group>
@@ -919,7 +931,7 @@
     <name>SFExmlto</name>
     <ips_package_name>developer/documentation-tool/xmlto</ips_package_name>
     <group>Development/Distribution Tools</group>
-    <summary>Converts an DocBook XML file into a specified format</summary>
+    <summary>Converts a DocBook XML file into a specified format</summary>
   </pkg>
   <pkg>
     <name>SFEmtr</name>
@@ -1073,7 +1085,7 @@
     <name>SFEfvwm-themes</name>
     <ips_package_name>desktop/window-manager/fvwm/themes</ips_package_name>
     <group>Desktop (GNOME)/Window Managers</group>
-    <summary>F Virtual Window Manager</summary>
+    <summary>F Virtual Window Manager themes</summary>
   </pkg>
   <pkg>
     <name>SFEemerald</name>
@@ -1173,13 +1185,13 @@
     <group>Desktop (GNOME)/Window Managers</group>
   </pkg>
   <pkg>
-    <name>SFExfce-loginmgr</name>
-    <ips_package_name>xfce/xfce-loginmanager</ips_package_name>
+    <name>SFExfce4-session</name>
+    <ips_package_name>xfce/xfce-session</ips_package_name>
     <group>Desktop (GNOME)/Sessions</group>
   </pkg>
   <pkg>
-    <name>SFExfce4-session</name>
-    <ips_package_name>xfce/xfce-session</ips_package_name>
+    <name>SFExfce-loginmgr</name>
+    <ips_package_name>xfce/xfce-loginmanager</ips_package_name>
     <group>Desktop (GNOME)/Sessions</group>
   </pkg>
   <pkg>
@@ -1271,7 +1283,7 @@
     <ips_package_name>library/desktop/wv</ips_package_name>
     <group>Desktop (GNOME)/Libraries</group>
   </pkg>
-  <pkg>
+  <pkg skip="true">  <!-- Deprecated and does not build anyway -->
     <name>SFEaspell</name>
     <ips_package_name>library/spell-checking/aspell</ips_package_name>
     <group>Applications/Accessories</group>