diff options
| author | Gabor Pali <pgj@FreeBSD.org> | 2012-08-03 10:30:07 +0800 |
|---|---|---|
| committer | Gabor Pali <pgj@FreeBSD.org> | 2012-08-03 10:30:07 +0800 |
| commit | db8a630740d7952632fca1d12503a442fc625335 (patch) | |
| tree | 8ee3a15fcf61eb9a77ce79ffe7cc567f6e56e480 /x11-wm | |
| parent | 336cf4f81e31ae43ff7b5ec434e2305615de4392 (diff) | |
| download | freebsd-ports-gnome-db8a630740d7952632fca1d12503a442fc625335.tar.gz freebsd-ports-gnome-db8a630740d7952632fca1d12503a442fc625335.tar.zst freebsd-ports-gnome-db8a630740d7952632fca1d12503a442fc625335.zip | |
- Teach the Haskell Cabal ports to use the new options framework
- Remove some cruft
Obtained from: FreeBSD Haskell
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/hs-xmonad-contrib/Makefile | 10 | ||||
| -rw-r--r-- | x11-wm/hs-xmonad/Makefile | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile index e0698c675e25..dd76beabee37 100644 --- a/x11-wm/hs-xmonad-contrib/Makefile +++ b/x11-wm/hs-xmonad-contrib/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmonad-contrib PORTVERSION= 0.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm haskell MAINTAINER= haskell@FreeBSD.org @@ -20,12 +20,14 @@ USE_XORG= x11 RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash -OPTIONS= XFT "Enable Xft support for fonts" On +OPTIONS_DEFINE= XFT +OPTIONS_DEFAULT= XFT + +XFT_DESC= Enable Xft support for fonts -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .include <bsd.port.options.mk> -.if defined(WITH_XFT) +.if ${PORT_OPTIONS:MXFT} CONFIGURE_ARGS+= --flags="use_xft" USE_CABAL+= X11-xft>=0.2 .endif diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile index aa0208818cfe..3fc0e28dc57c 100644 --- a/x11-wm/hs-xmonad/Makefile +++ b/x11-wm/hs-xmonad/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmonad PORTVERSION= 0.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm haskell MAINTAINER= haskell@FreeBSD.org |