--- a/eliminate-subpackages.patch	Sat Aug 06 19:34:59 2011 +0100
+++ b/eliminate-subpackages.patch	Mon Aug 22 23:51:40 2011 +0100
@@ -1,6 +1,6 @@
-diff -r 8ab0b5b4e3fa SFEboost-gpp.spec
---- a/SFEboost-gpp.spec	Sat Aug 06 19:29:20 2011 +0100
-+++ b/SFEboost-gpp.spec	Sat Aug 06 19:32:48 2011 +0100
+diff -r b3e0c8b3961b SFEboost-gpp.spec
+--- a/SFEboost-gpp.spec	Fri Aug 19 21:16:20 2011 +0100
++++ b/SFEboost-gpp.spec	Sat Aug 20 14:01:05 2011 +0100
 @@ -26,19 +26,12 @@
  BuildRequires:	SFEicu-gpp-devel
  Requires:	SFEicu-gpp
@@ -22,7 +22,7 @@
  %prep
  rm -rf %name-%version
  mkdir %name-%version
-@@ -98,13 +91,11 @@
+@@ -99,13 +92,11 @@
  %dir %attr (0755, root, bin) %{_libdir}
  %{_libdir}/lib*.so*
  
@@ -37,9 +37,9 @@
  %dir %attr (0755, root, sys) %{_datadir}
  %dir %attr (0755, root, other) %{_docdir}
  %{_docdir}/boost-%{version}
-diff -r 8ab0b5b4e3fa SFEboost-stdcxx.spec
---- a/SFEboost-stdcxx.spec	Sat Aug 06 19:29:20 2011 +0100
-+++ b/SFEboost-stdcxx.spec	Sat Aug 06 19:32:48 2011 +0100
+diff -r b3e0c8b3961b SFEboost-stdcxx.spec
+--- a/SFEboost-stdcxx.spec	Fri Aug 19 21:16:20 2011 +0100
++++ b/SFEboost-stdcxx.spec	Sat Aug 20 14:01:05 2011 +0100
 @@ -37,7 +37,7 @@
  Requires: SFEicu
  Requires: SUNWlibstdcxx4
@@ -67,9 +67,9 @@
  * Sun Apr  3 2011 - Alex Viskovatoff <[email protected]>
  - Update to 1.46.1
  * Thu Jan 27 2011 - Alex Viskovatoff
-diff -r 8ab0b5b4e3fa SFEgcc.spec
---- a/SFEgcc.spec	Sat Aug 06 19:29:20 2011 +0100
-+++ b/SFEgcc.spec	Sat Aug 06 19:32:48 2011 +0100
+diff -r b3e0c8b3961b SFEgcc.spec
+--- a/SFEgcc.spec	Fri Aug 19 21:16:20 2011 +0100
++++ b/SFEgcc.spec	Sat Aug 20 14:01:05 2011 +0100
 @@ -98,7 +98,7 @@
  %define _gnu_libdir %{_basedir}/gnu/lib
  
@@ -151,12 +151,12 @@
  %defattr (-, root, bin)
  %dir %attr (0755, root, bin) %{_prefix}
  %dir %attr (0755, root, sys) %{_datadir}
-diff -r 8ab0b5b4e3fa SFEqt-gpp.spec
---- a/SFEqt-gpp.spec	Sat Aug 06 19:29:20 2011 +0100
-+++ b/SFEqt-gpp.spec	Sat Aug 06 19:32:48 2011 +0100
-@@ -71,17 +71,12 @@
- #detected by ldding the binaries
- Requires: database/mysql-51/library,image/library/libjpeg,image/library/libpng,image/library/libtiff,library/glib2,library/libxml2,library/zlib,service/opengl/ogl-select,system/library,system/library/c++/sunpro,system/library/math,x11/library/libice,x11/library/libsm,x11/library/libx11,x11/library/libxdamage,x11/library/libxext,x11/library/libxrender,x11/library/mesa 
+diff -r b3e0c8b3961b SFEqt-gpp.spec
+--- a/SFEqt-gpp.spec	Fri Aug 19 21:16:20 2011 +0100
++++ b/SFEqt-gpp.spec	Sat Aug 20 14:01:05 2011 +0100
+@@ -66,17 +66,12 @@
+ BuildRequires: SUNWdbus
+ Requires: SUNWdbus
  
 -%package -n %name-devel
 +%package devel
@@ -173,7 +173,7 @@
  
  %prep
  %setup -q -n %srcname-%version
-@@ -196,7 +191,7 @@
+@@ -192,7 +187,7 @@
  %_datadir/qt/phrasebooks
  %_datadir/qt/translations
  
@@ -182,7 +182,7 @@
  %defattr (-, root, bin)
  %_bindir
  %dir %attr (0755, root, bin) %_includedir
