From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 25 17:30:02 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C6E7216A41C for ; Wed, 25 May 2005 17:30:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E1AD43D4C for ; Wed, 25 May 2005 17:30:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4PHU2k6018839 for ; Wed, 25 May 2005 17:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4PHU2QR018834; Wed, 25 May 2005 17:30:02 GMT (envelope-from gnats) Resent-Date: Wed, 25 May 2005 17:30:02 GMT Resent-Message-Id: <200505251730.j4PHU2QR018834@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Johan van Selst Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8EE5316A41C for ; Wed, 25 May 2005 17:29:45 +0000 (GMT) (envelope-from johans@stack.nl) Received: from skynet.stack.nl (skynet.stack.nl [131.155.140.225]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBF0C43D4C for ; Wed, 25 May 2005 17:29:42 +0000 (GMT) (envelope-from johans@stack.nl) Received: by skynet.stack.nl (Postfix, from userid 65534) id AB1C43F1A; Wed, 25 May 2005 19:31:21 +0200 (CEST) Received: from mud.stack.nl (mud.stack.nl [IPv6:2001:610:1108:5011:207:e9ff:fe14:b498]) by skynet.stack.nl (Postfix) with ESMTP id 399F83F18; Wed, 25 May 2005 19:31:20 +0200 (CEST) Received: by mud.stack.nl (Postfix, from userid 801) id 9FFE217039; Wed, 25 May 2005 19:29:39 +0200 (CEST) Message-Id: <20050525172939.9FFE217039@mud.stack.nl> Date: Wed, 25 May 2005 19:29:39 +0200 (CEST) From: Johan van Selst To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: simonmar@microsoft.com Subject: ports/81474: lang/ghc5: fix for compilation on FreeBSD 5.x X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Johan van Selst List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 May 2005 17:30:03 -0000 >Number: 81474 >Category: ports >Synopsis: lang/ghc5: fix for compilation on FreeBSD 5.x >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed May 25 17:30:01 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Johan van Selst >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD mud.stack.nl 5.4-STABLE FreeBSD 5.4-STABLE #3: Mon May 9 19:06:32 CEST 2005 root@mud.stack.nl:/usr/obj/usr/src/sys/mud i386 >Description: [Cc: maintainer, simonmar@microsoft.com] The way Haskell uses backslashes to format multi-line strings is not compatible with the latest cpp strictness. This patch changes multi-line strings to use string concatenation. It introduces no functional changes, but assures compilation of ghc5 on FreeBSD-STABLE machines as well. >How-To-Repeat: >Fix: Multi-line strings are frequently used. This creates 6 patchfiles: files/patch-ghc_compiler_ghci_InteractiveUI.hs files/patch-ghc_compiler_ndpFlatten_Flattening.hs files/patch-ghc_utils_ghc-pkg_Main.hs files/patch-ghc_utils_hsc2hs_Main.hs files/patch-libraries_base_Data_List.hs files/patch-ghc_rts_Profiling.c # fixes a gcc warning diff -uNr ghc5/Makefile ghc5/Makefile --- ghc5/Makefile Sat Sep 18 19:22:58 2004 +++ ghc5/Makefile Tue May 24 21:09:21 2005 @@ -20,10 +20,6 @@ USE_BZIP2= yes .include -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif - DISTFILES= ${SRC_DIST} .if ${OSVERSION} < 500000 diff -uNr ghc5/files/patch-ghc-rts-rts.conf.in ghc5/files/patch-ghc-rts-rts.conf.in --- ghc5/files/patch-ghc-rts-rts.conf.in Tue Dec 16 11:08:52 2003 +++ ghc5/files/patch-ghc-rts-rts.conf.in Wed May 25 00:38:26 2005 @@ -1,10 +1,10 @@ ---- ghc/rts/rts.conf.in.orig Thu Dec 11 15:53:05 2003 -+++ ghc/rts/rts.conf.in Thu Dec 11 16:08:54 2003 +--- ghc/rts/rts.conf.in.orig Mon Feb 10 11:18:31 2003 ++++ ghc/rts/rts.conf.in Tue May 24 21:03:38 2005 @@ -134,6 +134,7 @@ , "-u", "GHCziWeak_runFinalizzerBatch_closure" , "-u", "__stginit_Prelude" #endif -+ , "-L%%LOCALBASE%%/lib" ++ , "-L/usr/local/lib" ] #ifdef HAVE_FRAMEWORK_HASKELLSUPPORT , extra_frameworks = [ "HaskellSupport" ] diff -uNr ghc5/files/patch-ghc_compiler_ghci_InteractiveUI.hs ghc5/files/patch-ghc_compiler_ghci_InteractiveUI.hs --- ghc5/files/patch-ghc_compiler_ghci_InteractiveUI.hs Thu Jan 1 01:00:00 1970 +++ ghc5/files/patch-ghc_compiler_ghci_InteractiveUI.hs Wed May 25 00:38:14 2005 @@ -0,0 +1,98 @@ +--- ghc/compiler/ghci/InteractiveUI.hs.orig Tue May 24 23:10:08 2005 ++++ ghc/compiler/ghci/InteractiveUI.hs Tue May 24 23:11:37 2005 +@@ -80,12 +80,12 @@ import GHC.Posix ( setNonBlockingFD ) + + ----------------------------------------------------------------------------- + +-ghciWelcomeMsg = "\ +-\ ___ ___ _\n\ +-\ / _ \\ /\\ /\\/ __(_)\n\ +-\ / /_\\// /_/ / / | | GHC Interactive, version " ++ cProjectVersion ++ ", for Haskell 98.\n\ +-\/ /_\\\\/ __ / /___| | http://www.haskell.org/ghc/\n\ +-\\\____/\\/ /_/\\____/|_| Type :? for help.\n" ++ghciWelcomeMsg = ""++ ++ " ___ ___ _\n"++ ++ " / _ \\ /\\ /\\/ __(_)\n"++ ++ " / /_\\// /_/ / / | | GHC Interactive, version " ++ cProjectVersion ++ ", for Haskell 98.\n"++ ++ "/ /_\\\\/ __ / /___| | http://www.haskell.org/ghc/\n"++ ++ "\\____/\\/ /_/\\____/|_| Type :? for help.\n" + + GLOBAL_VAR(commands, builtin_commands, [(String, String -> GHCi Bool)]) + +@@ -118,41 +118,41 @@ keepGoingPaths a str = a (toArgs str) >> + shortHelpText = "use :? for help.\n" + + -- NOTE: spaces at the end of each line to workaround CPP/string gap bug. +-helpText = "\ +-\ Commands available from the prompt:\n\ +-\\n\ +-\ evaluate/run \n\ +-\ :add ... add module(s) to the current target set\n\ +-\ :browse [*] display the names defined by \n\ +-\ :cd change directory to \n\ +-\ :def define a command :\n\ +-\ :help, :? display this list of commands\n\ +-\ :info [ ...] display information about the given names\n\ +-\ :load ... load module(s) and their dependents\n\ +-\ :module [+/-] [*] ... set the context for expression evaluation\n\ +-\ :reload reload the current module set\n\ +-\\n\ +-\ :set