From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 21 13:50:02 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 10B8D1065672 for ; Fri, 21 Nov 2008 13:50:02 +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 E26F48FC12 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 mALDo12T067979 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 mALDo1ps067978; 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.mALDo1ps067978@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 CA4A9106567A for ; Fri, 21 Nov 2008 13:47:42 +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 B9F848FC13 for ; Fri, 21 Nov 2008 13:47:42 +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 mALDlgIc078946 for ; Fri, 21 Nov 2008 13:47:42 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id mALDlg34078945; Fri, 21 Nov 2008 13:47:42 GMT (envelope-from nobody) Message-Id: <200811211347.mALDlg34078945@www.freebsd.org> Date: Fri, 21 Nov 2008 13:47:42 GMT From: Ashish Shukla To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/129046: [PATCH] Add documentation to x11-wm/xmonad-contrib 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:02 -0000 >Number: 129046 >Category: ports >Synopsis: [PATCH] Add documentation to x11-wm/xmonad-contrib 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-wm/xmonad-contrib/Makefile xmonad-contrib/Makefile --- /usr/ports/x11-wm/xmonad-contrib/Makefile 2008-11-08 10:26:42.000000000 +0530 +++ xmonad-contrib/Makefile 2008-11-21 18:11:51.000000000 +0530 @@ -7,6 +7,7 @@ PORTNAME= xmonad-contrib PORTVERSION= 0.8 +PORTREVISION= 1 CATEGORIES= x11-wm haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/ @@ -24,15 +25,23 @@ 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} +.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-contrib/pkg-plist xmonad-contrib/pkg-plist --- /usr/ports/x11-wm/xmonad-contrib/pkg-plist 2008-11-08 10:26:42.000000000 +0530 +++ xmonad-contrib/pkg-plist 2008-11-21 18:25:23.000000000 +0530 @@ -137,8 +137,153 @@ %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/XUtils.hi %%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSxmonad-contrib-%%PORTVERSION%%.a %%SUBDIR%%/register.sh -share/doc/xmonad-contrib-%%PORTVERSION%%/LICENSE -@dirrm share/doc/xmonad-contrib-%%PORTVERSION%% +%%DOCSDIR%%/LICENSE +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-Commands.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-ConstrainedResize.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-CopyWindow.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-CycleRecentWS.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-CycleSelectedLayouts.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-CycleWS.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-DeManage.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-DwmPromote.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-DynamicWorkspaces.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-FindEmptyWorkspace.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-FlexibleManipulate.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-FlexibleResize.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-FloatKeys.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-FocusNth.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-MouseGestures.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-MouseResize.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-NoBorders.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-PerWorkspaceKeys.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-Plane.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-Promote.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-RotSlaves.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-Search.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-SimpleDate.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-SinkAll.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-Submap.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-SwapWorkspaces.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-TagWindows.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-UpdatePointer.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-Warp.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-WindowBringer.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-WindowGo.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Actions-WindowNavigation.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Config-Arossato.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Config-Desktop.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Config-Droundy.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Config-Gnome.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Config-Kde.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Config-PlainConfig.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Config-Sjanssen.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Config-Xfce.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Doc-Configuring.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Doc-Developing.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Doc-Extending.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Doc.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Hooks-DynamicHooks.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Hooks-DynamicLog.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Hooks-EventHook.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Hooks-EwmhDesktops.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Hooks-FadeInactive.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Hooks-ManageDocks.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Hooks-ManageHelpers.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Hooks-Script.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Hooks-ServerMode.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Hooks-SetWMName.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Hooks-UrgencyHook.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Hooks-XPropManage.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Accordion.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-BoringWindows.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Circle.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Combo.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Decoration.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-DecorationMadness.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Dishes.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-DragPane.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-DwmStyle.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Gaps.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Grid.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-HintedGrid.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-HintedTile.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-IM.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-LayoutCombinators.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-LayoutHints.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-LayoutModifier.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-LayoutScreens.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-MagicFocus.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Magnifier.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Master.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Maximize.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-MosaicAlt.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-MultiToggle-Instances.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-MultiToggle.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Named.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-NoBorders.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-PerWorkspace.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Reflect.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-ResizableTile.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-ResizeScreen.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Roledex.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-ShowWName.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-SimpleDecoration.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-SimpleFloat.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Simplest.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-SimplestFloat.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Spiral.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Square.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-StackTile.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-TabBarDecoration.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-Tabbed.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-ThreeColumns.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-ToggleLayouts.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-TwoPane.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-WindowArranger.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-WindowNavigation.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout-WorkspaceDir.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-AppLauncher.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-AppendFile.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-DirExec.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-Directory.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-Email.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-Input.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-Layout.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-Man.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-RunOrRaise.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-Shell.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-Ssh.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-Theme.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-Window.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-Workspace.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt-XMonad.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Prompt.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-CustomKeys.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-Dmenu.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-Dzen.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-EZConfig.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-Font.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-Invisible.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-Loggers.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-NamedWindows.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-Run.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-Scratchpad.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-Themes.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-Timer.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-WindowProperties.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-WorkspaceCompare.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-XSelection.html +%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Util-XUtils.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-contrib.haddock +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html +@dirrm %%DOCSDIR%% @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Prompt @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout/MultiToggle @@ -149,7 +294,7 @@ @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%% -@dirrm lib/xmonad-contrib-%%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-contrib >Release-Note: >Audit-Trail: >Unformatted: