From nobody Wed Jun 21 00:14:07 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qm3rv4YZCz4fvxk; Wed, 21 Jun 2023 00:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qm3rv3wzlz3rK5; Wed, 21 Jun 2023 00:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687306447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xgb9Gjiy1z5/HG18HL+nsbGx11eD8zRdh+xlc3vrpXc=; b=ggEia8FG0v0DbrfQ4zKQGUm/lVOf89vNFHMeMufXFsOT4dc/NiO9IjQYQvoVcoRr8mu2Sp 3VKlWRsnrRj5YDy+8k/iwPbDDKGcgbHeGIK39dOV74Q0F0XQ73kbN+N7NdppiUv8ejb1f5 ejQC9fNoXGhSwQF1oqu5o5+rkcR0tP35aLtowP1ivBHHBn7KG+lEx4RFnxxYaGJo4+a9mj lHHxf8KXweTrpMppxe7Do1KhCTp5Ou0HictWtPlc32B3mXPIeRsXQK3hEXamLi3T1Nr85D nxPG3Or3VcCjTf81BNHgcLfzwSgeVxaQgobVSXgursLx5OBhQnjHL1RMb0YKGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687306447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xgb9Gjiy1z5/HG18HL+nsbGx11eD8zRdh+xlc3vrpXc=; b=ELkSjzVaLpom1PiSS9wHzoj/tO9IaSVjAsst1eyb9PdD6UKyRTkK5djFVsBmT/nD/jz9BK qfC02W8ZPt7knAMLppisqr/o7naXYIxVvUJiGNoPaf87XGvYcvLXtZe1J2ZfaDjCIU0IfJ s3XxeBxKMx0dGbjh4s2fk+UApVFLckO39R9/yvbBCO6CwW9lCyjMGGlqZx5gEVnKPC9XYO nJHEK7npGKVy4/gkDjdOLcXGQlyU/VXKWA6WWzVKc7iUcfUY8YUm8bMznI0iL1CgMZnMxK fKmthzBIjn9fYyj4cztjix5APF3XrS+D5fxX49B++gbmQMWlxU+Otenswg/rLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687306447; a=rsa-sha256; cv=none; b=i1UbymUzHTb5OGNg5qMfS/jJ2HCgQAhth0RvZrXvVrAg8t0sQDKlP/RRBddOoYCBQk2+9f eDbFsOCSEVM3j6KXQjRPtFH2CQjwwUNy/zpFb5kep7dqCzDy93m+9OxmCxVR1nEgWOoLPi jkVIvpvYEqt5DlaW2cUEEIhzDe/NqflxnoY7vJdQVaTlnsWBrvOiGuk2gCvCo8uGb5KxYl HyVNmuP8nWC7Dg3lOlY1ThnSxv0huQGCKFmwHP4puA0YdlY+EhqJSd4Ug5/5OheIcbMvph A1AIoFzolVZc0fS1hxeSVM5XbbYO+6tUAhtfDQRrPJqyfa6w0UlJKzhoKbZ/gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qm3rv30GvzL2B; Wed, 21 Jun 2023 00:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35L0E7eJ019580; Wed, 21 Jun 2023 00:14:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35L0E77E019579; Wed, 21 Jun 2023 00:14:07 GMT (envelope-from git) Date: Wed, 21 Jun 2023 00:14:07 GMT Message-Id: <202306210014.35L0E77E019579@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: b940f4abf40e - main - textproc/multimarkdown: Update to 6.7.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b940f4abf40ec0c0a50ad74ed119320681d35e21 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=b940f4abf40ec0c0a50ad74ed119320681d35e21 commit b940f4abf40ec0c0a50ad74ed119320681d35e21 Author: Yasuhiro Kimura AuthorDate: 2023-06-11 23:19:47 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-06-21 00:13:37 +0000 textproc/multimarkdown: Update to 6.7.0 * Pet portclippy. * Tidy up Makefile with portfmt. ChangeLog: https://github.com/fletcher/MultiMarkdown-6/releases/tag/6.7.0 PR: 271958 Approved by: maintainer --- textproc/multimarkdown/Makefile | 35 ++++++++++------------- textproc/multimarkdown/distinfo | 6 ++-- textproc/multimarkdown/files/patch-CMakeLists.txt | 19 ++++++++++++ 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/textproc/multimarkdown/Makefile b/textproc/multimarkdown/Makefile index 6e33df809597..bfa9defeb33d 100644 --- a/textproc/multimarkdown/Makefile +++ b/textproc/multimarkdown/Makefile @@ -1,5 +1,5 @@ PORTNAME= multimarkdown -DISTVERSION= 6.6.0 +DISTVERSION= 6.7.0 CATEGORIES= textproc DIST_SUBDIR= ${PORTNAME} @@ -7,7 +7,7 @@ MAINTAINER= egypcio@FreeBSD.org COMMENT= Extended Markdown processor with more features, written in C WWW= https://www.fletcherpenney.net/multimarkdown/ -LICENSE= BSD3CLAUSE MIT GPLv2+ ZLIB +LICENSE= BSD3CLAUSE GPLv2+ MIT ZLIB LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE @@ -21,34 +21,38 @@ GH_PROJECT= MultiMarkdown-6 PORTDOCS= README.md -OPTIONS_DEFINE= CHEAT_SHEET EXTRAS HELPERS DOCS +OPTIONS_DEFINE= CHEAT_SHEET DOCS EXTRAS HELPERS +OPTIONS_SUB= yes + 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= MultiMarkdown-6-Syntax-Guide:cheat -CHEAT_SHEET_GH_TAGNAME= 2cf0881:cheat CHEAT_SHEET_GH_SUBDIR= cheat-sheet:cheat +CHEAT_SHEET_GH_TAGNAME= 2cf0881:cheat EXTRAS_GH_PROJECT= MMD-Support:support -EXTRAS_GH_TAGNAME= 685c95c:support EXTRAS_GH_SUBDIR= Support:support +EXTRAS_GH_TAGNAME= 685c95c:support HELPERS_CONFLICTS_INSTALL= mtools-* -OPTIONS_SUB= yes - post-patch: @${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/scripts/* +post-patch-CHEAT_SHEET-on: +.for f in .gitignore Makefile scripts source templates + @${RM} -r ${WRKSRC}/cheat-sheet/${f} +.endfor + 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/* -post-patch-CHEAT_SHEET-on: -.for f in .gitignore Makefile scripts source templates - @${RM} -r ${WRKSRC}/cheat-sheet/${f} -.endfor +do-install-CHEAT_SHEET-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR}/cheat-sheet + (cd ${WRKSRC} && ${COPYTREE_SHARE} cheat-sheet ${STAGEDIR}${DOCSDIR}) do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -63,13 +67,4 @@ do-install-EXTRAS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/Support/README.md ${STAGEDIR}${DOCSDIR}/README-extras.md -do-install-CHEAT_SHEET-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR}/cheat-sheet - (cd ${WRKSRC} && ${COPYTREE_SHARE} cheat-sheet ${STAGEDIR}${DOCSDIR}) - -post-install: -.for f in LICENSE.txt README.txt - ${RM} ${STAGEDIR}${PREFIX}/${f} -.endfor - .include diff --git a/textproc/multimarkdown/distinfo b/textproc/multimarkdown/distinfo index 88cf7f68f6bc..6c5eb99f6b9f 100644 --- a/textproc/multimarkdown/distinfo +++ b/textproc/multimarkdown/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1603917668 -SHA256 (multimarkdown/fletcher-MultiMarkdown-6-6.6.0_GH0.tar.gz) = 6496b43c933d2f93ff6be80f5029d37e9576a5d5eacb90900e6b28c90405037f -SIZE (multimarkdown/fletcher-MultiMarkdown-6-6.6.0_GH0.tar.gz) = 3347116 +TIMESTAMP = 1686463166 +SHA256 (multimarkdown/fletcher-MultiMarkdown-6-6.7.0_GH0.tar.gz) = aa386f54631dbc4e0beeb6b9cf9eb769db95a3f505a69b663140a80008cf0595 +SIZE (multimarkdown/fletcher-MultiMarkdown-6-6.7.0_GH0.tar.gz) = 3329318 SHA256 (multimarkdown/fletcher-MultiMarkdown-6-Syntax-Guide-2cf0881_GH0.tar.gz) = f0be767860bac92a3c8d5009e349b7e88ee84d6c03b42a23f77e8be4cbd85ba2 SIZE (multimarkdown/fletcher-MultiMarkdown-6-Syntax-Guide-2cf0881_GH0.tar.gz) = 49831 SHA256 (multimarkdown/fletcher-MMD-Support-685c95c_GH0.tar.gz) = 3544d81579a0a3d8b1649437ef418f5a4862c5cf080309fd817f617a2f958e69 diff --git a/textproc/multimarkdown/files/patch-CMakeLists.txt b/textproc/multimarkdown/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..e8f9b0db5995 --- /dev/null +++ b/textproc/multimarkdown/files/patch-CMakeLists.txt @@ -0,0 +1,19 @@ +--- CMakeLists.txt.orig 2023-06-11 01:48:25 UTC ++++ CMakeLists.txt +@@ -565,16 +565,6 @@ else (hasParent) + endif (public_headers) + endif (DEFINED SHAREDBUILD) + +- # Install Documentation +- install(FILES +- "${PROJECT_BINARY_DIR}/LICENSE.txt" +- "${PROJECT_BINARY_DIR}/README.txt" +- COMPONENT Docs +- DESTINATION share/doc/MultiMarkdown +- ) +- set (CPACK_COMPONENT_DOCS_DISPLAY_NAME "Documentation") +- set (CPACK_COMPONENT_DOCS_DESCRIPTION "Install README and LICENSE.") +- + # Install LaTeX support files + install (FILES ${latex} + DESTINATION share/texmf/tex/latex/mmd6