From 1e8ecc139a38c58921cfe6dbac98c727b1cefd71 Mon Sep 17 00:00:00 2001 From: pgj Date: Thu, 9 Jan 2014 21:32:12 +0000 Subject: - Stagify lang/ghc and all the Haskell Cabal ports - Update HACKAGE_SITE to follow changes in upstream - MAKE_ENV now sets LC_ALL and DESTDIR for Haskell Cabal ports - Further minor cosmetical changes: replace USE_GMAKE with USES, get rid of ${DO_NADA}, some refactoring Obtained from: FreeBSD Haskell --- x11/hs-X11-xft/Makefile | 1 - x11/hs-X11/Makefile | 1 - x11/hs-xmobar/Makefile | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) (limited to 'x11') diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile index 0b7638c9105d..03d873d61d8f 100644 --- a/x11/hs-X11-xft/Makefile +++ b/x11/hs-X11-xft/Makefile @@ -14,6 +14,5 @@ USES= pkgconfig USE_CABAL= utf8-string>=0.1 X11>=1.2.1 USE_XORG= xft xrender -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile index 35b77c1838c8..eb37283c9d5e 100644 --- a/x11/hs-X11/Makefile +++ b/x11/hs-X11/Makefile @@ -19,7 +19,6 @@ OPTIONS_DEFAULT= XINERAMA XINERAMA_DESC= Build with Xinerama support -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MXINERAMA} diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile index c74bf4b08ab3..0fe2f6654ec4 100644 --- a/x11/hs-xmobar/Makefile +++ b/x11/hs-xmobar/Makefile @@ -17,7 +17,7 @@ USE_XORG= xrandr EXECUTABLE= xmobar STANDALONE= yes -INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/samples/xmobar.config ${DATADIR} +INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/samples/xmobar.config ${STAGEDIR}${DATADIR} OPTIONS_DEFINE= XFT UTF8 MPD INOTIFY DATEZONE THREADED OPTIONS_DEFAULT= UTF8 @@ -29,7 +29,6 @@ INOTIFY_DESC= inotify support DATEZONE_DESC= Localized date support THREADED_DESC= Use threaded runtime -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" # Disable unsupported options -- cgit