-@@ -210,9 +205,6 @@
+@@ -206,9 +201,6 @@
  %dir %attr (0755, root, other) %_prefix/imports
  %_prefix/imports/*
  
@@ -192,7 +192,7 @@
  %_datadir/qt/q3porting.xml
  %dir %attr (0755, root, other) %_datadir/doc
  %_datadir/doc/*
-@@ -229,6 +221,10 @@
+@@ -244,6 +236,10 @@
  - Add patch qt-isnan.diff to enable building with gcc 4.6
  * Sat Jul  2 2011 - Alex Viskovatoff <[email protected]>
  - Add missing dependency on SFEgcc
@@ -203,9 +203,9 @@
  * Sat Jun 25 2011 - Alex Viskovatoff <[email protected]>
  - Use patches from kde-solaris instead of those inherited from SFEqt47.spec
  - Bump to 4.7.3
-diff -r 8ab0b5b4e3fa SFEqt47.spec
---- a/SFEqt47.spec	Sat Aug 06 19:29:20 2011 +0100
-+++ b/SFEqt47.spec	Sat Aug 06 19:32:48 2011 +0100
+diff -r b3e0c8b3961b SFEqt47.spec
+--- a/SFEqt47.spec	Fri Aug 19 21:16:20 2011 +0100
++++ b/SFEqt47.spec	Sat Aug 20 14:01:05 2011 +0100
 @@ -122,18 +122,12 @@
  Requires: SUNWxwxft
  # The above also pulls in SUNWfreetype2

--- a/packages.xml	Sat Aug 06 19:34:59 2011 +0100
+++ b/packages.xml	Mon Aug 22 23:51:40 2011 +0100
@@ -82,7 +82,7 @@
     <name>SFEpython3</name>
     <ips_package_name>runtime/python-32</ips_package_name>
   </pkg>
-  <pkg>
+  <pkg skip="true">  <!-- System package is older, but don't build anyway -->
     <name>SFEvala</name>
     <ips_package_name>developer/vala</ips_package_name>
     <group>Development/Other Languages</group>
@@ -113,9 +113,9 @@
     <ips_package_name>system/library/g++/boost</ips_package_name>
     <group>System/Libraries</group>
   </pkg>
-  <pkg skip="true"> <!-- Not clear why jurikm created this: it's in the system -->
-    <name>SFElibgc</name>
-    <ips_package_name>library/gc</ips_package_name>
+  <pkg skip="true">
+    <name>SFElibgc-gpp</name>
+    <ips_package_name>library/g++/gc</ips_package_name>
     <group>Development/C++</group>
   </pkg>
   <pkg>
@@ -159,6 +159,11 @@
     <ips_package_name>library/libmaa</ips_package_name>
     <group>System/Libraries</group>
   </pkg>
+  <pkg>
+    <name>SFElibtar</name>
+    <ips_package_name>library/libtar</ips_package_name>
+    <group>System/Libraries</group>
+  </pkg>
 
   <!-- Perl modules -->
   <pkg>
@@ -248,7 +253,7 @@
   </pkg>
   <pkg>
     <name>SFEgit</name>
-    <ips_package_name>developer/versioning/git</ips_package_name>
+    <ips_package_name>sfe.openindiana.org/developer/versioning/git</ips_package_name>
     <group>Development/Source Code Management</group>
   </pkg>
   <pkg>
@@ -299,6 +304,11 @@
     <ips_package_name>system/library/enet</ips_package_name>
     <group>System/Libraries</group>
   </pkg>
+  <pkg>
+    <name>SFElibupnp</name>
+    <ips_package_name>system/library/libupnp</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>
@@ -376,7 +386,7 @@
   </pkg>
   <pkg>
     <name>SFElibevent2</name>
-    <ips_package_name>system/library/libevent</ips_package_name>
+    <ips_package_name>sfe.openindiana.org/library/libevent</ips_package_name>
   </pkg>
   <pkg>
     <name>SFEtun</name>
@@ -422,24 +432,28 @@
     <ips_package_name>library/g++/sigcpp</ips_package_name>
   </pkg>
   <pkg>
+    <name>SFEpcre-gpp</name>
+    <ips_package_name>library/g++/pcre</ips_package_name>
+  </pkg>
+  <pkg>
     <name>SFEglibmm-gpp</name>
     <ips_package_name>library/g++/glibmm</ips_package_name>
   </pkg>
   <pkg>
-    <name>SFEgtkmm-gpp</name>
-    <ips_package_name>library/g++/gtkmm</ips_package_name>
-  </pkg>
-  <pkg>
     <name>SFEcairomm-gpp</name>
-    <ips_package_name>library/g++/cairomm</ips_package_name>
+    <ips_package_name>library/desktop/g++/cairomm</ips_package_name>
   </pkg>
   <pkg>
     <name>SFEpangomm-gpp</name>
-    <ips_package_name>library/g++/pangomm</ips_package_name>
+    <ips_package_name>library/desktop/g++/pangomm</ips_package_name>
   </pkg>
   <pkg>
     <name>SFEgtkmm-gpp</name>
-    <ips_package_name>library/g++/gtkmm</ips_package_name>
+    <ips_package_name>library/desktop/g++/gtkmm</ips_package_name>
+  </pkg>
+  <pkg>
+    <name>SFEgtksourceviewmm-gpp</name>
+    <ips_package_name>library/desktop/g++/gtksourceviewmm</ips_package_name>
   </pkg>
   <pkg>
     <name>SFEpoppler-gpp</name>
@@ -606,6 +620,16 @@
     <group>System/Multimedia Libraries</group>
   </pkg>
   <pkg>
+    <name>SFElibofa</name>
+    <ips_package_name>library/audio/libofa</ips_package_name>
+    <group>System/Multimedia Libraries</group>
+  </pkg>
+  <pkg encumbered="true">
+    <name>SFElibdts</name>
+    <ips_package_name>library/audio/libdca</ips_package_name>
+    <group>System/Multimedia Libraries</group>
+  </pkg>
+  <pkg>
     <name>SFEvorbis-tools</name>
     <ips_package_name>media/vorbis-tools</ips_package_name>
     <group>Applications/Sound and Video</group>
@@ -784,6 +808,11 @@
     <ips_package_name>library/video/libmms</ips_package_name>
     <group>System/Multimedia Libraries</group>
   </pkg>
+  <pkg encumbered="true">
+    <name>SFElibdvbpsi</name>
+    <ips_package_name>library/video/libdvbpsi</ips_package_name>
+    <group>System/Multimedia Libraries</group>
+  </pkg>
   <pkg encumbered="true" skip="true">  <!-- Unmaintained -->
     <name>SFEgnome-media-extras</name>
     <ips_package_name>gnome/media/gnome-media-extras</ips_package_name>
@@ -820,6 +849,11 @@
     <group>Applications/Sound and Video</group>
     <summary>Adobe Flash (SWF) manipulation and generation utilities</summary>
   </pkg>
+  <pkg>
+    <name>SFEvcdimager</name>
+    <ips_package_name>media/vcdimager</ips_package_name>
+    <group>Applications/Sound and Video</group>
+  </pkg>
 
   <!-- Graphics -->
   <pkg>
@@ -837,16 +871,15 @@
     <ips_package_name>image/library/imlib2</ips_package_name>
   </pkg>
   <pkg>
+    <name>SFEsdl-image</name>
+    <ips_package_name>image/library/sdl-image</ips_package_name>
+    <group>System/Multimedia Libraries</group>
+  </pkg>
+  <pkg>
     <name>SFElibast</name>
     <ips_package_name>library/desktop/libast</ips_package_name>
     <group>Desktop (GNOME)/Libraries</group>
   </pkg>
-  <pkg skip="true">  <!-- System is at newer version -->
-    <name>SFEaalib</name>
-    <ips_package_name>image/library/aalib</ips_package_name>
-    <group>System/Multimedia Libraries</group>
-    <summary>An ASCII art graphics library</summary>
-  </pkg>
   <pkg>
     <name>SFEjasper</name>
     <ips_package_name>codec/jasper</ips_package_name>
@@ -918,6 +951,10 @@
     <name>SFExcircuit</name>
     <ips_package_name>image/xcircuit</ips_package_name>
   </pkg>
+  <pkg skip="true">
+    <name>SFER</name>
+    <ips_package_name>image/R</ips_package_name>
+  </pkg>
   <pkg filename="SFEstellarium-gpp.spec">
     <name>SFEstellarium</name>
     <ips_package_name>image/stellarium</ips_package_name>
@@ -954,7 +991,7 @@
   </pkg>
   <pkg>
     <name>SFErsync</name>
-    <ips_package_name>network/rsync</ips_package_name>
+    <ips_package_name>sfe.openindiana.org/network/rsync</ips_package_name>
     <group>Applications/System Utilities</group>
     <summary>Utility providing fast incremental file transfer</summary>
   </pkg>
@@ -999,7 +1036,7 @@
   <!-- Internet -->
   <pkg>
     <name>SFEtransmission</name>
-    <ips_package_name>desktop/torrent/transmission</ips_package_name>
+    <ips_package_name>sfe.openindiana.org/desktop/torrent/transmission</ips_package_name>
     <group>Applications/Internet</group>
   </pkg>
   <pkg>
@@ -1074,7 +1111,7 @@
   </pkg>
   <pkg>
     <name>SFExchat</name>
-    <ips_package_name>desktop/irc/xchat</ips_package_name>
+    <ips_package_name>sfe.openindiana.org/desktop/irc/xchat</ips_package_name>
     <group>Applications/Internet</group>
   </pkg>
   <pkg>
@@ -1302,6 +1339,11 @@
     <group>Applications/Office</group>
   </pkg>
   <pkg>
+    <name>SFEgnote</name>
+    <ips_package_name>gnome/note-taking/gnote</ips_package_name>
+    <group>Applications/Office</group>
+  </pkg>
+  <pkg>
     <name>SFEgnucash</name>
     <ips_package_name>desktop/finance/gnucash</ips_package_name>
   </pkg>