From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jan 23 19:00:06 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 8838B16A421 for ; Wed, 23 Jan 2008 19:00:06 +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 6F8FC13C474 for ; Wed, 23 Jan 2008 19:00:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m0NJ06cW050089 for ; Wed, 23 Jan 2008 19:00:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m0NJ06bV050088; Wed, 23 Jan 2008 19:00:06 GMT (envelope-from gnats) Resent-Date: Wed, 23 Jan 2008 19:00:06 GMT Resent-Message-Id: <200801231900.m0NJ06bV050088@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, Matthieu GUEGAN Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3571B16A41A for ; Wed, 23 Jan 2008 18:58: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 2C9D613C4E8 for ; Wed, 23 Jan 2008 18:58:42 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m0NIv8XL072823 for ; Wed, 23 Jan 2008 18:57:08 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m0NIv8ee072822; Wed, 23 Jan 2008 18:57:08 GMT (envelope-from nobody) Message-Id: <200801231857.m0NIv8ee072822@www.freebsd.org> Date: Wed, 23 Jan 2008 18:57:08 GMT From: Matthieu GUEGAN To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/119928: [MAINTAINER] x11-wm/xmonad: [SUMMARIZE CHANGES] 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: Wed, 23 Jan 2008 19:00:06 -0000 >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 -.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: