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

Update hs-ports.

Browse Source
This commit is contained in:
dons 2005-03-26 03:37:09 +00:00
parent 85779f9436
commit 748d557916
6 changed files with 25 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/hs-ports/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2005/03/08 22:52:44 dons Exp $
# $OpenBSD: Makefile,v 1.4 2005/03/26 03:37:09 dons Exp $
# $FreeBSD: ports/devel/hs-hpl/Makefile,v 1.11 2004/03/11 07:48:11 obraun Exp $
# only for archs to which the GHC ffi has been ported
@ -6,7 +6,7 @@ ONLY_FOR_ARCHS= i386
COMMENT= "Haskell library for concurrent and distributed programming"
V= 0.4.1
V= 0.4.3
DISTNAME= hs-ports-${V}
CATEGORIES= devel
MAINTAINER= Don Stewart <dons@openbsd.org>
@ -20,6 +20,7 @@ WRKDIST= ${WRKDIR}/ports-${V}
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--prefix=${PREFIX}
SUBST_VARS+= V
do-regress:
@( cd ${WRKDIST}/tests && sh test.sh )

8
devel/hs-ports/distinfo
View File

@ -1,4 +1,4 @@
MD5 (ports-0.4.1.tar.gz) = 7d621a780168a32298ce49ea031ab22f
RMD160 (ports-0.4.1.tar.gz) = 0f7d4e97b4d984e05589a9421b145b74783f2b63
SHA1 (ports-0.4.1.tar.gz) = 5c6fc040776bbdd13782c9f2abcbf43d36939e68
SIZE (ports-0.4.1.tar.gz) = 66083
MD5 (ports-0.4.3.tar.gz) = b2c79b885475397176897ccba3bf266e
RMD160 (ports-0.4.3.tar.gz) = 0d0bf8885dcf5d071801b50615ea5267469e1623
SHA1 (ports-0.4.3.tar.gz) = 08d965a59bfe9e8083ef6a65de9e6deceafd9d8a
SIZE (ports-0.4.3.tar.gz) = 67528

15
devel/hs-ports/patches/patch-lib_Makefile
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-lib_Makefile,v 1.1.1.1 2004/05/09 10:30:22 dons Exp $
Needs a name in the ghc package system
--- lib/Makefile.orig 2004-05-08 10:54:34.000000000 +1000
+++ lib/Makefile 2004-05-08 10:54:42.000000000 +1000
@@ -33,7 +33,7 @@ include ../mk/config.mk ../mk/common.mk
# Extra flags for the Haskell compiler
#
-EXTRAHCFLAGS =
+EXTRAHCFLAGS = -package-name ports
# The files making up this library
#

51
devel/hs-ports/patches/patch-lib_Processes_hs
View File

@ -1,51 +0,0 @@
$OpenBSD: patch-lib_Processes_hs,v 1.1.1.1 2004/05/09 10:30:22 dons Exp $
fix code to follow semantics of post 6.2 forkProcess
--- lib/Processes.hs.orig 2004-05-07 13:32:22.000000000 +1000
+++ lib/Processes.hs 2004-05-07 13:47:33.000000000 +1000
@@ -1,3 +1,4 @@
+{-# OPTIONS -cpp #-}
-- Haskell Ports Library: Process management
--
-- Author : Manuel M T Chakravarty
@@ -304,10 +305,8 @@ forkExec path args env =
(stdinReadFD , stdinWriteFD ) <- createPipe
(stdoutReadFD, stdoutWriteFD) <- createPipe
(stderrReadFD, stderrWriteFD) <- createPipe
- pid <- forkProcess
- case pid of
- Nothing -> -- child process
- do
+
+ let child = do
dupTo stdinReadFD stdInput
dupTo stdoutWriteFD stdOutput
dupTo stderrWriteFD stdError
@@ -316,8 +315,8 @@ forkExec path args env =
stderrReadFD, stderrWriteFD]
executeFile path True args env
error "Processes.forkExec: executeFile: failed"
- Just pid -> -- parent process
- do
+
+ let parent pid = do
mapM_ closeFd [stdinReadFD, stdoutWriteFD, stderrWriteFD]
mapM_ (\fd -> setFdOption fd CloseOnExec True)
[stdinWriteFD, stdoutReadFD, stderrReadFD]
@@ -326,6 +325,15 @@ forkExec path args env =
stderrReadHandle <- fdToHandle stderrReadFD
return (pid, stdinWriteHandle, stdoutReadHandle, stderrReadHandle)
+#if __GLASGOW_HASKELL__ >= 601
+ pid <- forkProcess child -- fork child
+ parent pid -- and run parent code
+#else
+ pid <- forkProcess
+ case pid of
+ Just pid -> parent pid
+ Nothing -> child
+#endif
-- auxilliary routines for debugging
-- ---------------------------------

