diff options
| author | Gabor Pali <pgj@FreeBSD.org> | 2010-05-22 22:41:50 +0000 |
|---|---|---|
| committer | Gabor Pali <pgj@FreeBSD.org> | 2010-05-22 22:41:50 +0000 |
| commit | f1905422ee6b86d1afc28896fc9c0e4de3baf608 (patch) | |
| tree | 6189ae4ab63cdc0704c29f18be3e2b350c8349a3 /textproc/hs-pandoc | |
| parent | 7d1d3e059567d7924496edc21ddfbaf7d920f989 (diff) | |
| download | ports-f1905422ee6b86d1afc28896fc9c0e4de3baf608.tar.gz ports-f1905422ee6b86d1afc28896fc9c0e4de3baf608.zip | |
- Fix OPTIONS support for Cabal ports by introducing
bsd.cabal.options.mk
- Fix ports broken with non-default options
Triggered by: Yuri Pankov <yuri.pankov@gmail.com>
Notes
Notes:
svn path=/head/; revision=254867
Diffstat (limited to 'textproc/hs-pandoc')
| -rw-r--r-- | textproc/hs-pandoc/Makefile | 3 | ||||
| -rw-r--r-- | textproc/hs-pandoc/pkg-plist | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile index 941804ba49de..7d604d9e5e64 100644 --- a/textproc/hs-pandoc/Makefile +++ b/textproc/hs-pandoc/Makefile @@ -26,6 +26,7 @@ OPTIONS= HIGHLIGHTING "Compile in support for syntax highlighting" off \ LIBRARY "Build the pandoc library" on \ CITEPROC "Compile in support for citeproc-hs" off +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .include <bsd.port.options.mk> .if defined(WITH_HIGHLIGHTING) @@ -74,8 +75,10 @@ IGNORE= cannot be compiled in this configuration. Please (re)run 'make config' .if defined(WITH_CITEPROC) CONFIGURE_ARGS+= --flags="citeproc" USE_HACKAGE+= citeproc-hs +PLIST_SUB+= MAYBE_CITEPROC="" .else CONFIGURE_ARGS+= --flags="-citeproc" +PLIST_SUB+= MAYBE_CITEPROC="@comment " .endif .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/textproc/hs-pandoc/pkg-plist b/textproc/hs-pandoc/pkg-plist index 0f186a4140ea..6855f3c090ee 100644 --- a/textproc/hs-pandoc/pkg-plist +++ b/textproc/hs-pandoc/pkg-plist @@ -3,6 +3,7 @@ %%MAYBE_EXECUTABLE%%bin/pandoc %%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Paths_pandoc.hi %%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc.hi +%%MAYBE_LIBRARY%%%%MAYBE_CITEPROC%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Biblio.hi %%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Blocks.hi %%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/CharacterReferences.hi %%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Definition.hi |