diff options
| author | pgj <pgj@FreeBSD.org> | 2010-05-23 06:41:50 +0800 |
|---|---|---|
| committer | pgj <pgj@FreeBSD.org> | 2010-05-23 06:41:50 +0800 |
| commit | 2895aa97338047cd559fa9bd0586d799dc99f03a (patch) | |
| tree | a9dc08da2736702569cfb9ffc12399651e8a5377 /x11-wm | |
| parent | 988bcdfc0bbcd3a778a48fcbb719810254fb1fba (diff) | |
| download | freebsd-ports-gnome-2895aa97338047cd559fa9bd0586d799dc99f03a.tar.gz freebsd-ports-gnome-2895aa97338047cd559fa9bd0586d799dc99f03a.tar.zst freebsd-ports-gnome-2895aa97338047cd559fa9bd0586d799dc99f03a.zip | |
- Fix OPTIONS support for Cabal ports by introducing
bsd.cabal.options.mk
- Fix ports broken with non-default options
Triggered by: Yuri Pankov <yuri.pankov@gmail.com>
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/hs-xmonad-contrib/Makefile | 5 | ||||
| -rw-r--r-- | x11-wm/xmonad-contrib/Makefile | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile index a8693f955af2..81f5950c2611 100644 --- a/x11-wm/hs-xmonad-contrib/Makefile +++ b/x11-wm/hs-xmonad-contrib/Makefile @@ -19,7 +19,8 @@ USE_XORG= x11 OPTIONS= XFT "Enable Xft support for fonts" On -.include <bsd.port.pre.mk> +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" +.include <bsd.port.options.mk> .if defined(WITH_XFT) CONFIGURE_ARGS+= --flags="use_xft" @@ -27,4 +28,4 @@ USE_HACKAGE+= X11-xft>=0.2 .endif .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-wm/xmonad-contrib/Makefile b/x11-wm/xmonad-contrib/Makefile index a8693f955af2..81f5950c2611 100644 --- a/x11-wm/xmonad-contrib/Makefile +++ b/x11-wm/xmonad-contrib/Makefile @@ -19,7 +19,8 @@ USE_XORG= x11 OPTIONS= XFT "Enable Xft support for fonts" On -.include <bsd.port.pre.mk> +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" +.include <bsd.port.options.mk> .if defined(WITH_XFT) CONFIGURE_ARGS+= --flags="use_xft" @@ -27,4 +28,4 @@ USE_HACKAGE+= X11-xft>=0.2 .endif .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> |