ports/117667: [MAINTAINER] x11-wm/xmonad: [SUMMARIZE CHANGES]

[Matthieu GUEGAN]

>Number:         117667
>Category:       ports
>Synopsis:       [MAINTAINER] x11-wm/xmonad: [SUMMARIZE CHANGES]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 30 10:40:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Matthieu GUEGAN
>Release:        FreeBSD 7.0-BETA1 i386
>Organization:
>Environment:
FreeBSD 7.0-BETA1 #0: Tue Oct 23 11:56:06 CEST 2007
>Description:
Adding two options :
- XMonad Extensions compilation (XMonadContrib)
- XMonad building with user own config (Thanks to brad clawsie for this one)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN --exclude=CVS /usr/ports/x11-wm/xmonad.orig/Makefile /usr/ports/x11-wm/xmonad/Makefile
--- /usr/ports/x11-wm/xmonad.orig/Makefile	2007-10-30 09:20:23.000000000 +0100
+++ /usr/ports/x11-wm/xmonad/Makefile	2007-10-30 11:22:05.000000000 +0100
@@ -7,8 +7,11 @@
 
 PORTNAME=	xmonad
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	x11-wm haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
+MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/:source \
+		http://www.xmonad.org/:extensions
+DISTFILES=	xmonad-${PORTVERSION}${EXTRACT_SUFX}:source
 
 MAINTAINER=	matt.guegan at free.fr
 COMMENT=	Xmonad is a minimalist and tiling window manager for X
@@ -17,8 +20,15 @@
 
 CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
 
+OPTIONS=	XMONADCONTRIB "Enable XMonadContrib extensions"	Off
+
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_XMONADCONTRIB)
+DISTFILES+=	XMonadContrib-${PORTVERSION}.tar.gz:extensions
+XMONAD_EXTDIR=	${WRKDIR}/XMonadContrib
+.endif
+
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
 		hs-x11-extras-ghc>=0.4:${PORTSDIR}/x11/hs-x11-extras-ghc
 LIB_DEPENDS+=	gmp.7:${PORTSDIR}/math/libgmp4
@@ -27,6 +37,26 @@
 PORTDOCS=	LICENSE
 MAN1=		xmonad.1
 
+pre-fetch:
+.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
+	@${ECHO} ''
+	@${ECHO} ' To build XMonad with your own Config.hs,'
+	@${ECHO} ' use the XMONAD_CONF setting :'
+	@${ECHO} ' eg. make XMONAD_CONF=/path/to/xmonad/Config.hs install clean'
+	@${ECHO} ''
+.endif
+
+post-extract:
+.if defined(WITH_XMONADCONTRIB)
+	@${ECHO} ' Building with XMonadContrib extensions'
+	@${MV} ${XMONAD_EXTDIR} ${WRKSRC}
+.endif
+
+.if defined(XMONAD_CONF)
+	@${ECHO} ' Building binary with ${XMONAD_CONF}'
+	@${CP} ${XMONAD_CONF} ${WRKSRC}/Config.hs
+.endif
+
 do-configure:
 	cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX}
 
diff -ruN --exclude=CVS /usr/ports/x11-wm/xmonad.orig/distinfo /usr/ports/x11-wm/xmonad/distinfo
--- /usr/ports/x11-wm/xmonad.orig/distinfo	2007-10-30 09:20:23.000000000 +0100
+++ /usr/ports/x11-wm/xmonad/distinfo	2007-10-30 11:22:43.000000000 +0100
@@ -1,3 +1,6 @@
 MD5 (xmonad-0.4.tar.gz) = 5d24c556f7c8f04954721b391fd79a13
 SHA256 (xmonad-0.4.tar.gz) = 978fb99e40786070307992fde78fe252b96e834740fb983b94c3a395c45467bb
 SIZE (xmonad-0.4.tar.gz) = 41025
+MD5 (XMonadContrib-0.4.tar.gz) = b224d836e99cdc6be1b67626dd52b047
+SHA256 (XMonadContrib-0.4.tar.gz) = 73981f2bc28cb603c6ace843594926758c7e6aae1501230170f7cf09e5a99bf9
+SIZE (XMonadContrib-0.4.tar.gz) = 76413


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