3 files changed, 38 insertions, 30 deletions

diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index fc8e455ba018..2f8d347bd1b9 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pandoc
-PORTVERSION=	1.13.2
+PORTVERSION=	1.15.0.6
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -10,16 +10,16 @@ COMMENT=	Conversion between markup formats
 
 LICENSE=	GPLv2
 
-USE_CABAL=	aeson>=0.7 base64-bytestring>=0.1 blaze-html>=0.5 \
-		blaze-markup>=0.5.1 data-default>=0.4 deepseq-generics>=0.1 \
-		extensible-exceptions>=0.1 haddock-library>=1.1 \
-		highlighting-kate>=0.5.11.1 hslua>=0.3 HTTP>=4000.0.5 \
-		JuicyPixels>=3.1.6.1 mtl>=1.1 network>=2 \
-		pandoc-types>=1.12.4 parsec>=3.1 random>=1 scientific>=0.2 \
-		SHA>=1.6 syb>=0.1 tagsoup>=0.13.1 temporary>=1.1 \
-		texmath>=0.8.0.1 text>=0.11 unordered-containers>=0.2 \
-		vector>=0.10 xml>=1.3.12 yaml>=0.8.8.2 zip-archive>=0.2.3.4 \
-		zlib>=0.5
+USE_CABAL=	aeson>=0.7.0.5 base64-bytestring>=0.1 blaze-html>=0.5 \
+		blaze-markup>=0.5.1 cmark>=0.4.0.1 data-default>=0.4 \
+		deepseq-generics>=0.1 extensible-exceptions>=0.1 \
+		filemanip>=0.3 haddock-library>=1.1 highlighting-kate>=0.6 \
+		hslua>=0.3 HTTP>=4000.0.5 JuicyPixels>=3.1.6.1 mtl>=1.1 \
+		network>=2.6 network-uri>=2.6 pandoc-types>=1.12.4 parsec>=3.1 \
+		random>=1 scientific>=0.2 SHA>=1.6 syb>=0.1 tagsoup>=0.13.1 \
+		temporary>=1.1 texmath>=0.8.1 text>=0.11 \
+		unordered-containers>=0.2 vector>=0.10 xml>=1.3.12 \
+		yaml>=0.8.8.2 zip-archive>=0.2.3.4 zlib>=0.5
 
 USE_ALEX=	yes
 USE_HAPPY=	yes
@@ -29,16 +29,15 @@ EXECUTABLE=	pandoc
 # For PDF generation
 USE_TEX=	texmf:run
 
-MAN1SRC=	man/man1
-MAN5SRC=	man/man5
+MAN1SRC=	man
 MAN1PAGES=	pandoc.1
-MAN5PAGES=	pandoc_markdown.5
 
-FLAGS_DEFINE=			EMBED_DATA_FILES HTTPS TRYPANDOC
+FLAGS_DEFINE=			EMBED_DATA HTTPS TRYPANDOC
 FLAGS_DEFAULT=			HTTPS
 
-EMBED_DATA_FILES_DESC=		Embed data files in binary for relocatable executable
-EMBED_DATA_FILES_FLAG_ENABLE=	embed_data_files
+EMBED_DATA_DESC=		Embed data files in binary for relocatable executable
+EMBED_DATA_FLAG_ENABLE=	embed_data_files
+EMBED_DATA_FLAG_CABAL=	hsb2hs>=0.3.1
 
 HTTPS_DESC=		Enable downloading of resources over HTTPS
 HTTPS_FLAG_ENABLE=	https
@@ -50,6 +49,7 @@ TRYPANDOC_FLAG_CABAL=		aeson highlighting-kate text wai-extra wai>=0.3 \
 				http-types
 TRYPANDOC_FLAG_EXECUTABLE=	trypandoc
 
+FLAGS_ENABLE=		network-uri
 FLAGS_DISABLE=		make-pandoc-man-pages
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index f52429c82d0e..d7c721bc1184 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-1.13.2.tar.gz) = e65c445f4454e9efcf1bc8c28754260d7108803bd8979bc2ff3c34705e386d8a
-SIZE (cabal/pandoc-1.13.2.tar.gz) = 1980729
+SHA256 (cabal/pandoc-1.15.0.6.tar.gz) = d950968142526d5a765af7dfb26b47c3f60d4f883aa9d9eab668614179f1ed46
+SIZE (cabal/pandoc-1.15.0.6.tar.gz) = 2049870
diff --git a/textproc/hs-pandoc/pkg-descr b/textproc/hs-pandoc/pkg-descr
index d532d32887bf..5cfd90d5ec62 100644
--- a/textproc/hs-pandoc/pkg-descr
+++ b/textproc/hs-pandoc/pkg-descr
@@ -1,15 +1,23 @@
 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
 markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook,
-MediaWiki markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags and
-Textile, and it can write markdown, reStructuredText, HTML, LaTeX,
-ConTeXt, Docbook, OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki,
-DokuWiki, Textile, groff man pages, plain text, Emacs Org-Mode,
-AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML,
-and several kinds of HTML/javascript slide shows (S5, Slidy, Slideous,
-DZSlides, reveal.js).  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.
+MediaWiki markup, TWiki markup, Haddock markup, OPML, Emacs Org-Mode,
+txt2tags and Textile, and it can write markdown, reStructuredText,
+XHTML, HTML 5, LaTeX, ConTeXt, DocBook, OPML, OpenDocument, ODT, Word
+docx, RTF, MediaWiki, DokuWiki, Textile, groff man pages, plain text,
+Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3),
+FictionBook2, InDesign ICML, and several kinds of HTML/javascript slide
+shows (S5, Slidy, Slideous, DZSlides, reveal.js).
 
-WWW: http://johnmacfarlane.net/pandoc
+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://pandoc.org