Date: Tue, 21 Oct 2003 22:53:22 +0200 (CEST) From: Volker Stolz <stolz@i2.informatik.rwth-aachen.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: obraun@FreeBSD.org Subject: ports/58349: [patch] devel/hs-tclhaskell-ghc: Distinguish ghc 5 & 6 Message-ID: <200310212053.h9LKrMq6082578@menelaos.informatik.rwth-aachen.de> Resent-Message-ID: <200310212100.h9LL0VSk044008@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58349 >Category: ports >Synopsis: [patch] devel/hs-tclhaskell-ghc: Distinguish ghc 5 & 6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Oct 21 14:00:31 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Volker Stolz >Release: FreeBSD 4.9-RC i386 >Organization: Lehrstuhl für Informatik II >Environment: System: FreeBSD menelaos.informatik.rwth-aachen.de 4.9-RC FreeBSD 4.9-RC #10: Tue Oct 7 12:32:25 CEST 2003 root@menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386 >Description: - Add knob for GHC, prefer lang/ghc6 - Strip PORTNAME, generate PKGNAMESUFFIX depending on GHC version - Add patch file req'd for ghc6, fix package.conf => Bump PORTREVISION >How-To-Repeat: >Fix: New patch file: files/patch-TclPrimGhc.hs diff -urN /usr/ports/devel/hs-tclhaskell-ghc/Makefile hs-tclhaskell-ghc/Makefile --- /usr/ports/devel/hs-tclhaskell-ghc/Makefile Tue Jun 10 14:01:30 2003 +++ hs-tclhaskell-ghc/Makefile Tue Oct 21 22:42:47 2003 @@ -4,8 +4,9 @@ # # $FreeBSD: ports/devel/hs-tclhaskell-ghc/Makefile,v 1.2 2003/06/10 12:01:30 obraun Exp $ -PORTNAME= tclhaskell-ghc +PORTNAME= tclhaskell PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= devel haskell tcl83 MASTER_SITES= http://www.dcs.gla.ac.uk/~meurig/TclHaskell/ PKGNAMEPREFIX= hs- @@ -14,20 +15,36 @@ MAINTAINER= stolz@i2.informatik.rwth-aachen.de COMMENT= Tcl/Tk binding for Haskell +.if defined(WITH_GHC5) +GHC= ghc-5.04.3 +GHCDEP= ghc +.else +GHC= ghc-6.0.1 +GHCDEP= ghc6 +.endif +PKGNAMESUFFIX= -${GHCDEP} + LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 -BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc -RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc +BUILD_DEPENDS= ${GHC}:${PORTSDIR}/lang/${GHCDEP} +RUN_DEPENDS= ${GHC}:${PORTSDIR}/lang/${GHCDEP} WRKSRC= ${WRKDIR}/TclHaskell1.2/src USE_GMAKE= YES USE_REINPLACE= YES -GHC_VERSION= `${LOCALBASE}/bin/ghc --numeric-version` -GHC_LIB= ${LOCALBASE}/lib/ghc-${GHC_VERSION} +GHC_VERSION= `${LOCALBASE}/bin/${GHC} --numeric-version` +GHC_LIB= ${LOCALBASE}/lib/${GHC} PLIST_SUB+= GHC_VERSION="${GHC_VERSION}" PKGINSTALL= ${WRKDIR}/pkg-install MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" \ - MKDIR="${MKDIR}" + MKDIR="${MKDIR}" GHC="${GHC}" + +pre-everything:: + @${ECHO} + @${ECHO} "This port prefers lang/ghc6. To build this port with" + @${ECHO} "the Glasgow Haskell Compiler 5.x, restart this build with" + @${ECHO} "WITH_GHC5=YES." + @${ECHO} post-patch: ${REINPLACE_CMD} -e "s,/local.*tclhaskell,${GHC_LIB}," ${WRKSRC}/Makefile diff -urN /usr/ports/devel/hs-tclhaskell-ghc/files/patch-TclPrimGhc.hs hs-tclhaskell-ghc/files/patch-TclPrimGhc.hs --- /usr/ports/devel/hs-tclhaskell-ghc/files/patch-TclPrimGhc.hs Thu Jan 1 01:00:00 1970 +++ hs-tclhaskell-ghc/files/patch-TclPrimGhc.hs Tue Oct 21 17:43:51 2003 @@ -0,0 +1,11 @@ +--- TclPrimGhc.hs.orig Tue Oct 21 17:29:21 2003 ++++ TclPrimGhc.hs Tue Oct 21 17:29:43 2003 +@@ -42,7 +42,7 @@ + writeElt pstr 0 str + return pstr + where +- len = Word.intToWord32 (length str + 1) ++ len = fromIntegral (length str + 1) + + writeElt addr n [] = writeCharOffAddr addr n '\0' + writeElt addr n (v :vs) = do diff -urN /usr/ports/devel/hs-tclhaskell-ghc/pkg-install.in hs-tclhaskell-ghc/pkg-install.in --- /usr/ports/devel/hs-tclhaskell-ghc/pkg-install.in Wed Mar 5 17:18:39 2003 +++ hs-tclhaskell-ghc/pkg-install.in Tue Oct 21 19:10:25 2003 @@ -13,10 +13,10 @@ extra_libraries = ["tcl83","tk83","HSTclHaskell_cbits"], include_dirs = ["$GHC_LIB/include"], c_includes = [], - package_deps = [ "rts","lang","concurrent" ], + package_deps = [ "rts","lang","concurrent","data" ], extra_ghc_opts = [ "-fglasgow-exts", "-fvia-C" ], extra_cc_opts = [], - extra_ld_opts = [ "-L$PKG_PREFIX/lib -lncurses" ] + extra_ld_opts = [ "-L$PKG_PREFIX/lib", "-lncurses" ] } CONFEOF fi >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310212053.h9LKrMq6082578>