--- a/ChangeLog	Fri Jun 20 13:45:37 2008 +0000
+++ b/ChangeLog	Fri Jun 20 16:27:04 2008 +0000
@@ -1,3 +1,10 @@
+2008-06-20  River Tarnell  <[email protected]>
+
+	* SFElibcaca.spec, SFEnewt.spec, SFEmuttng.spec: Use SUNWslang
+	* patches/newt-02-solaris-makefile.diff: Remove -Wall from
+	  makefile, don't build 'depend' target
+	* SFEmutt.spec, SFEslang.spec: Move to archive
+
 2008-06-20  River Tarnell  <[email protected]>
 
 	* SFEmutt.spec: Change SFEslang dependency to SUNWslang

--- a/SFElibcaca.spec	Fri Jun 20 13:45:37 2008 +0000
+++ b/SFElibcaca.spec	Fri Jun 20 16:27:04 2008 +0000
@@ -15,9 +15,9 @@
 BuildRoot:           %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 
-BuildRequires: SFEslang
+BuildRequires: SUNWslang
 BuildRequires: SFEimlib2
-Requires: SFEslang
+Requires: SUNWslang
 Requires: SFEimlib2
 Requires: SUNWgccruntime
 
@@ -87,6 +87,8 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Jun 20 2008 - [email protected]
+- change SFEslang to SUNWslang
 * Thu Mar 22 2007 - [email protected]
 - Update Source location and add URL.
 * Mon Mar 19 2007 - [email protected]

