From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 24 21:10:02 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 ACABC1065675 for ; Fri, 24 Jul 2009 21:10:02 +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 7B61B8FC20 for ; Fri, 24 Jul 2009 21:10:02 +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 n6OLA27b036665 for ; Fri, 24 Jul 2009 21:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6OLA2Y4036664; Fri, 24 Jul 2009 21:10:02 GMT (envelope-from gnats) Resent-Date: Fri, 24 Jul 2009 21:10:02 GMT Resent-Message-Id: <200907242110.n6OLA2Y4036664@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 086E11065713 for ; Fri, 24 Jul 2009 21:00:20 +0000 (UTC) (envelope-from jacula@gmail.com) Received: from mail-bw0-f219.google.com (mail-bw0-f219.google.com [209.85.218.219]) by mx1.freebsd.org (Postfix) with ESMTP id 7209C8FC13 for ; Fri, 24 Jul 2009 21:00:19 +0000 (UTC) (envelope-from jacula@gmail.com) Received: by mail-bw0-f219.google.com with SMTP id 19so1617435bwz.43 for ; Fri, 24 Jul 2009 14:00:19 -0700 (PDT) Received: by 10.204.102.15 with SMTP id e15mr128177bko.196.1248469219058; Fri, 24 Jul 2009 14:00:19 -0700 (PDT) Received: from splork.wirewater.yow (host227-69-dynamic.43-79-r.retail.telecomitalia.it [79.43.69.227]) by mx.google.com with ESMTPS id 28sm5861600fkx.24.2009.07.24.14.00.18 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 24 Jul 2009 14:00:18 -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 n6OL0H73027607 for ; Fri, 24 Jul 2009 21:00:17 GMT Received: by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3/Submit) id n6OL0GM0027604 ; Fri, 24 Jul 2009 21:00:16 GMT Message-Id: <200907242100.n6OL0GM0027604@splork.wirewater.yow> Date: Fri, 24 Jul 2009 14:00:18 -0700 (PDT) From: Jacula Modyun To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/137104: [patch]: update of archivers/hs-zip-archive-ghc 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 21:10:03 -0000 >Number: 137104 >Category: ports >Synopsis: [patch]: update of archivers/hs-zip-archive-ghc 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 21:10:02 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-zip-archive-ghc.diff begins here --- diff -uNr hs-zip-archive-ghc.orig/Makefile hs-zip-archive-ghc/Makefile --- hs-zip-archive-ghc.orig/Makefile 2009-01-24 00:09:10.000000000 +0000 +++ hs-zip-archive-ghc/Makefile 2009-07-22 06:20:06.000000000 +0000 @@ -7,6 +7,7 @@ PORTNAME= zip-archive PORTVERSION= 0.1.1.3 +PORTREVISION= 1 CATEGORIES= archivers haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -18,46 +19,67 @@ BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \ hs-zlib>=0.5:${PORTSDIR}/archivers/hs-zlib \ hs-binary-ghc>=0.4:${PORTSDIR}/devel/hs-binary-ghc \ - hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \ + hs-utf8-string-ghc>=0.3.1:${PORTSDIR}/devel/hs-utf8-string-ghc \ hs-digest-ghc>=0.0.0.1:${PORTSDIR}/security/hs-digest-ghc RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \ hs-zlib>=0.5:${PORTSDIR}/archivers/hs-zlib \ hs-binary-ghc>=0.4:${PORTSDIR}/devel/hs-binary-ghc \ - hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \ - hs-digest-ghc>=0.0.0.1:${PORTSDIR}/security/hs-digest-ghc + hs-utf8-string-ghc>=0.3.1:${PORTSDIR}/devel/hs-utf8-string-ghc \ + hs-digest-ghc>=0.0.0.1:${PORTSDIR}/security/hs-digest-ghc + +GHC_VERSION= 6.10.4 +ZIPARCHIVE_VERSION= ${PORTVERSION} -GHC_VERSION= 6.8.3 -CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs -CABALDIR= lib/ghc-${GHC_VERSION}/cabal - -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ - PORTNAME=${PORTNAME} \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${CABALDIR} -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} -PORTDOCS= LICENSE html +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir='' +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +ZIPARCHIVE_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + ZIPARCHIVE_VERSION=${ZIPARCHIVE_VERSION} \ + ZIPARCHIVE_LIBDIR_REL=${ZIPARCHIVE_LIBDIR_REL} + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif .if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock -PLIST_SUB+= RMLIC="@comment " -.else -PLIST_SUB+= RMLIC="" +.endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour + +HSCOLOUR_VERSION= 1.13 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * .endif +.SILENT: + do-configure: - cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} + cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + .if !defined(NOPORTDOCS) - cd ${WRKSRC} && ${CABALCMD} haddock + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css .endif do-install: - cd ${WRKSRC} && ${CABALCMD} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${CABALDIR}/${PORTNAME}-register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${ZIPARCHIVE_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include diff -uNr hs-zip-archive-ghc.orig/pkg-descr hs-zip-archive-ghc/pkg-descr --- hs-zip-archive-ghc.orig/pkg-descr 2008-12-21 11:28:15.000000000 +0000 +++ hs-zip-archive-ghc/pkg-descr 2009-07-15 12:15:12.000000000 +0000 @@ -1,4 +1,9 @@ The zip-archive library provides functions for creating, modifying, and extracting files from zip archives. -WWW: http://johnmacfarlane.net/zip-archive/ +Author: John MacFarlane +Maintainer: jgm@berkeley.edu +License: GPL +WWW: http://johnmacfarlane.net/zip-archive/ + +Exposed-modules: Codec.Archive.Zip diff -uNr hs-zip-archive-ghc.orig/pkg-plist hs-zip-archive-ghc/pkg-plist --- hs-zip-archive-ghc.orig/pkg-plist 2009-01-24 00:09:10.000000000 +0000 +++ hs-zip-archive-ghc/pkg-plist 2009-07-20 14:59:31.000000000 +0000 @@ -1,12 +1,14 @@ -%%SUBDIR%%/Codec/Archive/Zip.hi -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/%%PORTNAME%%-register.sh -%%RMLIC%%%%DOCSDIR%%/LICENSE -%%RMLIC%%@dirrm %%DOCSDIR%% -@dirrmtry %%SUBDIR%%/Codec/Archive -@dirrmtry %%SUBDIR%%/Codec -@exec sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh -@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec ghc-pkg unregister %%PORTNAME%% -@unexec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +%%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Archive/Zip.hi +%%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSzip-archive-%%ZIPARCHIVE_VERSION%%.o +%%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSzip-archive-%%ZIPARCHIVE_VERSION%%.a +%%ZIPARCHIVE_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Archive +@dirrm %%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec +@dirrm %%ZIPARCHIVE_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%ZIPARCHIVE_LIBDIR_REL%% +@exec /bin/sh %D/%%ZIPARCHIVE_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister zip-archive +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old --- patch-hs-zip-archive-ghc.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: