Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Jan 2009 21:06:28 GMT
From:      Gabor PALI <pgj@FreeBSD.org>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/131137: [UPDATE] x11-wm/xmonad-contrib - Update to 0.8.1 + Fixes
Message-ID:  <200901292106.n0TL6SNu014540@www.freebsd.org>
Resent-Message-ID: <200901292110.n0TLA4Zn051653@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         131137
>Category:       ports
>Synopsis:       [UPDATE] x11-wm/xmonad-contrib - Update to 0.8.1 + Fixes
>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:   Thu Jan 29 21:10:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Gabor PALI
>Release:        7.1-STABLE
>Organization:
The FreeBSD Project
>Environment:
FreeBSD xxx 7.1-STABLE FreeBSD 7.1-STABLE #1: Fri Jan 23 20:38:51 CET 2009 xxx:/usr/obj/usr/src/sys/NON-GENERIC i386
>Description:
Update to 0.8.1, and improve PORTDOCS support for easier maintenance.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-wm/xmonad-contrib/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	23 Nov 2008 08:26:07 -0000	1.6
+++ Makefile	29 Jan 2009 20:51:21 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmonad-contrib
-PORTVERSION=	0.8
+PORTVERSION=	0.8.1
 CATEGORIES=	x11-wm haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/
 
@@ -25,12 +25,16 @@
 GHC_VERSION=	6.8.3
 SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=	LICENSE html
 PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
 		PORTVERSION=${PORTVERSION} \
 		SUBDIR=${SUBDIR}
 
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
+.else
+PLIST_DIRS+=	%%DOCSDIR%%
+PLIST_FILES+=	%%DOCSDIR%%/LICENSE
 .endif
 
 do-configure:
@@ -38,7 +42,7 @@
 
 do-build:
 	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	cd ${WRKSRC} && ${CABALCMD} haddock
 .endif
 
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/x11-wm/xmonad-contrib/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	8 Nov 2008 04:56:42 -0000	1.3
+++ distinfo	29 Jan 2009 20:51:21 -0000
@@ -1,3 +1,3 @@
-MD5 (xmonad-contrib-0.8.tar.gz) = 7969e29112b0fe4a68c75a7f5f668e8c
-SHA256 (xmonad-contrib-0.8.tar.gz) = 8555346cd88c16f84951b0e4fb5cd5d76f76ca0360c1c6d85f0e2d3967a32b61
-SIZE (xmonad-contrib-0.8.tar.gz) = 191246
+MD5 (xmonad-contrib-0.8.1.tar.gz) = 03f74fda270aca759407787da73e50d9
+SHA256 (xmonad-contrib-0.8.1.tar.gz) = dedbd2e7718f7383e403f5f0b40d411f27099625e7e1dcddd42f7c12bf6488a9
+SIZE (xmonad-contrib-0.8.1.tar.gz) = 191302
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11-wm/xmonad-contrib/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	23 Nov 2008 08:26:07 -0000	1.4
+++ pkg-plist	29 Jan 2009 20:51:21 -0000
@@ -1,4 +1,3 @@
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSxmonad-contrib-%%PORTVERSION%%.o
 %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/Commands.hi
 %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/ConstrainedResize.hi
 %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Actions/CopyWindow.hi
@@ -136,154 +135,8 @@
 %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/XSelection.hi
 %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Util/XUtils.hi
 %%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSxmonad-contrib-%%PORTVERSION%%.a
+%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSxmonad-contrib-%%PORTVERSION%%.o
 %%SUBDIR%%/register.sh
-%%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


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901292106.n0TL6SNu014540>