8 files changed, 240 insertions, 112 deletions

diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 95df711e7f59..941804ba49de 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pandoc
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.5.1.1
 CATEGORIES=	textproc haskell
 PKGNAMEPREFIX=
 
@@ -15,22 +14,69 @@ MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A general markup converter
 
 CABAL_SETUP=	Setup.hs
-USE_HACKAGE=	utf8-string>=0.3 zip-archive>=0.1.1.4
+USE_HACKAGE=	utf8-string>=0.3 zip-archive>=0.1.1.4 xml>=1.3.5 texmath HTTP>=4000.0.5
 
-MAN1=		pandoc.1 markdown2pdf.1 html2markdown.1 hsmarkdown.1
-
-EXECUTABLE=	pandoc markdown2pdf hsmarkdown
+MAN1=		pandoc.1 markdown2pdf.1
 
 PORTDATA=	*
 
-OPTIONS=	HIGHLIGHTING "Syntax highlighting support" off
+OPTIONS=	HIGHLIGHTING "Compile in support for syntax highlighting" off \
+		EXECUTABLE   "Build the pandoc executable" on \
+		WRAPPERS     "Build the wrappers (markdown2pdf)" on \
+		LIBRARY      "Build the pandoc library" on \
+		CITEPROC     "Compile in support for citeproc-hs" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_HIGHLIGHTING)
 CONFIGURE_ARGS+=	--flags="highlighting"
 USE_HACKAGE+=		highlighting-kate
+.else
+CONFIGURE_ARGS+=	--flags="-highlighting"
+.endif
+
+.if defined(WITH_EXECUTABLE)
+CONFIGURE_ARGS+=	--flags="exectuable"
+EXECUTABLE+=		pandoc
+PLIST_SUB+=		MAYBE_EXECUTABLE=""
+.else
+CONFIGURE_ARGS+=	--flags="-executable"
+PLIST_SUB+=		MAYBE_EXECUTABLE="@comment "
+.endif
+
+.if defined(WITH_WRAPPERS)
+CONFIGURE_ARGS+=	--flags="wrappers"
+EXECUTABLE+=		markdown2pdf
+PLIST_SUB+=		MAYBE_WRAPPERS=""
+
+.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"
+PLIST_SUB+=		MAYBE_WRAPPERS="@comment "
+.endif
+
+.if defined(WITH_LIBRARY)
+CONFIGURE_ARGS+=	--flags="library"
+PLIST_SUB+=		MAYBE_LIBRARY=""
+.else
+CONFIGURE_ARGS+=	--flags="-library"
+PLIST_SUB+=		MAYBE_LIBRARY="@comment "
+STANDALONE=		yes
+.endif
+
+.if !defined(WITH_EXECUTABLE) && !defined(WITH_LIBRARY)
+IGNORE=		cannot be compiled in this configuration.  Please (re)run 'make config' and choose either EXECUTABLE or LIBRARY or both
+.endif
+
+.if defined(WITH_CITEPROC)
+CONFIGURE_ARGS+=	--flags="citeproc"
+USE_HACKAGE+=		citeproc-hs
+.else
+CONFIGURE_ARGS+=	--flags="-citeproc"
 .endif
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index 18695f80f509..2bc2c6fef918 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,3 +1,3 @@
-MD5 (pandoc-1.4.tar.gz) = ee88d7f7f3cadda86d19eccf58bde057
-SHA256 (pandoc-1.4.tar.gz) = a1ae242147341878a23aaa2c92b358d30bf7430ff7959f401cc5399c00aee892
-SIZE (pandoc-1.4.tar.gz) = 339917
+MD5 (pandoc-1.5.1.1.tar.gz) = bfccc042ae0cf0901bbca1f87748f969
+SHA256 (pandoc-1.5.1.1.tar.gz) = 6d2283cb618fcaea5ee5cb885ef6532bc34628b351f14a6bd85b098d7a4128d9
+SIZE (pandoc-1.5.1.1.tar.gz) = 353653
diff --git a/textproc/hs-pandoc/files/patch-Setup.hs b/textproc/hs-pandoc/files/patch-Setup.hs
new file mode 100644
index 000000000000..1de649dd9d37
--- /dev/null
+++ b/textproc/hs-pandoc/files/patch-Setup.hs
@@ -0,0 +1,20 @@
+--- ./Setup.hs.orig	2010-03-29 16:24:56.000000000 +0200
++++ ./Setup.hs	2010-05-15 13:39:12.000000000 +0200
+@@ -6,7 +6,7 @@
+ import Distribution.Simple.LocalBuildInfo
+          (LocalBuildInfo(..), absoluteInstallDirs)
+ import Distribution.Verbosity ( Verbosity, silent )
+-import Distribution.Simple.InstallDirs (mandir, bindir, CopyDest (NoCopyDest))
++import Distribution.Simple.InstallDirs (prefix, bindir, CopyDest (NoCopyDest))
+ import Distribution.Simple.Utils (copyFiles)
+ import Control.Exception ( bracket_ )
+ import Control.Monad ( unless )
+@@ -86,7 +86,7 @@
+ installManpages :: PackageDescription -> LocalBuildInfo
+                 -> Verbosity -> CopyDest -> IO ()
+ installManpages pkg lbi verbosity copy =
+-  copyFiles verbosity (mandir (absoluteInstallDirs pkg lbi copy) </> "man1")
++  copyFiles verbosity (prefix (absoluteInstallDirs pkg lbi copy) </> "man/man1")
+              (zip (repeat manDir) manpages)
+ 
+ -- | Returns a list of 'dependencies' that have been modified after 'file'.
diff --git a/textproc/hs-pandoc/pkg-plist b/textproc/hs-pandoc/pkg-plist
index 5cbf0019fb6a..0f186a4140ea 100644
--- a/textproc/hs-pandoc/pkg-plist
+++ b/textproc/hs-pandoc/pkg-plist
@@ -1,47 +1,45 @@
 @comment $FreeBSD$
-bin/hsmarkdown
-bin/markdown2pdf
-bin/pandoc
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Paths_pandoc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Blocks.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/CharacterReferences.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Definition.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Highlighting.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/LaTeXMathML.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/ODT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/HTML.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/LaTeX.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/Markdown.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/RST.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/TeXMath.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Shared.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Templates.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/ConTeXt.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Docbook.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/HTML.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/LaTeX.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Man.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Markdown.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/MediaWiki.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/OpenDocument.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/RST.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/RTF.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/S5.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Texinfo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/XML.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
+%%MAYBE_WRAPPERS%%bin/markdown2pdf
+%%MAYBE_EXECUTABLE%%bin/pandoc
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Paths_pandoc.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Blocks.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/CharacterReferences.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Definition.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Highlighting.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/ODT.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/HTML.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/LaTeX.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/Markdown.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/RST.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/TeXMath.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Shared.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Templates.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/ConTeXt.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Docbook.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/HTML.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/LaTeX.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Man.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Markdown.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/MediaWiki.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/OpenDocument.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/RST.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/RTF.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/S5.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Texinfo.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/XML.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/COPYING
 %%NOPORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers
+%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers
+%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc
+%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
+%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%
+%%MAYBE_LIBRARY%%@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
+%%MAYBE_LIBRARY%%@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+%%MAYBE_LIBRARY%%@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
+%%MAYBE_LIBRARY%%@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/textproc/pandoc/Makefile b/textproc/pandoc/Makefile
index 95df711e7f59..941804ba49de 100644
--- a/textproc/pandoc/Makefile
+++ b/textproc/pandoc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pandoc
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.5.1.1
 CATEGORIES=	textproc haskell
 PKGNAMEPREFIX=
 
@@ -15,22 +14,69 @@ MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A general markup converter
 
 CABAL_SETUP=	Setup.hs
-USE_HACKAGE=	utf8-string>=0.3 zip-archive>=0.1.1.4
+USE_HACKAGE=	utf8-string>=0.3 zip-archive>=0.1.1.4 xml>=1.3.5 texmath HTTP>=4000.0.5
 
-MAN1=		pandoc.1 markdown2pdf.1 html2markdown.1 hsmarkdown.1
-
-EXECUTABLE=	pandoc markdown2pdf hsmarkdown
+MAN1=		pandoc.1 markdown2pdf.1
 
 PORTDATA=	*
 
-OPTIONS=	HIGHLIGHTING "Syntax highlighting support" off
+OPTIONS=	HIGHLIGHTING "Compile in support for syntax highlighting" off \
+		EXECUTABLE   "Build the pandoc executable" on \
+		WRAPPERS     "Build the wrappers (markdown2pdf)" on \
+		LIBRARY      "Build the pandoc library" on \
+		CITEPROC     "Compile in support for citeproc-hs" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_HIGHLIGHTING)
 CONFIGURE_ARGS+=	--flags="highlighting"
 USE_HACKAGE+=		highlighting-kate
