From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 21 14:00:13 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 6A2EE1065674 for ; Fri, 21 Nov 2008 14:00:13 +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 494CD8FC1E for ; Fri, 21 Nov 2008 14:00:13 +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 mALE0DZE075285 for ; Fri, 21 Nov 2008 14:00:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id mALE0DRE075284; Fri, 21 Nov 2008 14:00:13 GMT (envelope-from gnats) Resent-Date: Fri, 21 Nov 2008 14:00:13 GMT Resent-Message-Id: <200811211400.mALE0DRE075284@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 C899F106568E for ; Fri, 21 Nov 2008 13:51:05 +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 B955E8FC0C for ; Fri, 21 Nov 2008 13:51:05 +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 mALDp58l080373 for ; Fri, 21 Nov 2008 13:51:05 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id mALDp5mE080372; Fri, 21 Nov 2008 13:51:05 GMT (envelope-from nobody) Message-Id: <200811211351.mALDp5mE080372@www.freebsd.org> Date: Fri, 21 Nov 2008 13:51:05 GMT From: Ashish Shukla To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/129047: [PATCH] Add documentation to x11-wm/xmonad 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 14:00:13 -0000 >Number: 129047 >Category: ports >Synopsis: [PATCH] Add documentation to x11-wm/xmonad 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 14:00:12 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-wm/xmonad/Makefile xmonad/Makefile --- /usr/ports/x11-wm/xmonad/Makefile 2008-11-08 10:25:47.000000000 +0530 +++ xmonad/Makefile 2008-11-21 18:01:39.000000000 +0530 @@ -7,6 +7,7 @@ PORTNAME= xmonad PORTVERSION= 0.8 +PORTREVISION= 1 CATEGORIES= x11-wm haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/ @@ -22,17 +23,25 @@ CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs GHC_VERSION= 6.8.3 SUBDIR= lib/${PORTNAME}-${PORTVERSION} +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ PORTVERSION=${PORTVERSION} \ SUBDIR=${SUBDIR} MAN1= xmonad.1 +.ifndef (NOPORTDOCS) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock +.endif + do-configure: cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} do-build: cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script +.ifndef (NOPORTDOCS) + cd ${WRKSRC} && ${CABALCMD} haddock +.endif do-install: cd ${WRKSRC} && ${CABALCMD} install diff -urN /usr/ports/x11-wm/xmonad/pkg-plist xmonad/pkg-plist --- /usr/ports/x11-wm/xmonad/pkg-plist 2008-04-05 16:17:59.000000000 +0530 +++ xmonad/pkg-plist 2008-11-21 17:40:44.000000000 +0530 @@ -10,11 +10,28 @@ %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.hi %%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSxmonad-%%PORTVERSION%%.a %%SUBDIR%%/register.sh -share/doc/xmonad-%%PORTVERSION%%/LICENSE -@dirrm share/doc/xmonad-%%PORTVERSION%% +%%DOCSDIR%%/LICENSE +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Config.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Core.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Main.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-ManageHook.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Operations.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-StackSet.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad.html +%%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%%%%DOCSDIR%%/html/xmonad.haddock +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html +@dirrm %%DOCSDIR%% @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%% -@dirrm lib/xmonad-%%PORTVERSION%% +@dirrm %%SUBDIR%% @exec /bin/sh %D/%%SUBDIR%%/register.sh @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old @unexec %D/bin/ghc-pkg unregister xmonad >Release-Note: >Audit-Trail: >Unformatted: