From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 24 21:00:15 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 0620F1065674 for ; Fri, 24 Jul 2009 21:00:15 +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 CA0518FC1A for ; Fri, 24 Jul 2009 21:00:14 +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 n6OL0En0029135 for ; Fri, 24 Jul 2009 21:00:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6OL0EpK029134; Fri, 24 Jul 2009 21:00:14 GMT (envelope-from gnats) Resent-Date: Fri, 24 Jul 2009 21:00:14 GMT Resent-Message-Id: <200907242100.n6OL0EpK029134@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 33773106564A for ; Fri, 24 Jul 2009 20:59:58 +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 9CC718FC0C for ; Fri, 24 Jul 2009 20:59:57 +0000 (UTC) (envelope-from jacula@gmail.com) Received: by bwz19 with SMTP id 19so1617435bwz.43 for ; Fri, 24 Jul 2009 13:59:56 -0700 (PDT) Received: by 10.204.67.130 with SMTP id r2mr152864bki.83.1248469196322; Fri, 24 Jul 2009 13:59:56 -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 e17sm5853908fke.18.2009.07.24.13.59.55 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 24 Jul 2009 13:59:56 -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 n6OKxsTk027474 for ; Fri, 24 Jul 2009 20:59:54 GMT Received: by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3/Submit) id n6OKxs87027473 ; Fri, 24 Jul 2009 20:59:54 GMT Message-Id: <200907242059.n6OKxs87027473@splork.wirewater.yow> Date: Fri, 24 Jul 2009 13:59:56 -0700 (PDT) From: Jacula Modyun To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/137103: [patch]: update of archivers/hs-zlib from the 0.5.0.0 version to the 0.5.2.0 version 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:00:15 -0000 >Number: 137103 >Category: ports >Synopsis: [patch]: update of archivers/hs-zlib from the 0.5.0.0 version to the 0.5.2.0 version >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: Fri Jul 24 21:00:14 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-zlib.diff begins here --- diff -uNr hs-zlib.orig/Makefile hs-zlib/Makefile --- hs-zlib.orig/Makefile 2009-05-13 09:45:48.000000000 +0000 +++ hs-zlib/Makefile 2009-07-22 06:20:17.000000000 +0000 @@ -5,8 +5,7 @@ # $FreeBSD: ports/archivers/hs-zlib/Makefile,v 1.3 2009/05/13 09:45:48 ale Exp $ PORTNAME= zlib -PORTVERSION= 0.5.0.0 -PORTREVISION= 2 +PORTVERSION= 0.5.2.0 CATEGORIES= archivers haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ \ http://kerneled.org/tmp/ @@ -16,23 +15,61 @@ COMMENT= Pure Haskell interface to the C zlib library BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc -LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 +RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc -CABAL= ${LOCALBASE}/bin/runghc Setup.hs -GHC_VERSION= `${LOCALBASE}/bin/ghc --numeric-version` -SUBDIR= lib/${PORTNAME}-${PORTVERSION} -PLIST_SUB= GHC_VERSION="${GHC_VERSION}" \ - PORTVERSION=${PORTVERSION} \ - SUBDIR=${SUBDIR} +GHC_VERSION= 6.10.4 +ZLIB_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +ZLIB_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + ZLIB_VERSION=${ZLIB_VERSION} \ + ZLIB_LIBDIR_REL=${ZLIB_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 +.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} && ${CABAL} configure --prefix=${PREFIX} --ghc + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABAL} build && ${CABAL} register --gen-script + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif do-install: - cd ${WRKSRC} && ${CABAL} install - ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${ZLIB_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include diff -uNr hs-zlib.orig/distinfo hs-zlib/distinfo --- hs-zlib.orig/distinfo 2008-11-04 21:24:37.000000000 +0000 +++ hs-zlib/distinfo 2009-07-13 10:35:27.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (zlib-0.5.0.0.tar.gz) = 22fa6d394c42c8584b234799b923f860 -SHA256 (zlib-0.5.0.0.tar.gz) = 20e067cfbec87ec062ac144875a60e158ea6cf7836aac031ec367fcdd5446891 -SIZE (zlib-0.5.0.0.tar.gz) = 122533 +MD5 (zlib-0.5.2.0.tar.gz) = 19859e241dc18ef1501a5d44d8523507 +SHA256 (zlib-0.5.2.0.tar.gz) = 4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f +SIZE (zlib-0.5.2.0.tar.gz) = 125081 diff -uNr hs-zlib.orig/pkg-descr hs-zlib/pkg-descr --- hs-zlib.orig/pkg-descr 2008-11-04 21:24:37.000000000 +0000 +++ hs-zlib/pkg-descr 2009-07-13 13:41:19.000000000 +0000 @@ -5,4 +5,12 @@ for most tasks and for the few cases where more control is needed it provides access to the full zlib feature set. -WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/zlib +license: BSD3 +author: Duncan Coutts +maintainer: Duncan Coutts +WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/zlib + +exposed-modules: Codec.Compression.GZip, + Codec.Compression.Zlib, + Codec.Compression.Zlib.Raw, + Codec.Compression.Zlib.Internal diff -uNr hs-zlib.orig/pkg-plist hs-zlib/pkg-plist --- hs-zlib.orig/pkg-plist 2008-11-05 23:36:46.000000000 +0000 +++ hs-zlib/pkg-plist 2009-07-22 18:08:47.000000000 +0000 @@ -1,19 +1,19 @@ -%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSzlib-%%PORTVERSION%%.a -%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSzlib-%%PORTVERSION%%.o -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Codec/Compression/GZip.hi -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib.hi -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Internal.hi -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Raw.hi -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Stream.hi -%%SUBDIR%%/register.sh -share/doc/zlib-%%PORTVERSION%%/LICENSE -@dirrm share/doc/zlib-%%PORTVERSION%% -@dirrm lib/zlib-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib -@dirrm lib/zlib-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Codec/Compression -@dirrm lib/zlib-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Codec -@dirrm lib/zlib-%%PORTVERSION%%/ghc-%%GHC_VERSION%% -@dirrm lib/zlib-%%PORTVERSION%% -@exec /bin/sh %D/%%SUBDIR%%/register.sh +%%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSzlib-%%ZLIB_VERSION%%.a +%%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSzlib-%%ZLIB_VERSION%%.o +%%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/GZip.hi +%%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib.hi +%%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Internal.hi +%%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Raw.hi +%%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib/Stream.hi +%%ZLIB_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression/Zlib +@dirrm %%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec/Compression +@dirrm %%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Codec +@dirrm %%ZLIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%ZLIB_LIBDIR_REL%% +@exec /bin/sh %D/%%ZLIB_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old @unexec %D/bin/ghc-pkg unregister zlib @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old --- patch-hs-zlib.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: