From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 24 21:00:14 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 A12251065673 for ; Fri, 24 Jul 2009 21:00:14 +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 6E0B28FC16 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 n6OL0EfK029121 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 n6OL0Ei7029120; 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.n6OL0Ei7029120@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 463B7106564A for ; Fri, 24 Jul 2009 20:55:51 +0000 (UTC) (envelope-from jacula@gmail.com) Received: from mail-fx0-f205.google.com (mail-fx0-f205.google.com [209.85.220.205]) by mx1.freebsd.org (Postfix) with ESMTP id BF5308FC18 for ; Fri, 24 Jul 2009 20:55:50 +0000 (UTC) (envelope-from jacula@gmail.com) Received: by fxm1 with SMTP id 1so1732802fxm.19 for ; Fri, 24 Jul 2009 13:55:49 -0700 (PDT) Received: by 10.204.78.131 with SMTP id l3mr127893bkk.186.1248468949061; Fri, 24 Jul 2009 13:55:49 -0700 (PDT) Received: from splork.wirewater.yow ([95.234.86.213]) by mx.google.com with ESMTPS id 19sm5845940fkr.55.2009.07.24.13.55.48 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 24 Jul 2009 13:55:48 -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 n6OKtjCL026761 for ; Fri, 24 Jul 2009 20:55:45 GMT Received: by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3/Submit) id n6OKtjTW026760 ; Fri, 24 Jul 2009 20:55:45 GMT Message-Id: <200907242055.n6OKtjTW026760@splork.wirewater.yow> Date: Fri, 24 Jul 2009 13:55:48 -0700 (PDT) From: Jacula Modyun To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/137102: [patch]: update of textproc/hs-stringsearch 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:00:14 -0000 >Number: 137102 >Category: ports >Synopsis: [patch]: update of textproc/hs-stringsearch 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: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-stringsearch.diff begins here --- diff -uNr hs-stringsearch.orig/Makefile hs-stringsearch/Makefile --- hs-stringsearch.orig/Makefile 2009-05-13 09:45:59.000000000 +0000 +++ hs-stringsearch/Makefile 2009-07-22 06:26:55.000000000 +0000 @@ -6,7 +6,7 @@ PORTNAME= stringsearch PORTVERSION= 0.2.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/stringsearch/${PORTVERSION}/ \ http://kerneled.org/tmp/ @@ -16,23 +16,61 @@ COMMENT= Boyer-Moore/Knuth-Morris-Pratt string search 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.lhs -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 +STRINGSEARCH_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +STRINGSEARCH_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + STRINGSEARCH_VERSION=${STRINGSEARCH_VERSION} \ + STRINGSEARCH_LIBDIR_REL=${STRINGSEARCH_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.lhs -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}/${STRINGSEARCH_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include diff -uNr hs-stringsearch.orig/pkg-descr hs-stringsearch/pkg-descr --- hs-stringsearch.orig/pkg-descr 2008-11-02 01:32:14.000000000 +0000 +++ hs-stringsearch/pkg-descr 2009-07-16 14:06:24.000000000 +0000 @@ -2,4 +2,10 @@ implementations for Haskell bytestrings (with support for all strict and lazy ByteString permutations). -WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/stringsearch +Author: Daniel Fischer, Chris Kuklewicz, Justin Bailey +Maintainer: bos@serpentine.com +License: BSD3 +WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/stringsearch + +Exposed-modules: Data.ByteString.Search.BoyerMoore, + Data.ByteString.Search.KnuthMorrisPratt diff -uNr hs-stringsearch.orig/pkg-plist hs-stringsearch/pkg-plist --- hs-stringsearch.orig/pkg-plist 2008-11-05 23:36:46.000000000 +0000 +++ hs-stringsearch/pkg-plist 2009-07-20 20:05:48.000000000 +0000 @@ -1,16 +1,16 @@ -%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSstringsearch-%%PORTVERSION%%.a -%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSstringsearch-%%PORTVERSION%%.o -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/BoyerMoore.hi -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/KnuthMorrisPratt.hi -%%SUBDIR%%/register.sh -share/doc/stringsearch-%%PORTVERSION%%/LICENSE -@dirrm share/doc/stringsearch-%%PORTVERSION%% -@dirrm lib/stringsearch-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search -@dirrm lib/stringsearch-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Data/ByteString -@dirrm lib/stringsearch-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Data -@dirrm lib/stringsearch-%%PORTVERSION%%/ghc-%%GHC_VERSION%% -@dirrm lib/stringsearch-%%PORTVERSION%% -@exec /bin/sh %D/%%SUBDIR%%/register.sh +%%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/BoyerMoore.hi +%%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search/KnuthMorrisPratt.hi +%%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSstringsearch-%%STRINGSEARCH_VERSION%%.o +%%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSstringsearch-%%STRINGSEARCH_VERSION%%.a +%%STRINGSEARCH_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString/Search +@dirrm %%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data/ByteString +@dirrm %%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Data +@dirrm %%STRINGSEARCH_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%STRINGSEARCH_LIBDIR_REL%% +@exec /bin/sh %D/%%STRINGSEARCH_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec %D/bin/ghc-pkg unregister stringsearch +@unexec %D/bin/ghc-pkg unregister stringsearch @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old --- patch-hs-stringsearch.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: