Attachment 102341 Details for Bug 142121 – patch-xmonad

patch-xmonad

patch-xmonad (text/plain), 2.93 KB, created by Jacula Modyun on 2009-12-29 09:00:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jacula Modyun

Created: 2009-12-29 09:00:10 UTC

Size: 2.93 KB

patch

obsolete

>diff -uNr xmonad.orig/Makefile xmonad/Makefile
>--- xmonad.orig/Makefile	2009-12-06 20:56:55.000000000 +0000
>+++ xmonad/Makefile	2009-12-28 19:13:14.000000000 +0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	xmonad
>-PORTVERSION=	0.9
>-PORTREVISION=	1
>+PORTVERSION=	0.9.1
> CATEGORIES=	x11-wm haskell
> MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
> 
>@@ -28,7 +27,8 @@
> GHC_CMD=	${LOCALBASE}/bin/ghc
> SETUP_CMD=	./setup
> 
>-DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
>+DATADIR=		${PREFIX}/share/${DISTNAME}
>+DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
> XMONAD_LIBDIR_REL=	lib/${DISTNAME}
> 
> PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
>@@ -61,14 +61,15 @@
> 
> do-configure:
> 	cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
>-		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
>+		     && ${SETUP_CMD} configure --haddock-options=-w --datadir=${PREFIX}/share \
>+		     			       --datasubdir=${PORTNAME}-${PORTVERSION} --prefix=${PREFIX}
> 
> do-build:
> 	cd ${WRKSRC} && ${SETUP_CMD} build \
> 		     && ${SETUP_CMD} register --gen-script
> 
> .if !defined(NOPORTDOCS)
>-	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
>+	cd ${WRKSRC} && ${SETUP_CMD} haddock --executables --hyperlink-source \
> 					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
> .endif
> 
>diff -uNr xmonad.orig/distinfo xmonad/distinfo
>--- xmonad.orig/distinfo	2009-11-29 12:57:59.000000000 +0000
>+++ xmonad/distinfo	2009-12-28 19:08:23.000000000 +0000
>@@ -1,3 +1,3 @@
>-MD5 (xmonad-0.9.tar.gz) = 5ec4ec7b6ab1ec841ceca07184a28ba7
>-SHA256 (xmonad-0.9.tar.gz) = 51670f83de211a8ea24ce2724c71ac5c3e4782f25422319d8b5e43f3ae7bf9e8
>-SIZE (xmonad-0.9.tar.gz) = 55977
>+MD5 (xmonad-0.9.1.tar.gz) = 3d0dd5cf77768b10e1b7f3a47e32b09e
>+SHA256 (xmonad-0.9.1.tar.gz) = 014201200e8a521ee3a0d8c0727392916a7549207b91064fb456f8c660609927
>+SIZE (xmonad-0.9.1.tar.gz) = 56974
>diff -uNr xmonad.orig/pkg-plist xmonad/pkg-plist
>--- xmonad.orig/pkg-plist	2009-11-29 12:57:59.000000000 +0000
>+++ xmonad/pkg-plist	2009-12-28 19:08:23.000000000 +0000
>@@ -1,6 +1,5 @@
> @comment $FreeBSD: ports/x11-wm/xmonad/pkg-plist,v 1.6 2009/11/29 12:57:59 pgj Exp $
> bin/xmonad
>-share/xmonad-%%XMONAD_VERSION%%/man/xmonad.hs
> %%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSxmonad-%%XMONAD_VERSION%%.o
> %%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad.hi
> %%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Config.hi
>@@ -14,12 +13,13 @@
> %%XMONAD_LIBDIR_REL%%/register.sh
> %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
> %%NOPORTDOCS%%%%DOCSDIR%%/CONFIG
>+%%DATADIR%%/man/xmonad.hs
>+@dirrm %%DATADIR%%/man
>+@dirrm %%DATADIR%%
> %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
> @dirrm %%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad
> @dirrm %%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
> @dirrm %%XMONAD_LIBDIR_REL%%
>-@dirrm share/xmonad-%%XMONAD_VERSION%%/man
>-@dirrm share/xmonad-%%XMONAD_VERSION%%
> @exec /bin/sh %D/%%XMONAD_LIBDIR_REL%%/register.sh
> @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
> @unexec %D/bin/ghc-pkg unregister xmonad

Actions: View

Attachments on bug 142121: 102341 | 102342