diff options
| author | Gabor Pali <pgj@FreeBSD.org> | 2010-01-13 14:11:34 +0000 |
|---|---|---|
| committer | Gabor Pali <pgj@FreeBSD.org> | 2010-01-13 14:11:34 +0000 |
| commit | f4fb3d948c3d4f3a706df484978d3e41329732d2 (patch) | |
| tree | f43465d95d5d024efdad6cabf749b636f8680e03 /x11-wm/hs-xmonad | |
| parent | 325edc71a6ebdff4998d779ad3c261cddbe6eb1b (diff) | |
| download | ports-f4fb3d948c3d4f3a706df484978d3e41329732d2.tar.gz ports-f4fb3d948c3d4f3a706df484978d3e41329732d2.zip | |
- Update x11/hs-x11-ghc to 1.5.0.0
- Update x11-wm/xmonad to 0.9.1
- Update x11-wm/xmonad-contrib to 0.9.1
PR: ports/142106, ports/142121
Submitted by: Jacula Modyun <jacula(at)gmail.com>
Approved by: maintainer timeout (for xmonad and xmonad-contrib)
Notes
Notes:
svn path=/head/; revision=247815
Diffstat (limited to 'x11-wm/hs-xmonad')
| -rw-r--r-- | x11-wm/hs-xmonad/Makefile | 20 | ||||
| -rw-r--r-- | x11-wm/hs-xmonad/distinfo | 6 | ||||
| -rw-r--r-- | x11-wm/hs-xmonad/pkg-plist | 3 |
3 files changed, 17 insertions, 12 deletions
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile index bd3dd8759e76..967206ebd90a 100644 --- a/x11-wm/hs-xmonad/Makefile +++ b/x11-wm/hs-xmonad/Makefile @@ -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,10 @@ XMONAD_VERSION= ${PORTVERSION} GHC_CMD= ${LOCALBASE}/bin/ghc SETUP_CMD= ./setup -DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +DATADIR= ${PREFIX}/share/${DISTNAME} +PORTDATA= * + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} XMONAD_LIBDIR_REL= lib/${DISTNAME} PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ @@ -60,15 +62,21 @@ PORTDOCS= * .SILENT: do-configure: - cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \ - && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} + cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal +.if !defined(NOPORTDATA) + cd ${WRKSRC} && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} \ + --datadir='${PREFIX}/share' --datasubdir='${DISTNAME}' +.else + cd ${WRKSRC} && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX} \ + --datadir='' --datasubdir='' --docdir='${DOCSDIR}' +.endif 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 --git a/x11-wm/hs-xmonad/distinfo b/x11-wm/hs-xmonad/distinfo index 9239da58fd9d..dc0b9edebd9d 100644 --- a/x11-wm/hs-xmonad/distinfo +++ b/x11-wm/hs-xmonad/distinfo @@ -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 --git a/x11-wm/hs-xmonad/pkg-plist b/x11-wm/hs-xmonad/pkg-plist index a6349776ea84..70c9922513d3 100644 --- a/x11-wm/hs-xmonad/pkg-plist +++ b/x11-wm/hs-xmonad/pkg-plist @@ -1,6 +1,5 @@ @comment $FreeBSD$ 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 @@ -18,8 +17,6 @@ share/xmonad-%%XMONAD_VERSION%%/man/xmonad.hs @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 |