cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add fixes for ghc-7.4.

Browse Source
This commit is contained in:
kili 2012-09-02 22:12:36 +00:00
parent 2b06f2f37d
commit 0afda10308
5 changed files with 80 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/bustle/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2011/12/27 21:10:55 kili Exp $
# $OpenBSD: Makefile,v 1.6 2012/09/02 22:12:36 kili Exp $
COMMENT= D-Bus profiler
DISTNAME= bustle-0.2.3
REVISION= 3
REVISION= 4
CATEGORIES= devel
HOMEPAGE= http://willthompson.co.uk/bustle/
@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo
WANTLIB += dbus-1 expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glade-2.0 glib-2.0 gmodule-2.0 gmp gobject-2.0
WANTLIB += gio-2.0 glade-2.0 glib-2.0 gmp gobject-2.0
WANTLIB += gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pixman-1 png pthread pthread-stubs util
WANTLIB += xcb xcb-render xcb-shm xml2 z

13
devel/bustle/patches/patch-Bustle_Noninteractive_hs Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-Bustle_Noninteractive_hs,v 1.1 2012/09/02 22:12:36 kili Exp $
--- Bustle/Noninteractive.hs.orig Fri Oct 29 01:06:58 2010
+++ Bustle/Noninteractive.hs Fri Jul 13 21:51:19 2012
@@ -3,7 +3,8 @@ where
import Prelude hiding (log)
-import System
+import System.Environment
+import System.Exit
import System.IO (hPutStrLn, stderr)
import Bustle.Parser (readLog)

12
devel/bustle/patches/patch-Bustle_Stats_hs Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Bustle_Stats_hs,v 1.1 2012/09/02 22:12:36 kili Exp $
--- Bustle/Stats.hs.orig Fri Oct 29 01:06:58 2010
+++ Bustle/Stats.hs Fri Jul 13 21:50:24 2012
@@ -36,7 +36,7 @@ frequencies = reverse
where alt Nothing = Just 1
alt (Just n) = Just (n + 1)
-mean :: Fractional a => [a] -> a
+mean :: (Eq a, Fractional a) => [a] -> a
mean = acc 0 0
where acc 0 _ [] = error "mean of empty list"
acc n t [] = t / n

13
devel/bustle/patches/patch-bustle-dot_hs Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-bustle-dot_hs,v 1.1 2012/09/02 22:12:36 kili Exp $
--- bustle-dot.hs.orig Fri Oct 29 01:06:58 2010
+++ bustle-dot.hs Fri Jul 13 21:53:17 2012
@@ -3,7 +3,8 @@ import Prelude hiding (log)
import Control.Monad
import Data.List
import Data.Maybe
-import System
+import System.Environment
+import System.Exit
import Bustle.Parser (readLog)
import Bustle.Types

39
devel/bustle/patches/patch-bustle_cabal Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-bustle_cabal,v 1.1 2012/09/02 22:12:36 kili Exp $
--- bustle.cabal.orig Fri Jul 13 21:44:38 2012
+++ bustle.cabal Fri Jul 13 21:47:17 2012
@@ -27,11 +27,11 @@ Executable bustle
if flag(PostCabalizedGtk2HS)
-- Since gtk2hs 0.11, pango is a separate package, and its module names
-- have changed.
- Build-Depends: haskell98, mtl, base >= 4 && < 5, containers, parsec,
+ Build-Depends: mtl, base >= 4 && < 5, containers, parsec,
filepath, process,
gtk > 0.11, glade, pango, glib, cairo
else
- Build-Depends: haskell98, mtl, base >= 4 && < 5, containers, parsec,
+ Build-Depends: mtl, base >= 4 && < 5, containers, parsec,
filepath, process,
gtk > 0.10 && < 0.11, glade, pango, glib, cairo
@@ -39,18 +39,18 @@ Executable bustle-count
Main-is: bustle-count.hs
Other-modules: Bustle.Parser, Bustle.Stats, Bustle.Types,
Bustle.Noninteractive
- Build-Depends: haskell98, base >= 4 && < 5, containers, parsec
+ Build-Depends: base >= 4 && < 5, containers, parsec
Ghc-options: -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind
Executable bustle-time
Main-is: bustle-time.hs
Other-modules: Bustle.Parser, Bustle.Stats, Bustle.Types,
Bustle.Noninteractive
- Build-Depends: haskell98, base >= 4 && < 5, containers, parsec
+ Build-Depends: base >= 4 && < 5, containers, parsec
Ghc-options: -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind
Executable bustle-dot
Main-is: bustle-dot.hs
Other-modules: Bustle.Parser, Bustle.Types
- Build-Depends: haskell98, base >= 4 && < 5, containers, parsec
+ Build-Depends: base >= 4 && < 5, containers, parsec
Ghc-options: -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind