From owner-svn-ports-head@FreeBSD.ORG Fri Aug 3 03:13:14 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EF952106564A; Fri, 3 Aug 2012 03:13:13 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DA1248FC0C; Fri, 3 Aug 2012 03:13:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q733DDiE063336; Fri, 3 Aug 2012 03:13:13 GMT (envelope-from pgj@svn.freebsd.org) Received: (from pgj@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q733DDip063332; Fri, 3 Aug 2012 03:13:13 GMT (envelope-from pgj@svn.freebsd.org) Message-Id: <201208030313.q733DDip063332@svn.freebsd.org> From: Gabor Pali Date: Fri, 3 Aug 2012 03:13:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301911 - head/textproc/hs-pandoc X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Aug 2012 03:13:14 -0000 Author: pgj Date: Fri Aug 3 03:13:13 2012 New Revision: 301911 URL: http://svn.freebsd.org/changeset/ports/301911 Log: - Update to 1.9.4.2 - Use the new options framework Obtained from: FreeBSD Haskell Modified: head/textproc/hs-pandoc/Makefile head/textproc/hs-pandoc/distinfo head/textproc/hs-pandoc/pkg-descr Modified: head/textproc/hs-pandoc/Makefile ============================================================================== --- head/textproc/hs-pandoc/Makefile Fri Aug 3 03:12:14 2012 (r301910) +++ head/textproc/hs-pandoc/Makefile Fri Aug 3 03:13:13 2012 (r301911) @@ -6,7 +6,7 @@ # PORTNAME= pandoc -PORTVERSION= 1.9.3 +PORTVERSION= 1.9.4.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -27,29 +27,28 @@ USE_CABAL= base64-bytestring>=0.1 blaze- MAN1= pandoc.1 MAN5= pandoc_markdown.5 -OPTIONS= EXECUTABLE "Build the pandoc executable" on \ - LIBRARY "Build the pandoc library" on \ +OPTIONS_MULTI= FORMAT +OPTIONS_MULTI_FORMAT= EXECUTABLE LIBRARY +OPTIONS_DEFAULT= EXECUTABLE LIBRARY + +EXECUTABLE_DESC= Build the pandoc executable +LIBRARY_DESC= Build the pandoc library -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .include -.if defined(WITH_EXECUTABLE) +.if ${PORT_OPTIONS:MEXECUTABLE} CONFIGURE_ARGS+= --flags="exectuable" EXECUTABLE+= pandoc .else CONFIGURE_ARGS+= --flags="-executable" .endif -.if defined(WITH_LIBRARY) +.if ${PORT_OPTIONS:MLIBRARY} CONFIGURE_ARGS+= --flags="library" .else CONFIGURE_ARGS+= --flags="-library" 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 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Modified: head/textproc/hs-pandoc/distinfo ============================================================================== --- head/textproc/hs-pandoc/distinfo Fri Aug 3 03:12:14 2012 (r301910) +++ head/textproc/hs-pandoc/distinfo Fri Aug 3 03:13:13 2012 (r301911) @@ -1,2 +1,2 @@ -SHA256 (cabal/pandoc-1.9.3.tar.gz) = 40929596f7a57de4cbd58e30beca2faaf237e4eee1db3f6265b94a1a52ff1f36 -SIZE (cabal/pandoc-1.9.3.tar.gz) = 560502 +SHA256 (cabal/pandoc-1.9.4.2.tar.gz) = 535380d76be30747e264950ca1df96bc3d480a5917ab5a54fcd0d7b84cc722ff +SIZE (cabal/pandoc-1.9.4.2.tar.gz) = 575099 Modified: head/textproc/hs-pandoc/pkg-descr ============================================================================== --- head/textproc/hs-pandoc/pkg-descr Fri Aug 3 03:12:14 2012 (r301910) +++ head/textproc/hs-pandoc/pkg-descr Fri Aug 3 03:13:13 2012 (r301911) @@ -1,18 +1,18 @@ 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 +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. +plain text, Emacs Org-Mode, AsciiDoc, EPUB, and S5 and 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 +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. WWW: http://johnmacfarlane.net/pandoc