ports/131136: [UPDATE] x11-wm/xmonad - Update to 0.8.1 and Some Fixes

[Gabor PALI]

>Number:         131136
>Category:       ports
>Synopsis:       [UPDATE] x11-wm/xmonad - Update to 0.8.1 and Some 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, 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/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile	23 Nov 2008 08:25:03 -0000	1.7
+++ Makefile	29 Jan 2009 20:49:51 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmonad
-PORTVERSION=	0.8
+PORTVERSION=	0.8.1
 CATEGORIES=	x11-wm haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
 
@@ -23,14 +23,18 @@
 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}
 
 MAN1=		xmonad.1
 
-.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/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	8 Nov 2008 04:55:47 -0000	1.4
+++ distinfo	29 Jan 2009 20:49:51 -0000
@@ -1,3 +1,3 @@
-MD5 (xmonad-0.8.tar.gz) = 677a154a32add77b6ae3dfa97d9873e0
-SHA256 (xmonad-0.8.tar.gz) = 982a3189e6815dc7e1a9dfc5200a1d746490abe1a8a953f093ea9597a0d40681
-SIZE (xmonad-0.8.tar.gz) = 52896
+MD5 (xmonad-0.8.1.tar.gz) = 03a8f0a420902d9eea3df1d8d62598c7
+SHA256 (xmonad-0.8.1.tar.gz) = 9d58789a0bc08d40b9d14097b079822c7b8290d60efc6aa79144abf47d5db32c
+SIZE (xmonad-0.8.1.tar.gz) = 52878
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11-wm/xmonad/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	23 Nov 2008 08:25:03 -0000	1.3
+++ pkg-plist	29 Jan 2009 20:49:51 -0000
@@ -10,25 +10,6 @@
 %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.hi
 %%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSxmonad-%%PORTVERSION%%.a
 %%SUBDIR%%/register.sh
-%%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
- at dirrm %%DOCSDIR%%
 @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad
 @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%
 @dirrm %%SUBDIR%%


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