kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update x11/hs-x11-ghc to 1.5.0.0

Browse source 
- 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)
This commit is contained in:
Gabor Pali 2010-01-13 14:11:34 +00:00
parent 325edc71a6
commit f4fb3d948c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=247815
14 changed files with 70 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
x11-wm/hs-xmonad-contrib/Makefile
View file

@ -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)

6
x11-wm/hs-xmonad-contrib/distinfo
View file

@ -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

20
x11-wm/hs-xmonad/Makefile
View file

@ -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

6
x11-wm/hs-xmonad/distinfo
View file

@ -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

3
x11-wm/hs-xmonad/pkg-plist
View file

@ -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

27
x11-wm/xmonad-contrib/Makefile
View file

@ -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)

6
x11-wm/xmonad-contrib/distinfo
View file

@ -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

20
x11-wm/xmonad/Makefile
View file

@ -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

6
x11-wm/xmonad/distinfo
View file

@ -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

3
x11-wm/xmonad/pkg-plist
View file

@ -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

3
x11/hs-X11/Makefile
View file

@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= x11
PORTVERSION= 1.4.6.1
PORTREVISION= 1
PORTVERSION= 1.5.0.0
CATEGORIES= x11 haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
PKGNAMEPREFIX= hs-

6
x11/hs-X11/distinfo
View file

@ -1,3 +1,3 @@
MD5 (X11-1.4.6.1.tar.gz) = c60c94847e59895cd4a54e6405375851
SHA256 (X11-1.4.6.1.tar.gz) = 3e1375d4e53a8366fa2ea12bd9c3033ffe2f7dd00443acd84f722cf0dfff0fa9
SIZE (X11-1.4.6.1.tar.gz) = 175567
MD5 (X11-1.5.0.0.tar.gz) = ec6670f5ce1812206903c8a0fd9df04c
SHA256 (X11-1.5.0.0.tar.gz) = 653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f
SIZE (X11-1.5.0.0.tar.gz) = 178211

3
x11/hs-x11-ghc/Makefile
View file

@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= x11
PORTVERSION= 1.4.6.1
PORTREVISION= 1
PORTVERSION= 1.5.0.0
CATEGORIES= x11 haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
PKGNAMEPREFIX= hs-

6
x11/hs-x11-ghc/distinfo
View file

@ -1,3 +1,3 @@
MD5 (X11-1.4.6.1.tar.gz) = c60c94847e59895cd4a54e6405375851
SHA256 (X11-1.4.6.1.tar.gz) = 3e1375d4e53a8366fa2ea12bd9c3033ffe2f7dd00443acd84f722cf0dfff0fa9
SIZE (X11-1.4.6.1.tar.gz) = 175567
MD5 (X11-1.5.0.0.tar.gz) = ec6670f5ce1812206903c8a0fd9df04c
SHA256 (X11-1.5.0.0.tar.gz) = 653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f
SIZE (X11-1.5.0.0.tar.gz) = 178211