- Update pandoc to 1.1

- Take over maintainership

PR:		ports/129700
Submitted by:	pgj
Approved by:	(old) maintainer, miwi

6 files changed, 44 insertions, 20 deletions

diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 07953dd1f80a..6dda1a18e0f9 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -6,14 +6,16 @@
 #
 
 PORTNAME=	pandoc
-PORTVERSION=	0.46
+PORTVERSION=	1.1
 CATEGORIES=	textproc haskell
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
-MAINTAINER=	jgm@berkeley.edu
+MAINTAINER=	pgj@FreeBSD.org
 COMMENT=	A general markup converter
 
-BUILD_DEPENDS=	ghc>=6.6:${PORTSDIR}/lang/ghc
+BUILD_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc \
+		hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \
+		hs-zip-archive-ghc>=0.1:${PORTSDIR}/archivers/hs-zip-archive-ghc
 
 MANCOMPRESSED=	no
 MAN1=		pandoc.1 markdown2pdf.1 html2markdown.1 hsmarkdown.1
@@ -25,6 +27,15 @@ PLIST_FILES=	bin/pandoc bin/markdown2pdf bin/html2markdown bin/hsmarkdown
 PORTDOCS=	BUGS README README.html
 SCRIPTS=	hsmarkdown html2markdown markdown2pdf
 
+OPTIONS=	HIGHLIGHTING "Syntax highlighting support" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_HIGHLIGHTING)
+BUILD_DEPENDS+=	hs-highlighting-kate>=0.2:${PORTSDIR}/textproc/hs-highlighting-kate
+MAKE_ARGS=	CABALOPTS+="-fhighlighting"
+.endif
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/dist/build/pandoc/pandoc ${PREFIX}/bin
 .for script in ${SCRIPTS}
@@ -40,4 +51,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index d4f72112d775..efb2dbef48e0 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,3 +1,3 @@
-MD5 (pandoc-0.46.tar.gz) = 9a92a800678767393adab6eb1b69c04b
-SHA256 (pandoc-0.46.tar.gz) = 40d75fb5bf0d8757d896b3ee68cab6c7ac4e351c47ce91feb77a7896e7194abb
-SIZE (pandoc-0.46.tar.gz) = 408031
+MD5 (pandoc-1.1.tar.gz) = 2550a383dda6053907405dedacee860d
+SHA256 (pandoc-1.1.tar.gz) = 0d09d9b500c82c249359db9595c98e9566fd25a1d5d9fed362157a67045aadfc
+SIZE (pandoc-1.1.tar.gz) = 329070
diff --git a/textproc/hs-pandoc/pkg-descr b/textproc/hs-pandoc/pkg-descr
index 1ef530270b0a..7902266b0355 100644
--- a/textproc/hs-pandoc/pkg-descr
+++ b/textproc/hs-pandoc/pkg-descr
@@ -1,19 +1,20 @@
 Pandoc is a command-line tool for converting from one markup format
 to another.  It can read markdown and (subsets of) reStructuredText,
 HTML, and LaTeX, and it can write markdown, reStructuredText, HTML,
-LaTeX, ConTeXt, DocBook, RTF, groff man pages, and S5 HTML slide shows.
+LaTeX, ConTeXt, DocBook XML, OpenDocument XML, ODT, RTF, GNU Texinfo,
+MediaWiki markup, groff man pages, and S5 HTML slide shows.
 
 Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,
 and other features.  A compatibility mode is provided for those who
 need a drop-in replacement for Markdown.pl.  Included wrapper scripts
-make it easy to convert markdown documents to PDFs and to convert web
+make it easy to convert markdown documents to PDF and to convert web
 pages to markdown documents.
 
 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
+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/
diff --git a/textproc/pandoc/Makefile b/textproc/pandoc/Makefile
index 07953dd1f80a..6dda1a18e0f9 100644
--- a/textproc/pandoc/Makefile
+++ b/textproc/pandoc/Makefile
@@ -6,14 +6,16 @@
 #
 
 PORTNAME=	pandoc
-PORTVERSION=	0.46
+PORTVERSION=	1.1
 CATEGORIES=	textproc haskell
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
-MAINTAINER=	jgm@berkeley.edu
+MAINTAINER=	pgj@FreeBSD.org
 COMMENT=	A general markup converter
 
-BUILD_DEPENDS=	ghc>=6.6:${PORTSDIR}/lang/ghc
+BUILD_DEPENDS=	ghc>=6.8:${PORTSDIR}/lang/ghc \
+		hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \
+		hs-zip-archive-ghc>=0.1:${PORTSDIR}/archivers/hs-zip-archive-ghc
 
 MANCOMPRESSED=	no
 MAN1=		pandoc.1 markdown2pdf.1 html2markdown.1 hsmarkdown.1
@@ -25,6 +27,15 @@ PLIST_FILES=	bin/pandoc bin/markdown2pdf bin/html2markdown bin/hsmarkdown
 PORTDOCS=	BUGS README README.html
 SCRIPTS=	hsmarkdown html2markdown markdown2pdf
 
+OPTIONS=	HIGHLIGHTING "Syntax highlighting support" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_HIGHLIGHTING)
+BUILD_DEPENDS+=	hs-highlighting-kate>=0.2:${PORTSDIR}/textproc/hs-highlighting-kate
+MAKE_ARGS=	CABALOPTS+="-fhighlighting"
+.endif
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/dist/build/pandoc/pandoc ${PREFIX}/bin
 .for script in ${SCRIPTS}
@@ -40,4 +51,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/pandoc/distinfo b/textproc/pandoc/distinfo
index d4f72112d775..efb2dbef48e0 100644
--- a/textproc/pandoc/distinfo
+++ b/textproc/pandoc/distinfo
@@ -1,3 +1,3 @@
-MD5 (pandoc-0.46.tar.gz) = 9a92a800678767393adab6eb1b69c04b
-SHA256 (pandoc-0.46.tar.gz) = 40d75fb5bf0d8757d896b3ee68cab6c7ac4e351c47ce91feb77a7896e7194abb
-SIZE (pandoc-0.46.tar.gz) = 408031
+MD5 (pandoc-1.1.tar.gz) = 2550a383dda6053907405dedacee860d
+SHA256 (pandoc-1.1.tar.gz) = 0d09d9b500c82c249359db9595c98e9566fd25a1d5d9fed362157a67045aadfc
+SIZE (pandoc-1.1.tar.gz) = 329070
diff --git a/textproc/pandoc/pkg-descr b/textproc/pandoc/pkg-descr
index 1ef530270b0a..7902266b0355 100644
--- a/textproc/pandoc/pkg-descr
+++ b/textproc/pandoc/pkg-descr
@@ -1,19 +1,20 @@
 Pandoc is a command-line tool for converting from one markup format
 to another.  It can read markdown and (subsets of) reStructuredText,
 HTML, and LaTeX, and it can write markdown, reStructuredText, HTML,
-LaTeX, ConTeXt, DocBook, RTF, groff man pages, and S5 HTML slide shows.
+LaTeX, ConTeXt, DocBook XML, OpenDocument XML, ODT, RTF, GNU Texinfo,
+MediaWiki markup, groff man pages, and S5 HTML slide shows.
 
 Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,
 and other features.  A compatibility mode is provided for those who
 need a drop-in replacement for Markdown.pl.  Included wrapper scripts
-make it easy to convert markdown documents to PDFs and to convert web
+make it easy to convert markdown documents to PDF and to convert web
 pages to markdown documents.
 
 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
+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/