diff options
410 files changed, 186 insertions, 519 deletions
diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile index ddf85f904c6e..4781267711bd 100644 --- a/archivers/hs-tar/Makefile +++ b/archivers/hs-tar/Makefile @@ -10,7 +10,6 @@ COMMENT= Reading, writing, and manipulating ".tar" archive files LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile index 7ffd941d4ec2..b9351b8946e8 100644 --- a/archivers/hs-zip-archive/Makefile +++ b/archivers/hs-zip-archive/Makefile @@ -11,7 +11,6 @@ COMMENT= Library for creating and modifying zip archives LICENSE= BSD USE_CABAL= digest>=0.0.0.1 mtl utf8-string>=0.3.1 zlib -NO_STAGE= yes OPTIONS_DEFINE= EXECUTABLE diff --git a/archivers/hs-zlib-bindings/Makefile b/archivers/hs-zlib-bindings/Makefile index 1ce185e71a78..6843229a96e9 100644 --- a/archivers/hs-zlib-bindings/Makefile +++ b/archivers/hs-zlib-bindings/Makefile @@ -11,7 +11,6 @@ COMMENT= Low-level bindings to the zlib package LICENSE= BSD USE_CABAL= zlib>=0.5.2.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/archivers/hs-zlib-conduit/Makefile b/archivers/hs-zlib-conduit/Makefile index d960a16b87be..00bd11604c22 100644 --- a/archivers/hs-zlib-conduit/Makefile +++ b/archivers/hs-zlib-conduit/Makefile @@ -11,7 +11,6 @@ COMMENT= Streaming compression/decompression via conduits LICENSE= BSD USE_CABAL= conduit>=1.0 transformers>=0.2.2 void zlib-bindings>=0.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/archivers/hs-zlib-enum/Makefile b/archivers/hs-zlib-enum/Makefile index 0813c564f9aa..eb5b16c8bc89 100644 --- a/archivers/hs-zlib-enum/Makefile +++ b/archivers/hs-zlib-enum/Makefile @@ -11,7 +11,6 @@ COMMENT= Enumerator interface for zlib compression LICENSE= MIT USE_CABAL= enumerator transformers>=0.2 zlib-bindings -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile index 7924fd99d576..abdbb2a6b1d3 100644 --- a/archivers/hs-zlib/Makefile +++ b/archivers/hs-zlib/Makefile @@ -11,6 +11,5 @@ COMMENT= Compression and decompression in the gzip and zlib formats LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile index 06fc64e1d5d9..d324433b57d7 100644 --- a/audio/hs-ALUT/Makefile +++ b/audio/hs-ALUT/Makefile @@ -12,10 +12,9 @@ COMMENT= Binding for the OpenAL Utility Toolkit LICENSE= BSD USE_CABAL= OpenAL StateVar -NO_STAGE= yes USES= openal:al,alut -INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}) +INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile index 10c4e1a6b383..172086a74ce3 100644 --- a/audio/hs-OpenAL/Makefile +++ b/audio/hs-OpenAL/Makefile @@ -12,10 +12,9 @@ COMMENT= A binding to the OpenAL cross-platform 3D audio API LICENSE= BSD USE_CABAL= ObjectName StateVar Tensor -NO_STAGE= yes USES= openal:al -INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}) +INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/audio/hs-libmpd/Makefile b/audio/hs-libmpd/Makefile index 65c21a7142ef..15a946138c4d 100644 --- a/audio/hs-libmpd/Makefile +++ b/audio/hs-libmpd/Makefile @@ -11,7 +11,6 @@ COMMENT= An MPD client library LICENSE= LGPL21 USE_CABAL= mtl>=2.0 network>=2.1 text utf8-string>=0.3.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile index f1a0f1bdfbda..4c0a2ca415c7 100644 --- a/benchmarks/hs-criterion/Makefile +++ b/benchmarks/hs-criterion/Makefile @@ -16,10 +16,9 @@ USE_CABAL= aeson>=0.3.2.12 hastache>=0.5.0 mtl>=2 mwc-random>=0.8.0.3 \ vector>=0.7.1 vector-algorithms>=0.4 INSTALL_PORTEXAMPLES= \ - cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR} + cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} -INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/README.markdown ${DATADIR} +INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DATADIR} -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/converters/hs-aeson/Makefile b/converters/hs-aeson/Makefile index fb5c1ed8cc3c..761352501d4b 100644 --- a/converters/hs-aeson/Makefile +++ b/converters/hs-aeson/Makefile @@ -14,6 +14,5 @@ USE_CABAL= attoparsec>=0.8.6.1 blaze-builder>=0.2.1.4 dlist>=0.2 \ hashable>=1.1.2.0 mtl syb text>=0.11.1.0 \ unordered-containers>=0.1.3.0 vector>=0.7.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/converters/hs-dataenc/Makefile b/converters/hs-dataenc/Makefile index cac583a910e8..0d3f13681476 100644 --- a/converters/hs-dataenc/Makefile +++ b/converters/hs-dataenc/Makefile @@ -10,6 +10,5 @@ COMMENT= Data encoding library LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/converters/hs-json/Makefile b/converters/hs-json/Makefile index a0900839da23..56d66e064762 100644 --- a/converters/hs-json/Makefile +++ b/converters/hs-json/Makefile @@ -15,6 +15,5 @@ USE_CABAL= mtl syb>=0.3.3 text CONFIGURE_ARGS+= --flags="split-base generic -parsec -pretty -mapdict" -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/databases/hs-mysql/Makefile b/databases/hs-mysql/Makefile index d975d682457f..6e6ea4cfe00e 100644 --- a/databases/hs-mysql/Makefile +++ b/databases/hs-mysql/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_MYSQL= yes -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/databases/hs-persistent-sqlite/Makefile b/databases/hs-persistent-sqlite/Makefile index 9f21d5837a44..dd6ceedf4fe1 100644 --- a/databases/hs-persistent-sqlite/Makefile +++ b/databases/hs-persistent-sqlite/Makefile @@ -14,6 +14,5 @@ USE_CABAL= aeson>=0.5 conduit>=0.5.3 monad-control>=0.2 \ monad-logger>=0.2.4 persistent>=1.2 text>=0.7 \ transformers>=0.2.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/databases/hs-persistent-template/Makefile b/databases/hs-persistent-template/Makefile index 18c359f1c37f..209864f4fe1c 100644 --- a/databases/hs-persistent-template/Makefile +++ b/databases/hs-persistent-template/Makefile @@ -13,6 +13,5 @@ LICENSE= MIT USE_CABAL= aeson monad-control>=0.2 monad-logger persistent>=1.2 \ text>=0.5 transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/databases/hs-persistent/Makefile b/databases/hs-persistent/Makefile index f08407221a50..cfcda3c13fce 100644 --- a/databases/hs-persistent/Makefile +++ b/databases/hs-persistent/Makefile @@ -17,6 +17,5 @@ USE_CABAL= aeson>=0.5 attoparsec base64-bytestring blaze-html>=0.5 \ transformers>=0.2.1 transformers-base unordered-containers \ vector -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile index e4e30edc1636..ce7ce3c3e27e 100644 --- a/devel/hs-BNFC/Makefile +++ b/devel/hs-BNFC/Makefile @@ -15,6 +15,5 @@ USE_CABAL= mtl EXECUTABLE= bnfc -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile index 8d17cdef4e38..c51c6c171d58 100644 --- a/devel/hs-Boolean/Makefile +++ b/devel/hs-Boolean/Makefile @@ -10,6 +10,5 @@ COMMENT= Generalized Booleans and numbers LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile index b721492d91f8..114f3406b56f 100644 --- a/devel/hs-ConfigFile/Makefile +++ b/devel/hs-ConfigFile/Makefile @@ -12,6 +12,5 @@ LICENSE= LGPL21 USE_CABAL= MissingH>=1.0.0 mtl parsec -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-HUnit/Makefile b/devel/hs-HUnit/Makefile index 67778f142d40..dc0029fc3772 100644 --- a/devel/hs-HUnit/Makefile +++ b/devel/hs-HUnit/Makefile @@ -10,6 +10,5 @@ COMMENT= Unit testing framework for Haskell LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-IORefCAS/Makefile b/devel/hs-IORefCAS/Makefile index 05897ca1669f..b4c4171afbdb 100644 --- a/devel/hs-IORefCAS/Makefile +++ b/devel/hs-IORefCAS/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= bits-atomic -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-IfElse/Makefile b/devel/hs-IfElse/Makefile index f35d57511e5c..182bbfbfdd18 100644 --- a/devel/hs-IfElse/Makefile +++ b/devel/hs-IfElse/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= mtl -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-List/Makefile b/devel/hs-List/Makefile index c27de202f3eb..a60b281136ab 100644 --- a/devel/hs-List/Makefile +++ b/devel/hs-List/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-MaybeT/Makefile b/devel/hs-MaybeT/Makefile index 80635e8c9a0a..50537c5d3597 100644 --- a/devel/hs-MaybeT/Makefile +++ b/devel/hs-MaybeT/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= mtl -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile index 6b5ed7661f4a..d474a7ea402b 100644 --- a/devel/hs-MemoTrie/Makefile +++ b/devel/hs-MemoTrie/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= void -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile index 1610ff8e23c0..ad62f9cc8f5e 100644 --- a/devel/hs-MissingH/Makefile +++ b/devel/hs-MissingH/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= hslogger HUnit mtl network parsec random regex-compat -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-MonadCatchIO-mtl/Makefile b/devel/hs-MonadCatchIO-mtl/Makefile index 91cb068896b7..8e610621f283 100644 --- a/devel/hs-MonadCatchIO-mtl/Makefile +++ b/devel/hs-MonadCatchIO-mtl/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= extensible-exceptions mtl -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-MonadCatchIO-transformers/Makefile b/devel/hs-MonadCatchIO-transformers/Makefile index 26b027e30aa6..2e26e7f1226b 100644 --- a/devel/hs-MonadCatchIO-transformers/Makefile +++ b/devel/hs-MonadCatchIO-transformers/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= extensible-exceptions>=0.1 transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-MonadRandom/Makefile b/devel/hs-MonadRandom/Makefile index d47aa9b63b5a..e405fbba278b 100644 --- a/devel/hs-MonadRandom/Makefile +++ b/devel/hs-MonadRandom/Makefile @@ -10,6 +10,5 @@ COMMENT= Random-number generation monad USE_CABAL= mtl random -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile index e926700314f7..8be0a302c9f8 100644 --- a/devel/hs-ObjectName/Makefile +++ b/devel/hs-ObjectName/Makefile @@ -11,6 +11,5 @@ COMMENT= Explicitly handled object names for Haskell LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-PSQueue/Makefile b/devel/hs-PSQueue/Makefile index 8125be4c53ef..38e653f2035a 100644 --- a/devel/hs-PSQueue/Makefile +++ b/devel/hs-PSQueue/Makefile @@ -10,6 +10,5 @@ COMMENT= Priority Search Queue LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile index cee4e58456b5..4856a493ce59 100644 --- a/devel/hs-QuickCheck/Makefile +++ b/devel/hs-QuickCheck/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= random -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-ReadArgs/Makefile b/devel/hs-ReadArgs/Makefile index 5b8683eab208..387d3b602872 100644 --- a/devel/hs-ReadArgs/Makefile +++ b/devel/hs-ReadArgs/Makefile @@ -14,6 +14,5 @@ USE_CABAL= system-filepath>=0.4.7 text>=0.11.1.13 EXECUTABLE= ReadArgsEx -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-SafeSemaphore/Makefile b/devel/hs-SafeSemaphore/Makefile index 1fcb24853028..04ae4006a77a 100644 --- a/devel/hs-SafeSemaphore/Makefile +++ b/devel/hs-SafeSemaphore/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= stm -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-StateVar/Makefile b/devel/hs-StateVar/Makefile index 0a5f25f0112d..bd0e24b356ec 100644 --- a/devel/hs-StateVar/Makefile +++ b/devel/hs-StateVar/Makefile @@ -11,6 +11,5 @@ COMMENT= State variables for Haskell LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile index 4e570e766b57..d782f8e3784c 100644 --- a/devel/hs-Stream/Makefile +++ b/devel/hs-Stream/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= lazysmallcheck>=0.3 QuickCheck>=2.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-Tensor/Makefile b/devel/hs-Tensor/Makefile index 3089bf84e493..5f46cff1c78e 100644 --- a/devel/hs-Tensor/Makefile +++ b/devel/hs-Tensor/Makefile @@ -11,6 +11,5 @@ COMMENT= Tensor data types for Haskell LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-TypeCompose/Makefile b/devel/hs-TypeCompose/Makefile index 6e25d50957da..942076b32fe4 100644 --- a/devel/hs-TypeCompose/Makefile +++ b/devel/hs-TypeCompose/Makefile @@ -11,6 +11,5 @@ COMMENT= Type composition classes and instances LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-abstract-deque/Makefile b/devel/hs-abstract-deque/Makefile index 7d6c77533823..77edcf06db81 100644 --- a/devel/hs-abstract-deque/Makefile +++ b/devel/hs-abstract-deque/Makefile @@ -16,7 +16,6 @@ OPTIONS_DEFINE= USECAS USECAS_DESC= Use hardware compare-and-swap -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MUSECAS} diff --git a/devel/hs-abstract-par/Makefile b/devel/hs-abstract-par/Makefile index 8865fda2b008..d374a4a7bd9b 100644 --- a/devel/hs-abstract-par/Makefile +++ b/devel/hs-abstract-par/Makefile @@ -10,6 +10,5 @@ COMMENT= Type classes generalizing the functionality of the 'monad-par' library LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-activehs-base/Makefile b/devel/hs-activehs-base/Makefile index 87d625772286..a83d5006ae36 100644 --- a/devel/hs-activehs-base/Makefile +++ b/devel/hs-activehs-base/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= QuickCheck>=2.4 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile index bb373628a016..6a41a4e55785 100644 --- a/devel/hs-alex/Makefile +++ b/devel/hs-alex/Makefile @@ -19,8 +19,7 @@ USE_AUTOTOOLS= autoconf:env STANDALONE= yes EXECUTABLE= alex -INSTALL_PORTEXAMPLES= cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR} +INSTALL_PORTEXAMPLES= cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile index b6c8d3a85d94..4dc79cc9a8e2 100644 --- a/devel/hs-ansi-terminal/Makefile +++ b/devel/hs-ansi-terminal/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD CONFIGURE_ARGS+= --flags="-Example" -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile index dbbd3d331954..b12ca11dd669 100644 --- a/devel/hs-ansi-wl-pprint/Makefile +++ b/devel/hs-ansi-wl-pprint/Makefile @@ -14,6 +14,5 @@ USE_CABAL= ansi-terminal>=0.4.0 CONFIGURE_ARGS+= --flags="-Example" -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile index 5734246e1924..9ff822ae94cb 100644 --- a/devel/hs-arrows/Makefile +++ b/devel/hs-arrows/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= Stream -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile index 272ef3f9f6f1..3aac5a58d78d 100644 --- a/devel/hs-asn1-data/Makefile +++ b/devel/hs-asn1-data/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= cereal mtl text>=0.11 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-asn1-types/Makefile b/devel/hs-asn1-types/Makefile index d82d62246638..24d130a95e00 100644 --- a/devel/hs-asn1-types/Makefile +++ b/devel/hs-asn1-types/Makefile @@ -10,6 +10,5 @@ COMMENT= ASN.1 types LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-async/Makefile b/devel/hs-async/Makefile index 3a1c6de21d25..6f43b6951cf8 100644 --- a/devel/hs-async/Makefile +++ b/devel/hs-async/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= stm>=2.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-attempt/Makefile b/devel/hs-attempt/Makefile index 6e1a0c9adf6a..d52dc81a794b 100644 --- a/devel/hs-attempt/Makefile +++ b/devel/hs-attempt/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= failure>=0.2.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile index c557d7b62a5e..700d9f080399 100644 --- a/devel/hs-base-unicode-symbols/Makefile +++ b/devel/hs-base-unicode-symbols/Makefile @@ -10,6 +10,5 @@ COMMENT= Unicode alternatives for common functions and operators LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-base16-bytestring/Makefile b/devel/hs-base16-bytestring/Makefile index bf1d59195171..79a873945202 100644 --- a/devel/hs-base16-bytestring/Makefile +++ b/devel/hs-base16-bytestring/Makefile @@ -10,6 +10,5 @@ COMMENT= Fast base16 (hex) encoding and deconding for ByteStrings LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-base64-bytestring/Makefile b/devel/hs-base64-bytestring/Makefile index 28a04f74da0f..db28ff3247f3 100644 --- a/devel/hs-base64-bytestring/Makefile +++ b/devel/hs-base64-bytestring/Makefile @@ -10,6 +10,5 @@ COMMENT= Fast base64 encoding and decoding for ByteStrings LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-base64-conduit/Makefile b/devel/hs-base64-conduit/Makefile index 50e4fa462c8f..c3a44336851e 100644 --- a/devel/hs-base64-conduit/Makefile +++ b/devel/hs-base64-conduit/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= base64-bytestring>=0.1.1.1 conduit>=1.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-basic-prelude/Makefile b/devel/hs-basic-prelude/Makefile index 2ad491fc3e37..71f2a8b19146 100644 --- a/devel/hs-basic-prelude/Makefile +++ b/devel/hs-basic-prelude/Makefile @@ -13,6 +13,5 @@ LICENSE= MIT USE_CABAL= hashable lifted-base ReadArgs>=1.2 system-filepath>=0.4 text \ transformers unordered-containers vector -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-bifunctors/Makefile b/devel/hs-bifunctors/Makefile index b298c389773b..147547debf34 100644 --- a/devel/hs-bifunctors/Makefile +++ b/devel/hs-bifunctors/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= semigroupoids semigroups>=0.8.3.1 tagged>=0.4.4 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-bits-atomic/Makefile b/devel/hs-bits-atomic/Makefile index 790249f9aa72..cc7b1f82dea8 100644 --- a/devel/hs-bits-atomic/Makefile +++ b/devel/hs-bits-atomic/Makefile @@ -10,6 +10,5 @@ COMMENT= Atomic bit operations on memory locations LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-blaze-builder-conduit/Makefile b/devel/hs-blaze-builder-conduit/Makefile index ef864b4610de..cfcbb09364e5 100644 --- a/devel/hs-blaze-builder-conduit/Makefile +++ b/devel/hs-blaze-builder-conduit/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= blaze-builder>=0.2.1.4 conduit>=1.0 text>=0.11 \ transformers>=0.2.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-blaze-builder-enumerator/Makefile b/devel/hs-blaze-builder-enumerator/Makefile index e57e4de3dc52..45e2438a9837 100644 --- a/devel/hs-blaze-builder-enumerator/Makefile +++ b/devel/hs-blaze-builder-enumerator/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= blaze-builder>=0.2.1.4 enumerator>=0.4.3.1 transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile index 1ce06f46887b..438e995a0e8e 100644 --- a/devel/hs-blaze-builder/Makefile +++ b/devel/hs-blaze-builder/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= text>=0.10 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile index e274cf38e211..0933d4d7ff25 100644 --- a/devel/hs-blaze-textual/Makefile +++ b/devel/hs-blaze-textual/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= blaze-builder>=0.2.1.4 text>=0.11.0.2 vector -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-bloomfilter/Makefile b/devel/hs-bloomfilter/Makefile index 076e8d05c1ea..d5a52ed67331 100644 --- a/devel/hs-bloomfilter/Makefile +++ b/devel/hs-bloomfilter/Makefile @@ -10,6 +10,5 @@ COMMENT= Pure and impure Bloom Filter implementations LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile index 7bbba9abaacb..368792583dd3 100644 --- a/devel/hs-bsd-sysctl/Makefile +++ b/devel/hs-bsd-sysctl/Makefile @@ -11,6 +11,5 @@ COMMENT= Access to the BSD sysctl(3) interface LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile index d0ebb5029626..779fca4df2f9 100644 --- a/devel/hs-byteorder/Makefile +++ b/devel/hs-byteorder/Makefile @@ -10,6 +10,5 @@ COMMENT= Exposes the native endianness or byte ordering of the system LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile index 97017e74ad62..7ba67a4a5535 100644 --- a/devel/hs-bytestring-nums/Makefile +++ b/devel/hs-bytestring-nums/Makefile @@ -10,6 +10,5 @@ COMMENT= Parse numeric literals from ByteStrings LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-bytestring-show/Makefile b/devel/hs-bytestring-show/Makefile index 1ef0067f19c1..004ed75b3761 100644 --- a/devel/hs-bytestring-show/Makefile +++ b/devel/hs-bytestring-show/Makefile @@ -10,6 +10,5 @@ COMMENT= Efficient conversion of values into readable byte strings LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile index fb2f838bf388..5261e23c4bbb 100644 --- a/devel/hs-c2hs/Makefile +++ b/devel/hs-c2hs/Makefile @@ -21,6 +21,5 @@ EXECUTABLE= c2hs MAN1= c2hs.1 MAN1SRC= doc/man1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile index dc800238a5aa..c01f30c79e9e 100644 --- a/devel/hs-cabal-install/Makefile +++ b/devel/hs-cabal-install/Makefile @@ -19,10 +19,9 @@ EXECUTABLE= cabal-install SUB_FILES= cabal SUB_LIST= AR=${AR} CC=${CC} CPP=${CPP} LD=${LD} RANLIB=${RANLIB} -NO_STAGE= yes post-install:: - @${MV} ${PREFIX}/bin/cabal ${PREFIX}/bin/cabal-install - ${INSTALL_SCRIPT} ${WRKDIR}/cabal ${PREFIX}/bin + @${MV} ${STAGEDIR}${PREFIX}/bin/cabal ${STAGEDIR}${PREFIX}/bin/cabal-install + ${INSTALL_SCRIPT} ${WRKDIR}/cabal ${STAGEDIR}${PREFIX}/bin .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-cereal/Makefile b/devel/hs-cereal/Makefile index 892a5a24bd31..db55d83543ec 100644 --- a/devel/hs-cereal/Makefile +++ b/devel/hs-cereal/Makefile @@ -10,6 +10,5 @@ COMMENT= Binary serialization library for Haskell LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile index 812edbebfa89..5242f4e6a1ff 100644 --- a/devel/hs-checkers/Makefile +++ b/devel/hs-checkers/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= QuickCheck>=2.3 random -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-classy-prelude-conduit/Makefile b/devel/hs-classy-prelude-conduit/Makefile index 7498fc0f9eb3..f851cd84b463 100644 --- a/devel/hs-classy-prelude-conduit/Makefile +++ b/devel/hs-classy-prelude-conduit/Makefile @@ -13,6 +13,5 @@ LICENSE= MIT USE_CABAL= classy-prelude>=0.5.3 conduit>=0.5.4.1 monad-control \ resourcet transformers void xml-conduit>=1.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-classy-prelude/Makefile b/devel/hs-classy-prelude/Makefile index 997164458dea..55c918bec92e 100644 --- a/devel/hs-classy-prelude/Makefile +++ b/devel/hs-classy-prelude/Makefile @@ -14,6 +14,5 @@ USE_CABAL= basic-prelude>=0.3.4 hashable lifted-base>=0.2 \ system-filepath>=0.4 text transformers unordered-containers \ vector -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile index 9f9cf197e8d2..c715b1475bdf 100644 --- a/devel/hs-cmdargs/Makefile +++ b/devel/hs-cmdargs/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile index f3d73a01c6a0..06c865a660a5 100644 --- a/devel/hs-conduit/Makefile +++ b/devel/hs-conduit/Makefile @@ -14,6 +14,5 @@ USE_CABAL= lifted-base>=0.1 mmorph monad-control>=0.3.1 resourcet>=0.4.3 \ text>=0.11 transformers>=0.2.2 transformers-base>=0.4.1 \ void>=0.5.5 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile index 6c78550aaecb..24c16c55106b 100644 --- a/devel/hs-configurator/Makefile +++ b/devel/hs-configurator/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= attoparsec>=0.10.0.2 hashable text>=0.11.1.0 unix-compat \ unordered-containers -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-convertible/Makefile b/devel/hs-convertible/Makefile index 1ec0d1d3e5bb..7684f54f0e78 100644 --- a/devel/hs-convertible/Makefile +++ b/devel/hs-convertible/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= mtl text>=0.7 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile index 99f5cd61d955..27abdb9b8fba 100644 --- a/devel/hs-cpphs/Makefile +++ b/devel/hs-cpphs/Makefile @@ -13,6 +13,5 @@ LICENSE= LGPL21 EXECUTABLE= cpphs -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile index 29d942109fe3..45ccf9b31d4e 100644 --- a/devel/hs-darcs/Makefile +++ b/devel/hs-darcs/Makefile @@ -33,7 +33,6 @@ THREADED_DESC= Use threading and SMP support COLOR_DESC= Use ANSI color escapes MMAP_DESC= Compile with mmap support -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" CONFIGURE_ARGS+= --flags="library executable" diff --git a/devel/hs-data-default-class/Makefile b/devel/hs-data-default-class/Makefile index c8cc6fba0dd9..403f3ce44184 100644 --- a/devel/hs-data-default-class/Makefile +++ b/devel/hs-data-default-class/Makefile @@ -10,6 +10,5 @@ COMMENT= Class for types with a default value LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-data-default-instances-base/Makefile b/devel/hs-data-default-instances-base/Makefile index 004b8a190be9..014b932444c1 100644 --- a/devel/hs-data-default-instances-base/Makefile +++ b/devel/hs-data-default-instances-base/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= data-default-class -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-data-default-instances-containers/Makefile b/devel/hs-data-default-instances-containers/Makefile index a285d6686a4b..aae1b5800c30 100644 --- a/devel/hs-data-default-instances-containers/Makefile +++ b/devel/hs-data-default-instances-containers/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= data-default-class -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-data-default-instances-dlist/Makefile b/devel/hs-data-default-instances-dlist/Makefile index 42ce7e45e492..9dd3c49eba37 100644 --- a/devel/hs-data-default-instances-dlist/Makefile +++ b/devel/hs-data-default-instances-dlist/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= data-default-class dlist -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-data-default-instances-old-locale/Makefile b/devel/hs-data-default-instances-old-locale/Makefile index be42fc42ec45..603da7a47696 100644 --- a/devel/hs-data-default-instances-old-locale/Makefile +++ b/devel/hs-data-default-instances-old-locale/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= data-default-class -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile index 7f25c3c44875..682d6bc53ec6 100644 --- a/devel/hs-data-default/Makefile +++ b/devel/hs-data-default/Makefile @@ -14,6 +14,5 @@ USE_CABAL= data-default-class data-default-instances-base \ data-default-instances-containers data-default-instances-dlist \ data-default-instances-old-locale -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-data-pprint/Makefile b/devel/hs-data-pprint/Makefile index ee654158e2ef..06093d4d98c0 100644 --- a/devel/hs-data-pprint/Makefile +++ b/devel/hs-data-pprint/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= mtl>=2.0 parallel>=3.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-date-cache/Makefile b/devel/hs-date-cache/Makefile index 5aa3fb68f52f..079a4aaaa640 100644 --- a/devel/hs-date-cache/Makefile +++ b/devel/hs-date-cache/Makefile @@ -10,6 +10,5 @@ COMMENT= Date cacher LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile index 81ada5f081d2..f76a098865e1 100644 --- a/devel/hs-datetime/Makefile +++ b/devel/hs-datetime/Makefile @@ -13,6 +13,5 @@ LICENSE= GPLv3 USE_CABAL= QuickCheck>=2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-directory-tree/Makefile b/devel/hs-directory-tree/Makefile index 7494e7424b4f..bccf4daec448 100644 --- a/devel/hs-directory-tree/Makefile +++ b/devel/hs-directory-tree/Makefile @@ -10,6 +10,5 @@ COMMENT= Simple directory-like tree datatype, with useful IO functions LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile index f692ae9e4a8f..52b692a6c5fe 100644 --- a/devel/hs-dlist/Makefile +++ b/devel/hs-dlist/Makefile @@ -11,6 +11,5 @@ COMMENT= List-like type supporting O(1) append for Haskell LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-edit-distance/Makefile b/devel/hs-edit-distance/Makefile index 2ba65271edbb..482231ca04e2 100644 --- a/devel/hs-edit-distance/Makefile +++ b/devel/hs-edit-distance/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= random>=1.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-either/Makefile b/devel/hs-either/Makefile index 008c774bf41e..63812ee3c6a4 100644 --- a/devel/hs-either/Makefile +++ b/devel/hs-either/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= MonadRandom mtl>=2.0 semigroupoids>=3 semigroups>=0.8.3.1 \ transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-enumerator/Makefile b/devel/hs-enumerator/Makefile index b2b0f3122ebc..dacddb9dbf21 100644 --- a/devel/hs-enumerator/Makefile +++ b/devel/hs-enumerator/Makefile @@ -12,6 +12,5 @@ LICENSE= MIT USE_CABAL= text>=0.7 transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-errors/Makefile b/devel/hs-errors/Makefile index 48d8699fc1e2..b9981b342608 100644 --- a/devel/hs-errors/Makefile +++ b/devel/hs-errors/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= either>=3.1 safe>=0.3.3 transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-extensible-exceptions/Makefile b/devel/hs-extensible-exceptions/Makefile index 247dccf62c3c..e0a7d0be4c90 100644 --- a/devel/hs-extensible-exceptions/Makefile +++ b/devel/hs-extensible-exceptions/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD CABAL_SETUP= Setup.hs -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-failure/Makefile b/devel/hs-failure/Makefile index b72d0cb36c2c..e0e690818476 100644 --- a/devel/hs-failure/Makefile +++ b/devel/hs-failure/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile index 3ae89bedb90a..8c226612bc7c 100644 --- a/devel/hs-fast-logger/Makefile +++ b/devel/hs-fast-logger/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= blaze-builder date-cache>=0.3 text unix-time -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile index 42f57f2e961e..8518e7638822 100644 --- a/devel/hs-fgl/Makefile +++ b/devel/hs-fgl/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= mtl -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-file-embed/Makefile b/devel/hs-file-embed/Makefile index 6250e3606ff2..d62f182b30f8 100644 --- a/devel/hs-file-embed/Makefile +++ b/devel/hs-file-embed/Makefile @@ -10,6 +10,5 @@ COMMENT= Use Template Haskell to embed file contents directly LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile index 75bd230bb186..2f159338dfa0 100644 --- a/devel/hs-filemanip/Makefile +++ b/devel/hs-filemanip/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= mtl unix-compat -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-filestore/Makefile b/devel/hs-filestore/Makefile index 96fbfca3dbeb..86d172b39f25 100644 --- a/devel/hs-filestore/Makefile +++ b/devel/hs-filestore/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= Diff>=0.2 parsec>=2 split>=0.1 utf8-string>=0.3 xml>=1.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-filesystem-conduit/Makefile b/devel/hs-filesystem-conduit/Makefile index e2947bf476eb..0d6bc735794e 100644 --- a/devel/hs-filesystem-conduit/Makefile +++ b/devel/hs-filesystem-conduit/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= conduit>=1.0 system-fileio>=0.3.3 system-filepath>=0.4.3 \ text>=0.11 transformers>=0.2.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-fsnotify/Makefile b/devel/hs-fsnotify/Makefile index 3424c94be9b1..c72830491ef9 100644 --- a/devel/hs-fsnotify/Makefile +++ b/devel/hs-fsnotify/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= hinotify>=0.3.5 system-fileio>=0.3.8 system-filepath>=0.4.6 \ text>=0.11.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile index 0ea4d49c6cdf..3ddc2060827c 100644 --- a/devel/hs-gconf/Makefile +++ b/devel/hs-gconf/Makefile @@ -14,6 +14,5 @@ USES= pkgconfig USE_CABAL= glib>=0.12 gtk2hs-buildtools USE_GNOME= gconf2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-generic-deriving/Makefile b/devel/hs-generic-deriving/Makefile index 7666a269f8eb..7eec4281811c 100644 --- a/devel/hs-generic-deriving/Makefile +++ b/devel/hs-generic-deriving/Makefile @@ -10,6 +10,5 @@ COMMENT= Generic programming library for generalised deriving LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-geniplate/Makefile b/devel/hs-geniplate/Makefile index 02a0de3d2435..2d52d027a7e1 100644 --- a/devel/hs-geniplate/Makefile +++ b/devel/hs-geniplate/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= mtl -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile index 814d06d5822b..f8a3ec1db55c 100644 --- a/devel/hs-ghc-events/Makefile +++ b/devel/hs-ghc-events/Makefile @@ -14,6 +14,5 @@ USE_CABAL= mtl>=1.1 EXECUTABLE= ghc-events -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile index 5f9df55e9956..15a8bbe70f16 100644 --- a/devel/hs-ghc-mtl/Makefile +++ b/devel/hs-ghc-mtl/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= MonadCatchIO-mtl>=0.2.0.0 mtl -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile index ce23da5075aa..fd51f6b828c1 100644 --- a/devel/hs-ghc-paths/Makefile +++ b/devel/hs-ghc-paths/Makefile @@ -11,6 +11,5 @@ COMMENT= Knowledge of GHC's installation directories LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile index 17e51b253b0e..4b91847397bc 100644 --- a/devel/hs-gio/Makefile +++ b/devel/hs-gio/Makefile @@ -13,6 +13,5 @@ LICENSE= LGPL21 USES= pkgconfig USE_CABAL= glib>=0.12.0 mtl -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile index 810593edf12c..3a2a27eb2117 100644 --- a/devel/hs-git-annex/Makefile +++ b/devel/hs-git-annex/Makefile @@ -16,10 +16,11 @@ USE_CABAL= bloomfilter dataenc dlist edit-distance extensible-exceptions \ monad-control mtl>=2 network>=2.0 QuickCheck>=2.1 random \ SafeSemaphore SHA text unix-compat utf8-string uuid -USE_GMAKE= yes -USES= perl5 +USES= gmake perl5 USE_PERL5= build +MAN1= git-annex.1 git-annex-shell.1 + BUILD_DEPENDS+= rsync:${PORTSDIR}/net/rsync \ git:${PORTSDIR}/devel/git \ gsha256sum:${PORTSDIR}/sysutils/coreutils @@ -42,7 +43,6 @@ PAIRING_DESC= Enable pairing (requires web application) PRODUCTION_DESC= Production build TDFA_DESC= Use regex-tdfa for wildcards -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MS3} diff --git a/devel/hs-git-annex/files/patch-Setup.hs b/devel/hs-git-annex/files/patch-Setup.hs new file mode 100644 index 000000000000..7f82bdb2d34a --- /dev/null +++ b/devel/hs-git-annex/files/patch-Setup.hs @@ -0,0 +1,35 @@ +--- Setup.hs.orig 2013-08-27 21:23:35.000000000 +0100 ++++ Setup.hs 2013-12-08 17:28:34.656382191 +0000 +@@ -19,6 +19,7 @@ + main = defaultMainWithHooks simpleUserHooks + { preConf = configure + , postInst = myPostInst ++ , postCopy = myPostCopy + } + + configure _ _ = do +@@ -34,6 +35,15 @@ + dest = NoCopyDest + verbosity = fromFlag installVerbosity + ++myPostCopy :: Args -> CopyFlags -> PackageDescription -> LocalBuildInfo -> IO () ++myPostCopy _ (CopyFlags { copyVerbosity, copyDest }) pkg lbi = do ++ installGitAnnexShell dest verbosity pkg lbi ++ installManpages dest verbosity pkg lbi ++ installDesktopFile dest verbosity pkg lbi ++ where ++ dest = fromFlag copyDest ++ verbosity = fromFlag copyVerbosity ++ + installGitAnnexShell :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO () + installGitAnnexShell copyDest verbosity pkg lbi = + rawSystemExit verbosity "ln" +@@ -50,7 +60,7 @@ + installManpages copyDest verbosity pkg lbi = + installOrdinaryFiles verbosity dstManDir =<< srcManpages + where +- dstManDir = mandir (absoluteInstallDirs pkg lbi copyDest) </> "man1" ++ dstManDir = prefix (absoluteInstallDirs pkg lbi copyDest) </> "man" </> "man1" + srcManpages = zip (repeat srcManDir) + <$> filterM doesFileExist manpages + srcManDir = "" diff --git a/devel/hs-glade/Makefile b/devel/hs-glade/Makefile index af05df2771ea..cea93a04f45b 100644 --- a/devel/hs-glade/Makefile +++ b/devel/hs-glade/Makefile @@ -14,6 +14,5 @@ USES= pkgconfig USE_CABAL= glib>=0.12 gtk>=0.12 USE_GNOME= libglade2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile index d0d81013807e..004ad07eedb5 100644 --- a/devel/hs-glib/Makefile +++ b/devel/hs-glib/Makefile @@ -14,6 +14,5 @@ USES= pkgconfig USE_CABAL= gtk2hs-buildtools USE_GNOME= glib20 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-gtk2hs-buildtools/Makefile b/devel/hs-gtk2hs-buildtools/Makefile index 1a2d45ecf925..285ce7021908 100644 --- a/devel/hs-gtk2hs-buildtools/Makefile +++ b/devel/hs-gtk2hs-buildtools/Makefile @@ -18,6 +18,5 @@ EXECUTABLE= gtk2hsTypeGen gtk2hsHookGenerator gtk2hsC2hs STANDALONE= yes -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile index 2c6612295d01..5861d9396c75 100644 --- a/devel/hs-haddock/Makefile +++ b/devel/hs-haddock/Makefile @@ -22,7 +22,6 @@ PLIST_SUB+= GHC_HADDOCK_CMD=${GHC_HADDOCK_CMD} HADDOCK=${PREFIX}/bin/haddock EXE CONFIGURE_ARGS+= --program-suffix=-${PORTVERSION} -NO_STAGE= yes post-install:: @${LN} -sf ${PREFIX}/bin/${EXECUTABLE} ${PREFIX}/bin/haddock diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile index e16d76f48df5..385bae535052 100644 --- a/devel/hs-happy/Makefile +++ b/devel/hs-happy/Makefile @@ -19,8 +19,7 @@ USE_AUTOTOOLS= autoconf:env STANDALONE= yes EXECUTABLE= happy -INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}) +INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-hashable/Makefile b/devel/hs-hashable/Makefile index 4bf34e3d6935..3ffe455d013e 100644 --- a/devel/hs-hashable/Makefile +++ b/devel/hs-hashable/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= text>=0.11.0.5 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile index aa112f3d46d6..1c1bb6412821 100644 --- a/devel/hs-hashed-storage/Makefile +++ b/devel/hs-hashed-storage/Makefile @@ -14,6 +14,5 @@ USE_CABAL= dataenc extensible-exceptions mmap>=0.5 mtl zlib CONFIGURE_ARGS+= --flags="-test" -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile index 7cb0bda064b3..5cb9e2ef401f 100644 --- a/devel/hs-hashtables/Makefile +++ b/devel/hs-hashtables/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= hashable>=1.1 primitive vector>=0.7 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-haskeline/Makefile b/devel/hs-haskeline/Makefile index cc0838c36b99..f0866cc1b3ee 100644 --- a/devel/hs-haskeline/Makefile +++ b/devel/hs-haskeline/Makefile @@ -14,6 +14,5 @@ LICENSE= BSD USE_CABAL= transformers>=0.2 USES+= iconv -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-haskell-platform/Makefile b/devel/hs-haskell-platform/Makefile index a3dacff1383c..4f42839a17fe 100644 --- a/devel/hs-haskell-platform/Makefile +++ b/devel/hs-haskell-platform/Makefile @@ -49,6 +49,5 @@ USE_CABAL= async==2.0.1.4_2 \ alex==3.0.5_2 \ happy==1.18.10_4 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile index fd3a901f5adb..bbf655ca1599 100644 --- a/devel/hs-haskell-src-exts/Makefile +++ b/devel/hs-haskell-src-exts/Makefile @@ -14,6 +14,5 @@ LICENSE= BSD USE_CABAL= cpphs>=1.3 USE_HAPPY= yes -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile index 0fee9763ffda..6a4cbd2b68b1 100644 --- a/devel/hs-haskell-src/Makefile +++ b/devel/hs-haskell-src/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_HAPPY= yes USE_CABAL= syb -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-hasktags/Makefile b/devel/hs-hasktags/Makefile index d12b688f6681..0be7c7561cd4 100644 --- a/devel/hs-hasktags/Makefile +++ b/devel/hs-hasktags/Makefile @@ -14,6 +14,5 @@ EXECUTABLE= hasktags STANDALONE= yes -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-hastache/Makefile b/devel/hs-hastache/Makefile index 1225160f63cd..a07e404ce41d 100644 --- a/devel/hs-hastache/Makefile +++ b/devel/hs-hastache/Makefile @@ -12,8 +12,7 @@ LICENSE= BSD USE_CABAL= blaze-builder ieee754 mtl syb text transformers utf8-string -INSTALL_PORTDATA= cd ${WRKSRC} && ${INSTALL_DATA} README.md ${DATADIR} +INSTALL_PORTDATA= cd ${WRKSRC} && ${INSTALL_DATA} README.md ${STAGEDIR}${DATADIR} -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile index 2535e00169c8..b8d8d8e37903 100644 --- a/devel/hs-hinotify/Makefile +++ b/devel/hs-hinotify/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD LIB_DEPENDS= inotify.0:${PORTSDIR}/devel/libinotify -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile index 3036d33aacc4..da7068cb4cba 100644 --- a/devel/hs-hint/Makefile +++ b/devel/hs-hint/Makefile @@ -14,11 +14,10 @@ LICENSE= BSD USE_CABAL= ghc-mtl>=1.0.1.0 ghc-paths haskell-src MonadCatchIO-mtl>=0.3 \ mtl random utf8-string -INSTALL_PORTEXAMPLES= cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR} +INSTALL_PORTEXAMPLES= cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} -INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DATADIR} \ - && ${INSTALL_DATA} ${WRKSRC}/Changes ${DATADIR} +INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${WRKSRC}/Changes \ + ${STAGEDIR}${DATADIR} -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile index 992b3083fdeb..d428b37b304f 100644 --- a/devel/hs-hlibev/Makefile +++ b/devel/hs-hlibev/Makefile @@ -14,6 +14,5 @@ USE_CABAL= network LIB_DEPENDS= ev:${PORTSDIR}/devel/libev -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile index cdf5947b45fc..392aa4e76dcb 100644 --- a/devel/hs-hlint/Makefile +++ b/devel/hs-hlint/Makefile @@ -15,6 +15,5 @@ USE_CABAL= cpphs>=1.11 haskell-src-exts>=1.11 hscolour>=1.17 \ EXECUTABLE= hlint -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile index 984735a88ea1..0f1a59af9db6 100644 --- a/devel/hs-hoogle/Makefile +++ b/devel/hs-hoogle/Makefile @@ -18,6 +18,5 @@ USE_CABAL= blaze-builder>=0.2 case-insensitive>=0.2 cmdargs>=0.7 \ EXECUTABLE= hoogle -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile index 9bd58688ae25..65b0e4f9c002 100644 --- a/devel/hs-hslogger/Makefile +++ b/devel/hs-hslogger/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= mtl network -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-hspec-expectations/Makefile b/devel/hs-hspec-expectations/Makefile index ff8ac9788b4f..617fdfe2ff95 100644 --- a/devel/hs-hspec-expectations/Makefile +++ b/devel/hs-hspec-expectations/Makefile @@ -12,6 +12,5 @@ LICENSE= MIT USE_CABAL= HUnit -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-hspec/Makefile b/devel/hs-hspec/Makefile index d75247882ebd..a9b499166dbf 100644 --- a/devel/hs-hspec/Makefile +++ b/devel/hs-hspec/Makefile @@ -16,6 +16,5 @@ USE_CABAL= ansi-terminal>=0.5 hspec-expectations HUnit>=1.2.5 \ EXECUTABLE= hspec-discover -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-kqueue/Makefile b/devel/hs-kqueue/Makefile index a2bb426453e1..cbebe08a08df 100644 --- a/devel/hs-kqueue/Makefile +++ b/devel/hs-kqueue/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= mtl>=1.1 USE_C2HS= yes -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile index a3a7c1e61992..3efb33bd313a 100644 --- a/devel/hs-language-c/Makefile +++ b/devel/hs-language-c/Makefile @@ -14,6 +14,5 @@ USE_ALEX= yes USE_HAPPY= yes USE_CABAL= syb -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-language-javascript/Makefile b/devel/hs-language-javascript/Makefile index 8695ef425d85..acffc8fe6d2b 100644 --- a/devel/hs-language-javascript/Makefile +++ b/devel/hs-language-javascript/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= blaze-builder>=0.2 mtl>=1.1 utf8-light>=0.4 utf8-string>=0.3.7 USE_HAPPY= yes -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-largeword/Makefile b/devel/hs-largeword/Makefile index b69b0991d0dd..abb4ad794d8f 100644 --- a/devel/hs-largeword/Makefile +++ b/devel/hs-largeword/Makefile @@ -10,6 +10,5 @@ COMMENT= Provides a way of producing other large words LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile index 48e8e5cc2aa0..fef4f484233b 100644 --- a/devel/hs-lazysmallcheck/Makefile +++ b/devel/hs-lazysmallcheck/Makefile @@ -10,8 +10,7 @@ COMMENT= Library for demand-driven testing of Haskell programs LICENSE= BSD -INSTALL_PORTEXAMPLES= cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR} +INSTALL_PORTEXAMPLES= cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-lens/Makefile b/devel/hs-lens/Makefile index efad5fae86a2..602ecc300424 100644 --- a/devel/hs-lens/Makefile +++ b/devel/hs-lens/Makefile @@ -19,6 +19,5 @@ USE_CABAL= bifunctors>=3 comonad>=3 comonad-transformers>=3 \ text>=0.11 transformers>=0.3 unordered-containers>=0.2 \ vector>=0.9 void>=0.5 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-lifted-base/Makefile b/devel/hs-lifted-base/Makefile index 7340ddd09782..6261401f94bd 100644 --- a/devel/hs-lifted-base/Makefile +++ b/devel/hs-lifted-base/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= base-unicode-symbols>=0.1.1 monad-control>=0.3 \ transformers-base>=0.4 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-logict/Makefile b/devel/hs-logict/Makefile index c1ffdcc7fe05..fcb072b324c1 100644 --- a/devel/hs-logict/Makefile +++ b/devel/hs-logict/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= mtl>=1.0.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile index 616101011985..617bf0f0a249 100644 --- a/devel/hs-mmap/Makefile +++ b/devel/hs-mmap/Makefile @@ -11,6 +11,5 @@ COMMENT= Memory-mapped files for POSIX and Windows LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-mmorph/Makefile b/devel/hs-mmorph/Makefile index 4c3b226ed8de..8046cfc3df3a 100644 --- a/devel/hs-mmorph/Makefile +++ b/devel/hs-mmorph/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= transformers>=0.2.0.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-monad-control/Makefile b/devel/hs-monad-control/Makefile index 31e1953c1228..b0102690d880 100644 --- a/devel/hs-monad-control/Makefile +++ b/devel/hs-monad-control/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= base-unicode-symbols>=0.1.1 transformers>=0.2 \ transformers-base>=0.4.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-monad-logger/Makefile b/devel/hs-monad-logger/Makefile index d43b6329c185..86958a8c2c49 100644 --- a/devel/hs-monad-logger/Makefile +++ b/devel/hs-monad-logger/Makefile @@ -13,6 +13,5 @@ LICENSE= MIT USE_CABAL= conduit>=1.0 fast-logger>=0.2 monad-control mtl \ resourcet>=0.4 text transformers transformers-base -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-monad-par-extras/Makefile b/devel/hs-monad-par-extras/Makefile index f986789342c0..4e51ba7b1eb0 100644 --- a/devel/hs-monad-par-extras/Makefile +++ b/devel/hs-monad-par-extras/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= abstract-par>=0.3 cereal>=0.3 mtl>=2.0 random>=1.0 \ transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-monad-par/Makefile b/devel/hs-monad-par/Makefile index 35815d8c83a9..78ef82237577 100644 --- a/devel/hs-monad-par/Makefile +++ b/devel/hs-monad-par/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= abstract-deque>=0.1.4 abstract-par monad-par-extras \ mtl>=2.0.1.0 mwc-random>=0.11 parallel>=3.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-mtl/Makefile b/devel/hs-mtl/Makefile index 0da7a212c74b..7df38254fe5a 100644 --- a/devel/hs-mtl/Makefile +++ b/devel/hs-mtl/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= transformers>=0.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile index fe04eb4463cf..801b6c0e5651 100644 --- a/devel/hs-mueval/Makefile +++ b/devel/hs-mueval/Makefile @@ -17,6 +17,5 @@ EXECUTABLE= mueval mueval-core CONFIGURE_ARGS+= --ghc-options="-dynamic" -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-murmur-hash/Makefile b/devel/hs-murmur-hash/Makefile index e43f9e8a7a0a..a2db2c8ba5b0 100644 --- a/devel/hs-murmur-hash/Makefile +++ b/devel/hs-murmur-hash/Makefile @@ -10,6 +10,5 @@ COMMENT= MurmurHash2 implementation for Haskell LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-optparse-applicative/Makefile b/devel/hs-optparse-applicative/Makefile index e5aca2b7d68a..240efcf39433 100644 --- a/devel/hs-optparse-applicative/Makefile +++ b/devel/hs-optparse-applicative/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-parallel/Makefile b/devel/hs-parallel/Makefile index f5212ec2a401..cdc621fbcfa5 100644 --- a/devel/hs-parallel/Makefile +++ b/devel/hs-parallel/Makefile @@ -10,6 +10,5 @@ COMMENT= Parallel programming library LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile index 4347b5328c11..5b09f5402390 100644 --- a/devel/hs-pcre-light/Makefile +++ b/devel/hs-pcre-light/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-pool-conduit/Makefile b/devel/hs-pool-conduit/Makefile index b2ae16363e5f..4235d7b3b0a1 100644 --- a/devel/hs-pool-conduit/Makefile +++ b/devel/hs-pool-conduit/Makefile @@ -13,6 +13,5 @@ LICENSE= MIT USE_CABAL= monad-control resource-pool>=0.2.1 resourcet>=0.3 \ transformers>=0.2.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile index 65a1895c6fe3..bf7ee20b0028 100644 --- a/devel/hs-primitive/Makefile +++ b/devel/hs-primitive/Makefile @@ -10,6 +10,5 @@ COMMENT= Primitive memory-related operations LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-profunctor-extras/Makefile b/devel/hs-profunctor-extras/Makefile index 57b249c207dd..20c5605a33f9 100644 --- a/devel/hs-profunctor-extras/Makefile +++ b/devel/hs-profunctor-extras/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= comonad>=3 profunctors>=3.2 semigroupoid-extras>=3 \ semigroupoids>=3 tagged>=0.4.4 transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-profunctors/Makefile b/devel/hs-profunctors/Makefile index fd431b33b22a..30d5c2180736 100644 --- a/devel/hs-profunctors/Makefile +++ b/devel/hs-profunctors/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= comonad>=3 tagged>=0.4.4 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-project-template/Makefile b/devel/hs-project-template/Makefile index 83d3be17436c..023c7907c826 100644 --- a/devel/hs-project-template/Makefile +++ b/devel/hs-project-template/Makefile @@ -14,6 +14,5 @@ USE_CABAL= base64-bytestring base64-conduit classy-prelude>=0.4 \ conduit>=0.5.4 mtl>=2.0 resourcet>=0.4.3 system-fileio>=0.3 \ system-filepath>=0.4 text>=0.11 transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-quickcheck-io/Makefile b/devel/hs-quickcheck-io/Makefile index b3f5a5546b14..04d32f3c7cf3 100644 --- a/devel/hs-quickcheck-io/Makefile +++ b/devel/hs-quickcheck-io/Makefile @@ -12,6 +12,5 @@ LICENSE= MIT USE_CABAL= HUnit>=1.2.5 QuickCheck>=2.5.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-random/Makefile b/devel/hs-random/Makefile index f3ceb07fa536..97aecca1642b 100644 --- a/devel/hs-random/Makefile +++ b/devel/hs-random/Makefile @@ -10,6 +10,5 @@ COMMENT= Random number library LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-ranges/Makefile b/devel/hs-ranges/Makefile index 92ebf6e7467f..b4ec62d8e006 100644 --- a/devel/hs-ranges/Makefile +++ b/devel/hs-ranges/Makefile @@ -10,6 +10,5 @@ COMMENT= Ranges and various functions on them LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile index 77bd570cd3bb..cbc5b5551864 100644 --- a/devel/hs-readline/Makefile +++ b/devel/hs-readline/Makefile @@ -11,6 +11,5 @@ COMMENT= Interface to the GNU readline library LICENSE= GPLv2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-reflection/Makefile b/devel/hs-reflection/Makefile index 8843bd47f022..8b9ddd8eaa24 100644 --- a/devel/hs-reflection/Makefile +++ b/devel/hs-reflection/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= tagged>=0.4.4 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-resource-pool/Makefile b/devel/hs-resource-pool/Makefile index 91b93a253dee..10b50a54e65a 100644 --- a/devel/hs-resource-pool/Makefile +++ b/devel/hs-resource-pool/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= hashable monad-control>=0.2.0.1 stm transformers \ transformers-base>=0.4 vector>=0.7 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-resourcet/Makefile b/devel/hs-resourcet/Makefile index 9c707baab5b9..eaca8bdcbfd6 100644 --- a/devel/hs-resourcet/Makefile +++ b/devel/hs-resourcet/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= lifted-base>=0.1 mmorph monad-control>=0.3.1 mtl>=2.0 \ transformers>=0.2.2 transformers-base>=0.4.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile index f73037eedf20..ba34757c6994 100644 --- a/devel/hs-safe/Makefile +++ b/devel/hs-safe/Makefile @@ -11,6 +11,5 @@ COMMENT= Library for safe (pattern match free) functions LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-setenv/Makefile b/devel/hs-setenv/Makefile index 3cea1cf5f45c..ce631cfb898b 100644 --- a/devel/hs-setenv/Makefile +++ b/devel/hs-setenv/Makefile @@ -10,6 +10,5 @@ COMMENT= Cross-platform library for setting environment variables LICENSE= MIT -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile index 7a9362c398c8..b7e49e229436 100644 --- a/devel/hs-show/Makefile +++ b/devel/hs-show/Makefile @@ -13,6 +13,5 @@ LICENSE= GPLv2 USE_CABAL= syb -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-silently/Makefile b/devel/hs-silently/Makefile index c6cf60f451f1..cd711c23fad4 100644 --- a/devel/hs-silently/Makefile +++ b/devel/hs-silently/Makefile @@ -10,6 +10,5 @@ COMMENT= Prevent or capture writing to stdout and other handles LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-simple-reflect/Makefile b/devel/hs-simple-reflect/Makefile index b868068745d0..76e4f7cf0728 100644 --- a/devel/hs-simple-reflect/Makefile +++ b/devel/hs-simple-reflect/Makefile @@ -10,6 +10,5 @@ COMMENT= Simple reflection of expressions containing variables LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile index 5746fc02c1c8..5c1706cc333c 100644 --- a/devel/hs-smallcheck/Makefile +++ b/devel/hs-smallcheck/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= logict mtl -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-split/Makefile b/devel/hs-split/Makefile index 12058fe4d78b..4326b47d0f1b 100644 --- a/devel/hs-split/Makefile +++ b/devel/hs-split/Makefile @@ -11,6 +11,5 @@ COMMENT= Combinator library for splitting lists LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-stm/Makefile b/devel/hs-stm/Makefile index d907eabec8db..dbe0dc92aade 100644 --- a/devel/hs-stm/Makefile +++ b/devel/hs-stm/Makefile @@ -10,6 +10,5 @@ COMMENT= Software Transactional Memory LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-strict/Makefile b/devel/hs-strict/Makefile index 2ecddea58134..7251950d44c3 100644 --- a/devel/hs-strict/Makefile +++ b/devel/hs-strict/Makefile @@ -8,6 +8,5 @@ CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Strict data types and String IO -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-syb-with-class-instances-text/Makefile b/devel/hs-syb-with-class-instances-text/Makefile index f1c30a24b77c..1a9c2da89d4f 100644 --- a/devel/hs-syb-with-class-instances-text/Makefile +++ b/devel/hs-syb-with-class-instances-text/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= syb-with-class text>=0.7.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-syb-with-class/Makefile b/devel/hs-syb-with-class/Makefile index e6c0d637e18c..b24a4c1f323e 100644 --- a/devel/hs-syb-with-class/Makefile +++ b/devel/hs-syb-with-class/Makefile @@ -10,6 +10,5 @@ COMMENT= Scrap Your Boilerplate With Class LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-syb/Makefile b/devel/hs-syb/Makefile index e309bdc0206e..3b478dedbe82 100644 --- a/devel/hs-syb/Makefile +++ b/devel/hs-syb/Makefile @@ -10,6 +10,5 @@ COMMENT= Scrap Your Boilerplate LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-system-fileio/Makefile b/devel/hs-system-fileio/Makefile index 234d9e440271..4e6d3eecb2ea 100644 --- a/devel/hs-system-fileio/Makefile +++ b/devel/hs-system-fileio/Makefile @@ -12,6 +12,5 @@ LICENSE= MIT USE_CABAL= system-filepath>=0.3.1 text>=0.7.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-system-filepath/Makefile b/devel/hs-system-filepath/Makefile index 7f57683136f5..d7ff25e6050f 100644 --- a/devel/hs-system-filepath/Makefile +++ b/devel/hs-system-filepath/Makefile @@ -12,6 +12,5 @@ LICENSE= MIT USE_CABAL= text>=0.7.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-tagged/Makefile b/devel/hs-tagged/Makefile index f6b34f50be95..631511a6c72c 100644 --- a/devel/hs-tagged/Makefile +++ b/devel/hs-tagged/Makefile @@ -10,6 +10,5 @@ COMMENT= Haskell 98 phantom types to avoid unsafely passing dummy arguments LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-temporary/Makefile b/devel/hs-temporary/Makefile index 89d27d5e7d73..b7444323ea78 100644 --- a/devel/hs-temporary/Makefile +++ b/devel/hs-temporary/Makefile @@ -10,6 +10,5 @@ COMMENT= Portable temporary file and directory support for Windows and Unix LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-terminfo/Makefile b/devel/hs-terminfo/Makefile index ee1cc8ed4442..c9ed699dee30 100644 --- a/devel/hs-terminfo/Makefile +++ b/devel/hs-terminfo/Makefile @@ -15,6 +15,5 @@ USES= ncurses CONFIGURE_ARGS+= --configure-option=--with-curses-includes=${NCURSESINC} \ --configure-option=--with-curses-libraries=${NCURSESLIB} -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile index 50ca29a1f908..5f4914865099 100644 --- a/devel/hs-test-framework-hunit/Makefile +++ b/devel/hs-test-framework-hunit/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= HUnit>=1.2 test-framework>=0.2.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile index fbf508c61fdb..1a897b469061 100644 --- a/devel/hs-test-framework-quickcheck2/Makefile +++ b/devel/hs-test-framework-quickcheck2/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= QuickCheck>=2.4 test-framework>=0.7.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-test-framework/Makefile b/devel/hs-test-framework/Makefile index 6bc7eab35b82..46071ce4ae76 100644 --- a/devel/hs-test-framework/Makefile +++ b/devel/hs-test-framework/Makefile @@ -14,6 +14,5 @@ USE_CABAL= ansi-terminal>=0.4.0 ansi-wl-pprint>=0.5.1 \ extensible-exceptions>=0.1.1 hostname>=1.0 random>=1.0 \ regex-posix>=0.72 xml>=1.3.5 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-testpack/Makefile b/devel/hs-testpack/Makefile index 7b23a2573bab..4156722e6163 100644 --- a/devel/hs-testpack/Makefile +++ b/devel/hs-testpack/Makefile @@ -13,6 +13,5 @@ LICENSE= LGPL21 USE_CABAL= HUnit mtl QuickCheck>=2.1.0.3 random -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-text/Makefile b/devel/hs-text/Makefile index c5b383d19f8c..8c26d78bf5ab 100644 --- a/devel/hs-text/Makefile +++ b/devel/hs-text/Makefile @@ -10,6 +10,5 @@ COMMENT= Efficient packed Unicode text type LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-threads/Makefile b/devel/hs-threads/Makefile index b3308a9c3503..a8a4e82cb325 100644 --- a/devel/hs-threads/Makefile +++ b/devel/hs-threads/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= base-unicode-symbols>=0.1.1 stm>=2.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile index cbbfcf108664..6b627125fc8b 100644 --- a/devel/hs-threadscope/Makefile +++ b/devel/hs-threadscope/Makefile @@ -16,6 +16,5 @@ USE_CABAL= cairo ghc-events>=0.4.2 glib gtk>=0.12 gtk2hs-buildtools mtl \ EXECUTABLE= threadscope STANDALONE= yes -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-time-compat/Makefile b/devel/hs-time-compat/Makefile index b1f10c2c941d..d372834cec9f 100644 --- a/devel/hs-time-compat/Makefile +++ b/devel/hs-time-compat/Makefile @@ -10,6 +10,5 @@ COMMENT= Compatibility with old-time for the time package LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-timezone-olson/Makefile b/devel/hs-timezone-olson/Makefile index 3467a83e4ec5..c1e49a2a97b0 100644 --- a/devel/hs-timezone-olson/Makefile +++ b/devel/hs-timezone-olson/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= extensible-exceptions>=0.1.0 timezone-series>=0.1.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-timezone-series/Makefile b/devel/hs-timezone-series/Makefile index 17c4d504d43a..f3923934ce07 100644 --- a/devel/hs-timezone-series/Makefile +++ b/devel/hs-timezone-series/Makefile @@ -10,6 +10,5 @@ COMMENT= Enhanced timezone handling for Data.Time LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-transformers-base/Makefile b/devel/hs-transformers-base/Makefile index d6304f4a9a76..126379ac01f9 100644 --- a/devel/hs-transformers-base/Makefile +++ b/devel/hs-transformers-base/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-transformers/Makefile b/devel/hs-transformers/Makefile index 5abaf1419d88..f8f30176f2e3 100644 --- a/devel/hs-transformers/Makefile +++ b/devel/hs-transformers/Makefile @@ -11,6 +11,5 @@ COMMENT= Concrete functor monad transformers LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile index 4349b77a8058..389dbfefcf1d 100644 --- a/devel/hs-unamb/Makefile +++ b/devel/hs-unamb/Makefile @@ -11,6 +11,5 @@ COMMENT= Unambiguous choice LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile index a41ce5ff788d..aad205d51d21 100644 --- a/devel/hs-uniplate/Makefile +++ b/devel/hs-uniplate/Makefile @@ -13,8 +13,7 @@ LICENSE= BSD USE_CABAL= hashable>=1.1.2.3 syb unordered-containers>=0.2.1 -INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/uniplate.htm ${DATADIR} +INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/uniplate.htm ${STAGEDIR}${DATADIR} -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-unix-compat/Makefile b/devel/hs-unix-compat/Makefile index 36a1053465d5..be7184dfdc67 100644 --- a/devel/hs-unix-compat/Makefile +++ b/devel/hs-unix-compat/Makefile @@ -11,6 +11,5 @@ COMMENT= Portable POSIX-compatibility layer LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-unix-time/Makefile b/devel/hs-unix-time/Makefile index 5d8e858db75a..42fae4ca10ed 100644 --- a/devel/hs-unix-time/Makefile +++ b/devel/hs-unix-time/Makefile @@ -10,6 +10,5 @@ COMMENT= Unix time parser/formatter and utilities LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-unordered-containers/Makefile b/devel/hs-unordered-containers/Makefile index 9e56d1a2cec4..d5b830eb6e0f 100644 --- a/devel/hs-unordered-containers/Makefile +++ b/devel/hs-unordered-containers/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= hashable>=1.0.1.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-utf8-light/Makefile b/devel/hs-utf8-light/Makefile index 209d074a9978..b0cfddd45e15 100644 --- a/devel/hs-utf8-light/Makefile +++ b/devel/hs-utf8-light/Makefile @@ -10,6 +10,5 @@ COMMENT= Unicode LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile index 4a9dcf63ac43..fa54b42d5f91 100644 --- a/devel/hs-utf8-string/Makefile +++ b/devel/hs-utf8-string/Makefile @@ -10,6 +10,5 @@ COMMENT= Support for reading/writing UTF-8 strings for Haskell programs LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-utility-ht/Makefile b/devel/hs-utility-ht/Makefile index 749bf451d323..868802a3cffe 100644 --- a/devel/hs-utility-ht/Makefile +++ b/devel/hs-utility-ht/Makefile @@ -11,6 +11,5 @@ COMMENT= Various small helper functions LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-uuagc-bootstrap/Makefile b/devel/hs-uuagc-bootstrap/Makefile index ecccfe280b6b..7313c74a7f77 100644 --- a/devel/hs-uuagc-bootstrap/Makefile +++ b/devel/hs-uuagc-bootstrap/Makefile @@ -14,6 +14,5 @@ USE_CABAL= haskell-src-exts>=1.11.1 mtl>=1.1.1.1 uulib>=0.9.14 EXECUTABLE= uuagc-bootstrap -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile index 9eacd31a6f5e..0348eb2d849c 100644 --- a/devel/hs-uuagc-cabal/Makefile +++ b/devel/hs-uuagc-cabal/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= mtl>=2.0.1.0 uulib>=0.9.14 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile index 9730e37abb7c..11019c26ac5e 100644 --- a/devel/hs-uuagc/Makefile +++ b/devel/hs-uuagc/Makefile @@ -16,6 +16,5 @@ USE_CABAL= haskell-src-exts>=1.11.1 mtl>=1.1.1.1 uuagc-cabal>=1.0.2.0 \ EXECUTABLE= uuagc -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-uuid/Makefile b/devel/hs-uuid/Makefile index f84997e203d5..d36173236193 100644 --- a/devel/hs-uuid/Makefile +++ b/devel/hs-uuid/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= cryptohash>=0.7 maccatcher>=1.0 random>=1.0.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile index 47568822264a..da1d80e492aa 100644 --- a/devel/hs-uulib/Makefile +++ b/devel/hs-uulib/Makefile @@ -11,6 +11,5 @@ COMMENT= Haskell Utrecht Tools Library LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-vault/Makefile b/devel/hs-vault/Makefile index 2fd8f7081bc8..5cc778575215 100644 --- a/devel/hs-vault/Makefile +++ b/devel/hs-vault/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= hashable>=1.1 unordered-containers>=0.2.1.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-vector-algorithms/Makefile b/devel/hs-vector-algorithms/Makefile index b4e3a69bface..1481f01ae921 100644 --- a/devel/hs-vector-algorithms/Makefile +++ b/devel/hs-vector-algorithms/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= primitive>=0.3 vector>=0.6 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-vector/Makefile b/devel/hs-vector/Makefile index 0ec9ab506ace..4eb27e0e8f78 100644 --- a/devel/hs-vector/Makefile +++ b/devel/hs-vector/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= primitive>=0.5 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-void/Makefile b/devel/hs-void/Makefile index 9535c7ab4105..db611feb80fc 100644 --- a/devel/hs-void/Makefile +++ b/devel/hs-void/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= hashable>=1.1 semigroups>=0.8.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-word8/Makefile b/devel/hs-word8/Makefile index 15a665da10ac..6ad92470e7ae 100644 --- a/devel/hs-word8/Makefile +++ b/devel/hs-word8/Makefile @@ -10,6 +10,5 @@ COMMENT= Word8 library LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile index de3007171462..ec2f52113fad 100644 --- a/ftp/hs-curl/Makefile +++ b/ftp/hs-curl/Makefile @@ -14,6 +14,5 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl USE_GHC_NATIVE= yes -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile index 12694a583a67..4447e815a859 100644 --- a/graphics/hs-HGL/Makefile +++ b/graphics/hs-HGL/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= X11 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/graphics/hs-cairo/Makefile b/graphics/hs-cairo/Makefile index 3f6ae414bdfa..17d9cd0feb60 100644 --- a/graphics/hs-cairo/Makefile +++ b/graphics/hs-cairo/Makefile @@ -15,6 +15,5 @@ USE_CABAL= gtk2hs-buildtools mtl BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/cairo-pdf.pc:${PORTSDIR}/graphics/cairo -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/graphics/hs-dia-base/Makefile b/graphics/hs-dia-base/Makefile index c3fc6836dd4f..c640791ba85f 100644 --- a/graphics/hs-dia-base/Makefile +++ b/graphics/hs-dia-base/Makefile @@ -10,6 +10,5 @@ COMMENT= EDSL for teaching Haskell with diagrams - data types LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/graphics/hs-dia-functions/Makefile b/graphics/hs-dia-functions/Makefile index 7c8622edc9fc..3e887b2a7e5e 100644 --- a/graphics/hs-dia-functions/Makefile +++ b/graphics/hs-dia-functions/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= data-pprint>=0.2 dia-base>=0.1 mtl>=2.0 xhtml>=3000.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/graphics/hs-soegtk/Makefile b/graphics/hs-soegtk/Makefile index 431f8666bd00..63d232b5aa1d 100644 --- a/graphics/hs-soegtk/Makefile +++ b/graphics/hs-soegtk/Makefile @@ -13,6 +13,5 @@ LICENSE= LGPL21 USE_CABAL= cairo>=0.12 gtk>=0.11 mtl stm>=2 USE_GNOME= gtk20 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/graphics/hs-svgcairo/Makefile b/graphics/hs-svgcairo/Makefile index 2d670a145b25..94bd0f2346cf 100644 --- a/graphics/hs-svgcairo/Makefile +++ b/graphics/hs-svgcairo/Makefile @@ -14,6 +14,5 @@ USES= pkgconfig USE_CABAL= cairo>=0.12 glib>=0.12 mtl USE_GNOME= librsvg2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 721335016916..f35555b721c0 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -63,7 +63,6 @@ OPTIONS_DEFINE+= BOOT OPTIONS_DEFINE+= BOOTH .endif -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDYNAMIC} @@ -109,13 +108,12 @@ IGNORE= unsupported .endif # MBOOT DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} -GHC_LIBDIR= ${PREFIX}/lib/ghc-${GHC_VERSION} +GHC_LIBDIR= ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION} GHC_LIBDIR_REL= lib/ghc-${GHC_VERSION} PLIST_SUB+= GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL} -HACKAGE_SITE?= http://hackage.haskell.org/ -HACKAGE_ARCH?= packages/archive/ +HACKAGE_SITE?= http://hackage.haskell.org/package/ CONFIGURE_ARGS= --with-gcc=${CC} \ --with-ld=${LD} \ @@ -172,15 +170,13 @@ MAKE_ENV+= TMPDIR=${TMPDIR} .if empty(PORT_OPTIONS:MBOOTH) -MASTER_SITES+= ${HACKAGE_SITE}${HACKAGE_ARCH}hscolour/${HSCOLOUR_VERSION}/:docs +MASTER_SITES+= ${HACKAGE_SITE}hscolour-${HSCOLOUR_VERSION}/:docs DISTFILES+= hscolour-${HSCOLOUR_VERSION}.tar.gz:docs EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g} .endif # MBOOTH -MAN1= ghc.1 - .if empty(PORT_OPTIONS:MBOOTH) SLAVES_PREFIX= ${WRKDIR}/slaves_prefix @@ -235,27 +231,27 @@ post-extract: post-install-script: @${FIND} -ds ${GHC_LIBDIR} -type f -print | ${SED} -E -e \ '/^${GHC_LIBDIR:C/\//\\\//g}\/package.conf.d\/package\.cache/d' -e \ - 's,^${PREFIX}/?,,' >> ${TMPPLIST} - @${FIND} -ds ${DOCSDIR} -type f -print | ${SED} -E -e \ - '/^${DOCSDIR:C/\//\\\//g}\/html\/libraries\/doc-index-[^.]+\.html/d' -e \ - '/^${DOCSDIR:C/\//\\\//g}\/html\/libraries\/index[^\/.]*\.html/d' -e \ - '/^${DOCSDIR:C/\//\\\//g}\/html\/libraries\/[^\/]+\.png/d' -e \ - 's,^${PREFIX}/?,,' >> ${TMPPLIST} + 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} + @${FIND} -ds ${STAGEDIR}${DOCSDIR} -type f -print | ${SED} -E -e \ + '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/doc-index-[^.]+\.html/d' -e \ + '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/index[^\/.]*\.html/d' -e \ + '/^${STAGEDIR:C/\//\\\//g}${DOCSDIR:C/\//\\\//g}\/html\/libraries\/[^\/]+\.png/d' -e \ + 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} .if ${PORT_OPTIONS:MDOCS} # Cleanup the indexen created by gen_contents_index @${ECHO} "@unexec ${RM} -f %D/${DOCSDIR_REL}/html/libraries/doc-index-*.html" >> ${TMPPLIST} @${ECHO} "@unexec ${RM} -f %D/${DOCSDIR_REL}/html/libraries/index*.html" >> ${TMPPLIST} @${ECHO} "@unexec ${RM} -f %D/${DOCSDIR_REL}/html/libraries/*.png" >> ${TMPPLIST} .endif + @${ECHO} '@unexec ${RM} -f %D/${GHC_LIBDIR_REL}/package.conf.d/package.cache' >>${TMPPLIST} @${ECHO} "@exec %D/bin/ghc-pkg recache" >>${TMPPLIST} .if ${PORT_OPTIONS:MDOCS} @${ECHO} '@exec ${SH} -c "cd %D/${DOCSDIR_REL}/html/libraries && ./gen_contents_index"' >> ${TMPPLIST} .endif - @${ECHO} '@unexec ${RM} -f %D/${GHC_LIBDIR_REL}/package.conf.d/package.cache' >>${TMPPLIST} - @${FIND} -ds ${DOCSDIR} -type d -print | ${SED} -E -e \ - 's,^${PREFIX}/?,@dirrm ,' >> ${TMPPLIST} + @${FIND} -ds ${STAGEDIR}${DOCSDIR} -type d -print | ${SED} -E -e \ + 's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST} @${FIND} -ds ${GHC_LIBDIR} -type d -print | ${SED} -E -e \ - 's,^${PREFIX}/?,@dirrm ,' >> ${TMPPLIST} + 's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST} #post-build: # @(cd ${WRKSRC} && ${GMAKE} binary-dist) @@ -316,16 +312,13 @@ pre-configure: post-install: # cabalised hs-foo-ghc ports - @${MKDIR} ${PREFIX}/lib/cabal/ghc-${GHC_VERSION} - @${MKDIR} ${PREFIX}/share/cabal/ghc-${GHC_VERSION} - @${MKDIR} ${PREFIX}/share/doc/cabal/ghc-${GHC_VERSION} - @${MKDIR} ${PREFIX}/share/examples/cabal/ghc-${GHC_VERSION} -.if ${PORT_OPTIONS:MDOCS} - cd ${DOCSDIR}/html/libraries && ./gen_contents_index -.endif - @${RM} -f ${PREFIX}/bin/haddock + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/cabal/ghc-${GHC_VERSION} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/cabal/ghc-${GHC_VERSION} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cabal/ghc-${GHC_VERSION} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/cabal/ghc-${GHC_VERSION} + @${RM} -f ${STAGEDIR}${PREFIX}/bin/haddock .if ${PORT_OPTIONS:MDOCS} - @${LN} -sf ${PREFIX}/bin/haddock-ghc-${GHC_VERSION} ${PREFIX}/bin/haddock + @${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock .endif .include <bsd.port.mk> diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk index cb44567fa85a..49b39b4dfb3b 100644 --- a/lang/ghc/bsd.cabal.mk +++ b/lang/ghc/bsd.cabal.mk @@ -10,15 +10,19 @@ # .if !defined(METAPORT) -MASTER_SITES?= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ +MASTER_SITES?= http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/ .else MASTER_SITES= # empty DISTFILES= # empty EXTRACT_ONLY= # empty NO_FETCH= yes NO_BUILD= yes +NO_INSTALL= yes +NO_MTREE= yes .endif # !METAPORT +MAKE_ENV+= LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 DESTDIR=${STAGEDIR} + DIST_SUBDIR?= cabal SETUP_CMD?= ./setup @@ -76,7 +80,7 @@ BUILD_DEPENDS+= ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc .endif USE_BINUTILS= yes -USE_GCC= 4.6+ +USE_GCC= yes CONFIGURE_ARGS+= --with-gcc=${CC} --with-ld=${LD} --with-ar=${AR} \ --with-ranlib=${RANLIB} @@ -104,6 +108,8 @@ CONFIGURE_ARGS+= --with-c2hs=${C2HS_CMD} .if defined(EXECUTABLE) LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp USES+= iconv + +CONFIGURE_ARGS+= --enable-executable-stripping .endif .if defined(USE_CABAL) @@ -162,7 +168,7 @@ HADDOCK_OPTS+= --hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.c BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \ ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt -USE_GMAKE= yes +USES+= gmake .endif # !XMLDOCS @@ -197,9 +203,9 @@ post-patch:: _BUILD_SETUP= ${GHC_CMD} -o ${SETUP_CMD} -package Cabal --make +.if !defined(METAPORT) .if !target(do-configure) do-configure: -.if !defined(METAPORT) @if [ -f ${WRKSRC}/Setup.hs ]; then \ cd ${WRKSRC} && ${_BUILD_SETUP} Setup.hs; fi @if [ -f ${WRKSRC}/Setup.lhs ]; then \ @@ -219,14 +225,12 @@ do-configure: cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure --prefix=${PREFIX} .endif .endif # DOCS -.else - ${DO_NADA} -.endif # !METAPORT .endif # target(do-configure) +.endif # !METAPORT +.if !defined(METAPORT) .if !target(do-build) do-build: -.if !defined(METAPORT) cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} build .if !defined(STANDALONE) cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} register --gen-script @@ -240,54 +244,62 @@ do-build: @(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html) .endif # XMLDOCS .endif # DOCS -.else - ${DO_NADA} -.endif # !METAPORT .endif # target(do-build) +.endif # !METAPORT + +.if defined(MAN1) +.for man in ${MAN1} +PLIST_FILES+= man/man1/${man}.gz +.endfor +.endif +.if defined(MAN5) +.for man in ${MAN5} +PLIST_FILES+= man/man5/${man}.gz +.endfor +.endif + +.if !defined(METAPORT) .if !target(do-install) do-install: -.if !defined(METAPORT) - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} install + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} copy --destdir=${STAGEDIR} .if !defined(STANDALONE) - cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh + cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${STAGEDIR}${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh .endif .if !empty(INSTALL_PORTDATA) - @${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_PORTDATA} .endif .if !empty(INSTALL_PORTEXAMPLES) && ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_PORTEXAMPLES} .endif .if defined(MAN1SRC) .for man in ${MAN1} - @${INSTALL_MAN} ${WRKSRC}/${MAN1SRC}/${man} ${PREFIX}/man/man1 + @${INSTALL_MAN} ${WRKSRC}/${MAN1SRC}/${man} ${STAGEDIR}${PREFIX}/man/man1 .endfor .endif # MAN1SRC .if ${PORT_OPTIONS:MDOCS} .if !empty(XMLDOCS) .for xmldoc in ${XMLDOCS} - @(cd ${WRKSRC}/${xmldoc:C/:.*$//g} && ${COPYTREE_SHARE} \* ${DOCSDIR}/${xmldoc:C/^.*://g}) + @(cd ${WRKSRC}/${xmldoc:C/:.*$//g} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/${xmldoc:C/^.*://g}) .endfor .endif # XMLDOCS -.endif -.else - ${DO_NADA} -.endif # !METAPORT +.endif # DOCS .endif # target(do-install) +.endif # !METAPORT .if !target(post-install-script) post-install-script: - @for dir in ${CABAL_DIRS}; do if [ -d $${dir} ]; then ${FIND} -ds $${dir} \ - -type f -print | ${SED} -E -e 's,^${PREFIX}/?,,' >> ${TMPPLIST}; fi ; \ - if [ -d $${dir} ]; then ${FIND} -ds $${dir} \ - -type d -print | ${SED} -E -e 's,^${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}; fi ; done + @for dir in ${CABAL_DIRS}; do if [ -d ${STAGEDIR}$${dir} ]; then ${FIND} -ds ${STAGEDIR}$${dir} \ + -type f -print | ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}; fi ; \ + if [ -d ${STAGEDIR}$${dir} ]; then ${FIND} -ds ${STAGEDIR}$${dir} \ + -type d -print | ${SED} -E -e 's,^${STAGEDIR}${PREFIX}/?,@dirrm ,' >> ${TMPPLIST}; fi ; done .if defined(EXECUTABLE) .for exe in ${EXECUTABLE} @${ECHO_CMD} 'bin/${exe}' >>${TMPPLIST} @@ -296,46 +308,28 @@ post-install-script: .endif # target(post-install-script) +.if !defined(METAPORT) add-plist-post: add-plist-cabal add-plist-cabal: -.if !defined(METAPORT) - @if [ -f ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh ]; then \ - (${ECHO_CMD} '@exec ${SH} %D/${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}/register.sh'; \ - ${ECHO_CMD} '@unexec %D/bin/ghc-pkg unregister --force ${PORTNAME}-${PORTVERSION}') >> ${TMPPLIST}; fi + +.if !defined(STANDALONE) + @${ECHO_CMD} '@unexec ${LOCALBASE}/bin/ghc-pkg unregister --force ${PORTNAME}-${PORTVERSION}' >> ${TMPPLIST} +.endif + .if defined(HADDOCK_AVAILABLE) && ${PORT_OPTIONS:MDOCS} - @(${ECHO_CMD} '@exec if [ -f %D/${GHC_LIB_DOCSDIR_REL}/gen_contents_index ]; then ${LN} -s ${DOCSDIR}/html %D/${GHC_LIB_DOCSDIR_REL}/${DISTNAME} && \ - cd %D/${GHC_LIB_DOCSDIR_REL} && ${RM} -f doc-index*.html && ./gen_contents_index; fi' ; \ - ${ECHO_CMD} '@unexec ${RM} -f %D/${GHC_LIB_DOCSDIR_REL}/${DISTNAME}' ; \ - ${ECHO_CMD} '@unexec if [ -f %D/${GHC_LIB_DOCSDIR_REL}/gen_contents_index ]; then cd %D/${GHC_LIB_DOCSDIR_REL} && ${RM} -f doc-index*.html && ./gen_contents_index; fi') >>${TMPPLIST}; + @(${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${DISTNAME}' ; \ + ${ECHO_CMD} '@unexec cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \ + ${RM} -f doc-index*.html && ./gen_contents_index') >> ${TMPPLIST} +.endif + +.if !defined(STANDALONE) + @${ECHO_CMD} '@exec ${SH} %D/${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}/register.sh' >> ${TMPPLIST} .endif -.else - ${DO_NADA} -.endif # !METAPORT -post-install:: -.if !defined(METAPORT) .if defined(HADDOCK_AVAILABLE) && ${PORT_OPTIONS:MDOCS} - @if [ -f ${PREFIX}/${GHC_LIB_DOCSDIR_REL}/gen_contents_index ]; then \ - ${LN} -s ${DOCSDIR}/html ${PREFIX}/${GHC_LIB_DOCSDIR_REL}/${DISTNAME} && \ - cd ${PREFIX}/${GHC_LIB_DOCSDIR_REL} && \ - ${RM} -f doc-index*.html && ./gen_contents_index; \ - fi + @(${ECHO_CMD} '@exec ${LN} -s ${DOCSDIR}/html ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL}/${DISTNAME} && \ + cd ${LOCALBASE}/${GHC_LIB_DOCSDIR_REL} && \ + ${RM} -f doc-index*.html && ./gen_contents_index') >> ${TMPPLIST} .endif -.if defined(EXECUTABLE) -.for exe in ${EXECUTABLE} - @${STRIP_CMD} ${PREFIX}/bin/${exe} - @${CHMOD} ${BINMODE} ${PREFIX}/bin/${exe} -.endfor -.endif # EXECUTABLE - -.if defined(SHOW_PKGMSG) - @${ECHO_MSG} -e "\a" - @${ECHO_MSG} "=================================================================" - @${CAT} "${PKGMESSAGE}" - @${ECHO_MSG} "=================================================================" - @${ECHO_MSG} -.endif # SHOW_PKGMSG -.else - ${DO_NADA} .endif # !METAPORT diff --git a/lang/ghc/pkg-plist b/lang/ghc/pkg-plist index 8a1ccd4ce889..7bfd4d9b4b53 100644 --- a/lang/ghc/pkg-plist +++ b/lang/ghc/pkg-plist @@ -12,6 +12,7 @@ bin/ghci-%%GHC_VERSION%% bin/ghc-pkg-%%GHC_VERSION%% bin/haddock-ghc-%%GHC_VERSION%% bin/runghc-%%GHC_VERSION%% +man/man1/ghc.1.gz @exec /bin/ln -sf %D/bin/haddock-ghc-%%GHC_VERSION%% %D/bin/haddock || return true @unexec /bin/rm -f %D/bin/haddock || return true @exec /bin/mkdir -p %D/lib/cabal/ghc-%%GHC_VERSION%% || return true diff --git a/lang/hs-brainfuck/Makefile b/lang/hs-brainfuck/Makefile index b9a03b8c1dac..d36c4fbd7811 100644 --- a/lang/hs-brainfuck/Makefile +++ b/lang/hs-brainfuck/Makefile @@ -15,6 +15,5 @@ USE_CABAL= mtl EXECUTABLE= bf -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/lang/hs-epic/Makefile b/lang/hs-epic/Makefile index 4d8c118e4581..79c873221a82 100644 --- a/lang/hs-epic/Makefile +++ b/lang/hs-epic/Makefile @@ -20,7 +20,6 @@ RUN_DEPENDS+= boehm-gc>=7.1:${PORTSDIR}/devel/boehm-gc \ EXECUTABLE= epic -NO_STAGE= yes post-patch:: @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/evm/Makefile diff --git a/lang/hs-epic/files/patch-Setup.hs b/lang/hs-epic/files/patch-Setup.hs new file mode 100644 index 000000000000..9e14cf10a5eb --- /dev/null +++ b/lang/hs-epic/files/patch-Setup.hs @@ -0,0 +1,32 @@ +--- Setup.hs.orig 2012-02-27 23:44:30.000000000 +0000 ++++ Setup.hs 2013-12-08 15:39:13.067013368 +0000 +@@ -1,10 +1,12 @@ + import Distribution.Simple + import Distribution.Simple.InstallDirs + import Distribution.Simple.LocalBuildInfo +-import Distribution.PackageDescription ++import Distribution.Simple.Setup ++import Distribution.PackageDescription hiding (Flag) + + import System.Exit + import System.Process ++import System.FilePath.Posix + + -- After Epic is built, we need a run time system. + +@@ -33,7 +35,14 @@ + = do let pfx = prefix (installDirTemplates local) + system' $ "make -C evm install PREFIX=" ++ show pfx + ++postCopyLib args flags desc local = do ++ let pfix = prefix (installDirTemplates local) ++ let (Flag (CopyTo destDir)) = copyDest flags ++ putStrLn $ "PREFIX=" ++ (show destDir </> show pfix) ++ system' $ "make -C evm install PREFIX=" ++ (destDir </> show pfix) ++ + main = defaultMainWithHooks (simpleUserHooks { postBuild = buildLib, + postConf = postConfLib, +- postInst = postInstLib }) ++ postInst = postInstLib, ++ postCopy = postCopyLib }) + diff --git a/lang/hs-unlambda/Makefile b/lang/hs-unlambda/Makefile index d853952209bf..3686607feda2 100644 --- a/lang/hs-unlambda/Makefile +++ b/lang/hs-unlambda/Makefile @@ -15,6 +15,5 @@ USE_CABAL= mtl EXECUTABLE= unlambda -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/mail/hs-email-validate/Makefile b/mail/hs-email-validate/Makefile index 24a0684de5c0..583a912bb642 100644 --- a/mail/hs-email-validate/Makefile +++ b/mail/hs-email-validate/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= attoparsec>=0.10.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/mail/hs-mime-mail/Makefile b/mail/hs-mime-mail/Makefile index 460b93079af3..d22a8fac24b0 100644 --- a/mail/hs-mime-mail/Makefile +++ b/mail/hs-mime-mail/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1 random>=1.0 \ text>=0.7 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/mail/hs-mime-types/Makefile b/mail/hs-mime-types/Makefile index 01e076951cbd..4def7eab0f28 100644 --- a/mail/hs-mime-types/Makefile +++ b/mail/hs-mime-types/Makefile @@ -12,6 +12,5 @@ LICENSE= MIT USE_CABAL= text -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/mail/hs-mime/Makefile b/mail/hs-mime/Makefile index 70c07b98dcf4..40df20b95bf7 100644 --- a/mail/hs-mime/Makefile +++ b/mail/hs-mime/Makefile @@ -11,6 +11,5 @@ COMMENT= Working with MIME types LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile index 631295b9c1d6..027a0860bcc8 100644 --- a/math/hs-Agda/Makefile +++ b/math/hs-Agda/Makefile @@ -19,14 +19,13 @@ USES= iconv EXECUTABLE= agda-mode agda -INSTALL_PORTDATA= (cd ${WRKSRC} && ${INSTALL_DATA} README ${DATADIR}; \ - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DATADIR}) +INSTALL_PORTDATA= (cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DATADIR}; \ + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}) OPTIONS_DEFINE= EPIC EPIC_DESC= Install the Epic compiler -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MEPIC} diff --git a/math/hs-NumInstances/Makefile b/math/hs-NumInstances/Makefile index 00387714938a..d5300c670472 100644 --- a/math/hs-NumInstances/Makefile +++ b/math/hs-NumInstances/Makefile @@ -10,6 +10,5 @@ COMMENT= Instances of numeric classes for functions and tuples LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-categories/Makefile b/math/hs-categories/Makefile index 80ee4c77c1a1..4ca26613c2bd 100644 --- a/math/hs-categories/Makefile +++ b/math/hs-categories/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= void>=0.5.4.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-comonad-transformers/Makefile b/math/hs-comonad-transformers/Makefile index 2f666f01ff7c..84ab721b7443 100644 --- a/math/hs-comonad-transformers/Makefile +++ b/math/hs-comonad-transformers/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= comonad>=3.0 contravariant>=0.2.0.1 distributive>=0.2.2 \ semigroupoids>=3.0 semigroups>=0.8.3.1 transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-comonad/Makefile b/math/hs-comonad/Makefile index 120fb86b44b4..60f4f79f17a4 100644 --- a/math/hs-comonad/Makefile +++ b/math/hs-comonad/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= semigroups>=0.8.3 transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-comonads-fd/Makefile b/math/hs-comonads-fd/Makefile index 22bd225d4e48..ef21e1d6bdf8 100644 --- a/math/hs-comonads-fd/Makefile +++ b/math/hs-comonads-fd/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= comonad>=3.0 comonad-transformers>=3.0 mtl>=2.0 \ semigroups>=0.8.3.1 transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-contravariant/Makefile b/math/hs-contravariant/Makefile index ccdf9a1f9989..20e8f64be5df 100644 --- a/math/hs-contravariant/Makefile +++ b/math/hs-contravariant/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= tagged>=0.4.4 transformers>=0.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-data-lens-template/Makefile b/math/hs-data-lens-template/Makefile index b04b8dd023ac..61b760cc9a90 100644 --- a/math/hs-data-lens-template/Makefile +++ b/math/hs-data-lens-template/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= data-lens>=2.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-data-lens/Makefile b/math/hs-data-lens/Makefile index dfb1038fdc66..77d55d90cbf8 100644 --- a/math/hs-data-lens/Makefile +++ b/math/hs-data-lens/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= comonad>=1.1.1.3 comonad-transformers>=2.0 \ semigroupoids>=1.2.4 transformers>=0.2.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile index 52ef66c45034..c098ea9b4dfe 100644 --- a/math/hs-distributive/Makefile +++ b/math/hs-distributive/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= transformers>=0.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile index 33f3a35051ff..f77f98317caa 100644 --- a/math/hs-erf/Makefile +++ b/math/hs-erf/Makefile @@ -11,6 +11,5 @@ COMMENT= The error function, erf, and friends for Haskell LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-groupoids/Makefile b/math/hs-groupoids/Makefile index 047b7c334902..ba421075b3c4 100644 --- a/math/hs-groupoids/Makefile +++ b/math/hs-groupoids/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= semigroupoids>=3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-ieee754/Makefile b/math/hs-ieee754/Makefile index d2a9fcf3f251..26dc86a2aa8b 100644 --- a/math/hs-ieee754/Makefile +++ b/math/hs-ieee754/Makefile @@ -10,6 +10,5 @@ COMMENT= Utilities for dealing with IEEE floating point numbers LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile index 745eeecffa30..736fe8f9a014 100644 --- a/math/hs-math-functions/Makefile +++ b/math/hs-math-functions/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= erf>=2 vector>=0.7 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-mwc-random/Makefile b/math/hs-mwc-random/Makefile index 3bddca5cace3..1299abd22f64 100644 --- a/math/hs-mwc-random/Makefile +++ b/math/hs-mwc-random/Makefile @@ -13,8 +13,7 @@ LICENSE= BSD USE_CABAL= primitive vector>=0.7 -INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/README.markdown ${DATADIR} +INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DATADIR} -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-nats/Makefile b/math/hs-nats/Makefile index 651f5f781ee2..1b3f1cee52e6 100644 --- a/math/hs-nats/Makefile +++ b/math/hs-nats/Makefile @@ -10,6 +10,5 @@ COMMENT= Haskell 98 natural numbers LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-pointed/Makefile b/math/hs-pointed/Makefile index b1fb872dabb5..e4c5bfdd69b3 100644 --- a/math/hs-pointed/Makefile +++ b/math/hs-pointed/Makefile @@ -14,6 +14,5 @@ USE_CABAL= comonad>=3 comonad-transformers>=3 data-default>=0.4 \ semigroupoids>=3.0 semigroups>=0.8.3.1 stm>=2.1.2.1 \ transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-probability/Makefile b/math/hs-probability/Makefile index f91cab36a12c..50829003acab 100644 --- a/math/hs-probability/Makefile +++ b/math/hs-probability/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= random>=1.0 transformers>=0.0.1 utility-ht>=0.0.6 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-semigroupoid-extras/Makefile b/math/hs-semigroupoid-extras/Makefile index a3de231e52dd..4ea1b6fb5773 100644 --- a/math/hs-semigroupoid-extras/Makefile +++ b/math/hs-semigroupoid-extras/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= comonad>=3 distributive>=0.2.2 groupoids>=3 semigroupoids>=3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-semigroupoids/Makefile b/math/hs-semigroupoids/Makefile index 67ec0dd47ee8..668acc82d078 100644 --- a/math/hs-semigroupoids/Makefile +++ b/math/hs-semigroupoids/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= comonad>=3.0 contravariant>=0.2.0.1 semigroups>=0.8.3.1 \ transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-semigroups/Makefile b/math/hs-semigroups/Makefile index 5ca6d60aa626..a9c0519c3fec 100644 --- a/math/hs-semigroups/Makefile +++ b/math/hs-semigroups/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= nats>=0.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-statistics/Makefile b/math/hs-statistics/Makefile index 67048ca08ba8..42b890aebc83 100644 --- a/math/hs-statistics/Makefile +++ b/math/hs-statistics/Makefile @@ -14,8 +14,7 @@ LICENSE= BSD USE_CABAL= erf math-functions>=0.1.2 monad-par>=0.3.4 mwc-random>=0.11.0.0 \ primitive>=0.3 vector>=0.7.1 vector-algorithms>=0.4 -INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/README.markdown ${DATADIR} +INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DATADIR} -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-vector-space/Makefile b/math/hs-vector-space/Makefile index af997ac0859c..02ab1ffedd1c 100644 --- a/math/hs-vector-space/Makefile +++ b/math/hs-vector-space/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= Boolean>=0.1.0 MemoTrie>=0.5 NumInstances>=1.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/multimedia/hs-gstreamer/Makefile b/multimedia/hs-gstreamer/Makefile index 5ae5e0317e1d..da0868a2b280 100644 --- a/multimedia/hs-gstreamer/Makefile +++ b/multimedia/hs-gstreamer/Makefile @@ -17,6 +17,5 @@ USE_CABAL= glib>=0.12 mtl BUILD_DEPENDS+= gstreamer-plugins>=0.10:${PORTSDIR}/multimedia/gstreamer-plugins -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/net/hs-hostname/Makefile b/net/hs-hostname/Makefile index ad7de783d356..bed95115c81b 100644 --- a/net/hs-hostname/Makefile +++ b/net/hs-hostname/Makefile @@ -10,6 +10,5 @@ COMMENT= Cross-platform means of determining the hostname LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/net/hs-maccatcher/Makefile b/net/hs-maccatcher/Makefile index 2db68b8da868..89713f29f2ed 100644 --- a/net/hs-maccatcher/Makefile +++ b/net/hs-maccatcher/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= parsec -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/net/hs-network-conduit/Makefile b/net/hs-network-conduit/Makefile index 993e5ec6a15f..3338635addc3 100644 --- a/net/hs-network-conduit/Makefile +++ b/net/hs-network-conduit/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= conduit>=1.0 lifted-base>=0.1 monad-control>=0.3 \ network>=2.3 transformers>=0.2.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/net/hs-network-info/Makefile b/net/hs-network-info/Makefile index 895f155f51f1..e49c5d592cad 100644 --- a/net/hs-network-info/Makefile +++ b/net/hs-network-info/Makefile @@ -10,6 +10,5 @@ COMMENT= Access the local computer's basic network configuration LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/net/hs-network-multicast/Makefile b/net/hs-network-multicast/Makefile index d67d8a8edefa..11836208cb34 100644 --- a/net/hs-network-multicast/Makefile +++ b/net/hs-network-multicast/Makefile @@ -10,6 +10,5 @@ COMMENT= Simple multicast library USE_CABAL= network -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/net/hs-network/Makefile b/net/hs-network/Makefile index ae2dc353b5bd..b3fc4078225d 100644 --- a/net/hs-network/Makefile +++ b/net/hs-network/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= parsec>=3.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/net/hs-pcap/Makefile b/net/hs-pcap/Makefile index 6e3f7505de08..44d73f5a438d 100644 --- a/net/hs-pcap/Makefile +++ b/net/hs-pcap/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= network -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/net/hs-publicsuffixlist/Makefile b/net/hs-publicsuffixlist/Makefile index 0f2d2a6454a2..78f2d5031cdc 100644 --- a/net/hs-publicsuffixlist/Makefile +++ b/net/hs-publicsuffixlist/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= cereal data-default text>=0.11 utf8-string -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/net/hs-sendfile/Makefile b/net/hs-sendfile/Makefile index d710fac15067..07fbc1161580 100644 --- a/net/hs-sendfile/Makefile +++ b/net/hs-sendfile/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= network>=2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/net/hs-simple-sendfile/Makefile b/net/hs-simple-sendfile/Makefile index a02403ee096a..0f2c4f0c0ba8 100644 --- a/net/hs-simple-sendfile/Makefile +++ b/net/hs-simple-sendfile/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= network -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/net/hs-socks/Makefile b/net/hs-socks/Makefile index 0bf26c8d1ec1..ada246b003e6 100644 --- a/net/hs-socks/Makefile +++ b/net/hs-socks/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= cereal>=0.3.1 network>=2.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile index a5c7a46d1d5d..552f889ec309 100644 --- a/ports-mgmt/hs-porte/Makefile +++ b/ports-mgmt/hs-porte/Makefile @@ -15,6 +15,5 @@ USE_CABAL= extensible-exceptions stringsearch EXECUTABLE= porte -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile index 9495350037d2..7d0343b3e109 100644 --- a/print/hs-hscolour/Makefile +++ b/print/hs-hscolour/Makefile @@ -14,6 +14,5 @@ LICENSE= GPLv2 EXECUTABLE= HsColour -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/science/hs-bio/Makefile b/science/hs-bio/Makefile index 891197b920fc..9b702fbedb09 100644 --- a/science/hs-bio/Makefile +++ b/science/hs-bio/Makefile @@ -15,6 +15,5 @@ USE_CABAL= mtl parallel parsec QuickCheck>=2 tagsoup>=0.8 EXECUTABLE= fastout flowclip flx frecover frename orf rselect-pe -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-Crypto/Makefile b/security/hs-Crypto/Makefile index b068b0284bba..785b1493a496 100644 --- a/security/hs-Crypto/Makefile +++ b/security/hs-Crypto/Makefile @@ -12,6 +12,5 @@ USE_CABAL= HUnit QuickCheck>=2.4.0.1 random EXECUTABLE= HMACTest QuickTest RSATest SHA1Test SymmetricTest WordListTest -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-HsOpenSSL/Makefile b/security/hs-HsOpenSSL/Makefile index f7e3438d442b..f6b12eedbcff 100644 --- a/security/hs-HsOpenSSL/Makefile +++ b/security/hs-HsOpenSSL/Makefile @@ -10,6 +10,5 @@ COMMENT= (Incomplete) OpenSSL binding for Haskell USE_CABAL= network>=2.1.0.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-RSA/Makefile b/security/hs-RSA/Makefile index 13a1170edcd9..97bae85ca2a5 100644 --- a/security/hs-RSA/Makefile +++ b/security/hs-RSA/Makefile @@ -18,7 +18,6 @@ OPTIONS_DEFAULT= MD5 BINARY MD5_DESC= Include support for using MD5 BINARY_DESC= Use the binary package for serialization -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MMD5} diff --git a/security/hs-SHA/Makefile b/security/hs-SHA/Makefile index f5db31085b38..cb1f33a1c265 100644 --- a/security/hs-SHA/Makefile +++ b/security/hs-SHA/Makefile @@ -14,7 +14,6 @@ OPTIONS_DEFINE= EXE EXE_DESC= Build a SHA2-384 executable similar to 'md5sum' -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" CONFIGURE_ARGS+= --flags="-Test" diff --git a/security/hs-certificate/Makefile b/security/hs-certificate/Makefile index c05af4242485..2bae256d92bf 100644 --- a/security/hs-certificate/Makefile +++ b/security/hs-certificate/Makefile @@ -17,7 +17,6 @@ OPTIONS_DEFINE= EXECUTABLE EXECUTABLE_DESC= Build the executable -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MEXECUTABLE} diff --git a/security/hs-cipher-aes/Makefile b/security/hs-cipher-aes/Makefile index 0d38fbe03265..c819ac36a03a 100644 --- a/security/hs-cipher-aes/Makefile +++ b/security/hs-cipher-aes/Makefile @@ -10,6 +10,5 @@ COMMENT= Fast AES cipher implementation with advanced mode of operations LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-cipher-rc4/Makefile b/security/hs-cipher-rc4/Makefile index 5e97944c8df0..90430c077adb 100644 --- a/security/hs-cipher-rc4/Makefile +++ b/security/hs-cipher-rc4/Makefile @@ -10,6 +10,5 @@ COMMENT= Fast RC4 cipher implementation LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-clientsession/Makefile b/security/hs-clientsession/Makefile index bbbe3c806dd7..fa00b5ebde88 100644 --- a/security/hs-clientsession/Makefile +++ b/security/hs-clientsession/Makefile @@ -14,6 +14,5 @@ USE_CABAL= base64-bytestring>=0.1.1.1 cereal>=0.3 cipher-aes>=0.1.7 \ cprng-aes>=0.2 crypto-api>=0.8 entropy>=0.2.1 skein \ tagged>=0.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-cprng-aes/Makefile b/security/hs-cprng-aes/Makefile index 0e9a88f43bbf..aecdfd3f1c5d 100644 --- a/security/hs-cprng-aes/Makefile +++ b/security/hs-cprng-aes/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= cipher-aes>=0.1 crypto-api>=0.8 crypto-random-api>=0.2 \ entropy>=0.2 random -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-crypto-api/Makefile b/security/hs-crypto-api/Makefile index 2e17d45708ff..161bed70f523 100644 --- a/security/hs-crypto-api/Makefile +++ b/security/hs-crypto-api/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= cereal>=0.2 entropy tagged>=0.1 transformers -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-crypto-conduit/Makefile b/security/hs-crypto-conduit/Makefile index a61290ac0233..01b8f213f215 100644 --- a/security/hs-crypto-conduit/Makefile +++ b/security/hs-crypto-conduit/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= cereal>=0.3 conduit>=1.0 crypto-api>=0.9 transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-crypto-numbers/Makefile b/security/hs-crypto-numbers/Makefile index 8a9f23648bc0..98b1f04ab895 100644 --- a/security/hs-crypto-numbers/Makefile +++ b/security/hs-crypto-numbers/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= crypto-random-api>=0.2 vector -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-crypto-pubkey-types/Makefile b/security/hs-crypto-pubkey-types/Makefile index 2ef324778179..75978646d438 100644 --- a/security/hs-crypto-pubkey-types/Makefile +++ b/security/hs-crypto-pubkey-types/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= asn1-types>=0.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-crypto-pubkey/Makefile b/security/hs-crypto-pubkey/Makefile index 731d5488a752..b0c56224bb7a 100644 --- a/security/hs-crypto-pubkey/Makefile +++ b/security/hs-crypto-pubkey/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= crypto-numbers crypto-pubkey-types>=0.3 crypto-random-api>=0.2 \ cryptohash>=0.8 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-crypto-random-api/Makefile b/security/hs-crypto-random-api/Makefile index f27d85110fef..c7a9801b03dc 100644 --- a/security/hs-crypto-random-api/Makefile +++ b/security/hs-crypto-random-api/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= entropy -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-cryptocipher/Makefile b/security/hs-cryptocipher/Makefile index 8d3268aeb490..145f1a4fae26 100644 --- a/security/hs-cryptocipher/Makefile +++ b/security/hs-cryptocipher/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= cereal cipher-aes cipher-rc4 cpu>=0.1 crypto-api>=0.5 \ primitive vector>=0.7 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-cryptohash/Makefile b/security/hs-cryptohash/Makefile index c8018ae7b2e0..0f35989d219a 100644 --- a/security/hs-cryptohash/Makefile +++ b/security/hs-cryptohash/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= cereal>=0.2 crypto-api>=0.5 tagged>=0.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-digest/Makefile b/security/hs-digest/Makefile index 8cb8aa2b3a07..808d2ec7b1c6 100644 --- a/security/hs-digest/Makefile +++ b/security/hs-digest/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= zlib -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-entropy/Makefile b/security/hs-entropy/Makefile index a210cd48fbde..489a3632a7ba 100644 --- a/security/hs-entropy/Makefile +++ b/security/hs-entropy/Makefile @@ -10,6 +10,5 @@ COMMENT= Platform-independent entropy source LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-monadcryptorandom/Makefile b/security/hs-monadcryptorandom/Makefile index bdb1c5f0afb3..250ccefed5ea 100644 --- a/security/hs-monadcryptorandom/Makefile +++ b/security/hs-monadcryptorandom/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= crypto-api>=0.2 mtl>=2.0 tagged>=0.2 transformers>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-pem/Makefile b/security/hs-pem/Makefile index ff68c73eca2e..0ba65a92cae6 100644 --- a/security/hs-pem/Makefile +++ b/security/hs-pem/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= attoparsec base64-bytestring cereal mtl -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-pureMD5/Makefile b/security/hs-pureMD5/Makefile index 8b04882aec79..a388c98563b4 100644 --- a/security/hs-pureMD5/Makefile +++ b/security/hs-pureMD5/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= cereal>=0.2 crypto-api tagged -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-pwstore-fast/Makefile b/security/hs-pwstore-fast/Makefile index fe7131f05857..5e133581d10f 100644 --- a/security/hs-pwstore-fast/Makefile +++ b/security/hs-pwstore-fast/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= base64-bytestring>=0.1 cryptohash>=0.6 random>=1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-skein/Makefile b/security/hs-skein/Makefile index b82afd8fbbb5..df9cddda9bd5 100644 --- a/security/hs-skein/Makefile +++ b/security/hs-skein/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= cereal>=0.3 crypto-api>=0.6 tagged>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-tls-extra/Makefile b/security/hs-tls-extra/Makefile index b83408fc2b0a..1c3bbb42b499 100644 --- a/security/hs-tls-extra/Makefile +++ b/security/hs-tls-extra/Makefile @@ -14,6 +14,5 @@ USE_CABAL= certificate>=1.3.5 cipher-aes>=0.1 cipher-rc4 crypto-pubkey \ crypto-random-api cryptohash>=0.6 mtl network>=2.3 \ pem>=0.1.0 text>=0.5 tls>=1.1.0 vector -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-tls/Makefile b/security/hs-tls/Makefile index 0a18d8b00580..f64cd92e2ddb 100644 --- a/security/hs-tls/Makefile +++ b/security/hs-tls/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= cereal>=0.3 certificate>=1.3.0 crypto-pubkey \ crypto-random-api>=0.2 cryptohash>=0.6 mtl network -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/sysutils/hs-angel/Makefile b/sysutils/hs-angel/Makefile index 85bdae1602a4..440ceaaff3ff 100644 --- a/sysutils/hs-angel/Makefile +++ b/sysutils/hs-angel/Makefile @@ -17,6 +17,5 @@ EXECUTABLE= angel STANDALONE= yes -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/sysutils/hs-cpu/Makefile b/sysutils/hs-cpu/Makefile index 28c9f8e09ba7..f15f99260b19 100644 --- a/sysutils/hs-cpu/Makefile +++ b/sysutils/hs-cpu/Makefile @@ -10,6 +10,5 @@ COMMENT= Cpu information and properties helpers LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile index 03dfadd3c5b9..46f860a1e239 100644 --- a/textproc/hs-Diff/Makefile +++ b/textproc/hs-Diff/Makefile @@ -11,6 +11,5 @@ COMMENT= O(ND) diff algorithm in haskell LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile index a111ac77246d..e00e10209603 100644 --- a/textproc/hs-HStringTemplate/Makefile +++ b/textproc/hs-HStringTemplate/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= blaze-builder mtl parsec syb text utf8-string void -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile index 870be71ecedd..81fe7e20aead 100644 --- a/textproc/hs-HaXml/Makefile +++ b/textproc/hs-HaXml/Makefile @@ -16,6 +16,5 @@ USE_CABAL= polyparse>=1.9 random EXECUTABLE= Canonicalise CanonicaliseLazy DtdToHaskell FpMLToHaskell \ MkOneOf Validate XsdToHaskell Xtract -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-attoparsec-conduit/Makefile b/textproc/hs-attoparsec-conduit/Makefile index ac3baecbd810..494b68b608d4 100644 --- a/textproc/hs-attoparsec-conduit/Makefile +++ b/textproc/hs-attoparsec-conduit/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= attoparsec>=0.10 conduit>=1.0 text>=0.11 transformers>=0.2.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile index 523c2aab058c..aa64a1230f3a 100644 --- a/textproc/hs-attoparsec-enumerator/Makefile +++ b/textproc/hs-attoparsec-enumerator/Makefile @@ -12,6 +12,5 @@ LICENSE= MIT USE_CABAL= attoparsec>=0.10 enumerator>=0.4 text -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile index 0e6b53888aa3..fc036451b0fa 100644 --- a/textproc/hs-attoparsec/Makefile +++ b/textproc/hs-attoparsec/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= text>=0.11.1.5 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile index 5861a18d6c70..cc5607171e3f 100644 --- a/textproc/hs-blaze-html/Makefile +++ b/textproc/hs-blaze-html/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= blaze-builder>=0.2 blaze-markup>=0.5.1 text>=0.10 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile index 30a6cd965424..3a2cb0945e51 100644 --- a/textproc/hs-blaze-markup/Makefile +++ b/textproc/hs-blaze-markup/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= blaze-builder>=0.2 text>=0.10 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile index c4375dacea68..4e5ca751c62e 100644 --- a/textproc/hs-bytestring-csv/Makefile +++ b/textproc/hs-bytestring-csv/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= dlist -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile index ac440ca00c8d..581ef7ba5aa3 100644 --- a/textproc/hs-case-insensitive/Makefile +++ b/textproc/hs-case-insensitive/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= hashable>=1.0 text>=0.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile index 5ec06798ee5e..20559f00e2b6 100644 --- a/textproc/hs-citeproc-hs/Makefile +++ b/textproc/hs-citeproc-hs/Makefile @@ -19,7 +19,6 @@ BIBUTILS_DESC= Use Chris Putnam's Bibutils HEXPAT_DESC= Use hexpat to parse XML NETWORK_DESC= Use network and HTTP to retrieve CSL file -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MBIBUTILS} diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile index e30a707bad71..2338f877d961 100644 --- a/textproc/hs-csv/Makefile +++ b/textproc/hs-csv/Makefile @@ -13,6 +13,5 @@ LICENSE= MIT USE_CABAL= parsec -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile index 46837d2cc706..59007fdd5313 100644 --- a/textproc/hs-double-conversion/Makefile +++ b/textproc/hs-double-conversion/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= text>=0.11.0.8 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile index f89d76f7640e..65e03ea1d3ab 100644 --- a/textproc/hs-feed/Makefile +++ b/textproc/hs-feed/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= utf8-string xml>=1.2.6 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile index e6437e20d0a7..f7b313f2811c 100644 --- a/textproc/hs-hexpat/Makefile +++ b/textproc/hs-hexpat/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= extensible-exceptions>=0.1 List>=0.4.2 text>=0.5 transformers \ utf8-string -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile index 527768ed0044..a56d9f9a108a 100644 --- a/textproc/hs-highlighting-kate/Makefile +++ b/textproc/hs-highlighting-kate/Makefile @@ -16,7 +16,6 @@ OPTIONS_DEFINE= EXECUTABLE EXECUTABLE_DESC= Build the Highlight executable -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MEXECUTABLE} diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile index 7a3c638a7725..4615af04ed40 100644 --- a/textproc/hs-hs-bibutils/Makefile +++ b/textproc/hs-hs-bibutils/Makefile @@ -15,6 +15,5 @@ RUN_DEPENDS= bibutils>=5.0:${PORTSDIR}/textproc/bibutils USE_CABAL= syb -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile index af7bf1223f6f..5933e83846fa 100644 --- a/textproc/hs-html-conduit/Makefile +++ b/textproc/hs-html-conduit/Makefile @@ -14,6 +14,5 @@ USE_CABAL= conduit>=1.0 filesystem-conduit>=1.0 resourcet>=0.3 \ system-filepath>=0.4 tagstream-conduit>=0.4 text \ transformers xml-conduit>=1.1 xml-types>=0.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile index fe38959131a9..2b868c3f76d3 100644 --- a/textproc/hs-html/Makefile +++ b/textproc/hs-html/Makefile @@ -10,6 +10,5 @@ COMMENT= HTML combinator library LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile index a263b6b8e59c..083840b1343f 100644 --- a/textproc/hs-hxt-charproperties/Makefile +++ b/textproc/hs-hxt-charproperties/Makefile @@ -8,6 +8,5 @@ CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Character properties and classes for XML and Unicode -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile index 7141a8554374..9846c60b3e1a 100644 --- a/textproc/hs-hxt-regex-xmlschema/Makefile +++ b/textproc/hs-hxt-regex-xmlschema/Makefile @@ -12,6 +12,5 @@ LICENSE= MIT USE_CABAL= hxt-charproperties>=9 parsec>=2.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile index 6b4eb1dd08bd..ae17f32fa9ee 100644 --- a/textproc/hs-hxt-unicode/Makefile +++ b/textproc/hs-hxt-unicode/Makefile @@ -10,6 +10,5 @@ COMMENT= Unicode functions for UTF-8, iso-latin-* and other encodings USE_CABAL= hxt-charproperties>=9 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile index e65e6e3eb20e..f5e0fafab2a4 100644 --- a/textproc/hs-hxt/Makefile +++ b/textproc/hs-hxt/Makefile @@ -13,6 +13,5 @@ LICENSE= MIT USE_CABAL= HUnit>=1.2 hxt-charproperties>=9.1 hxt-regex-xmlschema>=9 \ hxt-unicode>=9.0.1 mtl>=2 network>=2.1 parsec>=2.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile index c766ed2bcb35..5330e904329a 100644 --- a/textproc/hs-lhs2tex/Makefile +++ b/textproc/hs-lhs2tex/Makefile @@ -19,6 +19,5 @@ EXECUTABLE= lhs2TeX MAN1= lhs2TeX.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-lhs2tex/files/patch-Setup.hs b/textproc/hs-lhs2tex/files/patch-Setup.hs index aa6c860894fd..df80ba1420b5 100644 --- a/textproc/hs-lhs2tex/files/patch-Setup.hs +++ b/textproc/hs-lhs2tex/files/patch-Setup.hs @@ -1,6 +1,6 @@ ---- ./Setup.hs.orig 2011-03-17 11:23:52.000000000 +0100 -+++ ./Setup.hs 2011-05-22 14:33:40.000000000 +0200 -@@ -204,7 +204,7 @@ +--- Setup.hs.orig 2012-09-08 22:29:52.000000000 +0100 ++++ Setup.hs 2013-12-08 15:55:17.403235103 +0000 +@@ -205,7 +205,7 @@ else docdir (absoluteInstallDirs pd lbi cd) `joinFileName` "doc" let manDir = if isWindows then dataPref `joinFileName` "Documentation" @@ -9,3 +9,13 @@ createDirectoryIfMissing True docDir installOrdinaryFile v (lhs2texDocDir `joinFileName` "Guide2.pdf") (docDir `joinFileName` "Guide2.pdf") when (not isWindows) $ +@@ -213,7 +213,8 @@ + installOrdinaryFile v ("lhs2TeX.1") (manDir `joinFileName` "lhs2TeX.1") + -- polytable + case (installPolyTable ebi) of +- Just texmf -> do let texmfDir = texmf ++ Just texmf -> do let CopyTo destdir = cd ++ texmfDir = destdir `joinFileName` texmf + ptDir = texmfDir `joinFileName` "tex" `joinFileName` "latex" + `joinFileName` "polytable" + createDirectoryIfMissing True ptDir diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile index a9ca709346df..b8c35ecd7f2a 100644 --- a/textproc/hs-libxml/Makefile +++ b/textproc/hs-libxml/Makefile @@ -15,6 +15,5 @@ USE_GNOME= libxml2 CONFIGURE_ARGS+= --extra-include-dirs="${LOCALBASE}/include/libxml2" -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile index 99f3ec4c049b..5e1a7a595c16 100644 --- a/textproc/hs-pandoc-types/Makefile +++ b/textproc/hs-pandoc-types/Makefile @@ -12,6 +12,5 @@ LICENSE= GPLv2 USE_CABAL= syb -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile index 7870b13ded10..24004343bd4f 100644 --- a/textproc/hs-pandoc/Makefile +++ b/textproc/hs-pandoc/Makefile @@ -31,7 +31,6 @@ OPTIONS_DEFINE= EMBED_DATA_FILES EMBED_DATA_FILES_DESC= Embed data files in binary for relocatable executable -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MEMBED_DATA_FILES} diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-parsec/Makefile index bd0d4807a61a..9ba1e48ad7a2 100644 --- a/textproc/hs-parsec/Makefile +++ b/textproc/hs-parsec/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= mtl text>=0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile index 75134d820ee2..42a645e06887 100644 --- a/textproc/hs-polyparse/Makefile +++ b/textproc/hs-polyparse/Makefile @@ -12,6 +12,5 @@ LICENSE= LGPL21 USE_CABAL= text -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile index 9840b9c09ad4..642cf1188749 100644 --- a/textproc/hs-regex-base/Makefile +++ b/textproc/hs-regex-base/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= mtl -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile index f0cc3c999c26..1b4ef8895741 100644 --- a/textproc/hs-regex-compat/Makefile +++ b/textproc/hs-regex-compat/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= regex-base>=0.93 regex-posix>=0.95.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile index f14fdba05473..a7d39120bd7b 100644 --- a/textproc/hs-regex-pcre-builtin/Makefile +++ b/textproc/hs-regex-pcre-builtin/Makefile @@ -14,6 +14,5 @@ USE_CABAL= regex-base>=0.93 LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile index c6a3c384f0d2..9e5b06afa436 100644 --- a/textproc/hs-regex-posix/Makefile +++ b/textproc/hs-regex-posix/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= regex-base>=0.93 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile index 73649cf17e3e..e842dd612cba 100644 --- a/textproc/hs-regex-tdfa/Makefile +++ b/textproc/hs-regex-tdfa/Makefile @@ -10,6 +10,5 @@ COMMENT= Replaces/Enhances Text.Regex USE_CABAL= mtl parsec regex-base>=0.93.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile index 17a3ce15b577..94f2478118e5 100644 --- a/textproc/hs-stringsearch/Makefile +++ b/textproc/hs-stringsearch/Makefile @@ -11,6 +11,5 @@ COMMENT= Fast searching, splitting and replacing of ByteStrings LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile index 1c14c8c682aa..06ba499e12a6 100644 --- a/textproc/hs-tagsoup/Makefile +++ b/textproc/hs-tagsoup/Makefile @@ -13,9 +13,7 @@ LICENSE= BSD USE_CABAL= text -INSTALL_PORTDATA= cd ${WRKSRC} && \ - ${INSTALL_DATA} ${WRKSRC}/tagsoup.htm ${DATADIR} +INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/tagsoup.htm ${STAGEDIR}${DATADIR} -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile index aed5190f5ea0..0dbd6ed994b5 100644 --- a/textproc/hs-tagstream-conduit/Makefile +++ b/textproc/hs-tagstream-conduit/Makefile @@ -14,6 +14,5 @@ USE_CABAL= attoparsec attoparsec-conduit>=0.5 blaze-builder \ blaze-builder-conduit>=0.5 case-insensitive conduit>=0.5 \ text transformers>=0.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile index 301d56222592..7c37d22a6256 100644 --- a/textproc/hs-texmath/Makefile +++ b/textproc/hs-texmath/Makefile @@ -17,7 +17,6 @@ OPTIONS_DEFINE= CGI CGI_DESC= Compile CGI executable -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MCGI} diff --git a/textproc/hs-xhtml/Makefile b/textproc/hs-xhtml/Makefile index 0a09cb8e5e8c..6864ca5edacd 100644 --- a/textproc/hs-xhtml/Makefile +++ b/textproc/hs-xhtml/Makefile @@ -10,6 +10,5 @@ COMMENT= XHTML combinator library LICENSE= BSD -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile index 993080bd070f..36340d4cdcda 100644 --- a/textproc/hs-xml-conduit/Makefile +++ b/textproc/hs-xml-conduit/Makefile @@ -16,6 +16,5 @@ USE_CABAL= attoparsec>=0.10 attoparsec-conduit>=1.0 blaze-builder>=0.2 \ resourcet>=0.3 system-filepath>=0.4 text>=0.7 \ transformers>=0.2 xml-types>=0.3.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile index 01a8acb4562b..282b828e5639 100644 --- a/textproc/hs-xml-types/Makefile +++ b/textproc/hs-xml-types/Makefile @@ -12,6 +12,5 @@ LICENSE= MIT USE_CABAL= text -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile index 3cbdaa2f7d4f..ccc3f65bd8e7 100644 --- a/textproc/hs-xml/Makefile +++ b/textproc/hs-xml/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= text -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile index 40806dc59577..78ffe72d02a7 100644 --- a/textproc/hs-xmlhtml/Makefile +++ b/textproc/hs-xmlhtml/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= blaze-builder>=0.2 blaze-html>=0.5 blaze-markup>=0.5 \ parsec>=3.1.2 text>=0.11 unordered-containers>=0.1.4 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile index d55bd8ac16bd..61eb250b9aab 100644 --- a/textproc/hs-yaml/Makefile +++ b/textproc/hs-yaml/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= aeson>=0.5 attoparsec conduit>=0.5 resourcet>=0.3 text \ transformers>=0.1 unordered-containers vector -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile index bfbf15f483da..ca9a9b02fdec 100644 --- a/www/hs-HTTP/Makefile +++ b/www/hs-HTTP/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= mtl network parsec -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile index 725dbeb20f5c..211b85ec9154 100644 --- a/www/hs-activehs/Makefile +++ b/www/hs-activehs/Makefile @@ -21,6 +21,5 @@ USE_CABAL= activehs-base>=0.2 blaze-html>=0.5 blaze-markup>=0.5.1.0 \ STANDALONE= yes EXECUTABLE= activehs -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile index aecd17aeac22..601f094cbe18 100644 --- a/www/hs-authenticate/Makefile +++ b/www/hs-authenticate/Makefile @@ -15,6 +15,5 @@ USE_CABAL= aeson>=0.5 attoparsec blaze-builder case-insensitive>=0.2 \ tagsoup>=0.12 text transformers>=0.1 unordered-containers \ xml-conduit>=1.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile index 6633309c5679..46166113371d 100644 --- a/www/hs-cgi/Makefile +++ b/www/hs-cgi/Makefile @@ -14,6 +14,5 @@ LICENSE= BSD USE_CABAL= extensible-exceptions mtl>=1 network>=2 parsec>=2 xhtml>=3000 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-cookie/Makefile b/www/hs-cookie/Makefile index ee2ffb6507a1..605687d46d04 100644 --- a/www/hs-cookie/Makefile +++ b/www/hs-cookie/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= blaze-builder>=0.2.1 data-default text>=0.7 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile index 0fd7b77cda81..9e082277961a 100644 --- a/www/hs-css-text/Makefile +++ b/www/hs-css-text/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= attoparsec>=0.10 text>=0.11 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile index e05c8bc75d0c..e678bbde6ea9 100644 --- a/www/hs-fastcgi/Makefile +++ b/www/hs-fastcgi/Makefile @@ -15,6 +15,5 @@ USE_CABAL= cgi>=3000.0.0 LIB_DEPENDS= fcgi.0:${PORTSDIR}/www/fcgi -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile index 7fc267474dc9..30cf0ad85794 100644 --- a/www/hs-gitit/Makefile +++ b/www/hs-gitit/Makefile @@ -20,6 +20,5 @@ USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.4 cgi ConfigFile>=1 \ EXECUTABLE= expireGititCache gitit -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile index 5ac574035824..5643d6d554f7 100644 --- a/www/hs-hS3/Makefile +++ b/www/hs-hS3/Makefile @@ -15,6 +15,5 @@ USE_CABAL= Crypto>=4.1.0 dataenc HTTP>=4000.0.0 hxt>=9.0.0 \ EXECUTABLE= hs3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-hamlet/Makefile b/www/hs-hamlet/Makefile index 5aab70212249..62921b6e3e72 100644 --- a/www/hs-hamlet/Makefile +++ b/www/hs-hamlet/Makefile @@ -13,6 +13,5 @@ LICENSE= MIT USE_CABAL= blaze-builder>=0.2 blaze-html>=0.5 blaze-markup>=0.5.1 \ failure>=0.1 parsec>=2 shakespeare>=1.0.1 text>=0.7 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile index ecf16ecbc6ef..b401e033f194 100644 --- a/www/hs-happstack-server/Makefile +++ b/www/hs-happstack-server/Makefile @@ -16,6 +16,5 @@ USE_CABAL= base64-bytestring blaze-html>=0.5 extensible-exceptions \ threads>=0.5 time-compat transformers>=0.1.3 \ transformers-base>=0.4 utf8-string>=0.3.4 xhtml zlib -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile index 76d71d720619..99418343caad 100644 --- a/www/hs-happstack/Makefile +++ b/www/hs-happstack/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= happstack-server>=7.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-heist/Makefile b/www/hs-heist/Makefile index cd8750900f10..567e2cb645db 100644 --- a/www/hs-heist/Makefile +++ b/www/hs-heist/Makefile @@ -16,6 +16,5 @@ USE_CABAL= aeson>=0.6 attoparsec>=0.10 blaze-builder>=0.2 \ random>=1.0.1.0 text>=0.10 unordered-containers>=0.1.4 \ vector>=0.9 xmlhtml>=0.1.6 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile index 7e35c4429391..0c9d3244d3af 100644 --- a/www/hs-hjsmin/Makefile +++ b/www/hs-hjsmin/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.1 text>=0.8 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile index a4d6a00016ba..e536cb219cc9 100644 --- a/www/hs-http-conduit/Makefile +++ b/www/hs-http-conduit/Makefile @@ -20,6 +20,5 @@ USE_CABAL= asn1-data>=0.5.1 base64-bytestring>=0.1 blaze-builder>=0.2.1 \ transformers-base>=0.4 utf8-string>=0.3.4 void>=0.5.5 \ zlib-conduit>=0.5 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile index d03d15195fb8..0de6c3fd8265 100644 --- a/www/hs-http-date/Makefile +++ b/www/hs-http-date/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= attoparsec -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile index dcf71c703529..b2fcf01f4f4f 100644 --- a/www/hs-http-reverse-proxy/Makefile +++ b/www/hs-http-reverse-proxy/Makefile @@ -15,6 +15,5 @@ USE_CABAL= blaze-builder>=0.3 case-insensitive>=0.4 classy-prelude>=0.3 \ lifted-base>=0.1 monad-control>=0.3 network network-conduit>=0.6 \ text>=0.11 wai>=1.3 warp>=1.3.4 word8>=0.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile index 71316b1653f8..2a539cba4684 100644 --- a/www/hs-http-server/Makefile +++ b/www/hs-http-server/Makefile @@ -14,17 +14,18 @@ LICENSE= BSD USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2 url>=2 utf8-string>=0.3.4 INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \ - ${COPYTREE_SHARE} \* ${EXAMPLESDIR} + ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} OPTIONS_DEFINE= EXAMPLES OPTIONS_DEFAULT= EXAMPLES -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MEXAMPLES} SUB_FILES= pkg-message -SHOW_PKGMSG= yes + +post-install:: + @${CAT} ${PKGMESSAGE} .endif .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/www/hs-http-server/files/pkg-message.in b/www/hs-http-server/files/pkg-message.in index 0932f20ea899..d549047b1b56 100644 --- a/www/hs-http-server/files/pkg-message.in +++ b/www/hs-http-server/files/pkg-message.in @@ -1,5 +1,8 @@ - You have installed the directory: + +------------------------------------------------------------------------ +Note that the examples have been installed into this directory: %%EXAMPLESDIR%% - you'll have to install the port converters/hs-json to use it. +The port converters/hs-json has to be installed in order to use them. +------------------------------------------------------------------------ diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile index 7bccbaec638b..abbb92e533f6 100644 --- a/www/hs-http-types/Makefile +++ b/www/hs-http-types/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= blaze-builder>=0.2.1.4 case-insensitive>=0.2 text>=0.11.0.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile index 6adeb19715a2..87e6053f931c 100644 --- a/www/hs-oeis/Makefile +++ b/www/hs-oeis/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= HTTP>=4000.0.2 network>=2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile index 0af640f85960..35727555ab03 100644 --- a/www/hs-path-pieces/Makefile +++ b/www/hs-path-pieces/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= text>=0.5 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile index 2db55d6d908e..bbc1fccc4a22 100644 --- a/www/hs-recaptcha/Makefile +++ b/www/hs-recaptcha/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= HTTP>=3001.1.4 network>=2.2.0.1 xhtml>=3000.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-scgi/Makefile b/www/hs-scgi/Makefile index 2d0919c1a3f1..24a5544d8a38 100644 --- a/www/hs-scgi/Makefile +++ b/www/hs-scgi/Makefile @@ -15,6 +15,5 @@ LICENSE= BSD USE_CABAL= cgi network>=2.2.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-shakespeare-css/Makefile b/www/hs-shakespeare-css/Makefile index da57e26293bc..f0e66e55c78d 100644 --- a/www/hs-shakespeare-css/Makefile +++ b/www/hs-shakespeare-css/Makefile @@ -12,6 +12,5 @@ LICENSE= MIT USE_CABAL= parsec>=2 shakespeare>=1.0 text>=0.11.1.1 transformers -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-shakespeare-i18n/Makefile b/www/hs-shakespeare-i18n/Makefile index 96a7084bb3cc..28f23ad5a869 100644 --- a/www/hs-shakespeare-i18n/Makefile +++ b/www/hs-shakespeare-i18n/Makefile @@ -12,6 +12,5 @@ LICENSE= MIT USE_CABAL= parsec shakespeare>=1.0 text>=0.7 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-shakespeare-js/Makefile b/www/hs-shakespeare-js/Makefile index 030fef775305..1e5e3e4599b0 100644 --- a/www/hs-shakespeare-js/Makefile +++ b/www/hs-shakespeare-js/Makefile @@ -12,6 +12,5 @@ LICENSE= MIT USE_CABAL= aeson>=0.5 shakespeare>=1.0.5 text>=0.7 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-shakespeare-text/Makefile b/www/hs-shakespeare-text/Makefile index 93f1b0271e2e..cd1741b92b1b 100644 --- a/www/hs-shakespeare-text/Makefile +++ b/www/hs-shakespeare-text/Makefile @@ -12,6 +12,5 @@ LICENSE= MIT USE_CABAL= shakespeare>=1.0 text>=0.7 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile index 51ae3abfb0e0..dfe06966239e 100644 --- a/www/hs-shakespeare/Makefile +++ b/www/hs-shakespeare/Makefile @@ -13,6 +13,5 @@ LICENSE= MIT USE_CABAL= parsec>=2 system-fileio>=0.3 system-filepath>=0.4 \ text>=0.7 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile index 6762f6a0dd4e..5d1f6919dc23 100644 --- a/www/hs-snap-core/Makefile +++ b/www/hs-snap-core/Makefile @@ -17,6 +17,5 @@ USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \ regex-posix>=0.95 text>=0.11 unix-compat>=0.2 \ unordered-containers>=0.1.4.3 vector>=0.6 zlib-enum>=0.2.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile index 85298e228df4..fc2dcbcc9af7 100644 --- a/www/hs-snap-server/Makefile +++ b/www/hs-snap-server/Makefile @@ -20,7 +20,6 @@ OPTIONS_DEFINE= OPENSSL OPENSSL_DESC= Enable HTTPS support using the HsOpenSSL library -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MOPENSSL} diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile index 0586300e9fa4..b86c5867d162 100644 --- a/www/hs-snap/Makefile +++ b/www/hs-snap/Makefile @@ -23,6 +23,5 @@ EXECUTABLE= snap IGNORE_DYNAMIC= yes -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile index a1959ff2df93..9722ba342b45 100644 --- a/www/hs-url/Makefile +++ b/www/hs-url/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= utf8-string>=0.3.4 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile index 60d139eeeb6f..fb54e0b50a89 100644 --- a/www/hs-wai-app-static/Makefile +++ b/www/hs-wai-app-static/Makefile @@ -16,6 +16,5 @@ USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1.4 blaze-html>=0.5 \ mime-types>=0.1 system-fileio>=0.3 system-filepath>=0.4 \ text>=0.7 transformers>=0.2.2 unix-compat>=0.2 wai>=1.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile index 42311940804b..01697e361bff 100644 --- a/www/hs-wai-extra/Makefile +++ b/www/hs-wai-extra/Makefile @@ -17,6 +17,5 @@ USE_CABAL= ansi-terminal blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \ text>=0.7 transformers>=0.2.2 void>=0.5 wai>=1.3 \ wai-logger>=0.2 word8 zlib-conduit>=0.5 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile index 7e82607cbdd7..c2420a46d047 100644 --- a/www/hs-wai-logger/Makefile +++ b/www/hs-wai-logger/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= blaze-builder byteorder case-insensitive date-cache>=0.3 \ fast-logger>=0.3 http-types network wai -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-wai-test/Makefile b/www/hs-wai-test/Makefile index e1617a576df1..1b86ca9124d2 100644 --- a/www/hs-wai-test/Makefile +++ b/www/hs-wai-test/Makefile @@ -15,6 +15,5 @@ USE_CABAL= blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \ http-types>=0.7 HUnit>=1.2 network text>=0.7 \ transformers>=0.2.2 wai>=1.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile index bc17c4b6241f..a30cddd17178 100644 --- a/www/hs-wai/Makefile +++ b/www/hs-wai/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= blaze-builder>=0.2.1.4 conduit>=0.5 http-types>=0.7 \ network>=2.2.1.5 text>=0.7 transformers>=0.2.2 vault>=0.1 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile index 7a87e6626c17..73949f6629cf 100644 --- a/www/hs-warp/Makefile +++ b/www/hs-warp/Makefile @@ -16,6 +16,5 @@ USE_CABAL= blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \ simple-sendfile>=0.2.7 transformers>=0.2.2 unix-compat>=0.2 \ void wai>=1.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile index 107c2faab691..0d4b19d7914e 100644 --- a/www/hs-webkit/Makefile +++ b/www/hs-webkit/Makefile @@ -14,6 +14,5 @@ USES= pkgconfig USE_CABAL= cairo>=0.12 glib>=0.12 gtk>=0.12 mtl pango>=0.12 BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:${PORTSDIR}/www/webkit-gtk2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile index 74f52b7e2f79..35bd8053124c 100644 --- a/www/hs-xss-sanitize/Makefile +++ b/www/hs-xss-sanitize/Makefile @@ -13,6 +13,5 @@ LICENSE= BSD USE_CABAL= attoparsec>=0.10.0.3 css-text>=0.1.1 network>=2 \ tagsoup>=0.12.2 text>=0.11 utf8-string>=0.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile index 8bd8159573f5..188c980f2168 100644 --- a/www/hs-yesod-auth/Makefile +++ b/www/hs-yesod-auth/Makefile @@ -20,6 +20,5 @@ USE_CABAL= aeson>=0.5 authenticate>=1.3 blaze-html>=0.5 \ unordered-containers wai>=1.4 yesod-core>=1.2 yesod-form>=1.3 \ yesod-persistent>=1.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile index 3f2a8edb89e2..03146cf321b8 100644 --- a/www/hs-yesod-core/Makefile +++ b/www/hs-yesod-core/Makefile @@ -22,6 +22,5 @@ USE_CABAL= aeson>=0.5 attoparsec-conduit blaze-builder>=0.2.1.4 \ vector>=0.9 wai>=1.4 wai-extra>=1.3 warp>=1.3.8 \ yesod-routes>=1.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile index ed97124df973..382a6f7e02dc 100644 --- a/www/hs-yesod-form/Makefile +++ b/www/hs-yesod-form/Makefile @@ -17,6 +17,5 @@ USE_CABAL= aeson attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \ text>=0.9 transformers>=0.2.2 wai>=1.3 xss-sanitize>=0.3.0.1 \ yesod-core>=1.2 yesod-persistent>=1.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile index 4eec9f71a925..e10f3d537000 100644 --- a/www/hs-yesod-persistent/Makefile +++ b/www/hs-yesod-persistent/Makefile @@ -14,6 +14,5 @@ USE_CABAL= blaze-builder conduit lifted-base persistent>=1.2 \ persistent-template>=1.2 pool-conduit resourcet \ transformers>=0.2.2 yesod-core>=1.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-platform/Makefile b/www/hs-yesod-platform/Makefile index 6526472fc2b0..c169c6b00316 100644 --- a/www/hs-yesod-platform/Makefile +++ b/www/hs-yesod-platform/Makefile @@ -137,6 +137,5 @@ USE_CABAL= aeson==0.6.1.0_4 \ zlib-bindings==0.1.1.3_3 \ zlib-conduit==1.0.0_3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-routes/Makefile b/www/hs-yesod-routes/Makefile index 80659bcbb012..cf46882d88e9 100644 --- a/www/hs-yesod-routes/Makefile +++ b/www/hs-yesod-routes/Makefile @@ -12,6 +12,5 @@ LICENSE= MIT USE_CABAL= path-pieces>=0.1 text>=0.5 vector>=0.8 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile index bf1c8cb71e88..aac803a7845e 100644 --- a/www/hs-yesod-static/Makefile +++ b/www/hs-yesod-static/Makefile @@ -17,6 +17,5 @@ USE_CABAL= base64-bytestring>=0.1.0.1 cereal>=0.3 conduit>=0.5 \ transformers>=0.2.2 unix-compat>=0.2 wai>=1.3 \ wai-app-static>=1.3 yesod-core>=1.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-test/Makefile b/www/hs-yesod-test/Makefile index 33aabff17537..93b4696d1b2e 100644 --- a/www/hs-yesod-test/Makefile +++ b/www/hs-yesod-test/Makefile @@ -17,6 +17,5 @@ USE_CABAL= attoparsec>=0.10 blaze-builder blaze-html>=0.5 \ transformers>=0.2.2 wai>=1.3 wai-test>=1.3 xml-conduit>=1.0 \ xml-types>=0.3 yesod-core>=1.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod/Makefile b/www/hs-yesod/Makefile index c3ffcb205e37..e84e80ae4cfc 100644 --- a/www/hs-yesod/Makefile +++ b/www/hs-yesod/Makefile @@ -17,6 +17,5 @@ USE_CABAL= aeson blaze-html>=0.5 blaze-markup>=0.5.1 data-default \ wai-extra>=1.3 warp>=1.3 yaml yesod-auth>=1.2 yesod-core>=1.2 \ yesod-form>=1.3 yesod-persistent>=1.2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/hs-GLURaw/Makefile b/x11-toolkits/hs-GLURaw/Makefile index 9ac10642c3ad..bb6c98294de1 100644 --- a/x11-toolkits/hs-GLURaw/Makefile +++ b/x11-toolkits/hs-GLURaw/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_CABAL= OpenGLRaw>=1.3 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile index c2139d831b88..86ca747059c0 100644 --- a/x11-toolkits/hs-GLUT/Makefile +++ b/x11-toolkits/hs-GLUT/Makefile @@ -15,6 +15,5 @@ LICENSE= BSD USE_CABAL= OpenGL>=2.8 OpenGLRaw>=1.3 USE_GL= glut -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile index 1fdc7d2f0df0..3164a0a0d4c3 100644 --- a/x11-toolkits/hs-OpenGL/Makefile +++ b/x11-toolkits/hs-OpenGL/Makefile @@ -14,6 +14,5 @@ LICENSE= BSD USE_CABAL= GLURaw>=1.1.0.0 OpenGLRaw>=1.3.0.0 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/hs-OpenGLRaw/Makefile b/x11-toolkits/hs-OpenGLRaw/Makefile index 4bdf2a099b6c..41aab0e5f0b7 100644 --- a/x11-toolkits/hs-OpenGLRaw/Makefile +++ b/x11-toolkits/hs-OpenGLRaw/Makefile @@ -12,6 +12,5 @@ LICENSE= BSD USE_GL= gl glut -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/hs-gtk/Makefile b/x11-toolkits/hs-gtk/Makefile index 002ea92f07f7..16442b317410 100644 --- a/x11-toolkits/hs-gtk/Makefile +++ b/x11-toolkits/hs-gtk/Makefile @@ -14,6 +14,5 @@ USES= pkgconfig USE_CABAL= cairo>=0.12.0 gio>=0.12.0 glib>=0.12.0 mtl pango>=0.12.0 USE_GNOME= gtk20 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile index 78ae33a43f15..88e153444c1c 100644 --- a/x11-toolkits/hs-gtk2hs/Makefile +++ b/x11-toolkits/hs-gtk2hs/Makefile @@ -25,7 +25,6 @@ VTE_DESC= Terminal emulator WEBKIT_DESC= WebKit rendering engine SOEGTK_DESC= Examples for Haskell SoE -NO_STAGE= yes .include "../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MGCONF} diff --git a/x11-toolkits/hs-gtkglext/Makefile b/x11-toolkits/hs-gtkglext/Makefile index e1c5aed1937e..94ae96444026 100644 --- a/x11-toolkits/hs-gtkglext/Makefile +++ b/x11-toolkits/hs-gtkglext/Makefile @@ -15,6 +15,5 @@ LICENSE= LGPL21 USES= pkgconfig USE_CABAL= glib>=0.12 gtk>=0.12 mtl pango>=0.12 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/hs-gtksourceview2/Makefile b/x11-toolkits/hs-gtksourceview2/Makefile index 1f1c71da9280..29ab543c1309 100644 --- a/x11-toolkits/hs-gtksourceview2/Makefile +++ b/x11-toolkits/hs-gtksourceview2/Makefile @@ -14,6 +14,5 @@ USES= pkgconfig USE_CABAL= glib>=0.12 gtk>=0.12 mtl USE_GNOME= gtksourceview2 -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/hs-pango/Makefile b/x11-toolkits/hs-pango/Makefile index 8f5618f8b77a..9b4a33207dbf 100644 --- a/x11-toolkits/hs-pango/Makefile +++ b/x11-toolkits/hs-pango/Makefile @@ -14,6 +14,5 @@ USES= pkgconfig USE_CABAL= cairo>=0.12.0 glib>=0.12.0 mtl USE_GNOME= pango -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile index e24fe22d6372..5af40f19cdaf 100644 --- a/x11-toolkits/hs-vte/Makefile +++ b/x11-toolkits/hs-vte/Makefile @@ -14,6 +14,5 @@ USES= pkgconfig USE_CABAL= glib>=0.12 gtk>=0.12 mtl pango>=0.12 USE_GNOME= vte -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/hs-wx/Makefile b/x11-toolkits/hs-wx/Makefile index 1060654904e8..0b71046d6c92 100644 --- a/x11-toolkits/hs-wx/Makefile +++ b/x11-toolkits/hs-wx/Makefile @@ -14,6 +14,5 @@ USE_WX= 2.9 WX_COMPS= wx WX_UNICODE= yes -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/hs-wxc/Makefile b/x11-toolkits/hs-wxc/Makefile index df3aeff6b79c..9bec86e90ebc 100644 --- a/x11-toolkits/hs-wxc/Makefile +++ b/x11-toolkits/hs-wxc/Makefile @@ -17,7 +17,6 @@ WX_UNICODE= yes NOPORTDOCS= yes USE_DOS2UNIX= yes -NO_STAGE= yes post-patch:: @${REINPLACE_CMD} 's|"wx-config"|"wxgtk2u-2.9-config"| ; \ s|/sbin/ldconfig -n|/sbin/ldconfig -m| ' ${WRKSRC}/Setup.hs diff --git a/x11-toolkits/hs-wxcore/Makefile b/x11-toolkits/hs-wxcore/Makefile index e9b5533ecb95..2c1e0574e7ab 100644 --- a/x11-toolkits/hs-wxcore/Makefile +++ b/x11-toolkits/hs-wxcore/Makefile @@ -14,6 +14,5 @@ USE_WX= 2.9 WX_COMPS= wx WX_UNICODE= yes -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/x11-toolkits/hs-wxdirect/Makefile b/x11-toolkits/hs-wxdirect/Makefile index 307d935e81e3..f3e4ac3e6b58 100644 --- a/x11-toolkits/hs-wxdirect/Makefile +++ b/x11-toolkits/hs-wxdirect/Makefile @@ -14,6 +14,5 @@ USE_CABAL= parsec>=2.1.0 strict EXECUTABLE= wxdirect -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile index b6672e33aac2..1e811d4bc2e9 100644 --- a/x11-wm/hs-xmonad-contrib/Makefile +++ b/x11-wm/hs-xmonad-contrib/Makefile @@ -21,7 +21,6 @@ OPTIONS_DEFAULT= XFT XFT_DESC= Use Xft to render text -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MXFT} diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile index e39313eaa4b6..00df6fa24c15 100644 --- a/x11-wm/hs-xmonad/Makefile +++ b/x11-wm/hs-xmonad/Makefile @@ -19,6 +19,5 @@ MAN1SRC= man EXECUTABLE= xmonad -NO_STAGE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> 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 <bsd.port.mk> 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 |