--- a/create-pkgbuild	Tue Jul 19 21:17:52 2011 +0100
+++ b/create-pkgbuild	Mon Jul 25 17:49:51 2011 +0100
@@ -4,8 +4,8 @@
 echo 'Installing pkgbuild from oi-extras ...'
 pfexec pkg install pkgbuild xml-parser
 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/`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
@@ -22,9 +22,9 @@
 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
+#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
 
 # Might as well build xz now, so as not to disturb the ordering in packages.xml

--- a/packages.xml	Tue Jul 19 21:17:52 2011 +0100
+++ b/packages.xml	Mon Jul 25 17:49:51 2011 +0100
@@ -46,10 +46,10 @@
   </pkg>
   <pkg>
     <name>SFEllvm</name>
-    <ips_package_name>developer/llvm</ips_package_name>
+    <ips_package_name>runtime/llvm</ips_package_name>
     <group>Development/C</group>
   </pkg>
-  <pkg>
+  <pkg skip="true">
     <name>SFEgawk</name>
     <ips_package_name>text/gawk</ips_package_name>
     <group>Applications/System Utilities</group>
@@ -129,11 +129,6 @@
     <ips_package_name>library/libiconv</ips_package_name>
     <group>System/Libraries</group>
   </pkg>
-  <pkg> <!-- hunspell displays Cyrillic characters incorrectly with ncurses -->
-    <name>SFEncursesw</name>
-    <ips_package_name>library/ncursesw</ips_package_name>
-    <group>System/Libraries</group>
-  </pkg>
   <pkg>
     <name>SFEgsl</name>
     <ips_package_name>library/gsl</ips_package_name>
@@ -237,7 +232,7 @@
     <ips_package_name>developer/documentation-tool/texi2html</ips_package_name>
     <group>Development/Distribution Tools</group>
   </pkg>
-  <pkg>
+  <pkg skip="true">
     <name>SFEdoxygen</name>
     <ips_package_name>developer/documentation-tool/doxygen</ips_package_name>
     <group>Development/Distribution Tools</group>
@@ -365,7 +360,7 @@
     <ips_package_name>system/file-system/libfuse</ips_package_name>
     <group>System/File System</group>
   </pkg>
-  <pkg>
+  <pkg skip="true"> <!-- Does nat build with gcc 4.6; unmaintained -->
     <name>SFEntfs-3g</name>
     <ips_package_name>system/file-system/ntfs-3g</ips_package_name>
     <group>System/File System</group>
@@ -414,7 +409,6 @@
   <pkg>
     <name>SFEossp-uuid</name>
     <ips_package_name>library/ossp-uuid</ips_package_name>
-    <group>Applications/System Utilities</group>
   </pkg>
 
   <!-- Qt -->
@@ -507,7 +501,6 @@
     <name>SFElibshout</name>
     <ips_package_name>library/audio/libshout</ips_package_name>
     <group>System/Multimedia Libraries</group>
-    <summary>Library for broadcasting to an Icecast streaming media server</summary>
   </pkg>
   <pkg>
     <name>SFElibgsm</name>
@@ -650,12 +643,19 @@
     <name>SFEsonata</name>
     <ips_package_name>gnome/media/sonata</ips_package_name>
   </pkg>
+  <pkg>
+    <name>SFElibmowgli</name>
+    <ips_package_name>library/libmowgli</ips_package_name>
+  </pkg>
+  <pkg>
+    <name>SFElibmcs</name>
+    <ips_package_name>library/libmcs</ips_package_name>
+  </pkg>
 
   <!-- Video -->
   <pkg encumbered="true">
     <name>SFElibx264</name>
     <ips_package_name>library/video/x264</ips_package_name>
-    <group>System/Multimedia Libraries</group>
   </pkg>
   <pkg encumbered="true">
     <name>SFExvid</name>
@@ -690,7 +690,8 @@
     <name>SFElibass</name>
     <ips_package_name>library/video/libass</ips_package_name>
   </pkg>
-  <pkg encumbered="true" filename="encumbered/SFEmplayer-snap.spec">
+  <!-- Do not build mplayer: mplayer2 works fine -->
+  <pkg skip="true" encumbered="true" filename="encumbered/SFEmplayer-snap.spec">
     <name>SFEmplayer</name>
     <ips_package_name>media/mplayer</ips_package_name>
     <group>Applications/Sound and Video</group>
@@ -726,7 +727,6 @@
   <pkg>
     <name>SFElibvpx</name>
     <ips_package_name>library/video/libvpx</ips_package_name>
-    <group>System/Multimedia Libraries</group>
   </pkg>
   <pkg>
     <name>SFElibdvdread</name>
@@ -744,7 +744,6 @@
     <name>SFElibmms</name>
     <ips_package_name>library/video/libmms</ips_package_name>
     <group>System/Multimedia Libraries</group>
-    <summary>mms stream protocol library</summary>
   </pkg>
   <pkg encumbered="true" skip="true">  <!-- Unmaintained -->
     <name>SFEgnome-media-extras</name>
@@ -765,7 +764,10 @@
   <pkg>
     <name>SFEmkvtoolnix</name>
     <ips_package_name>media/mkvtoolnix</ips_package_name>
-    <group>Applications/Sound and Video</group>
+  </pkg>
+  <pkg>
+    <name>SFEogmtools</name>
+    <ips_package_name>media/ogmtools</ips_package_name>
   </pkg>
   <pkg>
     <name>SFEtransmageddon</name>
@@ -966,7 +968,6 @@
     <name>SFEmsmtp</name>
     <ips_package_name>mail/msmtp</ips_package_name>
     <group>Applications/Internet</group>
-    <summary>SMTP client for sending to a smart host</summary>
   </pkg>
   <pkg>
     <name>SFEbogofilter</name>
@@ -1286,6 +1287,5 @@
   <pkg>
     <name>SFEopenttd</name>
     <ips_package_name>games/openttd</ips_package_name>
-    <group>Applications/Games</group>
   </pkg>
 </pkgs>

--- a/uninstall-packages	Tue Jul 19 21:17:52 2011 +0100
+++ b/uninstall-packages	Mon Jul 25 17:49:51 2011 +0100
@@ -8,4 +8,4 @@
 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/archiver/* pkg://sfebuild/communication/* pkg://sfebuild/x11/*
+pkg://sfebuild/archiver/* pkg://sfebuild/x11/*