1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

- Update to 1.9.3

Obtained from:	FreeBSD Haskell
This commit is contained in:
Gabor Pali 2012-06-03 22:32:23 +00:00
parent 2615f38635
commit 348e7bd8e5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=298271
4 changed files with 38 additions and 67 deletions

View File

@ -6,41 +6,33 @@
#
PORTNAME= pandoc
PORTVERSION= 1.8.2.1
PORTREVISION= 1
PORTVERSION= 1.9.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= A general markup converter
COMMENT= Conversion between markup formats
LICENSE= GPLv2
FILE_LICENSE= COPYING
CABAL_SETUP= Setup.hs
USE_CABAL= base64-bytestring>=0.1 citeproc-hs>=0.3.1 dlist>=0.4 \
HTTP>=4000.0.5 json>=0.4 mtl>=1.1 network>=2 pandoc-types>=1.8 \
parsec>=2.1 tagsoup>=0.12 texmath>=0.5 utf8-string>=0.3 \
xhtml>=3000.0 xml>=1.3.5 zip-archive>=0.1.1.7
MAN1= pandoc.1 markdown2pdf.1
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
MAN1= pandoc.1
MAN5= pandoc_markdown.5
OPTIONS= HIGHLIGHTING "Compile in support for syntax highlighting" off \
EXECUTABLE "Build the pandoc executable" on \
WRAPPERS "Build the wrappers (markdown2pdf)" on \
OPTIONS= EXECUTABLE "Build the pandoc executable" on \
LIBRARY "Build the pandoc library" on \
THREADED "Compile markdown2pdf with -threaded option" on
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.include <bsd.port.options.mk>
.if defined(WITH_HIGHLIGHTING)
CONFIGURE_ARGS+= --flags="highlighting"
USE_CABAL+= highlighting-kate
.else
CONFIGURE_ARGS+= --flags="-highlighting"
.endif
.if defined(WITH_EXECUTABLE)
CONFIGURE_ARGS+= --flags="exectuable"
EXECUTABLE+= pandoc
@ -48,18 +40,6 @@ EXECUTABLE+= pandoc
CONFIGURE_ARGS+= --flags="-executable"
.endif
.if defined(WITH_WRAPPERS)
CONFIGURE_ARGS+= --flags="wrappers"
EXECUTABLE+= markdown2pdf
.if !defined(WITH_EXECUTABLE)
IGNORE= cannot be compiled since wrappers require an executable. Please (re)run 'make config' and choose EXECUTABLE
.endif
.else
CONFIGURE_ARGS+= --flags="-wrappers"
.endif
.if defined(WITH_LIBRARY)
CONFIGURE_ARGS+= --flags="library"
.else
@ -71,11 +51,5 @@ STANDALONE= yes
IGNORE= cannot be compiled in this configuration. Please (re)run 'make config' and choose either EXECUTABLE or LIBRARY or both
.endif
.if defined(WITH_THREADED)
CONFIGURE_ARGS+= --flags="threaded"
.else
CONFIGURE_ARGS+= --flags="-threaded"
.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (cabal/pandoc-1.8.2.1.tar.gz) = f1025377b2c78043b06d7963eb61ce66c2290d2580f2488a8186c82c24f09433
SIZE (cabal/pandoc-1.8.2.1.tar.gz) = 461545
SHA256 (cabal/pandoc-1.9.3.tar.gz) = 40929596f7a57de4cbd58e30beca2faaf237e4eee1db3f6265b94a1a52ff1f36
SIZE (cabal/pandoc-1.9.3.tar.gz) = 560502

View File

@ -1,20 +1,20 @@
--- ./Setup.hs.orig 2011-02-13 18:03:00.000000000 +0100
+++ ./Setup.hs 2011-03-13 01:14:26.580023488 +0100
@@ -6,7 +6,7 @@
import Distribution.Simple.LocalBuildInfo
--- ./Setup.hs.orig 2012-05-13 05:04:40.000000000 +0200
+++ ./Setup.hs 2012-05-15 16:22:31.000000000 +0200
@@ -7,7 +7,7 @@
(LocalBuildInfo(..), absoluteInstallDirs)
import Distribution.Verbosity ( Verbosity, silent )
import Distribution.Simple.GHC (ghcPackageDbOptions)
-import Distribution.Simple.InstallDirs (mandir, bindir, CopyDest (NoCopyDest))
+import Distribution.Simple.InstallDirs (prefix, bindir, CopyDest (NoCopyDest))
import Distribution.Simple.Utils (copyFiles)
import Distribution.Simple.Utils (installOrdinaryFiles)
import Control.Exception ( bracket_ )
import Control.Monad ( unless )
@@ -85,7 +85,7 @@
@@ -86,7 +86,7 @@
installManpages :: PackageDescription -> LocalBuildInfo
-> Verbosity -> CopyDest -> IO ()
installManpages pkg lbi verbosity copy =
- copyFiles verbosity (mandir (absoluteInstallDirs pkg lbi copy))
+ copyFiles verbosity (prefix (absoluteInstallDirs pkg lbi copy) </> "man")
- installOrdinaryFiles verbosity (mandir (absoluteInstallDirs pkg lbi copy))
+ installOrdinaryFiles verbosity (prefix (absoluteInstallDirs pkg lbi copy) </> manDir)
(zip (repeat manDir) manpages)
-- | Returns a list of 'dependencies' that have been modified after 'file'.

View File

@ -1,21 +1,18 @@
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 plain text, markdown, reStructuredText,
HTML, LaTeX, ConTeXt, PDF, RTF, DocBook XML, OpenDocument XML, ODT, GNU
Texinfo, MediaWiki markup, groff man pages, EPUB ebooks, and S5 and
Slidy HTML slide shows.
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 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.
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 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
or output format requires only adding a reader or writer.
WWW: http://johnmacfarlane.net/pandoc/
WWW: http://johnmacfarlane.net/pandoc