Date: Fri, 24 Jul 2009 11:53:02 -0700 (PDT) From: Jacula Modyun <jacula@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/137094: [patch]: update of devel/hs-hmake to ghc-6.10.4 Message-ID: <200907241853.n6OIr2Ff012290@splork.wirewater.yow> Resent-Message-ID: <200907241900.n6OJ0B8G033114@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 137094 >Category: ports >Synopsis: [patch]: update of devel/hs-hmake to ghc-6.10.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 24 19:00:11 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Jacula Modyun >Release: FreeBSD 7.1-PRERELEASE i386 >Organization: >Environment: System: FreeBSD splork.wirewater.yow 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Sat Oct 18 11:22:07 UTC 2008 root@splork.wirewater.yow:/usr/obj/usr/src/sys/JACULA i386 >Description: See the PR: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/137055 >How-To-Repeat: >Fix: --- patch-hs-hmake.diff begins here --- diff -uNr hs-hmake.orig/Makefile hs-hmake/Makefile --- hs-hmake.orig/Makefile 2009-05-12 11:28:15.000000000 +0000 +++ hs-hmake/Makefile 2009-07-22 14:21:39.000000000 +0000 @@ -7,7 +7,7 @@ PORTNAME= hmake PORTVERSION= 3.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MASTER_SITES= http://www.haskell.org/hmake/ \ ftp://ftp.cs.york.ac.uk/pub/haskell/hmake/ \ @@ -17,11 +17,10 @@ MAINTAINER= haskell@FreeBSD.org COMMENT= Intelligent compilation management tool for Haskell programs -BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc -.if exists(${LOCALBASE}/lib/libreadline.so) -LIB_DEPENDS= readline.6:${PORTSDIR}/devel/readline -.endif +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-readline>=1.0.1.0:${PORTSDIR}/devel/hs-readline RUN_DEPENDS= ${BUILD_DEPENDS} +LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 HAS_CONFIGURE= YES CONFIGURE_ARGS+= --prefix=${PREFIX} @@ -35,6 +34,10 @@ PLIST_SUB+= ARCH=amd64 .endif +.if exists(${LOCALBASE}/lib/libreadline.so) +LIB_DEPENDS= readline.6:${PORTSDIR}/devel/readline +.endif + do-install: # cheat a bit, otherwise LIBDIR gets clobbered (cd ${WRKSRC} && ./configure --install) diff -uNr hs-hmake.orig/files/patch-src_hmake_Config.hs hs-hmake/files/patch-src_hmake_Config.hs --- hs-hmake.orig/files/patch-src_hmake_Config.hs 1970-01-01 00:00:00.000000000 +0000 +++ hs-hmake/files/patch-src_hmake_Config.hs 2009-07-16 08:00:21.000000000 +0000 @@ -0,0 +1,20 @@ +--- src/hmake/Config.hs.orig 2007-11-23 14:26:05.000000000 +0000 ++++ src/hmake/Config.hs 2009-07-16 07:56:15.000000000 +0000 +@@ -272,14 +272,14 @@ + ok <- doesFileExist ghcpkg0 + let ghcpkg = if ok then ghcpkg0 else dirname fullpath++"/ghc-pkg" + -- pkgs <- runAndReadStdout (ghcpkg++" --list-packages") +- pkgs <- runAndReadStdout (ghcpkg++" -l") ++ pkgs <- runAndReadStdout (ghcpkg++" list") + let pkgsOK = filter (\p-> any (`isPrefixOf` p) + ["std","base","haskell98"]) + (deComma pkgs) + idirs <- mapM (\p-> runAndReadStdout +- (ghcpkg++" --show-package=" ++ (ghcpkg++" field " + ++deVersion (ghcsym>=604) p +- ++" --field=import_dirs")) ++ ++" import_dirs")) + pkgsOK + return config{ includePaths = pkgDirs libdir (nub idirs) } + where diff -uNr hs-hmake.orig/files/patch-src_hmake_MkConfig.hs hs-hmake/files/patch-src_hmake_MkConfig.hs --- hs-hmake.orig/files/patch-src_hmake_MkConfig.hs 1970-01-01 00:00:00.000000000 +0000 +++ hs-hmake/files/patch-src_hmake_MkConfig.hs 2009-07-16 08:00:28.000000000 +0000 @@ -0,0 +1,20 @@ +--- src/hmake/MkConfig.hs.orig 2006-07-07 16:01:16.000000000 +0000 ++++ src/hmake/MkConfig.hs 2009-07-16 07:56:44.000000000 +0000 +@@ -258,14 +258,14 @@ + ok <- doesFileExist ghcpkg0 + let ghcpkg = if ok then ghcpkg0 else dirname fullpath++"/ghc-pkg" + -- pkgs <- runAndReadStdout (ghcpkg++" --list-packages") +- pkgs <- runAndReadStdout (ghcpkg++" -l") ++ pkgs <- runAndReadStdout (ghcpkg++" list") + let pkgsOK = filter (\p-> any (`isPrefixOf` p) + ["std","base","haskell98"]) + (deComma pkgs) + idirs <- mapM (\p-> runAndReadStdout +- (ghcpkg++" --show-package=" ++ (ghcpkg++" field " + ++deVersion (ghcsym>=604) p +- ++" --field=import_dirs")) ++ ++" import_dirs")) + pkgsOK + return config{ includePaths = pkgDirs libdir (nub idirs) } + else do ioError (userError ("Can't find ghc includes at "++incdir1)) diff -uNr hs-hmake.orig/files/patch-src_hmake_PackageConfig.hs hs-hmake/files/patch-src_hmake_PackageConfig.hs --- hs-hmake.orig/files/patch-src_hmake_PackageConfig.hs 1970-01-01 00:00:00.000000000 +0000 +++ hs-hmake/files/patch-src_hmake_PackageConfig.hs 2009-07-16 08:00:36.000000000 +0000 @@ -0,0 +1,22 @@ +--- src/hmake/PackageConfig.hs.orig 2008-04-25 10:28:08.000000000 +0000 ++++ src/hmake/PackageConfig.hs 2009-07-16 07:57:07.000000000 +0000 +@@ -55,7 +55,7 @@ + -- ghcpkg <- runAndReadStdout + -- ("echo `" ++ ghc ++ " --print-libdir`/bin/ghc-pkg") + -- pkgs <- runAndReadStdout (ghcpkg++" --list-packages") +- pkgs <- runAndReadStdout (ghcpkg++" -l") ++ pkgs <- runAndReadStdout (ghcpkg++" list") + let (ok,bad) = partition (\p-> elemBy versionMatch p (deComma pkgs)) + packages + when (not (null bad)) +@@ -63,8 +63,8 @@ + ++concat (intersperse ", " bad) + ++" not available (according to ghc-pkg)")) + idirs <- mapM (\p-> runAndReadStdout +- (ghcpkg++" --show-package="++p +- ++" --field=import_dirs")) ++ (ghcpkg++" field "++p ++ ++" import_dirs")) + ok + return (pkgDirs libdir idirs) + where --- patch-hs-hmake.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907241853.n6OIr2Ff012290>