From 46d1b25bce780b1f503b359f56124454f7d26aa1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 17 Oct 2012 22:00:29 -0400
Subject: [PATCH] add solaris workaround to cabal file too

uname reports SunOS, but cabal seems to use solaris.
---
 Makefile        | 2 +-
 git-annex.cabal | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 27ef62d460..c4341b9aec 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ OPTFLAGS?=-DWITH_INOTIFY
 clibs=Utility/libdiskfree.o Utility/libmounts.o
 THREADFLAGS=$(shell if test -e  `ghc --print-libdir`/libHSrts_thr.a; then printf -- -threaded; fi)
 else
-ifeq ($(OS),Solaris)
+ifeq ($(OS),SunOS)
 # Solaris is not supported by the assistant or watch command.
 FEATURES:=$(shell echo $(FEATURES) | sed -e 's/-DWITH_ASSISTANT//' -e 's/-DWITH_WEBAPP//')
 else
diff --git a/git-annex.cabal b/git-annex.cabal
index 20d4211eea..d27843d01a 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
 Name: git-annex
-Version: 3.20121017
+Version: 3.20121018
 Cabal-Version: >= 1.8
 License: GPL
 Maintainer: Joey Hess <joey@kitenet.net>
@@ -55,8 +55,6 @@ Executable git-annex
   Other-Modules: Utility.Touch Utility.Mounts
   Include-Dirs: Utility
   C-Sources: Utility/libdiskfree.c Utility/libmounts.c
-  if (! os(linux))
-    C-Sources: Utility/libkqueue.c
   Extensions: CPP
   GHC-Options: -threaded
   CPP-Options: -DURI_24
@@ -65,7 +63,7 @@ Executable git-annex
     Build-Depends: hS3
     CPP-Options: -DWITH_S3
 
-  if flag(Assistant)
+  if flag(Assistant) && ! os(windows) && ! os(solaris)
     Build-Depends: stm >= 2.3
     CPP-Options: -DWITH_ASSISTANT
 
@@ -73,8 +71,9 @@ Executable git-annex
     Build-Depends: hinotify
     CPP-Options: -DWITH_INOTIFY
   else
-    if (! os(windows))
+    if (! os(windows) && ! os(solaris))
       CPP-Options: -DWITH_KQUEUE
+      C-Sources: Utility/libkqueue.c
 
   if os(linux) && flag(Dbus)
     Build-Depends: dbus