From jacula@gmail.com  Fri Jul 24 16:06:23 2009
Return-Path: <jacula@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 63DB310656C8
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 24 Jul 2009 16:06:23 +0000 (UTC)
	(envelope-from jacula@gmail.com)
Received: from mail-fx0-f218.google.com (mail-fx0-f218.google.com [209.85.220.218])
	by mx1.freebsd.org (Postfix) with ESMTP id DDDF78FC1D
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 24 Jul 2009 16:06:22 +0000 (UTC)
	(envelope-from jacula@gmail.com)
Received: by fxm18 with SMTP id 18so1494971fxm.43
        for <FreeBSD-gnats-submit@freebsd.org>; Fri, 24 Jul 2009 09:06:21 -0700 (PDT)
Received: by 10.204.66.2 with SMTP id l2mr3400603bki.177.1248451581747;
        Fri, 24 Jul 2009 09:06:21 -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 18sm5313992fks.40.2009.07.24.09.06.21
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Fri, 24 Jul 2009 09:06:21 -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 n6OG6JKS078569
 	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 24 Jul 2009 16:06:20 GMT
Received: by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3/Submit) id n6OG6Jlf078568
	;
 	Fri, 24 Jul 2009 16:06:19 GMT
Message-Id: <200907241606.n6OG6Jlf078568@splork.wirewater.yow>
Date: Fri, 24 Jul 2009 09:06:21 -0700 (PDT)
From: Jacula Modyun <jacula@gmail.com>
Reply-To: Jacula Modyun <jacula@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch]: update of lang/ghc-doc from the 6.8.3 version to the 6.10.4 version
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         137057
>Category:       ports
>Synopsis:       [patch]: update of lang/ghc-doc from the 6.8.3 version to the 6.10.4 version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgj
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 24 16:10:02 UTC 2009
>Closed-Date:    Fri Aug 28 20:07:07 UTC 2009
>Last-Modified:  Fri Aug 28 20:07:07 UTC 2009
>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=137055

>How-To-Repeat:
	
>Fix:

	

--- patch-ghc-doc.diff begins here ---
diff -uNr ghc-doc.orig/Makefile ghc-doc/Makefile
--- ghc-doc.orig/Makefile	2008-07-18 20:05:16.000000000 +0000
+++ ghc-doc/Makefile	2009-07-24 14:31:55.000000000 +0000
@@ -1,4 +1,4 @@
-# Ports collection makefile for:	ghc6-doc
+# Ports collection makefile for:	ghc-doc
 # Date created:				19 Jun 2003
 # Whom:					olgeni@FreeBSD.org
 #
@@ -6,40 +6,61 @@
 #
 
 PORTNAME=	ghc
-PORTVERSION=	6.8.3
+PORTVERSION=	6.10.4
 CATEGORIES=	lang haskell
-MASTER_SITES=	http://www.haskell.org/ghc/docs/${PORTVERSION}/ \
-		http://www.haskell.org/ghc/docs/${PORTVERSION}/html/
+MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/FreeBSD/ \
+		http://www.haskell.org/ghc/dist/${PORTVERSION}/modyun/:boot \
+		http://www.haskell.org/ghc/dist/${PORTVERSION}/FreeBSD/:boot \
+		${MASTER_SITE_LOCAL:S/$/:boot/}
 PKGNAMESUFFIX=	-doc
-DISTFILES=	Cabal.html.tar.gz \
-		libraries.html.tar.gz users_guide.html.tar.gz \
-		index.html
-DIST_SUBDIR=	ghc-${PORTVERSION}
-EXTRACT_ONLY=
 
 MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	Documentation (HTML, PS) for the Glasgow Haskell Compiler
+COMMENT=	Documentation (HTML) for the Glasgow Haskell Compiler
+
+BUILD_DEPENDS=		${LOCALBASE}/lib/libgmp.so.8:${PORTSDIR}/math/libgmp4
+
+USE_BZIP2=		yes
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
+USE_PERL5_BUILD=	yes
 
 NO_BUILD=	yes
-DOCSDIR=	${PREFIX}/share/doc/ghc6
+
+#ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS=	i386
+
+GHC_VERSION=	${PORTVERSION}
+
+WRKSRC=	${WRKDIR}/ghc-${GHC_VERSION}-boot
+
+.include <bsd.port.pre.mk>
+
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}-doc
 PORTDOCS=	*
 
+CONFIGURE_ARGS_BOOT=	--prefix=${WRKSRC})
+
+.if ${ARCH} == "i386"
+.if ${OSVERSION} >= 800000
+DISTFILES+=	ghc-${GHC_VERSION}-i386-jm0-freebsd8-boot${EXTRACT_SUFX}:boot
+.elif ${OSVERSION} >= 700000
+DISTFILES+=	ghc-${GHC_VERSION}-i386-jm0-freebsd7-boot${EXTRACT_SUFX}:boot
+.elif ${OSVERSION} >= 600000
+DISTFILES+=	ghc-${GHC_VERSION}-i386-jm0-freebsd6-boot${EXTRACT_SUFX}:boot
+.else
+IGNORE=		unsupported at the moment
+.endif
+.endif
+
+do-configure:
+	@(cd ${WRKSRC} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS_BOOT}
+	@(cd ${WRKSRC} && ${GMAKE} install)
+
 do-install:
 .if defined(NOPORTDOCS)
 	@${ECHO} NOPORTDOCS set, nothing to do!
 .else
