- Update to 1.9.4.2

- Use the new options framework

Obtained from:	FreeBSD Haskell

3 files changed, 23 insertions, 24 deletions

diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 8f03263f3a8b..fc5700d8c1f0 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pandoc
-PORTVERSION=	1.9.3
+PORTVERSION=	1.9.4.2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -27,29 +27,28 @@ USE_CABAL=	base64-bytestring>=0.1 blaze-html>=0.4.3.0 citeproc-hs>=0.3.4 \
 MAN1=		pandoc.1
 MAN5=		pandoc_markdown.5
 
-OPTIONS=	EXECUTABLE   "Build the pandoc executable" on \
-		LIBRARY      "Build the pandoc library" on \
+OPTIONS_MULTI=		FORMAT
+OPTIONS_MULTI_FORMAT=	EXECUTABLE LIBRARY
+OPTIONS_DEFAULT=	EXECUTABLE LIBRARY
+
+EXECUTABLE_DESC=	Build the pandoc executable
+LIBRARY_DESC=		Build the pandoc library
 
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
 .include <bsd.port.options.mk>
 
-.if defined(WITH_EXECUTABLE)
+.if ${PORT_OPTIONS:MEXECUTABLE}
 CONFIGURE_ARGS+=	--flags="exectuable"
 EXECUTABLE+=		pandoc
 .else
 CONFIGURE_ARGS+=	--flags="-executable"
 .endif
 
-.if defined(WITH_LIBRARY)
+.if ${PORT_OPTIONS:MLIBRARY}
 CONFIGURE_ARGS+=	--flags="library"
 .else
 CONFIGURE_ARGS+=	--flags="-library"
 STANDALONE=		yes
 .endif
 
-.if !defined(WITH_EXECUTABLE) && !defined(WITH_LIBRARY)
-IGNORE=		cannot be compiled in this configuration.  Please (re)run 'make config' and choose either EXECUTABLE or LIBRARY or both
-.endif
-
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index 38b2e047b12a..641f1c6d050a 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-1.9.3.tar.gz) = 40929596f7a57de4cbd58e30beca2faaf237e4eee1db3f6265b94a1a52ff1f36
-SIZE (cabal/pandoc-1.9.3.tar.gz) = 560502
+SHA256 (cabal/pandoc-1.9.4.2.tar.gz) = 535380d76be30747e264950ca1df96bc3d480a5917ab5a54fcd0d7b84cc722ff
+SIZE (cabal/pandoc-1.9.4.2.tar.gz) = 575099
diff --git a/textproc/hs-pandoc/pkg-descr b/textproc/hs-pandoc/pkg-descr
index 9f2a42e3ee84..400d102d4c2f 100644
--- a/textproc/hs-pandoc/pkg-descr
+++ b/textproc/hs-pandoc/pkg-descr
@@ -1,18 +1,18 @@
 Pandoc is a Haskell library for converting from one markup format to
-another, and a command-line tool that uses this library. It can read
+another, and a command-line tool that uses this library.  It can read
 markdown and (subsets of) reStructuredText, HTML, LaTeX and Textile, and
 it can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook,
 OpenDocument, ODT, Word docx, RTF, MediaWiki, Textile, groff man pages,
-plain text, Emacs Org-Mode, AsciiDoc, EPUB, and S5 and Slidy HTML slide
-shows. Pandoc extends standard markdown syntax with footnotes, embedded
-LaTeX, definition lists, tables, and other features. A compatibility
-mode is provided for those who need a drop-in replacement for
-Markdown.pl. In contrast to existing tools for converting markdown to
-HTML, which use regex substitutions, pandoc has a modular design: it
-consists of a set of readers, which parse text in a given format and
-produce a native representation of the document, and a set of writers,
-which convert this native representation into a target format. Thus,
-adding an input or output format requires only adding a reader or
-writer.
+plain text, Emacs Org-Mode, AsciiDoc, EPUB, and S5 and Slidy and
+Slideous HTML slide shows.  Pandoc extends standard markdown syntax with
+footnotes, embedded LaTeX, definition lists, tables, and other features.
+A compatibility mode is provided for those who need a drop-in
+replacement for Markdown.pl.  In contrast to existing tools for
+converting markdown to HTML, which use regex substitutions, pandoc has a
+modular design: it consists of a set of readers, which parse text in a
+given format and produce a native representation of the document, and a
+set of writers, which convert this native representation into a target
+format.  Thus, adding an input or output format requires only adding a
+reader or writer.
 
 WWW:	http://johnmacfarlane.net/pandoc