From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Feb 7 17:40:04 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 5FFEA16A4C4 for ; Thu, 7 Feb 2008 17:40:04 +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 487D213C469 for ; Thu, 7 Feb 2008 17:40:04 +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 m17He4SF088116 for ; Thu, 7 Feb 2008 17:40:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m17He4Uh088115; Thu, 7 Feb 2008 17:40:04 GMT (envelope-from gnats) Date: Thu, 7 Feb 2008 17:40:04 GMT Message-Id: <200802071740.m17He4Uh088115@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Jacula Modyun Cc: Subject: Re: 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 Reply-To: Jacula Modyun List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Feb 2008 17:40:04 -0000 The following reply was made to PR ports/120234; it has been noted by GNATS. From: Jacula Modyun To: bug-followup@FreeBSD.org, matt.guegan@free.fr Cc: Subject: Re: ports/120234: [MAINTAINER] x11-wm/xmonad: update to 0.6 Date: Thu, 7 Feb 2008 17:11:40 +0000 --eDB11BtaWSyaBkpc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline The pkg-list and the dependencies are incorrect. Please, could you submit this patch? Best Regards --eDB11BtaWSyaBkpc Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-x11-wm-xmonad diff -uNr xmonad.orig/Makefile xmonad/Makefile --- xmonad.orig/Makefile 2007-10-29 07:33:00.000000000 +0000 +++ xmonad/Makefile 2008-02-07 15:46:52.000000000 +0000 @@ -6,8 +6,9 @@ # PORTNAME= xmonad -PORTVERSION= 0.4 +PORTVERSION= 0.6 CATEGORIES= x11-wm haskell + MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/ MAINTAINER= matt.guegan@free.fr @@ -15,28 +16,37 @@ USE_XLIB= yes -CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs +BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc +LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4 -.include +CABALCMD= ${LOCALBASE}/bin/runghc Setup.lhs -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 +GHC_VERSION= 6.8.2 +SUBDIR= lib/${PORTNAME}-${PORTVERSION} +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + SUBDIR=${SUBDIR} -PLIST_FILES= bin/xmonad -PORTDOCS= LICENSE MAN1= xmonad.1 +.include + do-configure: cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} do-build: - cd ${WRKSRC} && ${CABALCMD} build + cd ${WRKSRC} && ${CABALCMD} build \ + && ${CABALCMD} register --gen-script do-install: - @cd ${WRKSRC} && ${CABALCMD} install - ${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${MAN1PREFIX}/man/man1 - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR} + @cd ${WRKSRC} && ${CABALCMD} install \ + && ${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${MAN1PREFIX}/man/man1 \ + && ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh + +post-install: +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) + @${ECHO_MSG} + @${CAT} ${PKGMESSAGE} + @${ECHO_MSG} +.endif .include diff -uNr xmonad.orig/distinfo xmonad/distinfo --- xmonad.orig/distinfo 2007-10-29 07:33:00.000000000 +0000 +++ xmonad/distinfo 2008-02-05 15:40:41.000000000 +0000 @@ -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 -uNr xmonad.orig/pkg-message xmonad/pkg-message --- xmonad.orig/pkg-message 1970-01-01 00:00:00.000000000 +0000 +++ xmonad/pkg-message 2008-02-07 15:47:06.000000000 +0000 @@ -0,0 +1,6 @@ +From now XMonad uses a new configuration file system, +so you don't have to edit Config.hs anymore. +Instead, create a custom config file on ~/.xmonad/xmonad.hs +You can see some samples on Xmonad's website. + +Note that you can be interested by x11-wm/xmonad-contrib diff -uNr xmonad.orig/pkg-plist xmonad/pkg-plist --- xmonad.orig/pkg-plist 1970-01-01 00:00:00.000000000 +0000 +++ xmonad/pkg-plist 2008-02-07 11:57:54.000000000 +0000 @@ -0,0 +1,19 @@ +bin/xmonad +%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSxmonad-0.6.o +%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad.hi +%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Config.hi +%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Core.hi +%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Layout.hi +%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Main.hi +%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/ManageHook.hi +%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/Operations.hi +%%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.hi +%%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSxmonad-0.6.a +%%SUBDIR%%/register.sh +share/doc/xmonad-0.6/LICENSE +@dirrm share/doc/xmonad-0.6 +@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad +@dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%% +@dirrm lib/xmonad-0.6 +@exec /bin/sh %D/%%SUBDIR%%/register.sh +@unexec %D/bin/ghc-pkg unregister xmonad --eDB11BtaWSyaBkpc--