From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 24 21: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 06CB510656E1 for ; Fri, 24 Jul 2009 21: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 CCBEF8FC24 for ; Fri, 24 Jul 2009 21:20:05 +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 n6OLK5JD045193 for ; Fri, 24 Jul 2009 21: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 n6OLK53u045192; Fri, 24 Jul 2009 21:20:05 GMT (envelope-from gnats) Resent-Date: Fri, 24 Jul 2009 21:20:05 GMT Resent-Message-Id: <200907242120.n6OLK53u045192@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 494921065670 for ; Fri, 24 Jul 2009 21:12:58 +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 8A7808FC20 for ; Fri, 24 Jul 2009 21:12:55 +0000 (UTC) (envelope-from jacula@gmail.com) Received: by fxm19 with SMTP id 19so119765fxm.43 for ; Fri, 24 Jul 2009 14:12:54 -0700 (PDT) Received: by 10.204.52.135 with SMTP id i7mr148067bkg.154.1248469974222; Fri, 24 Jul 2009 14:12:54 -0700 (PDT) Received: from splork.wirewater.yow (host146-85-dynamic.55-79-r.retail.telecomitalia.it [79.55.85.146]) by mx.google.com with ESMTPS id c28sm5829981fka.49.2009.07.24.14.12.53 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 24 Jul 2009 14:12:53 -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 n6OLCqC9031257 for ; Fri, 24 Jul 2009 21:12:52 GMT Received: by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3/Submit) id n6OLCqU6031256 ; Fri, 24 Jul 2009 21:12:52 GMT Message-Id: <200907242112.n6OLCqU6031256@splork.wirewater.yow> Date: Fri, 24 Jul 2009 14:12:53 -0700 (PDT) From: Jacula Modyun To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/137107: [patch]: update of ports-mgmt/porte 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:20:06 -0000 >Number: 137107 >Category: ports >Synopsis: [patch]: update of ports-mgmt/porte 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: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-porte begins here --- diff -uNr porte.orig/Makefile porte/Makefile --- porte.orig/Makefile 2009-05-13 09:46:00.000000000 +0000 +++ porte/Makefile 2009-07-23 10:53:50.000000000 +0000 @@ -6,7 +6,7 @@ PORTNAME= porte PORTVERSION= 0.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ports-mgmt haskell MASTER_SITES= http://carte.repnop.org/releases/ @@ -15,23 +15,64 @@ BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ hs-stringsearch>=0.2.1.1:${PORTSDIR}/textproc/hs-stringsearch +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-stringsearch>=0.2.1.1:${PORTSDIR}/textproc/hs-stringsearch LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 -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 +PORTE_VERSION= ${PORTVERSION} + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DATADIR= ${PREFIX}/share/${DISTNAME} +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +PORTE_LIBDIR_REL= lib/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + PORTE_VERSION=${PORTE_VERSION} \ + PORTE_LIBDIR_REL=${PORTE_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 --executables \ + --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}/${PORTE_LIBDIR_REL}/register.sh + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include diff -uNr porte.orig/pkg-descr porte/pkg-descr --- porte.orig/pkg-descr 2008-11-05 01:46:11.000000000 +0000 +++ porte/pkg-descr 2009-07-23 10:34:45.000000000 +0000 @@ -2,4 +2,9 @@ FreeBSD ports index fields. It also has a simple statistics mode which allows collecting frequency statistics for these fields. -WWW: http://www.kerneled.org/ +Author: Samy Al Bahra +Maintainer: sbahra@kerneled.org +License: BSD3 +WWW: http://www.kerneled.org/ + +Exposed-Modules: Porte.Tool Porte.Statistics Porte.Ports diff -uNr porte.orig/pkg-plist porte/pkg-plist --- porte.orig/pkg-plist 2008-11-05 23:36:46.000000000 +0000 +++ porte/pkg-plist 2009-07-23 10:52:16.000000000 +0000 @@ -1,16 +1,16 @@ -%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSporte-%%PORTVERSION%%.a -%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSporte-%%PORTVERSION%%.o -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Porte/Ports.hi -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Porte/Statistics.hi -%%SUBDIR%%/ghc-%%GHC_VERSION%%/Porte/Tool.hi bin/porte -%%SUBDIR%%/register.sh -share/doc/porte-%%PORTVERSION%%/LICENSE -@dirrm share/doc/porte-%%PORTVERSION%% -@dirrm lib/porte-%%PORTVERSION%%/ghc-%%GHC_VERSION%%/Porte -@dirrm lib/porte-%%PORTVERSION%%/ghc-%%GHC_VERSION%% -@dirrm lib/porte-%%PORTVERSION%% -@exec /bin/sh %D/%%SUBDIR%%/register.sh +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSporte-%%PORTE_VERSION%%.o +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Ports.hi +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Statistics.hi +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte/Tool.hi +%%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSporte-%%PORTE_VERSION%%.a +%%PORTE_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE +%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% +@dirrm %%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Porte +@dirrm %%PORTE_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%PORTE_LIBDIR_REL%% +@exec /bin/sh %D/%%PORTE_LIBDIR_REL%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old @unexec %D/bin/ghc-pkg unregister porte @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old --- patch-porte ends here --- >Release-Note: >Audit-Trail: >Unformatted: