27 files changed, 159 insertions, 100 deletions

diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index 18fdaa34ab13..d32a3461c236 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	zip-archive
-PORTVERSION=	0.2.3.2
+PORTVERSION=	0.2.3.4
 CATEGORIES=	archivers haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo
index e346eb9932dd..d51d7dfff144 100644
--- a/archivers/hs-zip-archive/distinfo
+++ b/archivers/hs-zip-archive/distinfo
@@ -1,2 +1,2 @@
-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
diff --git a/devel/Makefile b/devel/Makefile
index 289afd814a5c..49d926737907 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -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
diff --git a/devel/hs-haddock-library/Makefile b/devel/hs-haddock-library/Makefile
new file mode 100644
index 000000000000..d86a7734c785
--- /dev/null
+++ b/devel/hs-haddock-library/Makefile
@@ -0,0 +1,13 @@
+# $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>
diff --git a/devel/hs-haddock-library/distinfo b/devel/hs-haddock-library/distinfo
new file mode 100644
index 000000000000..88c543c12a64
--- /dev/null
+++ b/devel/hs-haddock-library/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/haddock-library-1.1.0.tar.gz) = cd26439dabfe98bc5888e0cbb64163811df3091ea946052fdb77f5d76daaf82a
+SIZE (cabal/haddock-library-1.1.0.tar.gz) = 33032
diff --git a/devel/hs-haddock-library/pkg-descr b/devel/hs-haddock-library/pkg-descr
new file mode 100644
index 000000000000..60d7b0fcfcba
--- /dev/null
+++ b/devel/hs-haddock-library/pkg-descr
@@ -0,0 +1,5 @@
+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/
diff --git a/graphics/Makefile b/graphics/Makefile
index 3460cc14771e..0bd671262880 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -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
diff --git a/graphics/hs-JuicyPixels/Makefile b/graphics/hs-JuicyPixels/Makefile
new file mode 100644
index 000000000000..ac16f68271e5
--- /dev/null
+++ b/graphics/hs-JuicyPixels/Makefile
@@ -0,0 +1,21 @@
+# $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>
diff --git a/graphics/hs-JuicyPixels/distinfo b/graphics/hs-JuicyPixels/distinfo
new file mode 100644
index 000000000000..2525f297c052
--- /dev/null
+++ b/graphics/hs-JuicyPixels/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/JuicyPixels-3.1.6.1.tar.gz) = ac9484aad8e08ef6ff7bfff50344449133fa8d14eb7dc4efb2fffe408107a6ec
+SIZE (cabal/JuicyPixels-3.1.6.1.tar.gz) = 95511
diff --git a/graphics/hs-JuicyPixels/pkg-descr b/graphics/hs-JuicyPixels/pkg-descr
new file mode 100644
index 000000000000..789d776421b6
--- /dev/null
+++ b/graphics/hs-JuicyPixels/pkg-descr
@@ -0,0 +1,4 @@
+This library can load and store images in PNG,Bitmap, Jpeg, Radiance, Tiff and
+Gif images.
+
+WWW: https://github.com/Twinside/Juicy.Pixels
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index eefc2b1309ba..d4b250c1f6aa 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -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
diff --git a/net/Makefile b/net/Makefile
index 6c9263631e3a..ac29758fb812 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -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
diff --git a/net/hs-hoauth2/Makefile b/net/hs-hoauth2/Makefile
new file mode 100644
index 000000000000..e86032b8c2a7
--- /dev/null
+++ b/net/hs-hoauth2/Makefile
@@ -0,0 +1,18 @@
+# $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>
diff --git a/net/hs-hoauth2/distinfo b/net/hs-hoauth2/distinfo
new file mode 100644
index 000000000000..0601c487890d
--- /dev/null
+++ b/net/hs-hoauth2/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hoauth2-0.4.1.tar.gz) = fd5e140744bcf9707209e4b6089a2b337c614fd226eeb9246d3df4be927fb490
+SIZE (cabal/hoauth2-0.4.1.tar.gz) = 8462
diff --git a/net/hs-hoauth2/pkg-descr b/net/hs-hoauth2/pkg-descr
new file mode 100644
index 000000000000..878298ecabfa
--- /dev/null
+++ b/net/hs-hoauth2/pkg-descr
@@ -0,0 +1,3 @@
+Haskell OAuth2 authentication.
+
+WWW: https://github.com/freizl/hoauth2
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 023b419d35e0..7c8796c11477 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -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>
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index 03e14a741d66..4761abd4dd0e 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,2 +1,2 @@
-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
diff --git a/textproc/hs-pandoc/files/patch-Setup.hs b/textproc/hs-pandoc/files/patch-Setup.hs
deleted file mode 100644
index d7882e836375..000000000000
--- a/textproc/hs-pandoc/files/patch-Setup.hs
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./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
diff --git a/textproc/hs-pandoc/files/patch-pandoc.cabal b/textproc/hs-pandoc/files/patch-pandoc.cabal
index e3c233a8eb6b..3cb0a7f47131 100644
--- a/textproc/hs-pandoc/files/patch-pandoc.cabal
+++ b/textproc/hs-pandoc/files/patch-pandoc.cabal
@@ -1,11 +1,15 @@
---- ./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
diff --git a/textproc/hs-pandoc/files/patch-src__Text__Pandoc__Readers__TeXMath.hs b/textproc/hs-pandoc/files/patch-src__Text__Pandoc__Readers__TeXMath.hs
deleted file mode 100644
index ee7e5f4ae50a..000000000000
--- a/textproc/hs-pandoc/files/patch-src__Text__Pandoc__Readers__TeXMath.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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
diff --git a/textproc/hs-pandoc/pkg-descr b/textproc/hs-pandoc/pkg-descr
index da61bb64cd19..d532d32887bf 100644
--- a/textproc/hs-pandoc/pkg-descr
+++ b/textproc/hs-pandoc/pkg-descr
@@ -1,20 +1,15 @@
 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, and Textile, and
-it can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook,
-OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki, Textile, groff man
-pages, plain text, Emacs Org-Mode, AsciiDoc, 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.  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.
+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.
 
 WWW: http://johnmacfarlane.net/pandoc
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index 2576481f27f6..8ef41e34e471 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -2,24 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	texmath
-PORTVERSION=	0.6.7
+PORTVERSION=	0.8
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	Conversion of LaTeX math formulas to MathML or OMML
+COMMENT=	Conversion between formats used to represent mathematics
 
 LICENSE=	GPLv2
 
 USE_CABAL=	mtl pandoc-types>=1.12.3.3 parsec>=3 syb xml
 
-FLAGS_DEFINE=		CGI
-
-CGI_DESC=		Compile CGI executable
-CGI_FLAG_ENABLE=	cgi
-CGI_FLAG_CABAL=		cgi json utf8-string
-CGI_FLAG_EXECUTABLE=	texmath-cgi
-
-FLAGS_DISABLE=	test
+FLAGS_DISABLE=	executable
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index 0a3ae630bbc4..eda96b1c844e 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/texmath-0.6.7.tar.gz) = bfb9c02578f26bb435d3871b38a99522fbf7c8f6f083e0deed2b0e28d0aeb610
-SIZE (cabal/texmath-0.6.7.tar.gz) = 634186
+SHA256 (cabal/texmath-0.8.tar.gz) = eb9d558a67ac429055ebf70484b36a58ddbc9df1be59dfbf13146247524911c8
+SIZE (cabal/texmath-0.8.tar.gz) = 1613635
diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile
index b41d551c16b0..575a9382d7ab 100644
--- a/www/hs-activehs/Makefile
+++ b/www/hs-activehs/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	activehs
 PORTVERSION=	0.3.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/www/hs-activehs/files/patch-activehs.cabal b/www/hs-activehs/files/patch-activehs.cabal
