From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 8 19:30:04 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D34C11065672 for ; Fri, 8 Jan 2010 19:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A7CA88FC16 for ; Fri, 8 Jan 2010 19:30:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o08JU4du063191 for ; Fri, 8 Jan 2010 19:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o08JU424063186; Fri, 8 Jan 2010 19:30:04 GMT (envelope-from gnats) Resent-Date: Fri, 8 Jan 2010 19:30:04 GMT Resent-Message-Id: <201001081930.o08JU424063186@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jacula Modyun Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 816B4106566B for ; Fri, 8 Jan 2010 19:24:28 +0000 (UTC) (envelope-from jacula@gmail.com) Received: from mail-fx0-f227.google.com (mail-fx0-f227.google.com [209.85.220.227]) by mx1.freebsd.org (Postfix) with ESMTP id 0CFD58FC0A for ; Fri, 8 Jan 2010 19:24:27 +0000 (UTC) Received: by fxm27 with SMTP id 27so5009532fxm.3 for ; Fri, 08 Jan 2010 11:24:23 -0800 (PST) Received: by 10.223.18.145 with SMTP id w17mr3466070faa.66.1262978662483; Fri, 08 Jan 2010 11:24:22 -0800 (PST) Received: from splork.wirewater.yow ([95.238.82.21]) by mx.google.com with ESMTPS id 31sm33716774fkt.31.2010.01.08.11.24.21 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 08 Jan 2010 11:24:22 -0800 (PST) Received: from localhost.wirewater.yow [127.0.0.1] by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3) with ESMTP id o08JOGXq053104 for ; Fri, 8 Jan 2010 19:24:16 GMT Received: by splork.wirewater.yow (Sendmail: 8.14.3/8.14.3/Submit) id o08JOGnF053101 ; Fri, 8 Jan 2010 19:24:16 GMT Message-Id: <201001081924.o08JOGnF053101@splork.wirewater.yow> Date: Fri, 08 Jan 2010 11:24:22 -0800 (PST) From: Jacula Modyun To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/142477: [patch]: update of textproc/pandoc from the 1.3 version to the 1.4 version X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jacula Modyun List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2010 19:30:05 -0000 >Number: 142477 >Category: ports >Synopsis: [patch]: update of textproc/pandoc from the 1.3 version to the 1.4 version >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jan 08 19:30:03 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Jacula Modyun >Release: FreeBSD 7.1-PRERELEASE i386 >Organization: >Environment: System: FreeBSD splork.wirewater.yow 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Sat Oct 18 11:22:07 UTC 2008 root@splork.wirewater.yow:/usr/obj/usr/src/sys/JACULA i386 >Description: textproc/pandoc from the 1.3 version to the 1.4 version. >How-To-Repeat: >Fix: --- patch-pandoc begins here --- diff -uNr pandoc.orig/Makefile pandoc/Makefile --- pandoc.orig/Makefile 2009-12-15 20:10:57.000000000 +0000 +++ pandoc/Makefile 2010-01-08 19:16:39.000000000 +0000 @@ -6,53 +6,98 @@ # PORTNAME= pandoc -PORTVERSION= 1.3 +PORTVERSION= 1.4 CATEGORIES= textproc haskell MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= pgj@FreeBSD.org COMMENT= A general markup converter -BUILD_DEPENDS= ghc>=6.10:${PORTSDIR}/lang/ghc \ +BUILD_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \ + hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \ + hs-zip-archive-ghc>=0.1.1.4:${PORTSDIR}/archivers/hs-zip-archive-ghc +RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \ hs-utf8-string-ghc>=0.3:${PORTSDIR}/devel/hs-utf8-string-ghc \ hs-zip-archive-ghc>=0.1:${PORTSDIR}/archivers/hs-zip-archive-ghc +LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 -MANCOMPRESSED= no MAN1= pandoc.1 markdown2pdf.1 html2markdown.1 hsmarkdown.1 -USE_GMAKE= yes -USE_PERL5= yes - -PLIST_FILES= bin/pandoc bin/markdown2pdf bin/html2markdown bin/hsmarkdown -PORTDOCS= BUGS README README.html -SCRIPTS= hsmarkdown html2markdown markdown2pdf +GHC_VERSION= 6.10.4 +PANDOC_VERSION= ${PORTVERSION} +HLKATE_VERSION= 0.2.5.1 + +GHC_CMD= ${LOCALBASE}/bin/ghc +SETUP_CMD= ./setup + +DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} +PANDOC_LIBDIR_REL= lib/${DISTNAME} +DATADIR= ${PREFIX}/share/${DISTNAME} + +PLIST_SUB= GHC_VERSION=${GHC_VERSION} \ + PANDOC_VERSION=${PANDOC_VERSION} \ + PANDOC_LIBDIR_REL=${PANDOC_LIBDIR_REL} OPTIONS= HIGHLIGHTING "Syntax highlighting support" off .include +CONFIGURE_ARGS= --haddock-options=-w --prefix=${PREFIX} + +.if exists(${LOCALBASE}/lib/highlighting-kate-${HLKATE_VERSION}/register.sh) +WITH_HIGHLIGHTING= +.endif + .if defined(WITH_HIGHLIGHTING) -BUILD_DEPENDS+= hs-highlighting-kate-ghc>=0.2:${PORTSDIR}/textproc/hs-highlighting-kate-ghc -MAKE_ARGS= CABALOPTS+="-fhighlighting" +CONFIGURE_ARGS+= --flags="highlighting" +BUILD_DEPENDS+= hs-highlighting-kate-ghc>=0.2.3:${PORTSDIR}/textproc/hs-highlighting-kate-ghc +RUN_DEPENDS+= hs-highlighting-kate-ghc>=0.2.3:${PORTSDIR}/textproc/hs-highlighting-kate-ghc +LIB_DEPENDS+= pcre:${PORTSDIR}/devel/pcre +.endif + +.if defined(NOPORTDOCS) +PLIST_SUB+= NOPORTDOCS="" +.else +PLIST_SUB+= NOPORTDOCS="@comment " +.endif + +.if !defined(NOPORTDOCS) + +PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK) +.if !empty(PORT_HADDOCK:M?0) +BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock .endif +BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour -post-patch: - @${REINPLACE_CMD} -e 's/Text.Pandoc.TH,/Text.Pandoc.TH/; /Paths_pandoc/d' \ - ${WRKSRC}/pandoc.cabal +HSCOLOUR_VERSION= 1.15 +HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION} + +PORTDOCS= * +.endif + +.SILENT: + +do-configure: + cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \ + && ${SETUP_CMD} configure ${CONFIGURE_ARGS} + +do-build: + cd ${WRKSRC} && ${SETUP_CMD} build \ + && ${SETUP_CMD} register --gen-script + +.if !defined(NOPORTDOCS) + cd ${WRKSRC} && ${SETUP_CMD} haddock --executables --hyperlink-source \ + --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css +.endif do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/dist/build/pandoc/pandoc ${PREFIX}/bin -.for script in ${SCRIPTS} - @${INSTALL_SCRIPT} ${WRKSRC}/${script} ${PREFIX}/bin -.endfor + cd ${WRKSRC} && ${SETUP_CMD} install \ + && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${PANDOC_LIBDIR_REL}/register.sh .for man in ${MAN1} @${INSTALL_MAN} ${WRKSRC}/man/man1/${man} ${PREFIX}/man/man1 .endfor -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for doc in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} -.endfor -.endif + +post-install: + ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .include diff -uNr pandoc.orig/distinfo pandoc/distinfo --- pandoc.orig/distinfo 2009-12-15 20:10:57.000000000 +0000 +++ pandoc/distinfo 2010-01-08 18:06:12.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (pandoc-1.3.tar.gz) = a19d51312d61ffb629adaa4d42b88cb9 -SHA256 (pandoc-1.3.tar.gz) = 574fb7bd691776bc4bc3c44c366969496f282e8df546dcebc2e76891bcd18049 -SIZE (pandoc-1.3.tar.gz) = 343119 +MD5 (pandoc-1.4.tar.gz) = ee88d7f7f3cadda86d19eccf58bde057 +SHA256 (pandoc-1.4.tar.gz) = a1ae242147341878a23aaa2c92b358d30bf7430ff7959f401cc5399c00aee892 +SIZE (pandoc-1.4.tar.gz) = 339917 diff -uNr pandoc.orig/pkg-plist pandoc/pkg-plist --- pandoc.orig/pkg-plist 1970-01-01 00:00:00.000000000 +0000 +++ pandoc/pkg-plist 2010-01-08 18:25:15.000000000 +0000 @@ -0,0 +1,81 @@ +bin/hsmarkdown +bin/markdown2pdf +bin/pandoc +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSpandoc-%%PANDOC_VERSION%%.o +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Paths_pandoc.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Blocks.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/CharacterReferences.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Definition.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Highlighting.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/LaTeXMathML.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/ODT.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/HTML.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/LaTeX.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/Markdown.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/RST.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers/TeXMath.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Shared.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Templates.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/ConTeXt.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Docbook.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/HTML.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/LaTeX.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Man.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Markdown.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/MediaWiki.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/OpenDocument.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/RST.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/RTF.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/S5.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers/Texinfo.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/XML.hi +%%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSpandoc-%%PANDOC_VERSION%%.a +%%PANDOC_LIBDIR_REL%%/register.sh +%%NOPORTDOCS%%%%DOCSDIR%%/COPYING +%%DATADIR%%/BUGS +%%DATADIR%%/COPYRIGHT +%%DATADIR%%/INSTALL +%%DATADIR%%/README +%%DATADIR%%/changelog +%%DATADIR%%/data/LaTeXMathML.js.comment +%%DATADIR%%/data/LaTeXMathML.js.packed +%%DATADIR%%/hsmarkdown +%%DATADIR%%/html2markdown +%%DATADIR%%/markdown2pdf +%%DATADIR%%/reference.odt +%%DATADIR%%/s5/default/framing.css +%%DATADIR%%/s5/default/opera.css +%%DATADIR%%/s5/default/outline.css +%%DATADIR%%/s5/default/pretty.css +%%DATADIR%%/s5/default/print.css +%%DATADIR%%/s5/default/s5-core.css +%%DATADIR%%/s5/default/slides.js.comment +%%DATADIR%%/s5/default/slides.js.packed +%%DATADIR%%/templates/context.template +%%DATADIR%%/templates/docbook.template +%%DATADIR%%/templates/html.template +%%DATADIR%%/templates/latex.template +%%DATADIR%%/templates/man.template +%%DATADIR%%/templates/markdown.template +%%DATADIR%%/templates/mediawiki.template +%%DATADIR%%/templates/opendocument.template +%%DATADIR%%/templates/rst.template +%%DATADIR%%/templates/rtf.template +%%DATADIR%%/templates/texinfo.template +@dirrm %%DATADIR%%/templates +@dirrm %%DATADIR%%/s5/default +@dirrm %%DATADIR%%/s5 +@dirrm %%DATADIR%%/data +@dirrm %%DATADIR%% +%%NOPORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Writers +@dirrm %%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc/Readers +@dirrm %%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/Pandoc +@dirrm %%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text +@dirrm %%PANDOC_LIBDIR_REL%%/ghc-%%GHC_VERSION%% +@dirrm %%PANDOC_LIBDIR_REL%% +@exec /bin/sh %D/%%PANDOC_LIBDIR_REL%%/register.sh +@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old +@unexec %D/bin/ghc-pkg unregister pandoc +@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old --- patch-pandoc ends here --- >Release-Note: >Audit-Trail: >Unformatted: