--- a/create-pkgbuild	Sun Jul 17 03:06:02 2011 +0100
+++ b/create-pkgbuild	Tue Jul 19 20:26:39 2011 +0100
@@ -1,6 +1,7 @@
 #!/usr/bin/bash
 pfexec pkg set-publisher --enable oi-extras
-echo 'Installing pkgbuild from 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
@@ -8,14 +9,16 @@
 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 --update --logdir=/export/home/herzen/logs/$1 SFEperl-xml-parser.spec 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
-echo 'Unistalling oi-extras' pkgbuild and xz and installing our pkgbuild
-pfexec pkg uninstall pkgbuild xz
+
+echo 'Unistalling oi-extras' pkgbuild and installing our pkgbuild
+pfexec pkg uninstall pkgbuild
 pfexec pkg set-publisher --disable oi-extras
 pfexec pkg install pkgbuild
 pushd /usr/lib/pkgbuild-1.3.103
@@ -23,3 +26,9 @@
 pfexec mv /var/tmp/pkgbuild-herzen/rpm_package.pm .
 pfexec chown root:bin rpm_package.pm
 popd
+
+# 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 install xz

--- a/packages.xml	Sun Jul 17 03:06:02 2011 +0100
+++ b/packages.xml	Tue Jul 19 20:26:39 2011 +0100
@@ -24,9 +24,9 @@
     <ips_package_name>runtime/gcc</ips_package_name>
     <group>Development/C</group>
   </pkg>
-  <pkg filename="SFEgcc-46.spec">
-    <name>SFEgcc-46-runtime</name>
-    <ips_package_name>runtime/gcc-46</ips_package_name>
+  <pkg filename="SFEgcc-45.spec">
+    <name>SFEgcc-45-runtime</name>
+    <ips_package_name>runtime/gcc-45</ips_package_name>
     <group>Development/C</group>
   </pkg>
   <pkg>
@@ -74,8 +74,8 @@
     <ips_package_name>runtime/rakudo-perl</ips_package_name>
     <group>Development/Perl</group>
   </pkg>
-  <pkg>
-    <name>SFEqemu.spec</name>
+  <pkg skip="true">
+    <name>SFEqemu</name>
     <ips_package_name>runtime/qemu</ips_package_name>
     <group>System/Virtualization</group>
   </pkg>
@@ -186,11 +186,6 @@
     <group>Development/Perl</group>
   </pkg>
   <pkg>
-    <name>SFEperl-encode-detect</name>
-    <ips_package_name>library/perl-5/encode-detect</ips_package_name>
-    <group>Development/Perl</group>
-  </pkg>
-  <pkg>
     <name>SFEperl-digest-sha1</name>
     <ips_package_name>library/perl-5/digest-sha1</ips_package_name>
     <group>Development/Perl</group>
@@ -205,36 +200,11 @@
     <group>Development/Perl</group>
   </pkg>
   <pkg>
-    <name>SFEperl-net-dns</name>
-    <ips_package_name>library/perl-5/net-dns</ips_package_name>
-    <group>Development/Perl</group>
-  </pkg>
-  <pkg>
-    <name>SFEperl-io-socket-inet6</name>
-    <ips_package_name>library/perl-5/io-socket-inet6</ips_package_name>
-    <group>Development/Perl</group>
-  </pkg>
-  <pkg>
-    <name>SFEperl-exutils-cbuilder-</name>
-    <ips_package_name>library/perl-5/exutils-cbuilder</ips_package_name>
-    <group>Development/Perl</group>
-  </pkg>
-  <pkg>
-    <name>SFEperl-version</name>
-    <ips_package_name>library/perl-5/version</ips_package_name>
-    <group>Development/Perl</group>
-  </pkg>
-  <pkg>
     <name>SFEperl-module-build</name>
     <ips_package_name>library/perl-5/module-build</ips_package_name>
     <group>Development/Perl</group>
   </pkg>
   <pkg>
-    <name>SFEperl-netaddr-ip</name>
-    <ips_package_name>library/perl-5/netaddr-ip</ips_package_name>
-    <group>Development/Perl</group>
-  </pkg>
-  <pkg>
     <name>SFEperl-razor-agents</name>
     <ips_package_name>library/perl-5/razor-agents</ips_package_name>
     <group>Development/Perl</group>
@@ -255,21 +225,15 @@
     <group>Development/Perl</group>
   </pkg>
   <pkg>
-    <name>SFEperl-io-compress-raw-zlib</name>
-    <ips_package_name>library/perl-5/compress-raw-zlib</ips_package_name>
-    <group>Development/Perl</group>
-  </pkg>
-  <pkg>
     <name>SFEperl-archive-tar</name>
     <ips_package_name>library/perl-5/archive-tar</ips_package_name>
     <group>Development/Perl</group>
   </pkg>
   <pkg>
-    <name>SFEperl-io-zlip</name>
+    <name>SFEperl-io-zlib</name>
     <ips_package_name>library/perl-5/io-zlib</ips_package_name>
     <group>Development/Perl</group>
   </pkg>
-
   <pkg>
     <name>SFEemacs</name>
     <ips_package_name>editor/emacs</ips_package_name>
@@ -364,6 +328,11 @@
     <ips_package_name>system/library/enet</ips_package_name>
     <group>System/Libraries</group>
   </pkg>
