--- a/ChangeLog	Sun Nov 02 15:59:01 2008 +0000
+++ b/ChangeLog	Tue Nov 04 05:02:20 2008 +0000
@@ -1,3 +1,12 @@
+2008-11-04  Andras Barna  <[email protected]>
+
+	* SFEvalknut.spec: new spec
+	* base-specs/dclib.spec: added
+	* base-specs/valknut.spec: added
+	* patches/valknut-01-sockio.diff: added
+	* patches/valknut-02-aflocal.diff: added
+	* patches/valknut-03-fixicons.diff: added
+
 2008-11-02  Gilles Dauphin <[email protected]>
 
 	* SFEcrrcsim.spec: OpenGL flight simulator for OpenSolaris.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEvalknut.spec	Tue Nov 04 05:02:20 2008 +0000
@@ -0,0 +1,95 @@
+#http://www.sun.com/third-party/global/opensource.jsp
+# spec file for package SFEvalknut
+#
+# includes module(s): valknut dclib
+#
+%include Solaris.inc
+
+%include base.inc
+
+%use valknut = valknut.spec
+%use dclib = dclib.spec
+
+Name:		SFEvalknut
+Summary:	%{valknut.summary}
+Version:	%{valknut.version}
+SUNW_BaseDir:	%{_basedir}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+Requires: SFEqt
+BuildRequires: SFEqt
+Requires: SUNWlxml
+BuildRequires: SUNWlxml
+
+%prep
+rm -rf %name-%version
+mkdir %name-%version
+
+%valknut.prep -d %name-%version
+%dclib.prep -d %name-%version
+
+%build
+DCLIB_ROOT=%{_builddir}/%name-%version/%{dclib.name}-%{dclib.version}
+export CC=/usr/sfw/bin/gcc
+export CXX=/usr/sfw/bin/g++
+export CXXFLAGS="%{gcc_cxx_optflags} -I$DCLIB_ROOT/dclib -I$DCLIB_ROOT/dclib/core"
+export LDFLAGS="%_ldflags -L$DCLIB_ROOT/dclib/.libs"
+
+export PKG_CONFIG_PATH="%{_libdir}/pkgconfig:$DCLIB_ROOT"
+
+%dclib.build -d %name-%version
+%valknut.build -d %name-%version
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%dclib.install -d %name-%version
+%valknut.install -d %name-%version
+rm -f $RPM_BUILD_ROOT%{_libdir}/libdc.*a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/dclib
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+rm -rf $RPM_BUILD_ROOT%{_includedir}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}/lib*.so*
+%dir %attr (0755, root, bin) %{_mandir}
+%{_mandir}/*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, bin) %{_datadir}/valknut
+%{_datadir}/valknut/*
+%dir %attr (0755, root, other) %{_datadir}/applications
+%{_datadir}/applications/*
+%dir %attr (0755, root, other) %{_datadir}/icons
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/16x16
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/16x16/apps/
+%{_datadir}/icons/hicolor/16x16/apps/*
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/22x22/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/22x22/apps/
+%{_datadir}/icons/hicolor/22x22/apps/*
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/24x24/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/24x24/apps/
+%{_datadir}/icons/hicolor/24x24/apps/*
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/32x32/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/32x32/apps/
+%{_datadir}/icons/hicolor/32x32/apps/*
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/48x48/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/48x48/apps/
+%{_datadir}/icons/hicolor/48x48/apps/*
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/64x64/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/64x64/apps/
+%{_datadir}/icons/hicolor/64x64/apps/*
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/128x128/
+%dir %attr (0755, root, other) %{_datadir}/icons/hicolor/128x128/apps/
+%{_datadir}/icons/hicolor/128x128/apps/*
+
+%changelog
+* Tue Nov 4 2008 - Andras Barna ([email protected])
+- Initial spec file
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/dclib.spec	Tue Nov 04 05:02:20 2008 +0000
@@ -0,0 +1,42 @@
+#
+# spec file for package dclib
+#
+
+Name:		dclib
+Summary:	Library for the Direct Connect network.
+Version:	0.3.21
+Source:		%{sf_download}/wxdcgui/%{name}-%{version}.tar.bz2
+Patch1:         valknut-01-sockio.diff
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
+
+%prep
+%setup -q -n %{name}-%{version}
+%patch1 -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
+
+autoreconf --verbose --install
+
+./configure --prefix=%{_prefix}		\
+	    --bindir=%{_bindir}		\
+	    --mandir=%{_mandir}		\
+            --libdir=%{_libdir}         \
+            --libexecdir=%{_libexecdir}	\
+            --sysconfdir=%{_sysconfdir}
+
+make -j$CPUS
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%changelog
+* Tue Nov 4 2008 - Andras Barna ([email protected])
+- Initial spec file
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/valknut.spec	Tue Nov 04 05:02:20 2008 +0000
@@ -0,0 +1,44 @@
+#
+# spec file for package valknut
+#
+
+Name:		valknut
+Summary:	Client for the Direct Connect network.
+Version:	0.4.7
+Source:		%{sf_download}/wxdcgui/%{name}-%{version}.tar.bz2
+Patch1:         valknut-02-aflocal.diff
+Patch2:         valknut-03-fixicons.diff
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
+
+%prep
+%setup -q -n %{name}-%{version}
+%patch1 -p1
+%patch2 -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
+
+autoreconf --verbose --install
+
+./configure --prefix=%{_prefix}		\
+	    --bindir=%{_bindir}		\
+	    --mandir=%{_mandir}		\
+            --libdir=%{_libdir}     \
+            --libexecdir=%{_libexecdir}	\
+            --sysconfdir=%{_sysconfdir}
+
+make -j$CPUS
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%changelog
+* Tue Nov 4 2008 - Andras Barna ([email protected])
+- Initial spec file
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/valknut-01-sockio.diff	Tue Nov 04 05:02:20 2008 +0000
@@ -0,0 +1,14 @@
+diff -Naur dclib-0.3.21.old/dclib/core/cnetaddr.cpp dclib-0.3.21/dclib/core/cnetaddr.cpp
+--- dclib-0.3.21.old/dclib/core/cnetaddr.cpp	2008-11-03 07:06:58.649243531 +0200
++++ dclib-0.3.21/dclib/core/cnetaddr.cpp	2008-11-03 07:08:47.956170656 +0200
+@@ -31,6 +31,10 @@
+ #include <netdb.h>
+ #endif
+ 
++#if defined(__sun) && defined(__SVR4)
++#include <sys/sockio.h>
++#endif
++
+ /* if_nameindex() */
+ #include <net/if.h>
+ 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/valknut-02-aflocal.diff	Tue Nov 04 05:02:20 2008 +0000
@@ -0,0 +1,14 @@
+diff -Naur valknut-0.4.7.old/valknut/dcsigterm.cpp valknut-0.4.7/valknut/dcsigterm.cpp
+--- valknut-0.4.7.old/valknut/dcsigterm.cpp	2008-11-03 07:00:21.089846767 +0200
++++ valknut-0.4.7/valknut/dcsigterm.cpp	2008-11-03 08:04:16.899301552 +0200
+@@ -28,6 +28,10 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
++#if !defined(AF_LOCAL) && defined(AF_UNIX)
++#define AF_LOCAL AF_UNIX
++#endif
++
+ int DCSigTerm::sigtermsfd[2] = { -1, -1 };
+ 
+ /** */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/valknut-03-fixicons.diff	Tue Nov 04 05:02:20 2008 +0000
@@ -0,0 +1,21 @@
+--- valknut-0.4.7.old/valknut/icons/Makefile.am	2008-11-03 07:00:21.084616796 +0200
++++ valknut-0.4.7/valknut/icons/Makefile.am	2008-11-03 14:11:33.964813250 +0200
+@@ -129,11 +129,11 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/icon_16x16.png $(DESTDIR)$(datadir)/icons/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/icon_22x22.png $(DESTDIR)$(datadir)/icons/hicolor/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/icon_24x24.png $(DESTDIR)$(datadir)/icons/hicolor/24x24/apps
+-	$(INSTALL_DATA) $(srcdir)/icon_32x32.png $(DESTDIR)$(datadir)/icons/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/icon_48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/icon_64x64.png $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/icon_128x128.png $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/icon_16x16.png $(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/valknut.png
++	$(INSTALL_DATA) $(srcdir)/icon_22x22.png $(DESTDIR)$(datadir)/icons/hicolor/22x22/apps/valknut.png
++	$(INSTALL_DATA) $(srcdir)/icon_24x24.png $(DESTDIR)$(datadir)/icons/hicolor/24x24/apps/valknut.png
++	$(INSTALL_DATA) $(srcdir)/icon_32x32.png $(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/valknut.png
++	$(INSTALL_DATA) $(srcdir)/icon_48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/valknut.png
++	$(INSTALL_DATA) $(srcdir)/icon_64x64.png $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/valknut.png
++	$(INSTALL_DATA) $(srcdir)/icon_128x128.png $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/valknut.png
+