Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Jan 2008 18:57:08 GMT
From:      Matthieu GUEGAN <matt.guegan@free.fr>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/119928: [MAINTAINER] x11-wm/xmonad: [SUMMARIZE CHANGES]
Message-ID:  <200801231857.m0NIv8ee072822@www.freebsd.org>
Resent-Message-ID: <200801231900.m0NJ06bV050088@freefall.freebsd.org>

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

>Number:         119928
>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:   Wed Jan 23 19:00:06 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Matthieu GUEGAN
>Release:        FreeBSD 7.0-PRERELEASE i386
>Organization:
>Environment:
FreeBSD 7.0-PRERELEASE #6: Wed Jan  2 21:30:05 CET
>Description:
Here is a patch for xmonad : version 0.4 => 0.5

Removed config and xmonadcontrib variables.

Note I'll PR a new port for xmonad extensions : x11-wm/xmonad-contrib
>How-To-Repeat:

>Fix:
Apply the following patch in attachment

Patch attached with submission follows:

===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/x11-wm/xmonad.orig/Makefile /usr/ports/x11-wm/xmonad/Makefile
--- /usr/ports/x11-wm/xmonad.orig/Makefile	2008-01-23 08:37:52.000000000 +0100
+++ /usr/ports/x11-wm/xmonad/Makefile	2008-01-23 19:51:32.000000000 +0100
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	xmonad
-PORTVERSION=	0.4
-PORTREVISION=	1
+PORTVERSION=	0.5
 CATEGORIES=	x11-wm haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/:source \
-		http://www.xmonad.org/:extensions
-DISTFILES=	xmonad-${PORTVERSION}${EXTRACT_SUFX}:source
+MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
+DISTFILES=	xmonad-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	matt.guegan@free.fr
 COMMENT=	Xmonad is a minimalist and tiling window manager for X
@@ -20,15 +18,8 @@
 
 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
@@ -37,24 +28,17 @@
 PORTDOCS=	LICENSE
 MAN1=		xmonad.1
 
-pre-fetch:
+post-install:
 .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} ' From now XMonad uses a new config file system so you don't have to edit Config.hs anymore.'
+	@${ECHO} ' Instead, create a custom config file on ~/.xmonad/xmonad.hs'
+	@${ECHO} ' You can see some samples on Xmonad website'
 	@${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
+	@${ECHO} ''
+	@${ECHO} ' Maybe are you interested by x11-wm/xmonad-contrib for extentions'
+	@${ECHO} ''
 .endif
 
 do-configure:
diff -ruN --exclude=CVS /usr/ports/x11-wm/xmonad.orig/distinfo /usr/ports/x11-wm/xmonad/distinfo
--- /usr/ports/x11-wm/xmonad.orig/distinfo	2008-01-23 08:37:52.000000000 +0100
+++ /usr/ports/x11-wm/xmonad/distinfo	2008-01-23 18:55:28.000000000 +0100
@@ -1,6 +1,3 @@
-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
+MD5 (xmonad-0.5.tar.gz) = b23951c9d1ba03c6569fd1e573f15509
+SHA256 (xmonad-0.5.tar.gz) = cfcc4501b000fa740ed35a5be87dc01216e036219551630dcf71d9c3cf57e4c4
+SIZE (xmonad-0.5.tar.gz) = 48853
===> Done


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



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