From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 24 17:20:06 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52A74106566B for ; Fri, 24 Jul 2009 17:20:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 24F8F8FC1C for ; Fri, 24 Jul 2009 17:20:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n6OHK59l055015 for ; Fri, 24 Jul 2009 17:20:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6OHK5v3055014; Fri, 24 Jul 2009 17:20:05 GMT (envelope-from gnats) Resent-Date: Fri, 24 Jul 2009 17:20:05 GMT Resent-Message-Id: <200907241720.n6OHK5v3055014@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, Jacula Modyun Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8ACEE1065695 for ; Fri, 24 Jul 2009 17:13:28 +0000 (UTC) (envelope-from jacula@gmail.com) Received: from mail-fx0-f219.google.com (mail-fx0-f219.google.com [209.85.220.219]) by mx1.freebsd.org (Postfix) with ESMTP id 0C0288FC1D for ; Fri, 24 Jul 2009 17:13:27 +0000 (UTC) (envelope-from jacula@gmail.com) Received: by fxm19 with SMTP id 19so18752fxm.43 for ; Fri, 24 Jul 2009 10:13:27 -0700 (PDT) Received: by 10.204.59.135 with SMTP id l7mr3478836bkh.13.1248455606924; Fri, 24 Jul 2009 10:13:26 -0700 (PDT) Received: from splork.wirewater.yow (host247-86-dynamic.55-79-r.retail.telecomitalia.it [79.55.86.247]) by mx.google.com with ESMTPS id e17sm5422087fke.18.2009.07.24.10.13.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 24 Jul 2009 10:13:26 -0700 (PDT) Received: from localhost.wirewater.yow [127.0.0.1] by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3) with ESMTP id n6OHDP89089419 for ; Fri, 24 Jul 2009 17:13:25 GMT Received: by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3/Submit) id n6OHDPBd089418 ; Fri, 24 Jul 2009 17:13:25 GMT Message-Id: <200907241713.n6OHDPBd089418@splork.wirewater.yow> Date: Fri, 24 Jul 2009 10:13:26 -0700 (PDT) From: Jacula Modyun To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/137070: [patch]: update of devel/hs-c2hs to ghc-6.10.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jacula Modyun List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2009 17:20:06 -0000 >Number: 137070 >Category: ports >Synopsis: [patch]: update of devel/hs-c2hs 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 17:20:05 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-c2hs.diff begins here --- diff -uNr hs-c2hs.orig/Makefile hs-c2hs/Makefile --- hs-c2hs.orig/Makefile 2009-05-13 09:45:50.000000000 +0000 +++ hs-c2hs/Makefile 2009-07-22 06:21:36.000000000 +0000 @@ -7,7 +7,7 @@ PORTNAME= c2hs PORTVERSION= 0.16.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -20,34 +20,56 @@ RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 -.include +GHC_VERSION= 6.10.4 +C2HS_VERSION= ${PORTVERSION} -GHC_VERSION= 6.8.3 +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup -# 'owned' by lang/ghc: -CABALDIR= ${PREFIX}/${SUBDIR} -CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs -SUBDIR= lib/ghc-${GHC_VERSION}/cabal - -PLIST_FILES= bin/c2hs ${SUBDIR}/${PORTNAME}/C2HS.hs \ - ${SUBDIR}/${PORTNAME}/doc/c2hs-${PORTVERSION}/COPYING -PLIST_DIRS= ${SUBDIR}/${PORTNAME}/doc/c2hs-${PORTVERSION} ${SUBDIR}/${PORTNAME}/doc \ - ${SUBDIR}/${PORTNAME} - -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \ - --datadir=${CABALDIR}/${PORTNAME} \ - --libsubdir='' --datasubdir='' +DATADIR= ${PREFIX}/share/${DISTNAME} +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +C2HS_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + C2HS_VERSION=${C2HS_VERSION} \ + C2HS_LIBDIR_REL=${C2HS_LIBDIR_REL} + +MAN1= c2hs.1 + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif + +.if !defined(NOPORTDOCS) +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \ + ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt +USE_GMAKE= yes +PORTDOCS= COPYING users_guide +.endif + +.SILENT: do-configure: - cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build + cd ${WRKSRC} && ${SETUP_CMD} build + +.if !defined(NOPORTDOCS) + @(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html) +.endif do-install: - cd ${WRKSRC} && ${CABALCMD} install + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_MAN} ${WRKSRC}/doc/man1/c2hs.1 ${PREFIX}/man/man1 +.if !defined(NOPORTDOCS) + @(cd ${WRKSRC}/doc && ${CP} -R users_guide ${DOCSDIR}) +.endif post-install: - @${STRIP_CMD} ${PREFIX}/bin/c2hs + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old -.include +.include diff -uNr hs-c2hs.orig/pkg-plist hs-c2hs/pkg-plist --- hs-c2hs.orig/pkg-plist 1970-01-01 00:00:00.000000000 +0000 +++ hs-c2hs/pkg-plist 2009-07-15 14:02:06.000000000 +0000 @@ -0,0 +1,5 @@ +bin/c2hs +%%DATADIR%%/C2HS.hs +%%NOPORTDOCS%%%%DOCSDIR%%/COPYING +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%DATADIR%% --- patch-hs-c2hs.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: