Commit 8945d42a authored by pgj's avatar pgj
Browse files

- Update pandoc to 1.13.0.1

- Update gitit to 0.10.5
- Update texmath to 0.8
- Update zip-archive to 0.2.3.4
- Add haddock-library: Library exposing some functionality of Haddock
- Add hoauth2: Haskell OAuth2 authentication
- Add JuicyPixels: Picture loading/serialization

Obtained from:	FreeBSD Haskell
parent 5ec79c1f
# $FreeBSD$
PORTNAME= zip-archive
PORTVERSION= 0.2.3.2
PORTVERSION= 0.2.3.4
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
......
SHA256 (cabal/zip-archive-0.2.3.2.tar.gz) = c18120e1d2e50c8b56d2a4a70fcd28c1f31403ae8a2d43efa333702fcdd4c9f8
SIZE (cabal/zip-archive-0.2.3.2.tar.gz) = 11513
SHA256 (cabal/zip-archive-0.2.3.4.tar.gz) = f719e2fca32d7606d386cdb6a176fec72c0050f84aa4054c0e5dc9402f4ba8b0
SIZE (cabal/zip-archive-0.2.3.4.tar.gz) = 12319
......@@ -761,6 +761,7 @@
SUBDIR += hs-glib
SUBDIR += hs-gtk2hs-buildtools
SUBDIR += hs-haddock
SUBDIR += hs-haddock-library
SUBDIR += hs-happy
SUBDIR += hs-hashable
SUBDIR += hs-hashed-storage
......
# $FreeBSD$
PORTNAME= haddock-library
PORTVERSION= 1.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Library exposing some functionality of Haddock
LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
SHA256 (cabal/haddock-library-1.1.0.tar.gz) = cd26439dabfe98bc5888e0cbb64163811df3091ea946052fdb77f5d76daaf82a
SIZE (cabal/haddock-library-1.1.0.tar.gz) = 33032
Haddock is a documentation-generation tool for Haskell libraries. These
modules expose some functionality of it without pulling in the GHC
dependency.
WWW: http://www.haskell.org/haddock/
......@@ -347,6 +347,7 @@
SUBDIR += hobbes-icons-xpm
SUBDIR += hppsmtools
SUBDIR += hs-HGL
SUBDIR += hs-JuicyPixels
SUBDIR += hs-cairo
SUBDIR += hs-dia-base
SUBDIR += hs-dia-functions
......
# $FreeBSD$
PORTNAME= JuicyPixels
PORTVERSION= 3.1.6.1
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Picture loading/serialization
LICENSE= BSD3CLAUSE
USE_CABAL= mtl>=1.1 primitive>=0.4 vector>=0.9 zlib>=0.5.3.1
FLAGS_DEFINE= MMAP
MMAP_DESC= Enable file loading via mmap()
MMAP_FLAG_ENABLE= Mmap
MMAP_FLAG_CABAL= mmap
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
SHA256 (cabal/JuicyPixels-3.1.6.1.tar.gz) = ac9484aad8e08ef6ff7bfff50344449133fa8d14eb7dc4efb2fffe408107a6ec
SIZE (cabal/JuicyPixels-3.1.6.1.tar.gz) = 95511
This library can load and store images in PNG,Bitmap, Jpeg, Radiance, Tiff and
Gif images.
WWW: https://github.com/Twinside/Juicy.Pixels
......@@ -183,6 +183,7 @@ gtk2hs-buildtools_port= devel/hs-gtk2hs-buildtools
gtkglext_port= x11-toolkits/hs-gtkglext # lib_depends
gtksourceview2_port= x11-toolkits/hs-gtksourceview2
haddock_port= devel/hs-haddock # executable
haddock-library_port= devel/hs-haddock-library
happstack_port= www/hs-happstack # executable
happstack-server_port= www/hs-happstack-server
happy_port= devel/hs-happy # executable
......@@ -204,6 +205,7 @@ hint_port= devel/hs-hint
hjsmin_port= www/hs-hjsmin # executable
hlibev_port= devel/hs-hlibev # lib_depends
hlint_port= devel/hs-hlint # executable
hoauth2_port= net/hs-hoauth2
hoogle_port= devel/hs-hoogle # executable
hostname_port= net/hs-hostname
hs-bibutils_port= textproc/hs-hs-bibutils
......@@ -234,6 +236,7 @@ ieee754_port= math/hs-ieee754
IfElse_port= devel/hs-IfElse
iproute_port= net/hs-iproute
json_port= converters/hs-json
JuicyPixels_port= graphics/hs-JuicyPixels
keys_port= devel/hs-keys
kqueue_port= devel/hs-kqueue
language-c_port= devel/hs-language-c
......
......@@ -207,6 +207,7 @@
SUBDIR += hping-devel
SUBDIR += hs-connection
SUBDIR += hs-gsasl
SUBDIR += hs-hoauth2
SUBDIR += hs-hostname
SUBDIR += hs-iproute
SUBDIR += hs-maccatcher
......
# $FreeBSD$
PORTNAME= hoauth2
PORTVERSION= 0.4.1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell OAuth2 authentication
LICENSE= BSD3CLAUSE
USE_CABAL= aeson>=0.7 bytestring-show>=0.3.5 http-conduit>=2.0 \
http-types>=0.8 monad-control>=0.3 mtl>=1 random text>=0.11
FLAGS_DISABLE= test
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
SHA256 (cabal/hoauth2-0.4.1.tar.gz) = fd5e140744bcf9707209e4b6089a2b337c614fd226eeb9246d3df4be927fb490
SIZE (cabal/hoauth2-0.4.1.tar.gz) = 8462
Haskell OAuth2 authentication.
WWW: https://github.com/freizl/hoauth2
......@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pandoc
PORTVERSION= 1.12.4.2
PORTVERSION= 1.13.0.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
......@@ -12,13 +12,14 @@ LICENSE= GPLv2
USE_CABAL= aeson>=0.7 attoparsec>=0.10 base64-bytestring>=0.1 \
blaze-html>=0.5 blaze-markup>=0.5.1 data-default>=0.4 \
extensible-exceptions>=0.1 highlighting-kate>=0.5.8 \
hslua>=0.3 HTTP>=4000.0.5 http-conduit>=1.9 http-types>=0.8 \
mtl>=1.1 network>=2 pandoc-types>=1.12.3.3 parsec>=3.1 \
random>=1 scientific>=0.2 syb>=0.1 tagsoup>=0.13.1 \
temporary>=1.1 texmath>=0.6.6.1 text>=0.11 \
unordered-containers>=0.2 vector>=0.10 xml>=1.3.12 \
yaml>=0.8.8.2 zip-archive>=0.1.3.3 zlib>=0.5
extensible-exceptions>=0.1 haddock-library>=1.1 \
highlighting-kate>=0.5.8 hslua>=0.3 HTTP>=4000.0.5 \
JuicyPixels>=3.1.6.1 mtl>=1.1 network>=2 \
pandoc-types>=1.12.3.3 parsec>=3.1 random>=1 scientific>=0.2 \
SHA>=1.6 syb>=0.1 tagsoup>=0.13.1 temporary>=1.1 texmath>=0.8 \
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
......@@ -27,18 +28,29 @@ EXECUTABLE= pandoc
# For PDF generation
USE_TEX= texmf:run
MAN1SRC= man/man1
MAN5SRC= man/man5
MAN1PAGES= pandoc.1
MAN5PAGES= pandoc_markdown.5
MANCOMPRESSED= no
FLAGS_DEFINE= EMBED_DATA_FILES HTTP_CONDUIT
FLAGS_DEFAULT= HTTP_CONDUIT
FLAGS_DEFINE= EMBED_DATA_FILES 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
HTTP_CONDUIT_DESC= Enable downloading of resources over HTTPS
HTTP_CONDUIT_FLAG_ENABLE= http-conduit
HTTP_CONDUIT_FLAG_CABAL= http-conduit>=1.9 http-types>=0.8
HTTPS_DESC= Enable downloading of resources over HTTPS
HTTPS_FLAG_ENABLE= https
HTTPS_FLAG_CABAL= http-client>=0.3.2 http-client-tls>=0.2 http-types>=0.8
TRYPANDOC_DESC= Build trypandoc cgi executable
TRYPANDOC_FLAG_ENABLE= trypandoc
TRYPANDOC_FLAG_CABAL= aeson highlighting-kate text wai-extra wai>=0.3 \
http-types
TRYPANDOC_FLAG_EXECUTABLE= trypandoc
FLAGS_DISABLE= make-pandoc-man-pages
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
SHA256 (cabal/pandoc-1.12.4.2.tar.gz) = 2f47f5f36498d26aa9cda7b93bcee76afedeeca7463478b5eda076209ba27f45
SIZE (cabal/pandoc-1.12.4.2.tar.gz) = 1048263
SHA256 (cabal/pandoc-1.13.0.1.tar.gz) = a6994016a01050b4582021b88e8370d9bc6a0a03b164da5bde60bf91b2ee5e5e
SIZE (cabal/pandoc-1.13.0.1.tar.gz) = 1866051
--- ./Setup.hs.orig 2013-12-09 04:22:42.000000000 +0100
+++ ./Setup.hs 2013-12-27 02:49:01.000000000 +0100
@@ -9,7 +9,7 @@
import Distribution.Simple.LocalBuildInfo
(LocalBuildInfo(..), absoluteInstallDirs)
import Distribution.Verbosity ( Verbosity, silent )
-import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest), toPathTemplate)
+import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest), toPathTemplate)
import Distribution.Simple.Utils (installOrdinaryFiles, info)
import Distribution.Simple.Test (test)
import Prelude hiding (catch)
@@ -59,7 +59,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
--- ./pandoc.cabal.orig 2014-05-15 00:07:54.000000000 +0200
+++ ./pandoc.cabal 2014-07-13 00:56:47.000000000 +0200
@@ -234,7 +234,7 @@
blaze-markup >= 0.5.1 && < 0.7,
attoparsec >= 0.10 && < 0.12,
yaml >= 0.8.8.2 && < 0.9,
- scientific >= 0.2 && < 0.3,
+ scientific >= 0.2 && < 0.4,
vector >= 0.10 && < 0.11,
hslua >= 0.3 && < 0.4,
binary >= 0.5 && < 0.8
--- ./pandoc.cabal.orig 2014-08-18 02:12:46.000000000 +0200
+++ ./pandoc.cabal 2014-08-24 15:03:23.000000000 +0200
@@ -364,10 +364,10 @@
Executable trypandoc
Main-Is: trypandoc.hs
Hs-Source-Dirs: trypandoc
- build-depends: base, aeson, pandoc, highlighting-kate,
- text, wai-extra, wai >= 0.3, http-types
default-language: Haskell2010
if flag(trypandoc)
+ build-depends: base, aeson, pandoc, highlighting-kate,
+ text, wai-extra, wai >= 0.3, http-types
Buildable: True
else
Buildable: False
--- ./src/Text/Pandoc/Readers/TeXMath.hs.orig 2014-05-15 00:07:52.000000000 +0200
+++ ./src/Text/Pandoc/Readers/TeXMath.hs 2014-07-29 12:58:00.000000000 +0200
@@ -30,7 +30,7 @@
module Text.Pandoc.Readers.TeXMath ( readTeXMath, readTeXMath' ) where
import Text.Pandoc.Definition
-import Text.TeXMath
+import Text.TeXMath ( texMathToPandoc, DisplayType(DisplayBlock, DisplayInline) )
-- | Converts a raw TeX math formula to a list of 'Pandoc' inlines.
-- Defaults to raw formula between @$@ or @$$@ characters if entire formula
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment