--- a/eliminate-subpackages.patch	Tue Aug 02 18:48:16 2011 +0100
+++ b/eliminate-subpackages.patch	Sat Aug 06 19:34:59 2011 +0100
@@ -1,7 +1,7 @@
-diff -r bfbf8169a069 SFEboost-gpp.spec
---- a/SFEboost-gpp.spec	Sun Jul 17 21:52:10 2011 +0000
-+++ b/SFEboost-gpp.spec	Mon Jul 18 02:09:00 2011 +0100
-@@ -24,19 +24,12 @@
+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
+@@ -26,19 +26,12 @@
  BuildRequires:	SFEicu-gpp-devel
  Requires:	SFEicu-gpp
  
@@ -22,7 +22,7 @@
  %prep
  rm -rf %name-%version
  mkdir %name-%version
-@@ -90,18 +83,17 @@
+@@ -98,13 +91,11 @@
  %dir %attr (0755, root, bin) %{_libdir}
  %{_libdir}/lib*.so*
  
@@ -31,22 +31,15 @@
  %defattr (-, root, bin)
  %dir %attr (0755, root, bin) %{_includedir}
  %{_includedir}/boost
--
+ 
 -%files -n %name-doc
 -%defattr (-, root, bin)
  %dir %attr (0755, root, sys) %{_datadir}
  %dir %attr (0755, root, other) %{_docdir}
  %{_docdir}/boost-%{version}
- 
- %changelog
-+* Sun Jun 26 2011 - Alex Viskovatoff
-+- Eliminate separate devel and doc packages: facets provide that functionality
- * Thu Jun 23 2011 - Alex Viskovatoff
- - set correct runpath for libboost_regex, so it finds ICU libraries
- * Sun Apr  3 2011 - Alex Viskovatoff
-diff -r bfbf8169a069 SFEboost-stdcxx.spec
---- a/SFEboost-stdcxx.spec	Sun Jul 17 21:52:10 2011 +0000
-+++ b/SFEboost-stdcxx.spec	Mon Jul 18 02:09:00 2011 +0100
+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
 @@ -37,7 +37,7 @@
  Requires: SFEicu
  Requires: SUNWlibstdcxx4
@@ -74,10 +67,28 @@
  * Sun Apr  3 2011 - Alex Viskovatoff <[email protected]>
  - Update to 1.46.1
  * Thu Jan 27 2011 - Alex Viskovatoff
-diff -r bfbf8169a069 SFEgcc.spec
---- a/SFEgcc.spec	Sun Jul 17 21:52:10 2011 +0000
-+++ b/SFEgcc.spec	Mon Jul 18 02:09:00 2011 +0100
-@@ -154,7 +154,7 @@
+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
+@@ -98,7 +98,7 @@
+ %define _gnu_libdir %{_basedir}/gnu/lib
+ 
+ Name:                SFEgccruntime
+-Summary:             GNU gcc runtime libraries required by applications
++Summary:             GNU gcc compiler and runtime libraries
+ Version:             4.6.1
+ License:             GPLv3+
+ SUNW_Copyright:      gcc.copyright
+@@ -108,7 +108,7 @@
+ Patch2:              gcc-02-handle_pragma_pack_push_pop.diff
+ %else
+ %endif
+-Patch3:              gcc-03-gnulib.diff
++#Patch3:              gcc-03-gnulib.diff
+ SUNW_BaseDir:        %{_basedir}
+ BuildRoot:           %{_tmppath}/%{name}-%{version}-build
+ %include default-depend.inc
+@@ -157,7 +157,7 @@
  
  Requires: SUNWpostrun
  
@@ -86,7 +97,7 @@
  Summary:                 GNU gcc
  Version:                 %{version}
  SUNW_BaseDir:            %{_basedir}
-@@ -189,7 +189,7 @@
+@@ -192,7 +192,7 @@
  
  
  %if %build_l10n
@@ -95,7 +106,16 @@
  Summary:                 %{summary} - l10n files
  SUNW_BaseDir:            %{_basedir}
  %include default-depend.inc
-@@ -411,7 +411,7 @@
+@@ -211,7 +211,7 @@
+ %patch2 -p1
+ %else
+ %endif
+-%patch3 -p1
++#%patch3 -p1
+ 
+ %build
+ CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+@@ -413,7 +413,7 @@
  %clean
  rm -rf $RPM_BUILD_ROOT
  
@@ -104,7 +124,7 @@
  ( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ;
    echo 'infos="';
    echo 'gcc.info cpp.info gccint.info cppinternals.info gccinstall.info gfortran.info' ;
-@@ -422,7 +422,7 @@
+@@ -424,7 +424,7 @@
    echo 'done';
    echo 'exit $retval' ) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -c SFE
  