+  <pkg skip="true"> <!-- Only used by pulseaudio, which desn't build -->
+    <name>SFElibatomic-ops</name>
+    <ips_package_name>system/library/libatomic-ops</ips_package_name>
+    <group>System/Libraries</group>
+  </pkg>
   <pkg>
     <name>SFEldns</name>
     <ips_package_name>system/library/ldns</ips_package_name>
@@ -464,6 +433,12 @@
     <summary>Blogging software</summary>
   </pkg>
   <pkg>
+    <name>SFEdrupal7</name>
+    <ips_package_name>web/service/drupal</ips_package_name>
+    <group>Web Services/Portals</group>
+    <summary>Open-source content-management platform</summary>
+  </pkg>
+  <pkg>
     <name>SFEossp-uuid</name>
     <ips_package_name>library/ossp-uuid</ips_package_name>
     <group>Applications/System Utilities</group>
@@ -593,6 +568,11 @@
     <group>System/Multimedia Libraries</group>
     <summary>Advanced Linux Sound Architecture library</summary>
   </pkg>
+  <pkg skip="true">  <!-- Does not build yet -->
+    <name>SFEpulseaudio</name>
+    <ips_package_name>library/audio/pulseaudio</ips_package_name>
+    <group>System/Multimedia Libraries</group>
+  </pkg>
   <pkg>
     <name>SFEalsa-plugins</name>
     <ips_package_name>library/audio/alsa-plugins</ips_package_name>
@@ -715,6 +695,11 @@
     <group>System/Multimedia Libraries</group>
   </pkg>
   <pkg>
+    <name>SFElibmp4v2</name>
+    <ips_package_name>library/video/mp4v2</ips_package_name>
+    <group>System/Multimedia Libraries</group>
+  </pkg>
+  <pkg>
     <name>SFEliveMedia</name>
     <ips_package_name>library/video/liveMedia</ips_package_name>
     <group>System/Multimedia Libraries</group>
@@ -732,31 +717,28 @@
     <name>SFElibass</name>
     <ips_package_name>library/video/libass</ips_package_name>
   </pkg>
-  <pkg encumbered="true">
+  <pkg encumbered="true" filename="encumbered/SFEmplayer-snap.spec">
     <name>SFEmplayer</name>
     <ips_package_name>media/mplayer</ips_package_name>
     <group>Applications/Sound and Video</group>
     <summary>The Movie Player</summary>
-    <filename>encumbered/SFEmplayer-snap.spec</filename>
   </pkg>
   <pkg encumbered="true">
     <name>SFEmplayer2</name>
     <ips_package_name>media/mplayer2</ips_package_name>
     <group>Applications/Sound and Video</group>
   </pkg>
-  <pkg encumbered="true" filename="encumbered/SFEmplayer-snap.spec">
+  <pkg encumbered="true" filename="SFEsmplayer.spec">
     <name>SFEsmplayer</name>
     <ips_package_name>media/smplayer</ips_package_name>
     <group>Applications/Sound and Video</group>
     <summary>MPlayer front-end using Qt</summary>
-    <filename>SFEsmplayer.spec</filename>
   </pkg>
-  <pkg skip="true" encumbered="true">
+  <pkg skip="true" encumbered="true" filename="experimental/SFEvlc-1.1.4.1.spec">
     <name>SFEvlc</name>
     <ips_package_name>media/vlc</ips_package_name>
     <group>Applications/Sound and Video</group>
     <summary>Cross-platform media player and streaming server</summary>
-    <filename>experimental/SFEvlc-1.1.4.1.spec</filename>
   </pkg>
   <pkg skip="true" encumbered="true">  <!-- Does not build -->
     <name>SFExine-lib</name>
@@ -791,12 +773,12 @@
     <group>System/Multimedia Libraries</group>
     <summary>mms stream protocol library</summary>
   </pkg>
-  <pkg encumbered="true">
+  <pkg encumbered="true" skip="true">  <!-- Unmaintained -->
     <name>SFEgnome-media-extras</name>
     <ips_package_name>gnome/media/gnome-media-extras</ips_package_name>
     <group>Applications/Sound and Video</group>
   </pkg>
-  <!-- Currently, mkvtoolnix only links statically to libebml and libmatroska -->
+  <!-- Currently, mkvtoolnix links only statically to libebml and libmatroska -->
   <pkg skip="true">
     <name>SFElibebml</name>
     <ips_package_name>library/libebml</ips_package_name>
@@ -1114,7 +1096,7 @@
     <summary>F Virtual Window Manager</summary>
   </pkg>
   <pkg>
-    <name>SFEfvwmthemes</name>
+    <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>

--- a/uninstall-packages	Sun Jul 17 03:06:02 2011 +0100
+++ b/uninstall-packages	Tue Jul 19 20:26:39 2011 +0100
@@ -7,4 +7,5 @@
 pkg://sfebuild/media/* pkg://sfebuild/network/* pkg://sfebuild/runtime/* \
 pkg://sfebuild/service/* pkg://sfebuild/shell/* pkg://sfebuild/storage/* \
 pkg://sfebuild/system/* pkg://sfebuild/terminal/* pkg://sfebuild/text/* \
-pkg://sfebuild/web/* pkg://sfebuild/xfce/* pkg://sfebuild/package/*
+pkg://sfebuild/web/* pkg://sfebuild/xfce/* pkg://sfebuild/package/* \
+pkg://sfebuild/archiver/* pkg://sfebuild/communication/* pkg://sfebuild/x11/*