ports/137082: [patch]: update of x11-wm/xmonad to ghc-6.10.4

Jacula Modyun jacula at gmail.com
Fri Jul 24 18:10:02 UTC 2009 

>Number:         137082
>Category:       ports
>Synopsis:       [patch]: update of x11-wm/xmonad to ghc-6.10.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 24 18:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Jacula Modyun
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD splork.wirewater.yow 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Sat Oct 18 11:22:07 UTC 2008 root at splork.wirewater.yow:/usr/obj/usr/src/sys/JACULA i386


	
>Description:

See the PR: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/137055

>How-To-Repeat:
	
>Fix:

	

--- patch-xmonad.diff begins here ---
diff -uNr xmonad.orig/Makefile xmonad/Makefile
--- xmonad.orig/Makefile	2009-05-13 09:45:59.000000000 +0000
+++ xmonad/Makefile	2009-07-22 06:27:41.000000000 +0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmonad
 PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
 
@@ -16,40 +16,69 @@
 
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 		hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc
+RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
+		hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
 
 USE_XORG=	x11
 
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
-GHC_VERSION=	6.8.3
-SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
-PORTDOCS=	LICENSE html
+GHC_VERSION=	6.10.4
+XMONAD_VERSION=	${PORTVERSION}
+
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+XMONAD_LIBDIR_REL=	lib/${DISTNAME}
+
 PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		PORTVERSION=${PORTVERSION} \
-		SUBDIR=${SUBDIR}
+		XMONAD_VERSION=${XMONAD_VERSION} \
+		XMONAD_LIBDIR_REL=${XMONAD_LIBDIR_REL}
 
 MAN1=		xmonad.1
 
+.if defined(NOPORTDOCS)
+PLIST_SUB+=		NOPORTDOCS=""
+.else
+PLIST_SUB+=		NOPORTDOCS="@comment "
+.endif
+
 .if !defined(NOPORTDOCS)
+
+PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
+.if !empty(PORT_HADDOCK:M?0)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
-.else
-PLIST_DIRS+=	%%DOCSDIR%%
-PLIST_FILES+=	%%DOCSDIR%%/LICENSE
+.endif
+BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
+
+HSCOLOUR_VERSION=	1.13
+HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
+
+PORTDOCS=	*
 .endif
 
+.SILENT:
+
 do-configure:
-	cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX}
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script
+	cd ${WRKSRC} && ${SETUP_CMD} build \
+		     && ${SETUP_CMD} register --gen-script
+
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${CABALCMD} haddock
+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 .endif
 
 do-install:
-	cd ${WRKSRC} && ${CABALCMD} install
-	${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${MAN1PREFIX}/man/man1
-	${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${XMONAD_LIBDIR_REL}/register.sh \
+		     && ${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${MAN1PREFIX}/man/man1 \
+		     && ${INSTALL_DATA} ${WRKSRC}/CONFIG ${DOCSDIR}
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff -uNr xmonad.orig/pkg-descr xmonad/pkg-descr
--- xmonad.orig/pkg-descr	2007-10-29 07:33:00.000000000 +0000
+++ xmonad/pkg-descr	2009-07-20 20:21:53.000000000 +0000
@@ -13,4 +13,12 @@
     * Large extension library
     * Extensive documentation and support for hacking
 
-WWW:	http://www.xmonad.org/
+Author:		Spencer Janssen
+license:	BSD3
+maintainer:	xmonad at haskell.org
+WWW:		http://www.xmonad.org/
+
+exposed-modules: XMonad, XMonad.Main, XMonad.Core,
+		 XMonad.Config, XMonad.Layout,
+		 XMonad.ManageHook, XMonad.Operations,
+		 XMonad.StackSet
diff -uNr xmonad.orig/pkg-plist xmonad/pkg-plist
--- xmonad.orig/pkg-plist	2009-01-30 15:12:08.000000000 +0000
+++ xmonad/pkg-plist	2009-07-20 20:22:16.000000000 +0000
@@ -1,19 +1,22 @@
 bin/xmonad
-%%SUBDIR%%/ghc-%%GHC_VERSION%%/HSxmonad-%%PORTVERSION%%.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-%%PORTVERSION%%.a
-%%SUBDIR%%/register.sh
- at dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad
- at dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%
- at dirrm %%SUBDIR%%
- at exec /bin/sh %D/%%SUBDIR%%/register.sh
+%%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
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Core.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Layout.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Main.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/ManageHook.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/Operations.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.hi
+%%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSxmonad-%%XMONAD_VERSION%%.a
+%%XMONAD_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%%%DOCSDIR%%/CONFIG
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+ at dirrm %%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/XMonad
+ at dirrm %%XMONAD_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+ at dirrm %%XMONAD_LIBDIR_REL%%
+ at 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
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
--- patch-xmonad.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list