--- a/SFEmutt.spec	Fri Jun 20 13:45:37 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-#
-# Copyright (c) 2006 Sun Microsystems, Inc.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-
-%include Solaris.inc
-
-Name:                SFEmutt
-Summary:             The mutt e-mail client
-Version:             1.5.18
-Source:              ftp://ftp.mutt.org/mutt/devel/mutt-%{version}.tar.gz
-Patch1:              mutt-01-makefile.diff
-
-SUNW_BaseDir:        %{_basedir}
-BuildRoot:           %{_tmppath}/%{name}-%{version}-build
-%include default-depend.inc
-
-BuildRequires: SUNWslang
-BuildRequires: SFEgdbm
-BuildRequires: SFEgdbm-devel
-Requires: SUNWslang
-Requires: %{name}-root
-Requires: SFEgdbm
-
-%package root
-Summary:                 %{summary} - / filesystem
-SUNW_BaseDir:            /
-%include default-depend.inc
-
-%prep
-%setup -q -n mutt-%version
-%patch1 -p0
-
-%build
-
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
-     CPUS=1
-fi
-
-export CFLAGS="%optflags -I/usr/include/idn -I%{_includedir}"
-export LDFLAGS="%{_ldflags} -R/usr/sfw/lib -R%{_libdir} -L%{_libdir}"
-export CPPFLAGS="-I/usr/sfw/include"
-
-./configure --prefix=%{_prefix}  \
-            --mandir=%{_mandir}  \
-            --sysconfdir=%{_sysconfdir} \
-	    --with-docdir=%{_docdir}/mutt \
-	    --disable-nls \
-	    --with-slang=/usr/lib \
-	    --with-ssl=/usr/sfw \
-	    --enable-pop \
-	    --enable-imap \
-            --enable-hcache \
-            --without-qdbm
-
-make -j$CPUS
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
-%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}/man5
-%{_mandir}/man5/*.5
-%dir %attr (0755, root, other) %{_datadir}/doc
-%{_datadir}/doc/*
-
-%files root
-%defattr (-, root, sys)
-%dir %attr (0755, root, sys) %{_sysconfdir}
-%{_sysconfdir}/*
-
-%changelog
-* Fri Jun 20 2008 - [email protected]
-- change SFEslang dependency to SUNWslang
-* Sat May 17 2008 - [email protected]
-- 1.5.18
-* Wed May 14 2008 - [email protected]
-- Add --enable-hcache to configure
-- Depend on SFEgdbm(-devel)
-* Tue Jan 01 2008 - Thomas Wagner
-- bump to 1.5.17
-* Sun Nov 25 2007 - Thomas Wagner
-- PSARC 2007/167 "IDN" is found (new around build 73/74), add -I/usr/include/idn
-* Sat May 26 2007 - [email protected]
-- Corrected LDFLAGS setting
-* Wed May 23 2007 - [email protected]
-- Bump to v1.5.15 (devel)
-* Mon May 21 2007 - [email protected]
-- Added CPPFLAGS and LDFLAGS (/usr/sfw) to support openssl
-  Without it ssl is not supported by mutt
-- Added a patch for Makefile.in to change mime.types to mutt-mime.types
-  to exclude a clash with a system mime.types in /etc
-- Forced dependency from libcurses to slang
-* Sun May 20 2007 - [email protected]
-- Initial spec

--- a/SFEmuttng.spec	Fri Jun 20 13:45:37 2008 +0000
+++ b/SFEmuttng.spec	Fri Jun 20 16:27:04 2008 +0000
@@ -14,8 +14,8 @@
 BuildRoot:           %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 
-BuildRequires: SFEslang
-Requires: SFEslang
+BuildRequires: SUNWslang
+Requires: SUNWslang
 Requires: %{name}-root
 
 %package root
@@ -76,6 +76,8 @@
 %{_sysconfdir}/*
 
 %changelog
+* Fri Jun 20 2008 - [email protected]
+- change SFEslang to SUNWslang
 * Sun Nov 25 2007 Thomas Wagner
 - PSARC 2007/167 "IDN" is found (new around build 73/74), add -I/usr/include/idn
 * Sat May 26 2007

--- a/SFEnewt.spec	Fri Jun 20 13:45:37 2008 +0000
+++ b/SFEnewt.spec	Fri Jun 20 16:27:04 2008 +0000
@@ -17,8 +17,8 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 
-BuildRequires: SFEslang
-Requires: SFEslang
+BuildRequires: SUNWslang
+Requires: SUNWslang
 
 %prep
 %setup -q -n newt-%{version}
@@ -26,7 +26,7 @@
 cd newt-%{version}
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+%patch3 -p0
 
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -72,5 +72,9 @@
 %{_includedir}/newt.h
 
 %changelog
+* Fri Jun 20 2008 - [email protected]
+- need to remove -Wall from makefile
+- don't build 'depend' target as it only works with gcc
+- change SFEslang to SUNWslang
 * Thu May 01 2008 - [email protected]
 - Initial spec

--- a/SFEslang.spec	Fri Jun 20 13:45:37 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-#
-# Copyright (c) 2006 Sun Microsystems, Inc.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-
-%include Solaris.inc
-
-Name:                SFEslang
-Summary:             multi-platform programmer's library
-Version:             2.1.3
-Source:              ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.1/slang-%{version}.tar.gz
-
-SUNW_BaseDir:        %{_basedir}
-BuildRoot:           %{_tmppath}/%{name}-%{version}-build
-%include default-depend.inc
-
-Requires: SUNWpng
-
-Requires: %name-root
-%package root
-Summary:                 %{summary} - / filesystem
-SUNW_BaseDir:            /
-%include default-depend.inc
-
-%prep
-%setup -q -n slang-%version
-
-%build
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
-     CPUS=1
-fi
-
-export CFLAGS="%optflags"
-export LDFLAGS="%_ldflags -L../src/elfobjs"
-
-./configure --prefix=%{_prefix}  \
-            --mandir=%{_mandir} \
-            --sysconfdir=%{_sysconfdir}
-
-make -j$CPUS elf
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install-elf DESTDIR=$RPM_BUILD_ROOT
-#rm ${RPM_BUILD_ROOT}%{_libdir}/libslang.a
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/lib*.so*
-%dir %attr (0755, root, other) %{_libdir}/slang
-%dir %attr (0755, root, other) %{_libdir}/slang/v2
-%dir %attr (0755, root, other) %{_libdir}/slang/v2/modules
-%{_libdir}/slang/v2/modules/*
-%dir %attr (0755, root, bin) %{_includedir}
-%{_includedir}/*
-%dir %attr (0755, root, sys) %{_datadir}
-%dir %attr (0755, root, other) %{_datadir}/slsh
-%{_datadir}/slsh/*.sl
-%dir %attr (0755, root, other) %{_datadir}/slsh/local-packages
-%dir %attr (0755, root, other) %{_datadir}/slsh/scripts
-%{_datadir}/slsh/scripts/*
-%dir %attr (0755, root, other) %{_datadir}/slsh/cmaps
-%{_datadir}/slsh/cmaps/*
-%dir %attr (0755, root, other) %{_datadir}/slsh/help
-%{_datadir}/slsh/help/*
-%dir %attr (0755, root, other) %{_datadir}/slsh/rline
-%{_datadir}/slsh/rline/*
-%dir %attr (0755, root, other) %{_datadir}/doc
-%dir %attr (0755, root, other) %{_datadir}/doc/slang
-%dir %attr (0755, root, other) %{_datadir}/doc/slang/v2
-%{_datadir}/doc/slang/v2/*
-%dir %attr (0755, root, other) %{_datadir}/doc/slsh
-%dir %attr (0755, root, other) %{_datadir}/doc/slsh/html
-%{_datadir}/doc/slsh/html/*.html
-%dir %attr (0755, root, bin) %{_mandir}
-%dir %attr (0755, root, bin) %{_mandir}/man1
-%{_mandir}/man1/*
-
-%files root
-%defattr (-, root, sys)
-%dir %attr (0755, root, sys) %{_sysconfdir}
-%{_sysconfdir}/slsh.rc
-
-%changelog
-* Fri May 02 2008 - [email protected]
-- Bump to 2.1.3
-* Mon May 21 2007 - [email protected]
-- Bump to 2.0.7
-* Thu Dec 14 2006 - Eric Boutilier
-- Initial spec

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/archive/SFEmutt.spec	Fri Jun 20 16:27:04 2008 +0000
@@ -0,0 +1,108 @@
+#
+# Copyright (c) 2006 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+
+%include Solaris.inc
+
+Name:                SFEmutt
+Summary:             The mutt e-mail client
+Version:             1.5.18
+Source:              ftp://ftp.mutt.org/mutt/devel/mutt-%{version}.tar.gz
+Patch1:              mutt-01-makefile.diff
+
+SUNW_BaseDir:        %{_basedir}
+BuildRoot:           %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+BuildRequires: SUNWslang
+BuildRequires: SFEgdbm
+BuildRequires: SFEgdbm-devel
+Requires: SUNWslang
+Requires: %{name}-root
+Requires: SFEgdbm
+
+%package root
+Summary:                 %{summary} - / filesystem
+SUNW_BaseDir:            /
+%include default-depend.inc
+
+%prep
+%setup -q -n mutt-%version
+%patch1 -p0
+
+%build
+
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+     CPUS=1
+fi
+
+export CFLAGS="%optflags -I/usr/include/idn -I%{_includedir}"
+export LDFLAGS="%{_ldflags} -R/usr/sfw/lib -R%{_libdir} -L%{_libdir}"
+export CPPFLAGS="-I/usr/sfw/include"
+
+./configure --prefix=%{_prefix}  \
+            --mandir=%{_mandir}  \
+            --sysconfdir=%{_sysconfdir} \
+	    --with-docdir=%{_docdir}/mutt \
+	    --disable-nls \
+	    --with-slang=/usr/lib \
+	    --with-ssl=/usr/sfw \
+	    --enable-pop \
+	    --enable-imap \
+            --enable-hcache \
+            --without-qdbm
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%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}/man5
+%{_mandir}/man5/*.5
+%dir %attr (0755, root, other) %{_datadir}/doc
+%{_datadir}/doc/*
+
+%files root
+%defattr (-, root, sys)
+%dir %attr (0755, root, sys) %{_sysconfdir}
+%{_sysconfdir}/*
+
+%changelog
+* Fri Jun 20 2008 - [email protected]
+- change SFEslang dependency to SUNWslang
+* Sat May 17 2008 - [email protected]
+- 1.5.18
+* Wed May 14 2008 - [email protected]
+- Add --enable-hcache to configure
+- Depend on SFEgdbm(-devel)
+* Tue Jan 01 2008 - Thomas Wagner
+- bump to 1.5.17
+* Sun Nov 25 2007 - Thomas Wagner
+- PSARC 2007/167 "IDN" is found (new around build 73/74), add -I/usr/include/idn
+* Sat May 26 2007 - [email protected]
+- Corrected LDFLAGS setting
+* Wed May 23 2007 - [email protected]
+- Bump to v1.5.15 (devel)
+* Mon May 21 2007 - [email protected]
+- Added CPPFLAGS and LDFLAGS (/usr/sfw) to support openssl
+  Without it ssl is not supported by mutt
+- Added a patch for Makefile.in to change mime.types to mutt-mime.types
+  to exclude a clash with a system mime.types in /etc
+- Forced dependency from libcurses to slang
+* Sun May 20 2007 - [email protected]
+- Initial spec

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/archive/SFEslang.spec	Fri Jun 20 16:27:04 2008 +0000
@@ -0,0 +1,97 @@
+#
+# Copyright (c) 2006 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+
+%include Solaris.inc
+
+Name:                SFEslang
+Summary:             multi-platform programmer's library
+Version:             2.1.3
+Source:              ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v2.1/slang-%{version}.tar.gz
+
+SUNW_BaseDir:        %{_basedir}
+BuildRoot:           %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+Requires: SUNWpng
+
+Requires: %name-root
+%package root
+Summary:                 %{summary} - / filesystem
+SUNW_BaseDir:            /
+%include default-depend.inc
+
+%prep
+%setup -q -n slang-%version
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+     CPUS=1
+fi
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags -L../src/elfobjs"
+
+./configure --prefix=%{_prefix}  \
+            --mandir=%{_mandir} \
+            --sysconfdir=%{_sysconfdir}
+
+make -j$CPUS elf
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install-elf DESTDIR=$RPM_BUILD_ROOT
+#rm ${RPM_BUILD_ROOT}%{_libdir}/libslang.a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%dir %attr (0755, root, other) %{_libdir}/slang
+%dir %attr (0755, root, other) %{_libdir}/slang/v2
+%dir %attr (0755, root, other) %{_libdir}/slang/v2/modules
+%{_libdir}/slang/v2/modules/*
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/slsh
+%{_datadir}/slsh/*.sl
+%dir %attr (0755, root, other) %{_datadir}/slsh/local-packages
+%dir %attr (0755, root, other) %{_datadir}/slsh/scripts
+%{_datadir}/slsh/scripts/*
+%dir %attr (0755, root, other) %{_datadir}/slsh/cmaps
+%{_datadir}/slsh/cmaps/*
+%dir %attr (0755, root, other) %{_datadir}/slsh/help
+%{_datadir}/slsh/help/*
+%dir %attr (0755, root, other) %{_datadir}/slsh/rline
+%{_datadir}/slsh/rline/*
+%dir %attr (0755, root, other) %{_datadir}/doc
+%dir %attr (0755, root, other) %{_datadir}/doc/slang
+%dir %attr (0755, root, other) %{_datadir}/doc/slang/v2
+%{_datadir}/doc/slang/v2/*
+%dir %attr (0755, root, other) %{_datadir}/doc/slsh
+%dir %attr (0755, root, other) %{_datadir}/doc/slsh/html
+%{_datadir}/doc/slsh/html/*.html
+%dir %attr (0755, root, bin) %{_mandir}
+%dir %attr (0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*
+
+%files root
+%defattr (-, root, sys)
+%dir %attr (0755, root, sys) %{_sysconfdir}
+%{_sysconfdir}/slsh.rc
+
+%changelog
+* Fri May 02 2008 - [email protected]
+- Bump to 2.1.3
+* Mon May 21 2007 - [email protected]
+- Bump to 2.0.7
+* Thu Dec 14 2006 - Eric Boutilier
+- Initial spec

--- a/patches/newt-02-solaris-makefile.diff	Fri Jun 20 13:45:37 2008 +0000
+++ b/patches/newt-02-solaris-makefile.diff	Fri Jun 20 16:27:04 2008 +0000
@@ -1,9 +1,11 @@
-diff -r 7bcb5c2c46dd Makefile.in
---- a/Makefile.in	Thu May 01 12:25:15 2008 +0530
-+++ b/Makefile.in	Thu May 01 12:31:40 2008 +0530
-@@ -5,12 +5,11 @@ GPM_SUPPORT=@gpm_support@
+--- Makefile.in.orig	Fri Jun 20 17:21:47 2008
++++ Makefile.in	Fri Jun 20 17:26:02 2008
+@@ -3,14 +3,13 @@
+ LIBTCL = -ltcl8.4
+ 
  GPM_SUPPORT=@gpm_support@
- CFLAGS = $(RPM_OPT_FLAGS) -Wall  -D_GNU_SOURCE -g -O2 -DUTF8 -fPIC -I/usr/include/slang
+-CFLAGS = $(RPM_OPT_FLAGS) -Wall  -D_GNU_SOURCE -g -O2 -DUTF8 -fPIC -I/usr/include/slang
++CFLAGS = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -g -O2 -DUTF8 -fPIC -I/usr/include/slang
  
 -SHLIBFLAGS= -Wl,-O1 -Wl,--version-script,newt.0.52.ver
  VERSION = @VERSION@
@@ -15,7 +17,23 @@
  
  WHIPTCLSO=whiptcl.so
  
-@@ -52,7 +51,7 @@ po/stamp-po:
+@@ -40,11 +39,11 @@
+ SHAREDDIR = shared
+ SHAREDOBJS = $(patsubst %,$(SHAREDDIR)/%, $(LIBOBJS))
+ 
+-ifeq (.depend,$(wildcard .depend))
++#ifeq (.depend,$(wildcard .depend))
+ TARGET=$(PROGS)
+-else
+-TARGET=depend $(PROGS)
+-endif
++#else
++#TARGET=depend $(PROGS)
++#endif
+ 
+ all:	$(TARGET) _snackmodule.so po/stamp-po
+ 
+@@ -52,7 +51,7 @@
  	$(MAKE) -C po stamp-po
  
  test:	$(TESTOBJS) $(LIBNEWT)
@@ -24,7 +42,7 @@
  
  testgrid:	testgrid.o $(LIBNEWT)
  	$(CC) -g -o testgrid testgrid.o $(LIBNEWT) $(LIBS)
-@@ -68,18 +67,16 @@ showkey:	showkey.o $(LIBNEWT)
+@@ -68,18 +67,16 @@
  
  _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
  	for ver in $(PYTHONVERS) ; do \
@@ -47,7 +65,7 @@
  
  # Ensure dialogboxes is compiled -fPIC
  dialogboxes.o: dialogboxes.c
-@@ -111,7 +108,7 @@ sharedlib: $(LIBNEWTSH)
+@@ -111,7 +108,7 @@
  sharedlib: $(LIBNEWTSH)
  
  $(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)