ports/120234: [MAINTAINER] x11-wm/xmonad: update to 0.6

[Jacula Modyun]

The following reply was made to PR ports/120234; it has been noted by GNATS.

From: Jacula Modyun <jacula at gmail.com>
To: bug-followup at FreeBSD.org, matt.guegan at 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 at 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 <bsd.port.pre.mk>
 +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 <bsd.port.pre.mk>
 +
  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 <bsd.port.post.mk>
 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
 + at dirrm share/doc/xmonad-0.6
 + at dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad
 + at dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%
 + at dirrm lib/xmonad-0.6
 + at exec /bin/sh %D/%%SUBDIR%%/register.sh
 + at unexec %D/bin/ghc-pkg unregister xmonad
 
 --eDB11BtaWSyaBkpc--