Zap hs-network-bytestring dependency and bump.

avsm · Apr 11, 2011 · 3c892da · 3c892da
1 parent 5a44e89
commit 3c892da
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2011/04/05 11:43:17 kili Exp $
+# $OpenBSD: Makefile,v 1.8 2011/04/11 14:55:58 kili Exp $
 
 COMMENT =		Snap Haskell Web Framework Server
 
 DISTNAME =		snap-server-0.2.16.2
-REVISION =		0
+REVISION =		1
 CATEGORIES =		www
 HOMEPAGE =		http://snapframework.com/
 
@@ -34,7 +34,6 @@ RUN_DEPENDS +=		devel/hs-binary \
 			devel/hs-unix-compat \
 			devel/hs-vector \
 			devel/hs-vector-algorithms \
-			net/hs-network-bytestring \
 			textproc/hs-attoparsec-iteratee \
 			textproc/hs-bytestring-nums \
 			textproc/hs-bytestring-show \

diff --git a/www/hs-snap-server/patches/patch-snap-server_cabal b/www/hs-snap-server/patches/patch-snap-server_cabal
@@ -0,0 +1,26 @@
+$OpenBSD: patch-snap-server_cabal,v 1.1 2011/04/11 14:55:58 kili Exp $
+
+Build with newer network package; network-bytestring has been
+integrated into network.
+
+--- snap-server.cabal.orig	Wed Nov 10 22:09:47 2010
++++ snap-server.cabal	Sat Apr  9 17:31:06 2011
+@@ -121,7 +121,7 @@ Library
+     iteratee >= 0.3.1 && <0.4,
+     monads-fd < 0.1.0.3,
+     murmur-hash >= 0.1 && < 0.2,
+-    network == 2.2.1.*,
++    network >= 2.2.1 && < 2.4,
+     old-locale,
+     snap-core == 0.2.16.*,
+     template-haskell,
+@@ -142,8 +142,7 @@ Library
+     cpp-options: -DLIBEV
+   else
+     other-modules: Snap.Internal.Http.Server.TimeoutTable
+-    build-depends: network-bytestring >= 0.1.2 && < 0.2,
+-                   PSQueue >= 1.1 && <1.2
++    build-depends: PSQueue >= 1.1 && <1.2
+
+     other-modules: Snap.Internal.Http.Server.SimpleBackend
+
diff --git a/www/hs-snap-server/pkg/PLIST b/www/hs-snap-server/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2010/12/12 16:32:59 kili Exp $
+@comment $OpenBSD: PLIST,v 1.4 2011/04/11 14:55:58 kili Exp $
 lib/ghc/${DISTNAME}/
 lib/ghc/${DISTNAME}/Data/
 lib/ghc/${DISTNAME}/Data/Concurrent/
@@ -36,13 +36,14 @@ share/doc/hs-${DISTNAME}/html/System-FastLogger.html
 share/doc/hs-${DISTNAME}/html/doc-index.html
 share/doc/hs-${DISTNAME}/html/frames.html
 share/doc/hs-${DISTNAME}/html/haddock-util.js
-share/doc/hs-${DISTNAME}/html/haddock.css
-share/doc/hs-${DISTNAME}/html/haskell_icon.gif
+share/doc/hs-${DISTNAME}/html/hslogo-16.png
 share/doc/hs-${DISTNAME}/html/index-frames.html
 share/doc/hs-${DISTNAME}/html/index.html
 share/doc/hs-${DISTNAME}/html/mini_Snap-Http-Server-Config.html
 share/doc/hs-${DISTNAME}/html/mini_Snap-Http-Server.html
 share/doc/hs-${DISTNAME}/html/mini_System-FastLogger.html
 share/doc/hs-${DISTNAME}/html/minus.gif
+share/doc/hs-${DISTNAME}/html/ocean.css
 share/doc/hs-${DISTNAME}/html/plus.gif
 share/doc/hs-${DISTNAME}/html/snap-server.haddock
+share/doc/hs-${DISTNAME}/html/synopsis.png