+.else
+CONFIGURE_ARGS+=	--flags="-highlighting"
+.endif
+
+.if defined(WITH_EXECUTABLE)
+CONFIGURE_ARGS+=	--flags="exectuable"
+EXECUTABLE+=		pandoc
+PLIST_SUB+=		MAYBE_EXECUTABLE=""
+.else
+CONFIGURE_ARGS+=	--flags="-executable"
+PLIST_SUB+=		MAYBE_EXECUTABLE="@comment "
+.endif
+
+.if defined(WITH_WRAPPERS)
+CONFIGURE_ARGS+=	--flags="wrappers"
+EXECUTABLE+=		markdown2pdf
+PLIST_SUB+=		MAYBE_WRAPPERS=""
+
+.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"
+PLIST_SUB+=		MAYBE_WRAPPERS="@comment "
+.endif
+
+.if defined(WITH_LIBRARY)
+CONFIGURE_ARGS+=	--flags="library"
+PLIST_SUB+=		MAYBE_LIBRARY=""
+.else
+CONFIGURE_ARGS+=	--flags="-library"
+PLIST_SUB+=		MAYBE_LIBRARY="@comment "
+STANDALONE=		yes
+.endif
+
+.if !defined(WITH_EXECUTABLE) && !defined(WITH_LIBRARY)
+IGNORE=		cannot be compiled in this configuration.  Please (re)run 'make config' and choose either EXECUTABLE or LIBRARY or both
+.endif
+
+.if defined(WITH_CITEPROC)
+CONFIGURE_ARGS+=	--flags="citeproc"
+USE_HACKAGE+=		citeproc-hs
+.else
+CONFIGURE_ARGS+=	--flags="-citeproc"
 .endif
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/pandoc/distinfo b/textproc/pandoc/distinfo
index 18695f80f509..2bc2c6fef918 100644
--- a/textproc/pandoc/distinfo
+++ b/textproc/pandoc/distinfo
@@ -1,3 +1,3 @@
-MD5 (pandoc-1.4.tar.gz) = ee88d7f7f3cadda86d19eccf58bde057
-SHA256 (pandoc-1.4.tar.gz) = a1ae242147341878a23aaa2c92b358d30bf7430ff7959f401cc5399c00aee892
-SIZE (pandoc-1.4.tar.gz) = 339917
+MD5 (pandoc-1.5.1.1.tar.gz) = bfccc042ae0cf0901bbca1f87748f969
+SHA256 (pandoc-1.5.1.1.tar.gz) = 6d2283cb618fcaea5ee5cb885ef6532bc34628b351f14a6bd85b098d7a4128d9
+SIZE (pandoc-1.5.1.1.tar.gz) = 353653
diff --git a/textproc/pandoc/files/patch-Setup.hs b/textproc/pandoc/files/patch-Setup.hs
new file mode 100644
index 000000000000..1de649dd9d37
--- /dev/null
+++ b/textproc/pandoc/files/patch-Setup.hs
@@ -0,0 +1,20 @@
+--- ./Setup.hs.orig	2010-03-29 16:24:56.000000000 +0200
++++ ./Setup.hs	2010-05-15 13:39:12.000000000 +0200
+@@ -6,7 +6,7 @@
+ import Distribution.Simple.LocalBuildInfo
+          (LocalBuildInfo(..), absoluteInstallDirs)
+ import Distribution.Verbosity ( Verbosity, silent )
+-import Distribution.Simple.InstallDirs (mandir, bindir, CopyDest (NoCopyDest))
++import Distribution.Simple.InstallDirs (prefix, bindir, CopyDest (NoCopyDest))
+ import Distribution.Simple.Utils (copyFiles)
+ import Control.Exception ( bracket_ )
+ import Control.Monad ( unless )
+@@ -86,7 +86,7 @@
+ installManpages :: PackageDescription -> LocalBuildInfo
+                 -> Verbosity -> CopyDest -> IO ()
+ installManpages pkg lbi verbosity copy =
+-  copyFiles verbosity (mandir (absoluteInstallDirs pkg lbi copy) </> "man1")
++  copyFiles verbosity (prefix (absoluteInstallDirs pkg lbi copy) </> "man/man1")
+              (zip (repeat manDir) manpages)
+ 
+ -- | Returns a list of 'dependencies' that have been modified after 'file'.
diff --git a/textproc/pandoc/pkg-plist b/textproc/pandoc/pkg-plist
index 5cbf0019fb6a..0f186a4140ea 100644
--- a/textproc/pandoc/pkg-plist
+++ b/textproc/pandoc/pkg-plist
@@ -1,47 +1,45 @@
 @comment $FreeBSD$
-bin/hsmarkdown
-bin/markdown2pdf
-bin/pandoc
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Paths_pandoc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Blocks.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/CharacterReferences.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Definition.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Highlighting.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/LaTeXMathML.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/ODT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/HTML.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/LaTeX.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/Markdown.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/RST.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/TeXMath.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Shared.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Templates.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/ConTeXt.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Docbook.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/HTML.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/LaTeX.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Man.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Markdown.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/MediaWiki.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/OpenDocument.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/RST.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/RTF.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/S5.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Texinfo.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/XML.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
+%%MAYBE_WRAPPERS%%bin/markdown2pdf
+%%MAYBE_EXECUTABLE%%bin/pandoc
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Paths_pandoc.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Blocks.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/CharacterReferences.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Definition.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Highlighting.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/ODT.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/HTML.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/LaTeX.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/Markdown.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/RST.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/TeXMath.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Shared.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Templates.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/ConTeXt.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Docbook.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/HTML.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/LaTeX.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Man.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Markdown.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/MediaWiki.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/OpenDocument.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/RST.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/RTF.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/S5.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Texinfo.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/XML.hi
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
+%%MAYBE_LIBRARY%%%%LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/COPYING
 %%NOPORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers
+%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers
+%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc
+%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
+%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+%%MAYBE_LIBRARY%%@dirrm %%LIBDIR_REL%%
+%%MAYBE_LIBRARY%%@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
+%%MAYBE_LIBRARY%%@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+%%MAYBE_LIBRARY%%@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
+%%MAYBE_LIBRARY%%@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old