aboutsummaryrefslogtreecommitdiff
path: root/textproc/hs-pandoc
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2013-03-29 22:43:58 +0000
committerGabor Pali <pgj@FreeBSD.org>2013-03-29 22:43:58 +0000
commitbd8d410bbe561cb06cef8e6439398148ea172996 (patch)
treebb6acd9e4d75e5dd918d3f6f723ca485c7f0dd6f /textproc/hs-pandoc
parent18f2b16087e8ecd6790e8d551f1083d977da1d77 (diff)
downloadports-bd8d410bbe561cb06cef8e6439398148ea172996.tar.gz
ports-bd8d410bbe561cb06cef8e6439398148ea172996.zip
- Update Haskell ports from the development repository
- Avoid self-dependency for print/hs-hscolour (when HSCOLOUR is set) Contributed by: ashish New ports (5): devel/hs-geniplate 0.6.0.3 devel/hs-uuid 1.2.9 net/hs-maccatcher 2.1.5 net/hs-publicsuffixlist 0.0.3 textproc/hs-regex-tdfa 1.1.8 Removed ports (1): math/hs-Agda-executable 2.3.0.1_3 Updated ports (115): archivers/hs-zip-archive 0.1.3.3 --> 0.1.3.4 archivers/hs-zlib-conduit 0.5.0.3_1 --> 1.0.0 audio/hs-OpenAL 1.4.0.1_3 --> 1.4.0.2 databases/hs-persistent 1.1.4 --> 1.1.5.1 databases/hs-persistent-sqlite 1.1.2 --> 1.1.5 databases/hs-persistent-template 1.1.2.1 --> 1.1.2.4 devel/hs-Boolean 0.1.2 --> 0.2 devel/hs-ansi-terminal 0.5.5.1 --> 0.6 devel/hs-base64-bytestring 1.0.0.0_1 --> 1.0.0.1 devel/hs-base64-conduit 0.5.1 --> 1.0.0 devel/hs-basic-prelude 0.3.2.0 --> 0.3.4.0 devel/hs-bifunctors 3.2 --> 3.2.0.1 devel/hs-blaze-builder-conduit 0.5.0.3_1 --> 1.0.0 devel/hs-classy-prelude 0.4.3 --> 0.5.3 devel/hs-classy-prelude-conduit 0.4.3 --> 0.5.3 devel/hs-cmdargs 0.10.1_1 --> 0.10.2 devel/hs-conduit 0.5.6 --> 1.0.2 devel/hs-darcs 2.8.3_1 --> 2.8.4 devel/hs-either 3.1 --> 3.4 devel/hs-errors 1.3.1 --> 1.4.1 devel/hs-filestore 0.6 --> 0.6.0.1 devel/hs-filesystem-conduit 0.5.0.2_1 --> 1.0.0 devel/hs-git-annex 3.20130124 --> 4.20130323 devel/hs-hashtables 1.0.1.8_1 --> 1.1.0.2 devel/hs-haskeline 0.6.4.7_3 --> 0.7.0.3 devel/hs-hint 0.3.3.5_1 --> 0.3.3.6 devel/hs-hoogle 4.2.15 --> 4.2.16 devel/hs-hspec 1.4.3 --> 1.4.4 devel/hs-lens 3.8.5 --> 3.8.7.3 devel/hs-logict 0.5.0.2_1 --> 0.6 devel/hs-monad-logger 0.2.3.2 --> 0.3.0.1 devel/hs-monad-par 0.3_3 --> 0.3.4.1 devel/hs-mueval 0.8.2_3 --> 0.9 devel/hs-profunctors 3.2 --> 3.3 devel/hs-project-template 0.1.1 --> 0.1.3 devel/hs-readline 1.0.1.0_8 --> 1.0.3.0 devel/hs-reflection 1.1.6 --> 1.1.7 devel/hs-resourcet 0.4.4_1 --> 0.4.5 devel/hs-show 0.4.1.2_4 --> 0.5 devel/hs-simple-reflect 0.2_1 --> 0.3.1 devel/hs-smallcheck 0.6.2 --> 1.0.2 devel/hs-testpack 2.1.2_3 --> 2.1.2.1 devel/hs-threads 0.5.0.1_1 --> 0.5.0.2 devel/hs-time-compat 0.1.0.2_1 --> 0.1.0.3 devel/hs-unix-time 0.1.4_1 --> 0.1.5 devel/hs-uulib 0.9.14_4 --> 0.9.15 mail/hs-email-validate 0.3.2_1 --> 1.0.0 mail/hs-mime-types 0.1.0.2 --> 0.1.0.3 math/hs-Agda 2.3.0.1_3 --> 2.3.2 math/hs-NumInstances 1.0_4 --> 1.2 math/hs-comonad 3.0.1.1 --> 3.0.2 math/hs-contravariant 0.2.0.2_3 --> 0.4 math/hs-distributive 0.3 --> 0.3.1 math/hs-math-functions 0.1.1.2_1 --> 0.1.3.0 net/hs-network-conduit 0.6.2.2 --> 1.0.0 net/hs-sendfile 0.7.8_1 --> 0.7.9 net/hs-simple-sendfile 0.2.10 --> 0.2.11 net/hs-socks 0.4.2_1 --> 0.5.0 security/hs-crypto-api 0.10.2_3 --> 0.11 security/hs-crypto-conduit 0.4.3 --> 0.5.0 security/hs-monadcryptorandom 0.5_1 --> 0.5.1 security/hs-skein 0.1.0.11 --> 0.1.0.12 security/hs-tls 1.1.1 --> 1.1.2 textproc/hs-HStringTemplate 0.6.12_1 --> 0.7.1 textproc/hs-attoparsec 0.10.3.0 --> 0.10.4.0 textproc/hs-attoparsec-conduit 0.5.0.3_1 --> 1.0.0 textproc/hs-blaze-html 0.5.1.3 --> 0.6.0.0 textproc/hs-case-insensitive 0.4.0.4 --> 1.0 textproc/hs-citeproc-hs 0.3.7 --> 0.3.8 textproc/hs-highlighting-kate 0.5.3.5 --> 0.5.3.8 textproc/hs-hs-bibutils 4.16 --> 4.17 textproc/hs-html-conduit 0.1.0.4_1 --> 1.1.0 textproc/hs-hxt-regex-xmlschema 9.0.4_4 --> 9.1.0 textproc/hs-pandoc 1.9.4.5_1 --> 1.11.1 textproc/hs-pandoc-types 1.9.1_3 --> 1.10 textproc/hs-tagstream-conduit 0.5.3_1 --> 0.5.4 textproc/hs-xml-conduit 1.0.3.3_1 --> 1.1.0.3 textproc/hs-xmlhtml 0.2.0.3_1 --> 0.2.1 textproc/hs-yaml 0.8.2 --> 0.8.2.3 www/hs-activehs 0.3.0.1_1 --> 0.3.1 www/hs-authenticate 1.3.2_1 --> 1.3.2.6 www/hs-fastcgi 3001.0.2.3_7 --> 3001.0.2.4 www/hs-gitit 0.10.1.2 --> 0.10.3.1 www/hs-hS3 0.5.6_5 --> 0.5.7 www/hs-hamlet 1.1.3.1 --> 1.1.6.3 www/hs-happstack-server 7.1.1_1 --> 7.1.7 www/hs-heist 0.11.0 --> 0.11.1 www/hs-hjsmin 0.1.4 --> 0.1.4.1 www/hs-http-conduit 1.8.7 --> 1.9.0 www/hs-http-reverse-proxy 0.1.1.1 --> 0.1.1.3 www/hs-http-server 1.0.1_1 --> 1.0.2 www/hs-http-types 0.7.3.0.1_1 --> 0.8.0 www/hs-shakespeare 1.0.2_1 --> 1.0.3.1 www/hs-shakespeare-css 1.0.2_1 --> 1.0.3 www/hs-shakespeare-js 1.1.1 --> 1.1.2.1 www/hs-snap 0.11.0 --> 0.11.2 www/hs-snap-core 0.9.2.2_1 --> 0.9.3.1 www/hs-snap-server 0.9.2.4_1 --> 0.9.3.3 www/hs-wai 1.3.0.1_1 --> 1.4.0 www/hs-wai-app-static 1.3.1_1 --> 1.3.1.2 www/hs-wai-extra 1.3.2 --> 1.3.2.4 www/hs-wai-test 1.3.0_1 --> 1.3.0.4 www/hs-warp 1.3.7.1 --> 1.3.7.4 www/hs-yesod 1.1.7.2 --> 1.1.9.2 www/hs-yesod-auth 1.1.3 --> 1.1.5.3 www/hs-yesod-core 1.1.7.1 --> 1.1.8.2 www/hs-yesod-default 1.1.3 --> 1.1.3.2 www/hs-yesod-form 1.2.0.2 --> 1.2.1.3 www/hs-yesod-json 1.1.2_1 --> 1.1.2.1 www/hs-yesod-platform 1.1.7.2 --> 1.1.8 www/hs-yesod-routes 1.1.1.1_1 --> 1.1.2 www/hs-yesod-static 1.1.1.2 --> 1.1.2.2 www/hs-yesod-test 0.3.3 --> 0.3.5 x11-wm/hs-xmonad-contrib 0.11 --> 0.11.1 x11/hs-X11 1.6.0.2 --> 1.6.1.1 Please note that port revisions for dependent ports are bumped. Obtained from: FreeBSD Haskell
Notes
Notes: svn path=/head/; revision=315580
Diffstat (limited to 'textproc/hs-pandoc')
-rw-r--r--textproc/hs-pandoc/Makefile38
-rw-r--r--textproc/hs-pandoc/distinfo4
-rw-r--r--textproc/hs-pandoc/files/patch-Setup.hs12
-rw-r--r--textproc/hs-pandoc/pkg-descr9
4 files changed, 28 insertions, 35 deletions
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 3bcc670b26cd..0003ff03c210 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= pandoc
-PORTVERSION= 1.9.4.5
-PORTREVISION= 1
+PORTVERSION= 1.11.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,37 +13,28 @@ FILE_LICENSE= COPYING
CABAL_SETUP= Setup.hs
-USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.4.3.0 citeproc-hs>=0.3.4 \
- highlighting-kate>=0.5.0.2 HTTP>=4000.0.5 json>=0.4 \
- mtl>=1.1 network>=2 pandoc-types>=1.9.0.2 parsec>=3.1 \
- random>=1 syb>=0.1 tagsoup>=0.12.5 temporary>=1.1 \
- texmath>=0.6.0.2 utf8-string>=0.3 xml>=1.3.12 \
- zip-archive>=0.1.1.7 zlib>=0.5
+USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.6 blaze-markup>=0.5.1 \
+ citeproc-hs>=0.3.7 data-default>=0.4 highlighting-kate>=0.5.3.7 \
+ HTTP>=4000.0.5 json>=0.4 mtl>=1.1 network>=2 \
+ pandoc-types>=1.10 parsec>=3.1 random>=1 syb>=0.1 \
+ tagsoup>=0.12.5 temporary>=1.1 texmath>=0.6.1.3 \
+ text>=0.11 xml>=1.3.12 zip-archive>=0.1.3.3 zlib>=0.5
+
+EXECUTABLE= pandoc
MAN1= pandoc.1
MAN5= pandoc_markdown.5
-OPTIONS_MULTI= FORMAT
-OPTIONS_MULTI_FORMAT= EXECUTABLE LIBRARY
-OPTIONS_DEFAULT= EXECUTABLE LIBRARY
+OPTIONS_DEFINE= EMBED_DATA_FILES
-EXECUTABLE_DESC= Build the pandoc executable
-LIBRARY_DESC= Build the pandoc library
+EMBED_DATA_FILES_DESC= Embed data files in binary for relocatable executable
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-.if ${PORT_OPTIONS:MEXECUTABLE}
-CONFIGURE_ARGS+= --flags="exectuable"
-EXECUTABLE+= pandoc
-.else
-CONFIGURE_ARGS+= --flags="-executable"
-.endif
-
-.if ${PORT_OPTIONS:MLIBRARY}
-CONFIGURE_ARGS+= --flags="library"
+.if ${PORT_OPTIONS:MEMBED_DATA_FILES}
+CONFIGURE_ARGS+= --flags="embed_data_files"
.else
-CONFIGURE_ARGS+= --flags="-library"
-STANDALONE= yes
+CONFIGURE_ARGS+= --flags="-embed_data_files"
.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index b064335c32a1..f0ca3b6cb903 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-1.9.4.5.tar.gz) = cb993c42549746712a6261b5d8a5b89aa8ee2ed46f9a45fb01d5947346896816
-SIZE (cabal/pandoc-1.9.4.5.tar.gz) = 574992
+SHA256 (cabal/pandoc-1.11.1.tar.gz) = ebb090b08b5439d719d1d01575aa91262035cb9b8de61ffaf49a853a5fde432c
+SIZE (cabal/pandoc-1.11.1.tar.gz) = 1093354
diff --git a/textproc/hs-pandoc/files/patch-Setup.hs b/textproc/hs-pandoc/files/patch-Setup.hs
index 27c5e204c9f7..244447974f1a 100644
--- a/textproc/hs-pandoc/files/patch-Setup.hs
+++ b/textproc/hs-pandoc/files/patch-Setup.hs
@@ -1,18 +1,20 @@
---- ./Setup.hs.orig 2012-10-21 23:06:41.000000000 +0200
-+++ ./Setup.hs 2012-10-23 18:33:48.000000000 +0200
-@@ -6,7 +6,7 @@
+--- ./Setup.hs.orig 2013-01-29 01:14:38.000000000 +0100
++++ ./Setup.hs 2013-02-17 00:48:54.000000000 +0100
+@@ -8,7 +8,7 @@
import Distribution.Simple.LocalBuildInfo
(LocalBuildInfo(..), absoluteInstallDirs)
import Distribution.Verbosity ( Verbosity, silent )
-import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
+import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest))
- import Distribution.Simple.Utils (installOrdinaryFiles)
+ import Distribution.Simple.Utils (installOrdinaryFiles, info)
import Prelude hiding (catch)
import System.Process ( rawSystem )
-@@ -49,5 +49,5 @@
+@@ -53,7 +53,7 @@
installManpages :: PackageDescription -> LocalBuildInfo
-> Verbosity -> CopyDest -> IO ()
installManpages pkg lbi verbosity copy =
- installOrdinaryFiles verbosity (mandir (absoluteInstallDirs pkg lbi copy))
+ installOrdinaryFiles verbosity (prefix (absoluteInstallDirs pkg lbi copy) </> manDir)
(zip (repeat manDir) manpages)
+
+ ppBlobSuffixHandler :: PPSuffixHandler
diff --git a/textproc/hs-pandoc/pkg-descr b/textproc/hs-pandoc/pkg-descr
index 4c16865ec933..dab008ebc876 100644
--- a/textproc/hs-pandoc/pkg-descr
+++ b/textproc/hs-pandoc/pkg-descr
@@ -1,9 +1,10 @@
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) 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 and
+markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook,
+MediaWiki markup, 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 (v2 and v3), FictionBook2, and S5, 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 21:49:40 +0000