From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 21 13:50:01 2008 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 B97B0106567F for ; Fri, 21 Nov 2008 13:50:01 +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 97B0E8FC0C for ; Fri, 21 Nov 2008 13:50:01 +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 mALDo1Yi067966 for ; Fri, 21 Nov 2008 13:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id mALDo1TU067965; Fri, 21 Nov 2008 13:50:01 GMT (envelope-from gnats) Resent-Date: Fri, 21 Nov 2008 13:50:01 GMT Resent-Message-Id: <200811211350.mALDo1TU067965@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, Ashish Shukla Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B11921065670 for ; Fri, 21 Nov 2008 13:44:07 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id A1EAF8FC14 for ; Fri, 21 Nov 2008 13:44:07 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id mALDi7df075470 for ; Fri, 21 Nov 2008 13:44:07 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id mALDi7iM075469; Fri, 21 Nov 2008 13:44:07 GMT (envelope-from nobody) Message-Id: <200811211344.mALDi7iM075469@www.freebsd.org> Date: Fri, 21 Nov 2008 13:44:07 GMT From: Ashish Shukla To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/129045: [PATCH] Add documentation to x11/hs-x11-ghc port X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2008 13:50:01 -0000 >Number: 129045 >Category: ports >Synopsis: [PATCH] Add documentation to x11/hs-x11-ghc port >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 Nov 21 13:50:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Ashish Shukla >Release: 8.0-CURRENT >Organization: N/A >Environment: FreeBSD monte-cristo.france 8.0-CURRENT FreeBSD 8.0-CURRENT #21: Mon Nov 10 21:19:13 IST 2008 root@monte-cristo.france:/usr/obj/usr/src/sys/ULE amd64 >Description: This patch enables port to install HTML documentation (generated from haddock) if NOPORTDOCS is not defined. >How-To-Repeat: >Fix: diff -urN /usr/ports/x11/hs-x11-ghc/Makefile hs-x11-ghc/Makefile --- /usr/ports/x11/hs-x11-ghc/Makefile 2008-07-19 01:35:16.000000000 +0530 +++ hs-x11-ghc/Makefile 2008-11-21 17:57:50.000000000 +0530 @@ -6,7 +6,7 @@ PORTNAME= x11 PORTVERSION= 1.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/ PKGNAMEPREFIX= hs- @@ -36,8 +36,13 @@ # 'owned' by lang/ghc: CABALDIR= ${PREFIX}/lib/ghc-${GHC_VERSION}/cabal CABALCMD= ${LOCALBASE}/bin/runghc Setup.hs +DOCSDIR= ${PREFIX}/share/doc/X11-${PORTVERSION} SUBDIR= ${PORTNAME}${PKGNAMESUFFIX} +.ifndef (NOPORTDOCS) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.endif + do-configure: cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \ --libsubdir='' --datasubdir='' @@ -45,6 +50,9 @@ do-build: cd ${WRKSRC} && ${CABALCMD} build \ && ${CABALCMD} --gen-script register +.ifndef (NOPORTDOCS) + cd ${WRKSRC} && ${CABALCMD} haddock +.endif do-install: cd ${WRKSRC} && ${CABALCMD} install \ diff -urN /usr/ports/x11/hs-x11-ghc/pkg-plist hs-x11-ghc/pkg-plist --- /usr/ports/x11/hs-x11-ghc/pkg-plist 2007-12-30 20:36:11.000000000 +0530 +++ hs-x11-ghc/pkg-plist 2008-11-21 17:48:28.000000000 +0530 @@ -1,31 +1,57 @@ +%%SUBDIR%%/Graphics/X11.hi +%%SUBDIR%%/Graphics/X11/Types.hi %%SUBDIR%%/Graphics/X11/Xinerama.hi -%%SUBDIR%%/Graphics/X11/Xlib/Extras.hi -%%SUBDIR%%/include/XlibExtras.h +%%SUBDIR%%/Graphics/X11/Xlib.hi %%SUBDIR%%/Graphics/X11/Xlib/Atom.hi %%SUBDIR%%/Graphics/X11/Xlib/Color.hi %%SUBDIR%%/Graphics/X11/Xlib/Context.hi %%SUBDIR%%/Graphics/X11/Xlib/Display.hi %%SUBDIR%%/Graphics/X11/Xlib/Event.hi +%%SUBDIR%%/Graphics/X11/Xlib/Extras.hi %%SUBDIR%%/Graphics/X11/Xlib/Font.hi +%%SUBDIR%%/Graphics/X11/Xlib/Image.hi %%SUBDIR%%/Graphics/X11/Xlib/Misc.hi %%SUBDIR%%/Graphics/X11/Xlib/Region.hi %%SUBDIR%%/Graphics/X11/Xlib/Screen.hi %%SUBDIR%%/Graphics/X11/Xlib/Types.hi %%SUBDIR%%/Graphics/X11/Xlib/Window.hi -%%SUBDIR%%/Graphics/X11/Xlib/Image.hi -%%SUBDIR%%/Graphics/X11/Types.hi -%%SUBDIR%%/Graphics/X11/Xlib.hi -%%SUBDIR%%/Graphics/X11.hi -%%SUBDIR%%/libHSX11-%%PORTVERSION%%.a %%SUBDIR%%/HSX11-%%PORTVERSION%%.o %%SUBDIR%%/include/HsXlib.h +%%SUBDIR%%/include/XlibExtras.h +%%SUBDIR%%/libHSX11-%%PORTVERSION%%.a %%SUBDIR%%/%%PORTNAME%%-register.sh -share/doc/X11-1.4.1/LICENSE -@dirrm share/doc/X11-1.4.1 +%%DOCSDIR%%/LICENSE +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Types.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xinerama.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Atom.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Color.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Context.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Display.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Event.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Extras.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Font.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Image.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Misc.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Region.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Screen.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Types.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib-Window.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11-Xlib.html +%%PORTDOCS%%%%DOCSDIR%%/html/Graphics-X11.html +%%PORTDOCS%%%%DOCSDIR%%/html/X11.haddock +%%PORTDOCS%%%%DOCSDIR%%/html/doc-index.html +%%PORTDOCS%%%%DOCSDIR%%/html/haddock-util.js +%%PORTDOCS%%%%DOCSDIR%%/html/haddock.css +%%PORTDOCS%%%%DOCSDIR%%/html/haskell_icon.gif +%%PORTDOCS%%%%DOCSDIR%%/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/html/minus.gif +%%PORTDOCS%%%%DOCSDIR%%/html/plus.gif +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html +@dirrm %%DOCSDIR%% +@dirrmtry %%SUBDIR%%/include @dirrm %%SUBDIR%%/Graphics/X11/Xlib @dirrm %%SUBDIR%%/Graphics/X11 @dirrmtry %%SUBDIR%%/Graphics -@dirrmtry %%SUBDIR%%/include @exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old @unexec %D/bin/ghc-pkg unregister X11 >Release-Note: >Audit-Trail: >Unformatted: