From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 24 17:30: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 56E0F1065672 for ; Fri, 24 Jul 2009 17:30: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 26F238FC1D for ; Fri, 24 Jul 2009 17:30: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 n6OHU2XE062133 for ; Fri, 24 Jul 2009 17:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6OHU17T062132; Fri, 24 Jul 2009 17:30:01 GMT (envelope-from gnats) Resent-Date: Fri, 24 Jul 2009 17:30:01 GMT Resent-Message-Id: <200907241730.n6OHU17T062132@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 AD85F106564A for ; Fri, 24 Jul 2009 17:26:29 +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 10B228FC0A for ; Fri, 24 Jul 2009 17:26:28 +0000 (UTC) (envelope-from jacula@gmail.com) Received: by bwz19 with SMTP id 19so1527401bwz.43 for ; Fri, 24 Jul 2009 10:26:28 -0700 (PDT) Received: by 10.204.116.208 with SMTP id n16mr3425101bkq.96.1248456387813; Fri, 24 Jul 2009 10:26:27 -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 k29sm5404765fkk.26.2009.07.24.10.26.27 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 24 Jul 2009 10:26:27 -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 n6OHQQqD092148 for ; Fri, 24 Jul 2009 17:26:26 GMT Received: by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3/Submit) id n6OHQQGa092147 ; Fri, 24 Jul 2009 17:26:26 GMT Message-Id: <200907241726.n6OHQQGa092147@splork.wirewater.yow> Date: Fri, 24 Jul 2009 10:26:27 -0700 (PDT) From: Jacula Modyun To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/137072: [patch]: update of security/hs-digest-ghc from the 0.0.0.5 version to the 0.0.0.6 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 17:30:02 -0000 >Number: 137072 >Category: ports >Synopsis: [patch]: update of security/hs-digest-ghc from the 0.0.0.5 version to the 0.0.0.6 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 17:30:01 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-digest-ghc.diff begins here --- diff -uNr hs-digest-ghc.orig/Makefile hs-digest-ghc/Makefile --- hs-digest-ghc.orig/Makefile 2009-03-30 13:13:04.000000000 +0000 +++ hs-digest-ghc/Makefile 2009-07-22 06:26:19.000000000 +0000 @@ -6,7 +6,7 @@ # PORTNAME= digest -PORTVERSION= 0.0.0.5 +PORTVERSION= 0.0.0.6 CATEGORIES= security haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -18,38 +18,59 @@ BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc -GHC_VERSION= 6.8.3 -CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs -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_VERSION= 6.10.4 +DIGEST_VERSION= ${PORTVERSION} -CONFIGURE_ARGS= --ghc --prefix=${PREFIX} --libdir=${PREFIX}/${CABALDIR} --libsubdir='' --datasubdir='' +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +DIGEST_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + DIGEST_VERSION=${DIGEST_VERSION} \ + DIGEST_LIBDIR_REL=${DIGEST_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.hs -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}/${DIGEST_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include diff -uNr hs-digest-ghc.orig/distinfo hs-digest-ghc/distinfo --- hs-digest-ghc.orig/distinfo 2009-03-30 13:13:04.000000000 +0000 +++ hs-digest-ghc/distinfo 2009-07-14 08:14:31.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (digest-0.0.0.5.tar.gz) = ba60cc9d1ad6d0795ad84390976699d1 -SHA256 (digest-0.0.0.5.tar.gz) = dddfcdd325dc7d4fb1ce4772c1f5618cb20504b28dba8a78682011cba1341efd -SIZE (digest-0.0.0.5.tar.gz) = 15487 +MD5 (digest-0.0.0.6.tar.gz) = bc75fa0d90cf58973144f9af18b29214 +SHA256 (digest-0.0.0.6.tar.gz) = a293da46aa874c5e75f28f4b100b766e42fbc7d6ebcb43c6351dbe3e1ec13752 +SIZE (digest-0.0.0.6.tar.gz) = 15522 diff -uNr hs-digest-ghc.orig/pkg-descr hs-digest-ghc/pkg-descr --- hs-digest-ghc.orig/pkg-descr 2009-01-23 23:47:58.000000000 +0000 +++ hs-digest-ghc/pkg-descr 2009-07-14 08:17:20.000000000 +0000 @@ -2,4 +2,10 @@ strict and lazy bytestrings for the functional programming language Haskell. -WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/digest +Author: Eugene Kirpichov +Maintainer: Eugene Kirpichov +License: BSD3 +WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/digest + +exposed-modules: Data.Digest.CRC32, + Data.Digest.Adler32 diff -uNr hs-digest-ghc.orig/pkg-plist hs-digest-ghc/pkg-plist --- hs-digest-ghc.orig/pkg-plist 2009-03-06 19:50:25.000000000 +0000 +++ hs-digest-ghc/pkg-plist 2009-07-20 19:51:51.000000000 +0000 @@ -1,14 +1,15 @@ -@comment $FreeBSD: ports/security/hs-digest-ghc/pkg-plist,v 1.2 2009/03/06 19:50:25 pgj Exp $ -%%SUBDIR%%/Data/Digest/Adler32.hi -%%SUBDIR%%/Data/Digest/CRC32.hi -%%SUBDIR%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%SUBDIR%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%SUBDIR%%/%%PORTNAME%%-register.sh -%%RMLIC%%%%DOCSDIR%%/LICENSE -%%RMLIC%%@dirrm %%DOCSDIR%% -@dirrmtry %%SUBDIR%%/Data/Digest -@dirrmtry %%SUBDIR%%/Data -@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 +%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Digest/Adler32.hi +%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Digest/CRC32.hi +%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSdigest-%%DIGEST_VERSION%%.o +%%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSdigest-%%DIGEST_VERSION%%.a +%%DIGEST_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/Digest +@dirrm %%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data +@dirrm %%DIGEST_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%DIGEST_LIBDIR_REL%% +@exec /bin/sh %D/%%DIGEST_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister digest +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old --- patch-hs-digest-ghc.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: