From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 3 09:40:01 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 C96C916A469 for ; Sun, 3 Feb 2008 09:40:01 +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 AADB913C469 for ; Sun, 3 Feb 2008 09:40:01 +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 m139e192093393 for ; Sun, 3 Feb 2008 09:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m139e1Dx093392; Sun, 3 Feb 2008 09:40:01 GMT (envelope-from gnats) Resent-Date: Sun, 3 Feb 2008 09:40:01 GMT Resent-Message-Id: <200802030940.m139e1Dx093392@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 22E6416A420 for ; Sun, 3 Feb 2008 09:37:46 +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 134E513C4E7 for ; Sun, 3 Feb 2008 09:37:46 +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 m139Znrv059904 for ; Sun, 3 Feb 2008 09:35:49 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m139ZnSp059903; Sun, 3 Feb 2008 09:35:49 GMT (envelope-from nobody) Message-Id: <200802030935.m139ZnSp059903@www.freebsd.org> Date: Sun, 3 Feb 2008 09:35:49 GMT From: Matthieu GUEGAN To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/120234: [MAINTAINER] x11-wm/xmonad: update to 0.6 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: Sun, 03 Feb 2008 09:40:02 -0000 >Number: 120234 >Category: ports >Synopsis: [MAINTAINER] x11-wm/xmonad: update to 0.6 >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: Sun Feb 03 09:40:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Matthieu GUEGAN >Release: FreeBSD 7.0-PRERELEASE i386 >Organization: >Environment: FreeBSD 7.0-PRERELEASE #1: Fri Feb 1 16:01:50 CET >Description: This PR is a replacement for ports/119928 which was not diffed correctly from the CVS version.. So here is the update 0.4->0.6, I've added a small script to deinstall correctly xmonad from ghc. I strongly encourage a @portsmgr to review it (and change it if necessary).. >How-To-Repeat: Apply the diff below on your current ports tree >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 2008-02-02 18:22:05.000000000 +0100 +++ /usr/ports/x11-wm/xmonad/Makefile 2008-02-03 10:26:45.000000000 +0100 @@ -6,9 +6,10 @@ # PORTNAME= xmonad -PORTVERSION= 0.4 +PORTVERSION= 0.6 CATEGORIES= x11-wm haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/ +DISTNAME= xmonad-${PORTVERSION} MAINTAINER= matt.guegan@free.fr COMMENT= Xmonad is a minimalist and tiling window manager for X @@ -27,6 +28,19 @@ PORTDOCS= LICENSE MAN1= xmonad.1 +post-install: +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) + @${ECHO} '' + @${ECHO} ' From now XMonad uses a new configuration file system, ' + @${ECHO} ' 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's website.' + @${ECHO} '' + + @${ECHO} ' Note that you can be interested by x11-wm/xmonad-contrib' + @${ECHO} '' +.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 2008-02-02 18:22:05.000000000 +0100 +++ /usr/ports/x11-wm/xmonad/distinfo 2008-02-02 18:28:48.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (xmonad-0.4.tar.gz) = 5d24c556f7c8f04954721b391fd79a13 -SHA256 (xmonad-0.4.tar.gz) = 978fb99e40786070307992fde78fe252b96e834740fb983b94c3a395c45467bb -SIZE (xmonad-0.4.tar.gz) = 41025 +MD5 (xmonad-0.6.tar.gz) = 5e431d5e13cfb5cbcde2f5a3f813796a +SHA256 (xmonad-0.6.tar.gz) = e107c5dbc659b2342e0e736d9baee0ee88a1404fa5161481b1924f23d3367c21 +SIZE (xmonad-0.6.tar.gz) = 49635 diff -ruN --exclude=CVS /usr/ports/x11-wm/xmonad.orig/pkg-deinstall /usr/ports/x11-wm/xmonad/pkg-deinstall --- /usr/ports/x11-wm/xmonad.orig/pkg-deinstall 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/x11-wm/xmonad/pkg-deinstall 2008-02-03 10:28:07.000000000 +0100 @@ -0,0 +1,33 @@ +#!/bin/sh +# Uses the ghc unregister command to deinstall properly + +# Define VARS here + +PKG_VERSION="0.6" +PKG_NAME="xmonad" +PKG_CATEGORY="x11-wm" + +LOCALBASE=/usr/local +PORTSDIR=/usr/ports + +CABALCMD="${LOCALBASE}/bin/runghc Setup.lhs" +WRKSRC=${PORTSDIR}/${PKG_CATEGORY}/${PKG_NAME}/work/${PKG_NAME}-${PKG_VERSION} +PKGDIR=${PORTSDIR}/${PKG_CATEGORY}/${PKG_NAME} + +# ---SCRIPT--- + +case "$2" in +DEINSTALL) + if [ -f $WRKSRC/Setup.lhs ]; then + echo "Nice ! a work dir seems to be present..." + echo "Try to make clean if this script fails..." + else + echo "We need to extract and compile xmonad pkg first..." + cd ${PKGDIR} && make + echo "OK here we go !!!" + fi + cd ${WRKSRC} && ${CABALCMD} unregister + ;; +esac + +exit 0 >Release-Note: >Audit-Trail: >Unformatted: