git: b940f4abf40e - main - textproc/multimarkdown: Update to 6.7.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 21 Jun 2023 00:14:07 UTC
The branch main has been updated by yasu:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b940f4abf40ec0c0a50ad74ed119320681d35e21
commit b940f4abf40ec0c0a50ad74ed119320681d35e21
Author: Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2023-06-11 23:19:47 +0000
Commit: Yasuhiro Kimura <yasu@FreeBSD.org>
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 <bsd.port.mk>
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