index 53f52357b85f..170b056abcf3 100644
--- a/www/hs-activehs/files/patch-activehs.cabal
+++ b/www/hs-activehs/files/patch-activehs.cabal
@@ -32,7 +32,7 @@
 +    exceptions >= 0.6 && < 0.7,
      split >= 0.1 && < 0.3,
 -    pandoc >= 1.10 && < 1.11,
-+    pandoc >= 1.10 && < 1.13,
++    pandoc >= 1.10 && < 1.14,
      time >= 1.2 && < 1.5,
      old-time >= 1.0 && < 1.2,
 -    process >= 1.0 && < 1.2,
diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile
index 65fded0ce52d..779bdeb5e25e 100644
--- a/www/hs-gitit/Makefile
+++ b/www/hs-gitit/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitit
-PORTVERSION=	0.10.4
+PORTVERSION=	0.10.5
 CATEGORIES=	www haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -9,16 +9,26 @@ COMMENT=	Wiki using happstack, git or darcs, and pandoc
 
 LICENSE=	GPLv2
 
-USE_CABAL=	base64-bytestring>=0.1 blaze-html>=0.4 ConfigFile>=1 \
-		feed>=0.3.6 filestore>=0.6 ghc-paths happstack-server>=7.0 \
-		highlighting-kate>=0.5.0.1 hslogger>=1 HStringTemplate>=0.6 \
-		HTTP>=4000.0 HTTP json>=0.4 mtl network>=2.3 pandoc>=1.12.4 \
-		pandoc-types>=1.12.3 parsec random recaptcha>=0.1 safe \
-		SHA>1 split syb tagsoup>=0.13 text uri>=0.1 url>=2.1 \
-		url utf8-string>=0.3 xml>=1.3.5 xss-sanitize>=0.3 \
-		zlib>=0.5
+USE_CABAL=	aeson>=0.7 base64-bytestring>=0.1 blaze-html>=0.4 \
+		ConfigFile>=1 feed>=0.3.6 filestore>=0.6 \
+		happstack-server>=7.0 highlighting-kate>=0.5.0.1 \
+		hoauth2>=0.4.1 hslogger>=1 HStringTemplate>=0.6 HTTP>=4000.0 \
+		http-client>=0.3.5 http-client-tls>=0.2.2 json>=0.4 mtl \
+		network>=2 pandoc>=1.12.4 pandoc-types>=1.12.3 parsec random \
+		recaptcha>=0.1 safe SHA>1 split syb tagsoup>=0.13 text \
+		uri>=0.1 url>=2.1 utf8-string>=0.3 xml>=1.3.5 \
+		xss-sanitize>=0.3 zlib>=0.5
 
 EXECUTABLE=	expireGititCache gitit
 
+FLAGS_DEFINE=	PLUGINS
+FLAGS_DEFAULT=	PLUGINS
+
+PLUGINS_DESC=		Enable support for plugins
+PLUGINS_FLAG_ENABLE=	plugins
+PLUGINS_FLAG_CABAL=	ghc-paths
+
+FLAGS_DISABLE=		network-uri
+
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/www/hs-gitit/distinfo b/www/hs-gitit/distinfo
index e7539e0ab381..8471a58913dd 100644
--- a/www/hs-gitit/distinfo
+++ b/www/hs-gitit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gitit-0.10.4.tar.gz) = f64c7c76676a765fe4bee5d43aa56e2934b0e7f883671d3f38f5e6aa6ed806fc
-SIZE (cabal/gitit-0.10.4.tar.gz) = 215467
+SHA256 (cabal/gitit-0.10.5.tar.gz) = 922c5e3581233d463582b51a99b7f4746337a499d5a33e81a68ae7240e155d5c
+SIZE (cabal/gitit-0.10.5.tar.gz) = 218905