6
devel/hs-ports/patches/patch-package_conf_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-package_conf_in,v 1.1.1.1 2004/05/09 10:30:22 dons Exp $
$OpenBSD: patch-package_conf_in,v 1.2 2005/03/26 03:37:09 dons Exp $
package spec
@ -7,9 +7,9 @@ package spec
@@ -0,0 +1,15 @@
+Package
+ {name = "ports",
+ import_dirs = ["${PREFIX}/lib/hs-ports-0.4.1/ghc6/import"],
+ import_dirs = ["${PREFIX}/lib/hs-ports-0.4.3/ghc6/import"],
+ source_dirs = [],
+ library_dirs = ["${PREFIX}/lib/hs-ports-0.4.1/ghc6"],
+ library_dirs = ["${PREFIX}/lib/hs-ports-0.4.3/ghc6"],
+ hs_libraries = ["portsHS"],
+ extra_libraries = [],
+ include_dirs = [],

30
devel/hs-ports/pkg/PLIST
View File

@ -1,19 +1,19 @@
@comment $OpenBSD: PLIST,v 1.3 2005/03/08 22:52:45 dons Exp $
@comment $OpenBSD: PLIST,v 1.4 2005/03/26 03:37:09 dons Exp $
bin/ports-config
lib/hs-ports-0.4.1/
lib/hs-ports-0.4.1/ghc6/
lib/hs-ports-0.4.1/ghc6/import/
lib/hs-ports-0.4.1/ghc6/import/HPL.hi
lib/hs-ports-0.4.1/ghc6/import/PortThreads.hi
lib/hs-ports-0.4.1/ghc6/import/Ports.hi
lib/hs-ports-0.4.1/ghc6/import/PortsConfig.hi
lib/hs-ports-0.4.1/ghc6/import/PortsVersion.hi
lib/hs-ports-0.4.1/ghc6/import/Processes.hi
lib/hs-ports-0.4.1/ghc6/import/SVars.hi
lib/hs-ports-0.4.1/ghc6/import/ThreadUtils.hi
lib/hs-ports-0.4.1/ghc6/libportsHS.a
lib/hs-ports-0.4.1/ghc6/package.conf.in
@exec /bin/cat %D/lib/hs-ports-0.4.1/ghc6/package.conf.in | /usr/bin/env PREFIX=%D %D/bin/ghc-pkg -u
lib/hs-ports-${V}/
lib/hs-ports-${V}/ghc6/
lib/hs-ports-${V}/ghc6/import/
lib/hs-ports-${V}/ghc6/import/HPL.hi
lib/hs-ports-${V}/ghc6/import/PortThreads.hi
lib/hs-ports-${V}/ghc6/import/Ports.hi
lib/hs-ports-${V}/ghc6/import/PortsConfig.hi
lib/hs-ports-${V}/ghc6/import/PortsVersion.hi
lib/hs-ports-${V}/ghc6/import/Processes.hi
lib/hs-ports-${V}/ghc6/import/SVars.hi
lib/hs-ports-${V}/ghc6/import/ThreadUtils.hi
lib/hs-ports-${V}/ghc6/libportsHS.a
lib/hs-ports-${V}/ghc6/package.conf.in
@exec /bin/cat %D/lib/hs-ports-${V}/ghc6/package.conf.in | /usr/bin/env PREFIX=%D %D/bin/ghc-pkg -u
@exec /bin/rm -f %D/lib/ghc-6.2.2/package.conf.old
@unexec %D/bin/ghc-pkg -r ports
@unexec /bin/rm -f %D/lib/ghc-6.2.2/package.conf.old