aboutsummaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2010-01-13 14:11:34 +0000
committerGabor Pali <pgj@FreeBSD.org>2010-01-13 14:11:34 +0000
commitf4fb3d948c3d4f3a706df484978d3e41329732d2 (patch)
treef43465d95d5d024efdad6cabf749b636f8680e03 /x11-wm
parent325edc71a6ebdff4998d779ad3c261cddbe6eb1b (diff)
downloadports-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')
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile27
-rw-r--r--x11-wm/hs-xmonad-contrib/distinfo6
-rw-r--r--x11-wm/hs-xmonad/Makefile20
-rw-r--r--x11-wm/hs-xmonad/distinfo6
-rw-r--r--x11-wm/hs-xmonad/pkg-plist3
-rw-r--r--x11-wm/xmonad-contrib/Makefile27
-rw-r--r--x11-wm/xmonad-contrib/distinfo6
-rw-r--r--x11-wm/xmonad/Makefile20
-rw-r--r--x11-wm/xmonad/distinfo6
-rw-r--r--x11-wm/xmonad/pkg-plist3
10 files changed, 62 insertions, 62 deletions
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 53c6191ff1e6..77a42c6c9f50 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xmonad-contrib
-PORTVERSION= 0.9
-PORTREVISION= 1
+PORTVERSION= 0.9.1
CATEGORIES= x11-wm haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/
@@ -15,17 +14,19 @@ MAINTAINER= matt.guegan@free.fr
COMMENT= Third party tiling algorithms, configurations and scripts to xmonad
BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
- xmonad:${PORTSDIR}/x11-wm/xmonad
+ xmonad:${PORTSDIR}/x11-wm/xmonad \
+ hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
- xmonad:${PORTSDIR}/x11-wm/xmonad
+ xmonad:${PORTSDIR}/x11-wm/xmonad \
+ hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4
USE_XORG= x11
GHC_VERSION= 6.10.4
XMONADC_VERSION= ${PORTVERSION}
-UTF8STR_VERSION= 0.3.5
-HSX11XFT_VERSION= 0.3
+UTF8STR_VERSION= 0.3.6
+HSX11XFT_VERSION= 0.7
GHC_CMD= ${LOCALBASE}/bin/ghc
SETUP_CMD= ./setup
@@ -38,8 +39,7 @@ PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
XMONADC_LIBDIR_REL=${XMONADC_LIBDIR_REL}
# See (1)
-OPTIONS= XFT "Enable Xft support for fonts" On \
- UTF8 "Enable UTF-8 support" Off
+OPTIONS= XFT "Enable Xft support for fonts" On
.include <bsd.port.pre.mk>
@@ -48,17 +48,12 @@ CONFIGURE_ARGS= --haddock-options=-w --prefix=${PREFIX}
# (1)
.if exists(${LOCALBASE}/lib/X11-xft-${HSX11XFT_VERSION}/register.sh)
WITH_XFT=
-.elif exists(${LOCALBASE}/lib/utf8-string-${UTF8STR_VERSION}/register.sh)
-WITH_UTF8=
.endif
.if defined(WITH_XFT)
-CONFIGURE_ARGS+= --flags="with_xft"
-BUILD_DEPENDS+= hs-x11-xft-ghc>=0.2:${PORTSDIR}/x11/hs-x11-xft-ghc \
- hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
-.elif defined(WITH_UTF8)
-CONFIGURE_ARGS+= --flags="with_utf8"
-BUILD_DEPENDS+= hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
+CONFIGURE_ARGS+= --flags="use_xft"
+BUILD_DEPENDS+= hs-x11-xft-ghc>=0.2:${PORTSDIR}/x11/hs-x11-xft-ghc
+RUN_DEPENDS+= hs-x11-xft-ghc>=0.2:${PORTSDIR}/x11/hs-x11-xft-ghc
.endif
.if defined(NOPORTDOCS)
diff --git a/x11-wm/hs-xmonad-contrib/distinfo b/x11-wm/hs-xmonad-contrib/distinfo
index 277dd26dd2b9..0837e18555bc 100644
--- a/x11-wm/hs-xmonad-contrib/distinfo
+++ b/x11-wm/hs-xmonad-contrib/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmonad-contrib-0.9.tar.gz) = 545485c8ec417de9e1c36975c17656d4
-SHA256 (xmonad-contrib-0.9.tar.gz) = f67471785eba323ac416f912d3503976ef6ed43e93e53fabf5621b2c93351ae9
-SIZE (xmonad-contrib-0.9.tar.gz) = 291502
+MD5 (xmonad-contrib-0.9.1.tar.gz) = 09a6e5173878d43b9f3ddd13b3ec955b
+SHA256 (xmonad-contrib-0.9.1.tar.gz) = b4ca1d71d12903be76187ce58898697086e7af3ef73468987cb7ef03b076ec47
+SIZE (xmonad-contrib-0.9.1.tar.gz) = 291348
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
diff --git a/x11-wm/xmonad-contrib/Makefile b/x11-wm/xmonad-contrib/Makefile
index 53c6191ff1e6..77a42c6c9f50 100644
--- a/x11-wm/xmonad-contrib/Makefile
+++ b/x11-wm/xmonad-contrib/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xmonad-contrib
-PORTVERSION= 0.9
-PORTREVISION= 1
+PORTVERSION= 0.9.1
CATEGORIES= x11-wm haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/
@@ -15,17 +14,19 @@ MAINTAINER= matt.guegan@free.fr
COMMENT= Third party tiling algorithms, configurations and scripts to xmonad
BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
- xmonad:${PORTSDIR}/x11-wm/xmonad
+ xmonad:${PORTSDIR}/x11-wm/xmonad \
+ hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
RUN_DEPENDS= ghc:${PORTSDIR}/lang/ghc \
- xmonad:${PORTSDIR}/x11-wm/xmonad
+ xmonad:${PORTSDIR}/x11-wm/xmonad \
+ hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4
USE_XORG= x11
GHC_VERSION= 6.10.4
XMONADC_VERSION= ${PORTVERSION}
-UTF8STR_VERSION= 0.3.5
-HSX11XFT_VERSION= 0.3
+UTF8STR_VERSION= 0.3.6
+HSX11XFT_VERSION= 0.7
GHC_CMD= ${LOCALBASE}/bin/ghc
SETUP_CMD= ./setup
@@ -38,8 +39,7 @@ PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
XMONADC_LIBDIR_REL=${XMONADC_LIBDIR_REL}
# See (1)
-OPTIONS= XFT "Enable Xft support for fonts" On \
- UTF8 "Enable UTF-8 support" Off
+OPTIONS= XFT "Enable Xft support for fonts" On
.include <bsd.port.pre.mk>
@@ -48,17 +48,12 @@ CONFIGURE_ARGS= --haddock-options=-w --prefix=${PREFIX}
# (1)
.if exists(${LOCALBASE}/lib/X11-xft-${HSX11XFT_VERSION}/register.sh)
WITH_XFT=
-.elif exists(${LOCALBASE}/lib/utf8-string-${UTF8STR_VERSION}/register.sh)
-WITH_UTF8=
.endif
.if defined(WITH_XFT)
-CONFIGURE_ARGS+= --flags="with_xft"
-BUILD_DEPENDS+= hs-x11-xft-ghc>=0.2:${PORTSDIR}/x11/hs-x11-xft-ghc \
- hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
-.elif defined(WITH_UTF8)
-CONFIGURE_ARGS+= --flags="with_utf8"
-BUILD_DEPENDS+= hs-utf8-string-ghc>=0.1:${PORTSDIR}/devel/hs-utf8-string-ghc
+CONFIGURE_ARGS+= --flags="use_xft"
+BUILD_DEPENDS+= hs-x11-xft-ghc>=0.2:${PORTSDIR}/x11/hs-x11-xft-ghc
+RUN_DEPENDS+= hs-x11-xft-ghc>=0.2:${PORTSDIR}/x11/hs-x11-xft-ghc
.endif
.if defined(NOPORTDOCS)
diff --git a/x11-wm/xmonad-contrib/distinfo b/x11-wm/xmonad-contrib/distinfo
index 277dd26dd2b9..0837e18555bc 100644
--- a/x11-wm/xmonad-contrib/distinfo
+++ b/x11-wm/xmonad-contrib/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmonad-contrib-0.9.tar.gz) = 545485c8ec417de9e1c36975c17656d4
-SHA256 (xmonad-contrib-0.9.tar.gz) = f67471785eba323ac416f912d3503976ef6ed43e93e53fabf5621b2c93351ae9
-SIZE (xmonad-contrib-0.9.tar.gz) = 291502
+MD5 (xmonad-contrib-0.9.1.tar.gz) = 09a6e5173878d43b9f3ddd13b3ec955b
+SHA256 (xmonad-contrib-0.9.1.tar.gz) = b4ca1d71d12903be76187ce58898697086e7af3ef73468987cb7ef03b076ec47
+SIZE (xmonad-contrib-0.9.1.tar.gz) = 291348
diff --git a/x11-wm/xmonad/Makefile b/x11-wm/xmonad/Makefile
index bd3dd8759e76..967206ebd90a 100644
--- a/x11-wm/xmonad/Makefile
+++ b/x11-wm/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/xmonad/distinfo b/x11-wm/xmonad/distinfo
index 9239da58fd9d..dc0b9edebd9d 100644
--- a/x11-wm/xmonad/distinfo
+++ b/x11-wm/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/xmonad/pkg-plist b/x11-wm/xmonad/pkg-plist
index a6349776ea84..70c9922513d3 100644
--- a/x11-wm/xmonad/pkg-plist
+++ b/x11-wm/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 22:27:23 +0000