From owner-svn-ports-head@freebsd.org Fri Feb 23 12:56:33 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 392B6F1FE69; Fri, 23 Feb 2018 12:56:33 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D69A67E2D8; Fri, 23 Feb 2018 12:56:32 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D17D116CBC; Fri, 23 Feb 2018 12:56:32 +0000 (UTC) (envelope-from pizzamig@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1NCuWKp018439; Fri, 23 Feb 2018 12:56:32 GMT (envelope-from pizzamig@FreeBSD.org) Received: (from pizzamig@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1NCuW6u018435; Fri, 23 Feb 2018 12:56:32 GMT (envelope-from pizzamig@FreeBSD.org) Message-Id: <201802231256.w1NCuW6u018435@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pizzamig set sender to pizzamig@FreeBSD.org using -f From: Luca Pizzamiglio Date: Fri, 23 Feb 2018 12:56:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462691 - in head/textproc/multimarkdown: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pizzamig X-SVN-Commit-Paths: in head/textproc/multimarkdown: . files X-SVN-Commit-Revision: 462691 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 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, 23 Feb 2018 12:56:33 -0000 Author: pizzamig Date: Fri Feb 23 12:56:32 2018 New Revision: 462691 URL: https://svnweb.freebsd.org/changeset/ports/462691 Log: textproc/multimarkdown: Upgrade to 6.3.0 PR: 226045 Submitted by: Yasuhiro KIMURA Added: head/textproc/multimarkdown/files/ head/textproc/multimarkdown/files/patch-CMakeLists.txt (contents, props changed) Modified: head/textproc/multimarkdown/Makefile head/textproc/multimarkdown/distinfo head/textproc/multimarkdown/pkg-plist Modified: head/textproc/multimarkdown/Makefile ============================================================================== --- head/textproc/multimarkdown/Makefile Fri Feb 23 12:56:22 2018 (r462690) +++ head/textproc/multimarkdown/Makefile Fri Feb 23 12:56:32 2018 (r462691) @@ -2,31 +2,33 @@ # $FreeBSD$ PORTNAME= multimarkdown -DISTVERSION= 4.7.1 +DISTVERSION= 6.3.0 CATEGORIES= textproc DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Extended Markdown processor with more features, written in C -LICENSE= MIT GPLv2+ -LICENSE_COMB= dual +LICENSE= BSD3CLAUSE MIT GPLv2+ ZLIB +LICENSE_COMB= multi +LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= gmake +LIB_DEPENDS= libcurl.so:ftp/curl + +USES= cmake USE_GITHUB= yes -GH_ACCOUNT= fletcher:DEFAULT nddrylliog:greg -GH_PROJECT= MultiMarkdown-4 greg:greg -GH_TAGNAME= 98ecf13:greg -GH_SUBDIR= greg:greg -ALL_TARGET= ${PORTNAME} +GH_ACCOUNT= fletcher +GH_PROJECT= MultiMarkdown-6 +PORTDOCS= README.md + OPTIONS_DEFINE= CHEAT_SHEET EXTRAS HELPERS DOCS CHEAT_SHEET_DESC= HTML-based cheat sheat EXTRAS_DESC= Extra scripts and XSLT support HELPERS_DESC= Helper scripts (conflicts with emulators/mtools) -CHEAT_SHEET_GH_PROJECT= human-markdown-reference:cheat -CHEAT_SHEET_GH_TAGNAME= 199dae8:cheat +CHEAT_SHEET_GH_PROJECT= MultiMarkdown-6-Syntax-Guide:cheat +CHEAT_SHEET_GH_TAGNAME= 3b268b4:cheat CHEAT_SHEET_GH_SUBDIR= cheat-sheet:cheat EXTRAS_GH_PROJECT= MMD-Support:support EXTRAS_GH_TAGNAME= 685c95c:support @@ -37,19 +39,18 @@ HELPERS_CONFLICTS_INSTALL= mtools-* OPTIONS_SUB= yes post-patch: - @${REINPLACE_CMD} -E "s/^(CFLAGS).+=/\1 \+=/" ${WRKSRC}/Makefile ${WRKSRC}/greg/Makefile + @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/scripts/* - @${REINPLACE_CMD} -E 's,(-include) (GLibFacade.h),\1 ${WRKSRC}/\2,' ${WRKSRC}/Makefile post-patch-EXTRAS-on: @${REINPLACE_CMD} -E "s,^(xslt_path)=.*,\1=${DATADIR},; s,(xslt_path)/../,\1/," \ ${WRKSRC}/Support/bin/* @${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/Support/bin/* -do-install: - @${FIND} ${WRKSRC} -name '*.bak' -o -name '*.bat' -delete - ${INSTALL_PROGRAM} ${WRKSRC}/multimarkdown ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${PREFIX}/bin +post-patch-CHEAT_SHEET-on: +.for f in .gitignore Makefile scripts source templates + @${RM} -r ${WRKSRC}/cheat-sheet/${f} +.endfor do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/textproc/multimarkdown/distinfo ============================================================================== --- head/textproc/multimarkdown/distinfo Fri Feb 23 12:56:22 2018 (r462690) +++ head/textproc/multimarkdown/distinfo Fri Feb 23 12:56:32 2018 (r462691) @@ -1,9 +1,7 @@ -TIMESTAMP = 1518418152 -SHA256 (multimarkdown/fletcher-MultiMarkdown-4-4.7.1_GH0.tar.gz) = 832e5dce6fa1bff4d67e64ac2cc24f0920ae8d91280e53ea879237a1d43f4865 -SIZE (multimarkdown/fletcher-MultiMarkdown-4-4.7.1_GH0.tar.gz) = 120896 -SHA256 (multimarkdown/nddrylliog-greg-98ecf13_GH0.tar.gz) = 47fe156a4d6fb2a6009f49c3037c6460e56c4f70f6836fb4fa73749644ed68d9 -SIZE (multimarkdown/nddrylliog-greg-98ecf13_GH0.tar.gz) = 34254 -SHA256 (multimarkdown/fletcher-human-markdown-reference-199dae8_GH0.tar.gz) = afab54673253f5b4d6f1be96bd7ec0383b07328f8ff26512e9edd0724b099783 -SIZE (multimarkdown/fletcher-human-markdown-reference-199dae8_GH0.tar.gz) = 53809 +TIMESTAMP = 1519036011 +SHA256 (multimarkdown/fletcher-MultiMarkdown-6-6.3.0_GH0.tar.gz) = 0c511910cd378a8bdf0c6de34123cbacaec74c18b5a4131093e940589a18946c +SIZE (multimarkdown/fletcher-MultiMarkdown-6-6.3.0_GH0.tar.gz) = 2297376 +SHA256 (multimarkdown/fletcher-MultiMarkdown-6-Syntax-Guide-3b268b4_GH0.tar.gz) = cc8e5c49d81dc65212b3366719a13fb62ab2b21f54d997ec943a439118158401 +SIZE (multimarkdown/fletcher-MultiMarkdown-6-Syntax-Guide-3b268b4_GH0.tar.gz) = 48364 SHA256 (multimarkdown/fletcher-MMD-Support-685c95c_GH0.tar.gz) = 3544d81579a0a3d8b1649437ef418f5a4862c5cf080309fd817f617a2f958e69 SIZE (multimarkdown/fletcher-MMD-Support-685c95c_GH0.tar.gz) = 16865 Added: head/textproc/multimarkdown/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/multimarkdown/files/patch-CMakeLists.txt Fri Feb 23 12:56:32 2018 (r462691) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2018-02-19 11:02:50 UTC ++++ CMakeLists.txt +@@ -437,6 +437,8 @@ if (NOT DEFINED TEST) + find_package(CURL) + if (CURL_FOUND) + add_definitions(-DUSE_CURL) ++ include_directories(%%PREFIX%%/include) ++ link_directories(%%PREFIX%%/lib) + message (STATUS "libcurl found") + else () + message (STATUS "libcurl not found") Modified: head/textproc/multimarkdown/pkg-plist ============================================================================== --- head/textproc/multimarkdown/pkg-plist Fri Feb 23 12:56:22 2018 (r462690) +++ head/textproc/multimarkdown/pkg-plist Fri Feb 23 12:56:32 2018 (r462691) @@ -2,14 +2,43 @@ bin/markdown bin/multimarkdown %%HELPERS%%bin/mmd %%HELPERS%%bin/mmd2all -%%HELPERS%%bin/mmd2odf +%%HELPERS%%bin/mmd2epub +%%HELPERS%%bin/mmd2fodt +%%HELPERS%%bin/mmd2odt %%HELPERS%%bin/mmd2opml %%HELPERS%%bin/mmd2pdf -%%HELPERS%%bin/mmd2rtf %%HELPERS%%bin/mmd2tex - -%%PORTDOCS%%%%DOCSDIR%%/README.md - +share/texmf/tex/latex/mmd6/Portfolio.png +share/texmf/tex/latex/mmd6/README.md +share/texmf/tex/latex/mmd6/Vintage.png +share/texmf/tex/latex/mmd6/beamerthemekeynote-gradient.sty +share/texmf/tex/latex/mmd6/beamerthemekeynote-portfolio.sty +share/texmf/tex/latex/mmd6/beamerthemekeynote-vintage.sty +share/texmf/tex/latex/mmd6/mmd-envelope.sty +share/texmf/tex/latex/mmd6/mmd-letterhead.sty +share/texmf/tex/latex/mmd6/mmd6-article-begin.tex +share/texmf/tex/latex/mmd6/mmd6-article-footer.tex +share/texmf/tex/latex/mmd6/mmd6-article-leader.tex +share/texmf/tex/latex/mmd6/mmd6-beamer-begin.tex +share/texmf/tex/latex/mmd6/mmd6-beamer-footer.tex +share/texmf/tex/latex/mmd6/mmd6-beamer-leader.tex +share/texmf/tex/latex/mmd6/mmd6-criticmarkup.tex +share/texmf/tex/latex/mmd6/mmd6-default-metadata.tex +share/texmf/tex/latex/mmd6/mmd6-letterhead-begin.tex +share/texmf/tex/latex/mmd6/mmd6-letterhead-footer.tex +share/texmf/tex/latex/mmd6/mmd6-letterhead-leader.tex +share/texmf/tex/latex/mmd6/mmd6-memoir-footer.tex +share/texmf/tex/latex/mmd6/mmd6-memoir-layout-8.5x11.tex +share/texmf/tex/latex/mmd6/mmd6-memoir-packages.tex +share/texmf/tex/latex/mmd6/mmd6-memoir-setup.tex +share/texmf/tex/latex/mmd6/mmd6-title.tex +share/texmf/tex/latex/mmd6/mmd6-tufte-book-begin.tex +share/texmf/tex/latex/mmd6/mmd6-tufte-book-footer.tex +share/texmf/tex/latex/mmd6/mmd6-tufte-book-leader.tex +share/texmf/tex/latex/mmd6/mmd6-tufte-footer.tex +share/texmf/tex/latex/mmd6/mmd6-tufte-handout-begin.tex +share/texmf/tex/latex/mmd6/mmd6-tufte-handout-footer.tex +share/texmf/tex/latex/mmd6/mmd6-tufte-handout-leader.tex %%EXTRAS%%bin/mmd-xslt %%EXTRAS%%bin/mmd2LaTeX.pl %%EXTRAS%%bin/mmd2ODF.pl @@ -30,23 +59,9 @@ bin/multimarkdown %%EXTRAS%%%%DATADIR%%/XSLT/xhtml-toc-h2.xslt %%EXTRAS%%%%DATADIR%%/XSLT/xhtml2latex.xslt %%EXTRAS%%%%DOCSDIR%%/README-extras.md - -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/LICENCE -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/MMD-Guide.html %%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/README.md +%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/css/markdown-reference.css %%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/index.html -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/markdown-reference.css -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/mmd.png -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/images/arrow_down.gif -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/images/arrow_right.gif %%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/javascripts/guide.js %%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/javascripts/jquery-1.4.2.min.js -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/ca/index.html -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/de/index.html -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/en/index.html -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/es/index.html -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/fr/index.html -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/it/index.html -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/ru/index.html -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/sv/index.html -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/tr/index.html +%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/mmd.png