@@ -113,7 +133,7 @@
  ( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ;
    echo 'infos="';
    echo 'gcc.info cpp.info gccint.info cppinternals.info gccinstall.info gfortran.info' ;
-@@ -446,7 +446,7 @@
+@@ -448,7 +448,7 @@
  %{_gnu_libdir}
  
  
@@ -122,7 +142,7 @@
  %defattr (-, root, bin)
  %dir %attr (0755, root, bin) %{_prefix}
  %{_prefix}/man
-@@ -474,7 +474,7 @@
+@@ -476,7 +476,7 @@
  %{_datadir}/gcc-%{version}/python/libstdcxx/__init__.py
  
  %if %build_l10n
@@ -131,10 +151,10 @@
  %defattr (-, root, bin)
  %dir %attr (0755, root, bin) %{_prefix}
  %dir %attr (0755, root, sys) %{_datadir}
-diff -r bfbf8169a069 SFEqt47-gpp.spec
---- a/SFEqt47-gpp.spec	Sun Jul 17 21:52:10 2011 +0000
-+++ b/SFEqt47-gpp.spec	Mon Jul 18 02:09:00 2011 +0100
-@@ -63,17 +63,12 @@
+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 
  
@@ -153,7 +173,7 @@
  
  %prep
  %setup -q -n %srcname-%version
-@@ -186,7 +181,7 @@
+@@ -196,7 +191,7 @@
  %_datadir/qt/phrasebooks
  %_datadir/qt/translations
  
@@ -162,9 +182,9 @@
  %defattr (-, root, bin)
  %_bindir
  %dir %attr (0755, root, bin) %_includedir
-@@ -198,9 +193,6 @@
- %dir %attr (0755, root, sys) %_datadir
- %_datadir/qt/mkspecs
+@@ -210,9 +205,6 @@
+ %dir %attr (0755, root, other) %_prefix/imports
+ %_prefix/imports/*
  
 -%files -n %name-doc
 -%defattr (-, root, bin)
@@ -172,8 +192,8 @@
  %_datadir/qt/q3porting.xml
  %dir %attr (0755, root, other) %_datadir/doc
  %_datadir/doc/*
-@@ -209,6 +201,10 @@
- %changelog
+@@ -229,6 +221,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
 +* Sun Jun 26 2011 - Alex Viskovatoff
@@ -183,10 +203,10 @@
  * 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 bfbf8169a069 SFEqt47.spec
---- a/SFEqt47.spec	Sun Jul 17 21:52:10 2011 +0000
-+++ b/SFEqt47.spec	Mon Jul 18 02:09:00 2011 +0100
-@@ -121,18 +121,12 @@
+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
+@@ -122,18 +122,12 @@
  Requires: SUNWxwxft
  # The above also pulls in SUNWfreetype2
  
@@ -206,7 +226,7 @@
  
  %prep
  %setup -q -n %{srcname}-%version
-@@ -259,7 +253,7 @@
+@@ -260,7 +254,7 @@
  %dir %attr (0755, root, sys) %{_datadir}
  %{_datadir}/qt
  
@@ -215,20 +235,3 @@
  %defattr (-, root, bin)
  %dir %attr (0755, root, bin) %{_includedir}
  %dir %attr (0755, root, other) %{_includedir}/qt
-@@ -268,14 +262,14 @@
- %dir %attr (0755, root, other) %{_libdir}/pkgconfig 
- %{_libdir}/pkgconfig/*
- 
--%files -n %name-doc
--%defattr (-, root, bin)
- %dir %attr (0755, root, sys) %{_datadir}
- %dir %attr (0755, root, other) %{_datadir}/doc
- %{_datadir}/doc/*
- 
- 
- %changelog
-+* Sun Jun 26 2011 - Alex Viskovatoff
-+- Eliminate separate devel and doc packages: facets provide that functionality
- * Wed Mar 30 2011 - Alex Viskovatoff
- - create separate doc package
- * Tue Mar 29 2011 - Thomas Wagner

--- a/packages.xml	Tue Aug 02 18:48:16 2011 +0100
+++ b/packages.xml	Sat Aug 06 19:34:59 2011 +0100
@@ -18,8 +18,7 @@
   </pkg>
   <pkg filename="SFEgcc.spec">
     <!-- This is the "standard" SFE gcc: this package creates
-	 symlinks from /usr/gnu/bin/gcc to /usr/gcc/4.5/bin/gcc,
-	 and analogously for libraries. -->
+	 symlinks from /usr/gnu/bin/gcc to /usr/gcc/4.6/bin/gcc. -->
     <name>SFEgccruntime</name>
     <ips_package_name>runtime/gcc</ips_package_name>
     <group>Development/C</group>
@@ -364,7 +363,7 @@
     <ips_package_name>system/file-system/libfuse</ips_package_name>
     <group>System/File System</group>
   </pkg>
-  <pkg skip="true"> <!-- Does nat build with gcc 4.6; unmaintained -->
+  <pkg skip="true"> <!-- Does not 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>
@@ -418,6 +417,34 @@
     <name>SFEossp-uuid</name>
     <ips_package_name>library/ossp-uuid</ips_package_name>
   </pkg>
+  <pkg>
+    <name>SFEsigcpp-gpp</name>
+    <ips_package_name>library/g++/sigcpp</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>
+  </pkg>
+  <pkg>
+    <name>SFEpangomm-gpp</name>
+    <ips_package_name>library/g++/pangomm</ips_package_name>
+  </pkg>
+  <pkg>
+    <name>SFEgtkmm-gpp</name>
+    <ips_package_name>library/g++/gtkmm</ips_package_name>
+  </pkg>
+  <pkg>
+    <name>SFEpoppler-gpp</name>
+    <ips_package_name>library/g++/poppler</ips_package_name>
+  </pkg>
 
   <!-- Qt -->
   <pkg skip="true">
@@ -814,7 +841,7 @@
     <ips_package_name>library/desktop/libast</ips_package_name>
     <group>Desktop (GNOME)/Libraries</group>
   </pkg>
-  <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>
@@ -844,6 +871,10 @@
     <group>Applications/Graphics and Imaging</group>
   </pkg>
   <pkg>
+    <name>SFEinkscape</name>
+    <ips_package_name>image/editor/inkscape</ips_package_name>
+  </pkg>
+  <pkg>
     <name>SFEnetpbm</name>
     <ips_package_name>image/editor/netpbm</ips_package_name>
     <summary>Network Portable Bitmap Tools</summary>
@@ -975,6 +1006,7 @@
     <name>SFEpostfix</name>
     <ips_package_name>service/network/smtp/postfix</ips_package_name>
     <group>System/Services</group>
+    <summary>Mailer system</summary>
   </pkg>
   <pkg>
     <name>SFEmsmtp</name>