# HG changeset patch
# User Alex Viskovatoff <herzen@imap.cc>
# Date 1323645105 0
# Node ID c5a5d6f3c1e89889d42435849a9e7e056900d6a7
# Parent  565e0daa124cb99a2b347468e3c59bd010c37007
Add OI-SFEgcc.spec, forked off SFEgcc.spec rev 4859, which we use to build gcc
Add manifests for some packages which have been renamed
Rename some packages as a response to different IPS package names being added to the specs
Add scons, postgres-91, fuse-ext2, fuse-exfat, openvpn, rtmpdump, graphicsmagick, smfgui, multitail
Make pkgbuild look for packages.xml in ~/oi-sfe-tools

diff -r 565e0daa124c -r c5a5d6f3c1e8 OI-SFEgcc.spec
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OI-SFEgcc.spec	Sun Dec 11 23:11:45 2011 +0000
@@ -0,0 +1,571 @@
+#
+# spec file for package SFEgcc
+#
+# includes module(s): GNU gcc
+#
+
+##NOTE## This spec file is an interim solution regarding the path layout on disk
+##       expect relocation to /usr/gcc/4.5/ and symlinks provided from /usr/gnu 
+##       into to that location (provided by the latest installed or "pkg fix"ed gcc-45 
+##NOTE## most likely the package name will change to SFEgcc-43 and another empty
+##       package SFEgcc will be created always requiring the latest SFEgcc-<major><minor>
+##NOTE## If you experience problems with that version bump, please drop us a note
+##NOTE## you will need "pkg uninstall SFEgccruntime and SFEgcc" *before* you can
+#        to get this spec build successfully. Reason: older runtime-libs interfere
+#        with building this eventually incompatible, newer gcc runtime from this spec
+
+
+# to more widely test if this change causes regressions, by default off:
+# want this? compile with: --with-handle_pragma_pack_push_pop
+%define with_handle_pragma_pack_push_pop %{?_with_handle_pragma_pack_push_pop:1}%{?!_with_handle_pragma_pack_push_pop:0}
+
+%include Solaris.inc
+%include base.inc
+
+%define osbuild %(uname -v | sed -e 's/[A-z_]//g')
+
+##TODO## should include/arch64.inc consider setting _arch64 that way?
+#        gcc builds 64-bit libs/binaries even on 32-bit CPUs/Kernels (e.g. ATOM CPU)
+%ifarch amd64 i386
+%define _arch64 amd64
+%else
+%define _arch64 sparcv9
+%endif
+
+
+#default to SUNWbinutils
+##TODO## if necessary add osbuild numbers to decide SUNW/SFE version
+%define SUNWbinutils    %(/usr/bin/pkginfo -q SUNWbinutils 2>/dev/null && echo 1 || echo 0)
+%define SFEbinutils     %(/usr/bin/pkginfo -q SFEbinutils  2>/dev/null && echo 1 || echo 0)
+#see below, older builds then 126 have too old gmp / mpfr to gcc version around 4.4.4
+#%define SFEgmp          %(/usr/bin/pkginfo -q SFEgmp  2>/dev/null  && echo 1 || echo 0)
+##TODO## to be replaced by packagenamemacros, selecting SFEgmp on specific osbuilds where
+#it is too old for fresh gcc builds
+%define SFEgmp          1
+#%define SFEmpfr         %(/usr/bin/pkginfo -q SFEmpfr 2>/dev/null  && echo 1 || echo 0)
+##TODO## to be replaced by packagenamemacros, selecting SFEmpfr on specific osbuilds where
+#it is too old for fresh gcc builds
+%define SFEmpfr         1
+
+# force using SFEbinutils
+#if SFEbinutils is not present, force it by the commandline switch --with_SFEbinutils
+%define with_SFEbinutils %{?_with_SFEbinutils:1}%{?!_with_SFEbinutils:0}
+%if %with_SFEbinutils
+%define SFEbinutils 1
+%define SUNWbinutils 0
+%endif
+
+# force using gmp | mpfr
+#if SFEgmp is not present, force them as required by the commandline switch --with_SFEgmp
+%define with_SFEgmp %{?_with_SFEgmp:1}%{?!_with_SFEgmp:0}
+#if build is lower then 126 then force it (update to gmp see CR 6863696)
+%if %(expr %{osbuild} '<' 126)
+%define with_SFEgmp 1
+%endif
+
+%if %with_SFEgmp
+%define SFEgmp 1
+%endif
+
+#if SFEgmp is not present, force them as required by the commandline switch --with_SFEmpfr
+%define with_SFEmpfr %{?_with_SFEmpfr:1}%{?!_with_SFEmpfr:0}
+#if build is lower then 126 then force it (update to gmp see CR 6863684)
+%if %(expr %{osbuild} '<' 126)
+%define with_SFEmpfr 1
+%endif
+
+%if %with_SFEmpfr
+%define SFEmpfr 1
+%endif
+
+#if SFElibmpc is not present, force them as required by the commandline switch --with-SFElibmpc
+#future OS versins might include a libmpc, leave code commented until then
+%define with_SFElibmpc %{?_with_SFElibmpc:1}%{?!_with_SFElibmpc:0}
+#parked #if build is lower then 126 then force it (update to gmp see CR 6863684)
+#parked %if %(expr %{osbuild} '<' 126)
+#for *now* require SFElibmpc in any case
+%define with_SFElibmpc 1
+#parked %endif
+
+%if %with_SFElibmpc
+%define SFElibmpc 1
+%endif
+
+%define major_minor 4.6
+%define _prefix /usr/gcc/%major_minor
+%define _infodir %{_prefix}/info
+%define _std_bindir %_basedir/bin
+%define _std_libdir %_basedir/lib
+
+Name:                SFEgccruntime
+IPS_package_name:    runtime/gcc
+Summary:             GNU gcc runtime libraries required by applications
+Version:             4.6.2
+License:             GPLv3+
+SUNW_Copyright:      gcc.copyright
+Source:              ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.bz2
+Patch1:              gcc-01-libtool-rpath.diff
+%if %with_handle_pragma_pack_push_pop
+Patch2:              gcc-02-handle_pragma_pack_push_pop.diff
+%else
+%endif
+Patch3:              gcc-03-gnulib.diff
+SUNW_BaseDir:        %{_basedir}
+BuildRoot:           %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+BuildRequires: SFElibiconv-devel
+Requires:      SFElibiconv
+BuildRequires: SUNWbash
+
+%if %SFEgmp
+BuildRequires: SFEgmp-devel
+Requires: SFEgmp
+#workaround on IPS which is wrong with BASEdir as "/" -> then assume /usr/gnu
+%define SFEgmpbasedir %(pkgparam SFEgmp BASEDIR 2>/dev/null | sed -e 's+^/$+/usr/gnu+')
+%else
+BuildRequires: SUNWgnu-mp
+Requires: SUNWgnu-mp
+%endif
+
+%if %SFEmpfr
+BuildRequires: SFEmpfr-devel
+Requires: SFEmpfr
+#workaround on IPS which is wrong with BASEdir as "/" -> then assume /usr/gnu
+%define SFEmpfrbasedir %(pkgparam SFEmpfr BASEDIR 2>/dev/null | sed -e 's+^/$+/usr/gnu+')
+%else
+BuildRequires: SUNWgnu-mpfr
+Requires: SUNWgnu-mpfr
+%endif
+
+%if %SFElibmpc
+BuildRequires: SFElibmpc-devel
+Requires: SFElibmpc
+#workaround on IPS which is wrong with BASEdir as "/" -> then assume /usr/gnu
+%define SFElibmpcbasedir %(pkgparam SFElibmpc BASEDIR 2>/dev/null | sed -e 's+^/$+/usr/gnu+')
+%else
+#BuildRequires: empty
+#Requires: empty
+%endif
+
+%if %SFEbinutils
+BuildRequires: SFEbinutils
+Requires: SFEbinutils
+%else
+BuildRequires: SUNWbinutils
+Requires: SUNWbinutils
+%endif
+
+Requires: SUNWpostrun
+
+%package devel
+Summary:                 GNU gcc
+Version:                 %{version}
+SUNW_BaseDir:            %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%if %SFEgmp
+BuildRequires: SFEgmp-devel
+Requires: SFEgmp
+%else
+BuildRequires: SUNWgnu-mp
+Requires: SUNWgnu-mp
+%endif
+
+%if %SFEmpfr
+BuildRequires: SFEmpfr-devel
+Requires: SFEmpfr
+%else
+BuildRequires: SUNWgnu-mpfr
+Requires: SUNWgnu-mpfr
+%endif
+
+%if %SFElibmpc
+BuildRequires: SFElibmpc-devel
+Requires: SFElibmpc
+%else
+#BuildRequires: SUNWthis-package-not-availbale
+#Requires: SUNWthis-package-not-availbale
+%endif
+
+#Requires: SUNWpostrun
+
+
+%if %build_l10n
+%package l10n
+Summary:                 %{summary} - l10n files
+SUNW_BaseDir:            %{_basedir}
+%include default-depend.inc
+Requires:                %{name}
+%endif
+
+%prep
+%setup -q -c -n %{name}-%version
+mkdir gcc
+#with 4.3.3 in new directory libjava/classpath/
+cd gcc-%{version}/libjava/classpath/
+#%patch1 -p1
+cd ../../..
+cd gcc-%{version}
+%if %with_handle_pragma_pack_push_pop
+%patch2 -p1
+%else
+%endif
+#%patch3 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+     CPUS=1
+fi
+
+#perl -w -pi.bak -e "s,^#\!\s*/bin/sh,#\!/usr/bin/bash -x," `find . -type f -name configure -exec grep -q "^#\!.*/bin/sh" {} \; -print`
+#perl -w -pi.bak -e "s,^#\!\s*/bin/sh,#\!/usr/bin/bash -x," `find . -type f -name configure -exec grep -q "^#\!.*/bin/sh" {} \; -print`
+
+cd gcc
+
+%if %build_l10n
+nlsopt='--with-libiconv-prefix=/usr/gnu -enable-nls'
+%else
+nlsopt=-disable-nls
+%endif
+
+%define ld_options      -zignore -zcombreloc -Bdirect -i
+
+export CC=gcc
+export CXX=g++
+#export CONFIG_SHELL=/usr/bin/bash
+export CONFIG_SHELL=/usr/bin/ksh
+export CPP="cc -E -Xs"
+export CFLAGS="-O"
+# for stage2 and stage3 GCC
+#export BOOT_CFLAGS="%gcc_optflags -Os -Xlinker -i %gcc_picflags"
+#-m64 and i586 mutually exclusive
+export BOOT_CFLAGS="-Os -Xlinker -i %gcc_picflags"
+# for target libraries (built with bootstrapped GCC)
+#export CFLAGS_FOR_TARGET="%gcc_optflags -O2 -Xlinker -i %gcc_picflags"
+#-m64 and i586 mutually exclusive
+export CFLAGS_FOR_TARGET="-O2 -Xlinker -i %gcc_picflags"
+export LDFLAGS="%_ldflags %gnu_lib_path"
+export LD_OPTIONS="%ld_options %gnu_lib_path"
+#export LD_LIBRARY_PATH="%gnu_lib_path"
+
+# For pod2man
+export PATH="$PATH:/usr/perl5/bin"
+
+%define build_gcc_with_gnu_ld 0
+#saw problems. 134 did compile, OI147 stopped with probably linker errors
+##TODO## research which osbuild started to fail, adjust the number below
+#%if %(expr %{osbuild} '>=' 146)
+#%define build_gcc_with_gnu_ld 1
+#%endif
+
+%if %build_gcc_with_gnu_ld
+export LD="/usr/gnu/bin/ld"
+%else
+export LD=/usr/bin/ld
+%endif
+
+
+../gcc-%{version}/configure			\
+	--prefix=%{_prefix}			\
+        --libdir=%{_libdir}			\
+        --libexecdir=%{_libexecdir}		\
+        --mandir=%{_mandir}			\
+	--infodir=%{_infodir}			\
+%if %SUNWbinutils
+	--with-build-time-tools=/usr/sfw	\
+	--with-as=/usr/sfw/bin/gas		\
+	--with-gnu-as				\
+%else
+	--with-as=/usr/gnu/bin/as		\
+	--with-gnu-as				\
+%endif
+%if %build_gcc_with_gnu_ld
+	--with-ld=/usr/gnu/bin/ld		\
+	--with-gnu-ld				\
+%else
+	--with-ld=$LD				\
+	--without-gnu-ld			\
+%endif
+	--enable-languages=c,c++,fortran,objc	\
+	--enable-shared				\
+	--disable-static			\
+	--enable-decimal-float			\
+%if %SFEgmp
+	--with-gmp=%{SFEgmpbasedir}             \
+%else
+        --with-gmp_include=%{_basedir}/include/gmp \
+%endif
+%if %SFEmpfr
+	--with-mpfr=%{SFEmpfrbasedir}           \
+%else
+        --with-mpfr_include=%{_basedir}/include/mpfr \
+%endif
+%if %SFElibmpc
+	--with-mpc=%{SFElibmpcbasedir}           \
+%else
+        --with-mpc_include=%{_basedir}/include	\
+%endif
+	$nlsopt
+
+make -j$CPUS bootstrap-lean BOOT_CFLAGS="$BOOT_CFLAGS" CFLAGS_FOR_TARGET="$CFLAGS_FOR_TARGET" CXXFLAGS_FOR_TARGET="$CFLAGS_FOR_TARGET"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+cd gcc
+make install DESTDIR=$RPM_BUILD_ROOT
+
+cd $RPM_BUILD_ROOT%{_prefix}
+ln -s share/man man
+
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
+%if %build_l10n
+%else
+# REMOVE l10n FILES
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+%endif
+
+#link runtime libs, for compatibility
+#note: links only "basename_of_lib", then "major"-number version libs
+#leaves out "minor" and "micro" version libs, they are normally not
+#to be linked by userland binaries (runtime linking, see output of "ldd binaryname")
+mkdir %buildroot%_std_libdir
+cd %buildroot%_std_libdir
+ln -s ../gcc/%major_minor/lib/libgcc_s.so.1
+ln -s ../gcc/%major_minor/lib/libgcc_s.so
+ln -s ../gcc/%major_minor/lib/libgfortran.so.3
+ln -s ../gcc/%major_minor/lib/libgfortran.so
+ln -s ../gcc/%major_minor/lib/libgomp.so.1
+ln -s ../gcc/%major_minor/lib/libgomp.so
+ln -s ../gcc/%major_minor/lib/libobjc.so
+ln -s ../gcc/%major_minor/lib/libssp.so.0
+ln -s ../gcc/%major_minor/lib/libssp.so
+ln -s ../gcc/%major_minor/lib/libstdc++.so.6
+ln -s ../gcc/%major_minor/lib/libstdc++.so
+#link arch runtime libs for compatibility
+%ifarch amd64 sparcv9
+mkdir %buildroot%_std_libdir/%_arch64
+cd %buildroot%_std_libdir/%_arch64
+ln -s ../../gcc/%major_minor/lib/%{_arch64}/libgcc_s.so.1
+ln -s ../../gcc/%major_minor/lib/%{_arch64}/libgcc_s.so
+ln -s ../../gcc/%major_minor/lib/%{_arch64}/libgfortran.so.3
+ln -s ../../gcc/%major_minor/lib/%{_arch64}/libgfortran.so
+ln -s ../../gcc/%major_minor/lib/%{_arch64}/libgomp.so.1
+ln -s ../../gcc/%major_minor/lib/%{_arch64}/libgomp.so
+ln -s ../../gcc/%major_minor/lib/%{_arch64}/libobjc.so.3
+ln -s ../../gcc/%major_minor/lib/%{_arch64}/libobjc.so
+ln -s ../../gcc/%major_minor/lib/%{_arch64}/libssp.so.0
+ln -s ../../gcc/%major_minor/lib/%{_arch64}/libssp.so
+ln -s ../../gcc/%major_minor/lib/%{_arch64}/libstdc++.so.6
+ln -s ../../gcc/%major_minor/lib/%{_arch64}/libstdc++.so
+%endif
+
+#link binaries into usual place the former SFEgcc used and 
+#a lot of spec files still use and are as well the recommended
+#paths to specify just what the "default" SFEgcc 4-series
+#compiler is called from. Note: binaries built that way *may*
+#point to libraries found in a compiler major.minor specific
+#directory in /usr/gcc/<majornumber>.<minornumber> 
+#This is in preparation for eventually getting a meta-level
+#package SFEgcc (contains symlinks only into /usr/gcc/<majornumber>.<minornumber>,
+#and is the package Requirement written in customer spec files.
+#below that SFEgcc packages, a SFEgcc-452 exists with the real compiler in it
+
+#NOTE: the os-distro delivers the "SFW" version of gcc 3.x.x
+#and therefore does deliver links into /usr/gnu/bin:
+#/usr/gnu/bin/cc    ->    ../../sfw/bin/gcc     (stays)
+#/usr/gnu/bin/cpp   ->    ../../sfw/bin/cpp     (stays, interferes with us)
+#we do exclude "cpp" from this SFEgcc.spec for that reason!
+
+#link binaries, enables CC=/usr/gnu/bin/gcc CXX=/usr/gnu/bin/g++ 
+#to get SFEgcc.spec version 4.x compiler in use without specifying
+#the exact SFEgcc compiler version number, just use the most recent 4.x.x
+mkdir %buildroot%_std_bindir
+cd %buildroot%_std_bindir
+ln -s ../gcc/%major_minor/bin/g++
+ln -s ../gcc/%major_minor/bin/gcc
+ln -s ../gcc/%major_minor/bin/gcov
+ln -s ../gcc/%major_minor/bin/gfortran
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%ifarch amd64 sparcv9
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/lib*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/lib*.la
+%endif
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_prefix}
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%{_libdir}/lib*.spec
+%dir %_std_libdir
+%_std_libdir/lib*.so*
+%ifarch amd64 sparcv9 i386
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%{_libdir}/%{_arch64}/lib*.so*
+%{_libdir}/%{_arch64}/lib*.spec
+%_std_libdir/%_arch64
+%endif
+
+
+%files devel
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_prefix}
+%{_prefix}/man
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%_std_bindir
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/gcc
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, bin) %{_mandir}
+%dir %attr (0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*.1
+%dir %attr (0755, root, bin) %{_mandir}/man7
+%{_mandir}/man7/*.7
+%{_infodir}
+%{_includedir}
+
+%dir %attr (0755, root, sys) %{_datadir}/gcc-%{version}
+%dir %attr (0755, root, sys) %{_datadir}/gcc-%{version}/python
+%dir %attr (0755, root, sys) %{_datadir}/gcc-%{version}/python/libstdcxx
+%dir %attr (0755, root, sys) %{_datadir}/gcc-%{version}/python/libstdcxx/v6
+%{_datadir}/gcc-%{version}/python/libstdcxx/v6/printers.py
+%{_datadir}/gcc-%{version}/python/libstdcxx/v6/__init__.py
+%{_datadir}/gcc-%{version}/python/libstdcxx/__init__.py
+
+%if %build_l10n
+%files l10n
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_prefix}
+%dir %attr (0755, root, sys) %{_datadir}
+%attr (-, root, other) %{_datadir}/locale
+%endif
+
+%changelog
+* Sun Oct 30 2011 - Alex Viskovatoff
+- fork OI-SFEgcc.spec off SFEgcc.spec rev 4859; bump to 4.6.2
+- symlinks in /usr/bin and /usr/lib; use facets
+* Sat Jul 23 2011 - Guido Berhoerster <gber@openindiana.org>
+- added License and SUNW_Copyright tags
+* Sun Jul 17 2011 - Alex Viskovatoff
+- do not hardcode <majornumber>.<minornumber>
+* Sun Jul 17 2011 - Milan Jurik
+- bump to 4.6.1
+* Tue May 17 2011 - Milan Jurik
+- bump to 4.5.3
+* Thu Mar 17 2011 - Thomas Wagner
+- temporarily force SFEgmp SFEmpfr to have pkgtool --autodeps working in correct build-order
+* Wed Mar 16 2011 - Thomas Wagner
+- symlinks did not go into package, added %{_gnu_bindir}/* to %files SFEgcc 
+* Tue Mar 15 2011 - Thomas Wagner
+- add missing %define _gnu_bindir %{_basedir}/gnu/bin
+* Sat Mar 12 2011 - Thomas Wagner
+- make symlinks to get SFEgcc.spec version 4.x.x to have the gcc 4.x.x
+  default compiler accessible by /usr/gnu/bin/gcc and /usr/gnu/bin/g++ 
+  and /usr/gnu/bin/gfortran ...
+* Fri Mar 04 2011 - Milan Jurik
+- RUNPATH enforced to contain /usr/gnu/lib, libs symlinked to /usr/gnu/lib
+* Wed Mar 02 2011 - Milan Jurik
+- fix NLS build, need to fix linker for g++ still
+* Tue Mar 01 2011 - Milan Jurik
+- move to /usr/gcc/4.5
+* Tue Feb 08 2011 - Thomas Wagner
+- interim solution for very old gcc-4.3.3, derived from experimental/SFEgcc-4.5.2.spec
+* Sun Jan 30 2011 - Thomas Wagner
+- bump to 4.5.2
+* Sat Oct 23 2010 - Thomas Wagner
+- bump to 4.5.1
+- require SFEgmp / SFEmpfr (new version) for builds below 126. may add
+  upper limit later if OS contains required version as SUNWgnu-mp / SUNWgnu-mpfr
+- finetune BASEDIR detection (SVR4 works, IPS lacks BASEDIR -> emulate)
+- merge new logic for (Build)Requires from SFEgcc version 4.4.4 to 4.5.0 spec file
+- start with osbuild >= 146 to use gnu ld for linking (build_gcc_with_gnu_ld)
+  because looks like linker error
+- collect python files from directory based on gcc %version
+- make spec bailout if the symlink /usr/gnu/bin/cc exists
+- add (Build)Requires SFElibmpc.spec  (SFEMpc might retire, naming)
+- add new python files to %files
+- add experimental --with-SFEbinutils to force using more fresh SFEbinutils
+- don't hard-code ld-wrapper location, use instead `which ld-wrapper`
+* Mon Jul 28 2010 - Thomas Wagner
+- bump to 4.5.0
+* Wed Aug 18 2010 - Thomas Wagner
+- try with defaults to SUNWbinutils SUNWgnu-mp SUNWgnu-mpfr
+  this might break gcc compile on older osbuild versions
+- stop and exit 1 if the link /usr/gnu/bin/cc exists. Give user hint to 
+  remove this problematic symlink of gcc to cc
+- search ld-wrapper from PATH (e.g. /opt/jdsbld/bin or /opt/dtbld/bin)
+- workaround IPS bug that ever prints BASEdir as "/" even if it presents 
+  "/usr/gnu" to have configure find SFEgmp and SFEmpfr in case it should 
+* Sun Jun  6 2010 - Thomas Wagner
+- bump to 4.4.4
+- add switches to force SFEgmp and SFEmpfr
+- experimenting with gcc related CFLAGS/LDFLAGS
+* Fri Feb 05 2010 - Albert Lee <trisk@opensolaris.org>
+- Fix bootstrap compiler options
+* Sun Aug 09 2009 - Thomas Wagner
+- BuildRequires: SUNWbash
+* Sat Mar 14 2009 - Thomas Wagner
+- change logic to require SFEgmp/SFEmpfr only if *no* SUNWgnu-mp/SUNWgnu-mpfr is present (this is on old OS builds)
+- make SFEgcc use of new SUNWgnu-mp/SUNWgnu-mpfr (replacement for SFEgmp/SFEmpfr, SFE-versions still work with SFEgcc)
+- detect new location of SFEgmp/SFEmpfr now in /usr/gnu and use them only if missing SUNWgnu-mp/SUNWgnu-mpfr
+- add (Build)Requires: SFElibiconv(-devel) (thanks to check-deps.pl)
+* Sat Feb 21 2009 - Thomas Wagner
+- bump to 4.3.3
+- make conditional SFEgmp  / SUNWgnu-mp
+- make conditional SFEmpfr / SUNWgnu-mpfr
+- add extra configure switch if SUNWgnu-mp and/or SUNWgnu-mpfr is used
+* Sun Jan 25 2009 - Thomas Wagner
+- make default without HANDLE_PRAGMA_PACK_PUSH_POP. switch on with:
+  --with-handle_pragma_pack_push_pop
+* Sat Jan 24 2009 - Thomas Wagner
+- add HANDLE_PRAGMA_PACK_PUSH_POP (might help wine)
+- bump to 4.2.4, version SFEgcc wit %{version}
+* Wed Jan  7 2009 - Thomas Wagner
+- add conditional SUNWbinutils/SFEbinutils to SFEgcc package
+* Sun Dec 28 2008 - Thomas Wagner
+- work around %files section on i386/32-bit not finding %{_arch64} binaries because _arch64 is unset ... _arch64 only set if running 64-bit OS in include/arch64.inc
+* Sat Dec 27 2008 - Thomas Wagner
+- add conditional SUNWbinutils/SFEbinutils to re-enable build on old OS
+- add configure-switch for SUNWbinutils otherwise left over SFEbinutils catched by configure/compile. SUNWbinuils not found otherwise.
+* Wed Aug 06 2008 - andras.barna@gmail.com
+- change SFEbinutils to SUNWbinutils, defaulting to SUN ld
+* Mon Mar 10 2008 - laca@sun.com
+- add missing defattr
+* Sun Mar  2 2008 - Mark Wright <markwright@internode.on.net>
+- Add gcc-01-libtool-rpath.diff patch for a problem where
+- the old, modified libtool 1.4 in gcc 4.2.3 drops
+- -rpath /usr/gnu/lib when building libstdc++.so.6.0.9.
+* Fri Feb 29 2008 - Mark Wright <markwright@internode.on.net>
+- Bump to 4.2.3.  Remove patch for 32787 as it is upstreamed into gcc 4.2.3.
+* Sat Jan 26 2008 - Moinak Ghosh <moinak.ghosh@sun.com>
+- Refactor package to have SFEgcc and SFEgccruntime.
+* Sun Oct 14 2007 - Mark Wright <markwright@internode.on.net>
+- Bump to 4.2.2.
+* Wed Aug 15 2007 - Mark Wright <markwright@internode.on.net>
+- Change from /usr/ccs/bin/ld to /usr/gnu/bin/ld, this change
+  requires SFEbinutils built with binutils-01-bug-2495.diff,
+  binutils-02-ld-m-elf_i386.diff and binutils-03-lib-amd64-ld-so-1.diff.
+  Add objc to --enable-languages, add --enable-decimal-float.
+* Wed Jul 24 2007 - Mark Wright <markwright@internode.on.net>
+- Bump to 4.2.1, add patch for gcc bug 32787.
+* Wed May 16 2007 - Doug Scott <dougs@truemail.co.th>
+- Bump to 4.2.0
+* Tue Mar 20 2007 - Doug Scott <dougs@truemail.co.th>
+- Added LD_OPTIONS so libs in /usr/gnu/lib will be found
+* Sun Mar  7 2007 - Doug Scott <dougs@truemail.co.th>
+- change to use GNU as from SFEbinutils
+* Sun Mar  7 2007 - Doug Scott <dougs@truemail.co.th>
+- Initial spec
diff -r 565e0daa124c -r c5a5d6f3c1e8 manifests/ffmpeg.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/manifests/ffmpeg.p5m	Sun Dec 11 23:11:45 2011 +0000
@@ -0,0 +1,5 @@
+set name=pkg.fmri value=pkg://sfebuildb/library/video/ffmpeg@0.8.5,5.11-0.151
+set name=variant.arch value=i386
+set name=pkg.renamed value=true
+set name=variant.opensolaris.zone value=global value=nonglobal
+depend fmri=video/ffmpeg@0.8.5-0.151 type=require
diff -r 565e0daa124c -r c5a5d6f3c1e8 manifests/lame.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/manifests/lame.p5m	Sun Dec 11 23:11:45 2011 +0000
@@ -0,0 +1,5 @@
+set name=pkg.fmri value=pkg://sfebuildb/library/audio/lame@3.98.4,5.11-0.151
+set name=variant.arch value=i386
+set name=pkg.renamed value=true
+set name=variant.opensolaris.zone value=global value=nonglobal
+depend fmri=audio/lame@3.98.4-0.151 type=require
diff -r 565e0daa124c -r c5a5d6f3c1e8 manifests/mkvtoolnix.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/manifests/mkvtoolnix.p5m	Sun Dec 11 23:11:45 2011 +0000
@@ -0,0 +1,5 @@
+set name=pkg.fmri value=pkg://sfebuildb/media/mkvtoolnix@5.0.1,5.11-0.151
+set name=variant.arch value=i386
+set name=pkg.renamed value=true
+set name=variant.opensolaris.zone value=global value=nonglobal
+depend fmri=video/mkvtoolnix@5.0.1-0.151 type=require
diff -r 565e0daa124c -r c5a5d6f3c1e8 manifests/mpg123.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/manifests/mpg123.p5m	Sun Dec 11 23:11:45 2011 +0000
@@ -0,0 +1,5 @@
+set name=pkg.fmri value=pkg://sfebuildb/library/audio/mpg123@1.13.4,5.11-0.151
+set name=variant.arch value=i386
+set name=pkg.renamed value=true
+set name=variant.opensolaris.zone value=global value=nonglobal
+depend fmri=audio/mpg123@1.13.4-0.151 type=require
diff -r 565e0daa124c -r c5a5d6f3c1e8 manifests/wine.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/manifests/wine.p5m	Sun Dec 11 23:11:45 2011 +0000
@@ -0,0 +1,5 @@
+set name=pkg.fmri value=pkg://sfebuildb/library/desktop/wine@1.3.30,5.11-0.151
+set name=variant.arch value=i386
+set name=pkg.renamed value=true
+set name=variant.opensolaris.zone value=global value=nonglobal
+depend fmri=desktop/wine@1.3.30-0.151 type=require
diff -r 565e0daa124c -r c5a5d6f3c1e8 packages.xml
--- a/packages.xml	Mon Sep 26 19:10:14 2011 +0000
+++ b/packages.xml	Sun Dec 11 23:11:45 2011 +0000
@@ -54,7 +54,7 @@
     <group>Applications/System Utilities</group>
     <summary>GNU implementation of awk, a pattern scanning and processing filter</summary>
   </pkg>
-  <pkg filename="haskell/SFEghc.spec">
+  <pkg>
     <name>SFEghc</name>
     <ips_package_name>runtime/ghc</ips_package_name>
     <group>Development/Other Languages</group>
@@ -241,6 +241,11 @@
     <group>Development/Distribution Tools</group>
   </pkg>
   <pkg>
+    <name>SFEscons</name>
+    <ips_package_name>developer/build/scons</ips_package_name>
+    <group>Development/Distribution Tools</group>
+  </pkg>
+  <pkg>
     <name>SFEgob</name>
     <ips_package_name>developer/build/gob2</ips_package_name>
   </pkg>
@@ -310,8 +315,8 @@
   </pkg>
   <pkg>
     <name>SFEnginx</name>
-    <ips_package_name>service/network/nginx</ips_package_name>
-    <group>System/Services</group>
+    <ips_package_name>web/server/nginx</ips_package_name>
+    <group>Web Services/Application and Web Servers</group>
   </pkg>
   <pkg>
     <name>SFEenet</name>
@@ -363,6 +368,11 @@
     <group>System/Databases</group>
   </pkg>
   <pkg>
+    <name>SFEpostgres-91</name>
+    <ips_package_name>database/postgres-91</ips_package_name>
+    <group>System/Databases</group>
+  </pkg>
+  <pkg>
     <name>SFEbdb</name>
     <ips_package_name>database/bdb</ips_package_name>
     <group>System/Databases</group>
@@ -387,7 +397,17 @@
     <ips_package_name>system/file-system/libfuse</ips_package_name>
     <group>System/File System</group>
   </pkg>
-  <pkg skip="true"> <!-- Does not build with gcc 4.6; unmaintained -->
+  <pkg>
+    <name>SFEfuse-ext2</name>
+    <ips_package_name>system/file-system/fuse-ext2</ips_package_name>
+    <group>System/File System</group>
+  </pkg>
+  <pkg>
+    <name>SFEfuse-exfat</name>
+    <ips_package_name>system/file-system/fuse-exfat</ips_package_name>
+    <group>System/File System</group>
+  </pkg>
+  <pkg>
     <name>SFEntfs-3g</name>
     <ips_package_name>system/file-system/ntfs-3g</ips_package_name>
     <group>System/File System</group>
@@ -408,6 +428,10 @@
     <group>System/Core</group>
   </pkg>
   <pkg>
+    <name>SFEopenvpn</name>
+    <ips_package_name>service/network/openvpn</ips_package_name>
+  </pkg>
+  <pkg>
     <name>SFEc-ares</name>
     <ips_package_name>library/c-ares</ips_package_name>
     <group>System/Libraries</group>
@@ -518,6 +542,10 @@
     <ips_package_name>desktop/chm-viewer/kchmviewer</ips_package_name>
     <group>Applications/Office</group>
   </pkg>
+  <pkg>
+    <name>SFExpdf</name>
+    <ips_package_name>desktop/pdf-viewer/xpdf</ips_package_name>
+  </pkg>
 
   <!-- Audio -->
   <pkg encumbered="true">
@@ -526,19 +554,19 @@
     <group>System/Multimedia Libraries</group>
   </pkg>
   <pkg encumbered="true">
-    <name>SFEmpg123</name>
-    <ips_package_name>library/audio/mpg123</ips_package_name>
+    <name>SFEmpg123</name>  <!-- Renamed from library/audio/mpg123 -->
+    <ips_package_name>audio/mpg123</ips_package_name>
     <summary>Fast console MPEG Audio Player and decoder library</summary>
     <group>System/Multimedia Libraries</group>
   </pkg>
   <pkg encumbered="true">
-    <name>SFElame</name>
-    <ips_package_name>library/audio/lame</ips_package_name>
+    <name>SFElame</name>  <!-- Was incorrectly named library/audio/lame< -->
+    <ips_package_name>audio/lame</ips_package_name>
     <group>System/Multimedia Libraries</group>
   </pkg>
   <pkg encumbered="true">
-    <name>SFEtwolame</name>
-    <ips_package_name>library/audio/twolame</ips_package_name>
+    <name>SFEtwolame</name>  <!-- Renamed from library/audio/twolame -->
+    <ips_package_name>audio/twolame</ips_package_name>
     <group>System/Multimedia Libraries</group>
     <summary>MP3 encoder</summary>
   </pkg>
@@ -585,7 +613,7 @@
     <ips_package_name>library/audio/libshout</ips_package_name>
     <group>System/Multimedia Libraries</group>
   </pkg>
-  <pkg>
+  <pkg encumbered="true">
     <name>SFElibgsm</name>
     <ips_package_name>library/audio/libgsm</ips_package_name>
     <group>System/Multimedia Libraries</group>
@@ -674,13 +702,13 @@
     <group>Applications/Sound and Video</group>
   </pkg>
   <pkg>
-    <name>SFEaudacity</name>
-    <ips_package_name>media/audacity</ips_package_name>
+    <name>SFEaudacity</name>  <!-- Renamed from media/audacity -->
+    <ips_package_name>audio/editor/audacity</ips_package_name>
     <group>Applications/Sound and Video</group>
   </pkg>
   <pkg>
     <name>SFEeasytag</name>
-    <ips_package_name>media/easytag</ips_package_name>
+    <ips_package_name>audio/easytag</ips_package_name>
     <group>Applications/Sound and Video</group>
     <summary>Tag editor for MP3, Ogg Vorbis files and more</summary>
   </pkg>
@@ -755,7 +783,7 @@
   </pkg>
 
   <!-- Video -->
-  <pkg encumbered="true">
+  <pkg encumbered="true" filename="encumbered/SFElibx264-no-mp4.spec">
     <name>SFElibx264</name>
     <ips_package_name>library/video/x264</ips_package_name>
   </pkg>
@@ -769,6 +797,11 @@
     <ips_package_name>library/video/libschroedinger</ips_package_name>
     <group>System/Multimedia Libraries</group>
   </pkg>
+  <pkg encumbered="true">
+    <name>SFErtmpdump</name>
+    <ips_package_name>video/rtmpdump</ips_package_name>
+    <summary>RTMP (Real Time Messaging Protocol) streams toolkit</summary>
+  </pkg>
   <pkg>
     <name>SFElibmp4v2</name>
     <ips_package_name>library/video/mp4v2</ips_package_name>
@@ -780,8 +813,9 @@
     <group>System/Multimedia Libraries</group>
   </pkg>
   <pkg encumbered="true" filename="encumbered/SFEffmpeg-sse2-only.spec">
-    <name>SFEffmpeg</name>
-    <ips_package_name>library/video/ffmpeg</ips_package_name>
+    <name>SFEffmpeg</name>    <!-- Renamed from library/video/ffmpeg -->
+    <ips_package_name>video/ffmpeg</ips_package_name>
+    <group>Applications/Sound and Video</group>
   </pkg>
   <pkg>
     <name>SFEliveMedia</name>
@@ -807,8 +841,10 @@
   <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>
+  </pkg>
+  <pkg encumbered="true" filename="SFEsmplayer2.spec">
+    <name>SFEsmplayer2</name>
+    <ips_package_name>media/smplayer2</ips_package_name>
   </pkg>
   <pkg encumbered="true" filename="experimental/SFEvlc-1.1.4.1.spec">
     <name>SFEvlc</name>
@@ -876,8 +912,8 @@
     <group>System/Multimedia Libraries</group>
   </pkg>
   <pkg>
-    <name>SFEmkvtoolnix</name>
-    <ips_package_name>media/mkvtoolnix</ips_package_name>
+    <name>SFEmkvtoolnix</name>  <!-- Renamed from /media/mkvtoolnix -->
+    <ips_package_name>video/mkvtoolnix</ips_package_name>
   </pkg>
   <pkg>
     <name>SFEogmtools</name>
@@ -931,10 +967,10 @@
     <ips_package_name>library/desktop/libast</ips_package_name>
     <group>Desktop (GNOME)/Libraries</group>
   </pkg>
-  <pkg>
-    <name>SFEwine</name>
-    <ips_package_name>library/desktop/wine</ips_package_name>
-    <group>Desktop (GNOME)/Libraries</group>
+  <pkg encumbered="true"> <!-- Encumbered on account of some dependencies -->
+    <name>SFEwine</name>  <!-- Renamed from library/desktop/wine -->
+    <ips_package_name>desktop/wine</ips_package_name>
+    <group>Desktop (GNOME)/Sessions</group>
   </pkg>
   <pkg>
     <name>SFEjasper</name>
@@ -957,6 +993,11 @@
     <name>SFEimagemagick</name>
     <ips_package_name>image/editor/imagemagick</ips_package_name>
     <summary>Image Manipulation Utilities and Libraries</summary>
+  </pkg>
+  <pkg>
+    <name>SFEgraphicsmagick</name>
+    <ips_package_name>image/editor/graphicsmagick</ips_package_name>
+    <summary>Image Manipulation Utilities and Libraries</summary>
     <group>Applications/Graphics and Imaging</group>
   </pkg>
   <pkg>
@@ -999,7 +1040,7 @@
     <ips_package_name>image/viewer/viking</ips_package_name>
     <group>Applications/Graphics and Imaging</group>
   </pkg>
-  <pkg>
+  <pkg skip="true">  <!-- (in userland-gate) -->
     <name>SFEgraphviz</name>
     <ips_package_name>image/graphviz</ips_package_name>
   </pkg>
@@ -1052,6 +1093,12 @@
     <summary>Utility providing fast incremental file transfer</summary>
   </pkg>
   <pkg>
+    <name>SFEsmfgui</name>
+    <ips_package_name>gnome/smfgui</ips_package_name>
+    <group>Applications/System Utilities</group>
+    <summary>Graphical user interface for service management facility</summary>
+  </pkg>
+  <pkg>
     <name>SFExmlto</name>
     <ips_package_name>developer/documentation-tool/xmlto</ips_package_name>
     <group>Development/Distribution Tools</group>
@@ -1083,6 +1130,10 @@
     <ips_package_name>text/enscript</ips_package_name>
   </pkg>
   <pkg>
+    <name>SFEmultitail</name>
+    <ips_package_name>text/multitail</ips_package_name>
+  </pkg>
+  <pkg>
     <name>SFEcabextract</name>
     <ips_package_name>archiver/cabextract</ips_package_name>
   </pkg>
@@ -1240,8 +1291,18 @@
     <group>Desktop (GNOME)/Libraries</group>
   </pkg>
   <pkg>
+    <name>SFEfltk</name>
+    <ips_package_name>library/desktop/c++/fltk</ips_package_name>
+    <group>Desktop (GNOME)/Libraries</group>
+  </pkg>
+  <pkg>
+    <name>SFEfltk-gpp</name>
+    <ips_package_name>library/desktop/g++/fltk</ips_package_name>
+    <group>Desktop (GNOME)/Libraries</group>
+  </pkg>
+  <pkg skip="true">
     <name>SFEfltk2</name>
-    <ips_package_name>library/desktop/fltk</ips_package_name>
+    <ips_package_name>library/desktop/fltk2</ips_package_name>
     <group>Desktop (GNOME)/Libraries</group>
   </pkg>
   <pkg>
@@ -1361,7 +1422,7 @@
     <group>Applications/Accessories</group>
   </pkg>
   <pkg>
-    <name>SFExfcalendar</name>
+    <name>SFExfce-calendar</name>
     <ips_package_name>xfce/xfce-calendar</ips_package_name>
     <group>Applications/Office</group>
   </pkg>
@@ -1380,6 +1441,10 @@
     <ips_package_name>xfce/tumbler</ips_package_name>
     <group>Applications/Plug-ins and Run-times</group>
   </pkg>
+  <pkg skip="true">  <!-- midori is buggy, although not observed to crash -->
+    <name>SFEmidori</name>
+    <ips_package_name>web/browser/midori</ips_package_name>
+  </pkg>
   <pkg>
     <name>SFEmenu-cache</name>
     <ips_package_name>lxde/menu-cache</ips_package_name>
diff -r 565e0daa124c -r c5a5d6f3c1e8 pkgbuild/patches/distro-redefine-tags.diff
--- a/pkgbuild/patches/distro-redefine-tags.diff	Mon Sep 26 19:10:14 2011 +0000
+++ b/pkgbuild/patches/distro-redefine-tags.diff	Sun Dec 11 23:11:45 2011 +0000
@@ -16,7 +16,7 @@
  my $all_block_names = "prep|build|install|clean|check|changelog|$all_script_names";
  my $all_keywords = "$all_block_names|define|patch|setup|files|description|package|iclass|rclass|use|actions";
  
-+my $distro_file_name = "${_homedir}/packages.xml";
++my $distro_file_name = "${_homedir}/oi-sfe-tools/packages.xml";
 +# Tags from the XML file relevant to pkgbuild, which we prevent the spec from redefining
 +# Don't use the exists function on an array because that is deprecated; define a hash instead
 +my %distro_tag_names = ("ips_package_name", 0, "group", 0, "summary", 0);