-	@${MKDIR} ${DOCSDIR}
-.for FILE in index.html
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${FILE} \
-		${DOCSDIR}
-.endfor
-.for FILE in Cabal.html.tar.gz \
-	libraries.html.tar.gz users_guide.html.tar.gz
-	@${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${FILE} \
-		-C ${DOCSDIR}
-.endfor
-	@${FIND} ${DOCSDIR}/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;
-	@${FIND} ${DOCSDIR}/ -type f -exec ${CHOWN} ${SHAREOWN}:${SHAREGRP} {} \;
+	@(${MKDIR} ${DOCSDIR} && cd ${WRKSRC}/share/doc && ${COPYTREE_SHARE} \* ${DOCSDIR})
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -uNr ghc-doc.orig/distinfo ghc-doc/distinfo
--- ghc-doc.orig/distinfo	2008-07-18 20:05:16.000000000 +0000
+++ ghc-doc/distinfo	2009-07-23 13:41:10.000000000 +0000
@@ -1,12 +1,9 @@
-MD5 (ghc-6.8.3/Cabal.html.tar.gz) = bf1a14c0236d712ab9402645ad764e6e
-SHA256 (ghc-6.8.3/Cabal.html.tar.gz) = f99b2acb8f3d73dfbedfabf6ba6e8aada6e34487bbdbc9b65dc74efcbbf4b6b6
-SIZE (ghc-6.8.3/Cabal.html.tar.gz) = 29411
-MD5 (ghc-6.8.3/libraries.html.tar.gz) = afe44e4743e6da9594d3839f39ca34b4
-SHA256 (ghc-6.8.3/libraries.html.tar.gz) = e1c1926c02b0144698156c7a38d4999531f345976cf3bb5b40831e362780e4ce
-SIZE (ghc-6.8.3/libraries.html.tar.gz) = 4113111
-MD5 (ghc-6.8.3/users_guide.html.tar.gz) = 8e9195b30ff3c62eea1e422bd9cb6744
-SHA256 (ghc-6.8.3/users_guide.html.tar.gz) = 499e97c5c923d41c10171f92111b9f5838b9d697c0d2240bf8015c92c22ab038
-SIZE (ghc-6.8.3/users_guide.html.tar.gz) = 285478
-MD5 (ghc-6.8.3/index.html) = ed7a0368fee505993e788a82081636ec
-SHA256 (ghc-6.8.3/index.html) = 571a616b6f32bd7891ef943ccead027e56f5286e8a32905522820e66654d2a8f
-SIZE (ghc-6.8.3/index.html) = 1337
+MD5 (ghc-6.10.4-i386-jm0-freebsd6-boot.tar.bz2) = e528ad305e12ec45b051acf22a41929f
+SHA256 (ghc-6.10.4-i386-jm0-freebsd6-boot.tar.bz2) = ff39d911930e0afd79dcd312583b2ade830e0f4f11db2d6c9ee5658732332ac3
+SIZE (ghc-6.10.4-i386-jm0-freebsd6-boot.tar.bz2) = 47466113
+MD5 (ghc-6.10.4-i386-jm0-freebsd7-boot.tar.bz2) = 3bb1b91d0f06af390d493d7d936b6086
+SHA256 (ghc-6.10.4-i386-jm0-freebsd7-boot.tar.bz2) = 44f41b1a2d9ffee6ede9aff00288b2b7bc405d68f2cc1a092db6bb2096344e9b
+SIZE (ghc-6.10.4-i386-jm0-freebsd7-boot.tar.bz2) = 47556193
+MD5 (ghc-6.10.4-i386-jm0-freebsd8-boot.tar.bz2) = c4e4ce9daae4bfdda1dcc14813cb9507
+SHA256 (ghc-6.10.4-i386-jm0-freebsd8-boot.tar.bz2) = 6d411549995acf0a4759759da9c56de1330377bd1c3f65e095b7762fb454df62
+SIZE (ghc-6.10.4-i386-jm0-freebsd8-boot.tar.bz2) = 47553947
diff -uNr ghc-doc.orig/pkg-descr ghc-doc/pkg-descr
--- ghc-doc.orig/pkg-descr	2002-07-26 13:38:27.000000000 +0000
+++ ghc-doc/pkg-descr	2009-07-22 07:30:56.000000000 +0000
@@ -1,3 +1,2 @@
-Documentation (HTML, PS) for the Glasgow Haskell Compiler.
-
-WWW: http://www.haskell.org/ghc/documentation.html
+HTML documentation for the Glasgow Haskell Compiler.
+This documentation was generated by HsColour and haddock.
--- patch-ghc-doc.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->haskell 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Jul 24 16:10:18 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=137057 
Responsible-Changed-From-To: haskell->wxs 
Responsible-Changed-By: wxs 
Responsible-Changed-When: Fri Jul 24 19:28:45 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=137057 
Responsible-Changed-From-To: wxs->pgj 
Responsible-Changed-By: pgj 
Responsible-Changed-When: Fri Aug 28 20:04:43 UTC 2009 
Responsible-Changed-Why:  
Over to me. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=137057 
State-Changed-From-To: open->closed 
State-Changed-By: pgj 
State-Changed-When: Fri Aug 28 20:05:10 UTC 2009 
State-Changed-Why:  
This patch will not be committed.  Port lang/ghc-doc will be removed as 
it is incorporated in lang/ghc.  Thank you for the submission, anyway! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=137057 
>Unformatted:
 
