diff options
| author | pgj <pgj@FreeBSD.org> | 2009-07-10 15:29:13 +0800 |
|---|---|---|
| committer | pgj <pgj@FreeBSD.org> | 2009-07-10 15:29:13 +0800 |
| commit | 4ccb166ed1292180cc224a62c2ab5db160884452 (patch) | |
| tree | 70e86ae16038e69946b42550d52491a9fb1ed014 /x11-wm | |
| parent | dbf58377bcc8d1243b706a2dd33d6da8335b8abe (diff) | |
| download | freebsd-ports-gnome-4ccb166ed1292180cc224a62c2ab5db160884452.tar.gz freebsd-ports-gnome-4ccb166ed1292180cc224a62c2ab5db160884452.tar.zst freebsd-ports-gnome-4ccb166ed1292180cc224a62c2ab5db160884452.zip | |
- Add support for Xft and UTF-8
- Bump PORTREVISION
PR: ports/136373
Submitted by: Pavel Plesov <pavel (dot) plesov (at) gmail (dot) com>
Approved by: maintainer, tabthorpe (mentor, implicit)
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/hs-xmonad-contrib/Makefile | 22 | ||||
| -rw-r--r-- | x11-wm/xmonad-contrib/Makefile | 22 |
2 files changed, 38 insertions, 6 deletions
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile index fd6354aa18aa..74840f0ff9e2 100644 --- a/x11-wm/hs-xmonad-contrib/Makefile +++ b/x11-wm/hs-xmonad-contrib/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmonad-contrib PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/ @@ -31,6 +31,22 @@ PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ PORTVERSION=${PORTVERSION} \ SUBDIR=${SUBDIR} +OPTIONS= XFT "Enable Xft support for fonts" Off \ + UTF8 "Enable UTF-8 support" Off + +.include <bsd.port.pre.mk> + +CONFIGURE_ARGS= --ghc --prefix=${PREFIX} + +.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 +.endif + .if !defined(NOPORTDOCS) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock .else @@ -39,7 +55,7 @@ PLIST_FILES+= %%DOCSDIR%%/LICENSE .endif do-configure: - cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} + cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} do-build: cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script @@ -51,4 +67,4 @@ do-install: cd ${WRKSRC} && ${CABALCMD} install ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-wm/xmonad-contrib/Makefile b/x11-wm/xmonad-contrib/Makefile index fd6354aa18aa..74840f0ff9e2 100644 --- a/x11-wm/xmonad-contrib/Makefile +++ b/x11-wm/xmonad-contrib/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmonad-contrib PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm haskell MASTER_SITES= http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/ @@ -31,6 +31,22 @@ PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ PORTVERSION=${PORTVERSION} \ SUBDIR=${SUBDIR} +OPTIONS= XFT "Enable Xft support for fonts" Off \ + UTF8 "Enable UTF-8 support" Off + +.include <bsd.port.pre.mk> + +CONFIGURE_ARGS= --ghc --prefix=${PREFIX} + +.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 +.endif + .if !defined(NOPORTDOCS) BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock .else @@ -39,7 +55,7 @@ PLIST_FILES+= %%DOCSDIR%%/LICENSE .endif do-configure: - cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} + cd ${WRKSRC} && ${CABALCMD} configure ${CONFIGURE_ARGS} do-build: cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script @@ -51,4 +67,4 @@ do-install: cd ${WRKSRC} && ${CABALCMD} install ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${PREFIX}/${SUBDIR}/register.sh -.include <bsd.port.mk> +.include <bsd.port.post.mk> |