Date: Tue, 4 Aug 2015 14:26:25 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393520 - head/textproc/multimarkdown Message-ID: <201508041426.t74EQPRE034196@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Tue Aug 4 14:26:24 2015 New Revision: 393520 URL: https://svnweb.freebsd.org/changeset/ports/393520 Log: Modernize. - Use multi-USE_GITHUB functionnality - Use options helper targets. Sponsored by: Absolight Modified: head/textproc/multimarkdown/Makefile head/textproc/multimarkdown/distinfo Modified: head/textproc/multimarkdown/Makefile ============================================================================== --- head/textproc/multimarkdown/Makefile Tue Aug 4 13:27:00 2015 (r393519) +++ head/textproc/multimarkdown/Makefile Tue Aug 4 14:26:24 2015 (r393520) @@ -4,12 +4,6 @@ PORTNAME= multimarkdown PORTVERSION= 4.7 CATEGORIES= textproc -MASTER_SITES= GH:MM4 \ - https://codeload.github.com/fletcher/MMD-Support/legacy.tar.gz/${SUPPORT_COMMIT}?dummy=/:support \ - https://codeload.github.com/fletcher/human-markdown-reference/legacy.tar.gz/${CHEAT_COMMIT}?dummy=/:cheat \ - https://codeload.github.com/nddrylliog/greg/legacy.tar.gz/${GREG_COMMIT}?dummy=/:greg -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:MM4 \ - greg-${GREG_COMMIT}${EXTRACT_SUFX}:greg DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org @@ -18,12 +12,9 @@ COMMENT= Extended Markdown processor wit LICENSE= MIT USE_GITHUB= yes -GH_ACCOUNT= fletcher -GH_PROJECT= MultiMarkdown-4 - -SUPPORT_COMMIT= 685c95c -CHEAT_COMMIT= 199dae8 -GREG_COMMIT= 98ecf13 +GH_ACCOUNT= fletcher:DEFAULT nddrylliog:greg +GH_PROJECT= MultiMarkdown-4 greg:greg +GH_TAGNAME= 98ecf13:greg ALL_TARGET= ${PORTNAME} USES= gmake @@ -33,57 +24,56 @@ CHEAT_SHEET_DESC= HTML-based cheat sheat EXTRAS_DESC= Extra scripts and XSLT support HELPERS_DESC= Helper scripts (conflicts with emulators/mtools) -CHEAT_SHEET_DISTFILES= human-markdown-reference-${CHEAT_COMMIT}${EXTRACT_SUFX}:cheat -EXTRAS_DISTFILES= MMD-Support-${SUPPORT_COMMIT}${EXTRACT_SUFX}:support +CHEAT_SHEET_GH_PROJECT= human-markdown-reference:cheat +CHEAT_SHEET_GH_TAGNAME= 199dae8:cheat +EXTRAS_GH_PROJECT= MMD-Support:support +EXTRAS_GH_TAGNAME= 685c95c:support HELPERS_CONFLICTS_INSTALL= mtools-* OPTIONS_SUB= yes -.include <bsd.port.options.mk> - post-extract: - @${MV} ${WRKDIR}/fasterthanlime-greg-${GREG_COMMIT}/* ${WRKSRC}/greg -.if ${PORT_OPTIONS:MCHEAT_SHEET} - @${MV} ${WRKDIR}/fletcher-human-markdown-reference-${CHEAT_COMMIT}/* ${WRKSRC}/cheat-sheet -.endif -.if ${PORT_OPTIONS:MEXTRAS} - @${MV} ${WRKDIR}/fletcher-MMD-Support-${SUPPORT_COMMIT}/* ${WRKSRC}/Support -.endif + @${RMDIR} ${WRKSRC}/greg + @${MV} ${WRKSRC_greg} ${WRKSRC}/greg + +post-extract-CHEAT_SHEET-on: + @${RMDIR} ${WRKSRC}/cheat-sheet + @${MV} ${WRKSRC_cheat} ${WRKSRC}/cheat-sheet + +post-extract-EXTRAS-on: + @${RMDIR} ${WRKSRC}/Support + @${MV} ${WRKSRC_support} ${WRKSRC}/Support post-patch: @${REINPLACE_CMD} -E "s/^(CFLAGS).+=/\1 \+=/" ${WRKSRC}/Makefile ${WRKSRC}/greg/Makefile @${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/scripts/* @${REINPLACE_CMD} -E 's,(-include) (GLibFacade.h),\1 ${WRKSRC}/\2,' ${WRKSRC}/Makefile -.if ${PORT_OPTIONS:MEXTRAS} + +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/* -.endif -pre-install: - @${FIND} ${WRKSRC} -name '*.bak' -delete - @${FIND} ${WRKSRC}/cheat-sheet -type f -exec ${CHMOD} ${SHAREMODE} {} \; do-install: + @${FIND} ${WRKSRC} -name '*.bak' -delete ${INSTALL_PROGRAM} ${WRKSRC}/multimarkdown ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} -.if ${PORT_OPTIONS:MEXTRAS} +post-install-EXTRAS-on: ${INSTALL_SCRIPT} ${WRKSRC}/Support/bin/* ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR}/XSLT ${INSTALL_DATA} ${WRKSRC}/Support/XSLT/* ${STAGEDIR}${DATADIR}/XSLT @${MKDIR} ${STAGEDIR}${DATADIR}/utilities ${INSTALL_SCRIPT} ${WRKSRC}/Support/Utilities/* ${STAGEDIR}${DATADIR}/utilities ${INSTALL_DATA} ${WRKSRC}/Support/README.md ${STAGEDIR}${DOCSDIR}/README-extras.md -.endif -.if ${PORT_OPTIONS:MCHEAT_SHEET} +post-install-CHEAT_SHEET-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/cheat-sheet (cd ${WRKSRC} && ${COPYTREE_SHARE} cheat-sheet ${STAGEDIR}${DOCSDIR}) -.endif .include <bsd.port.mk> Modified: head/textproc/multimarkdown/distinfo ============================================================================== --- head/textproc/multimarkdown/distinfo Tue Aug 4 13:27:00 2015 (r393519) +++ head/textproc/multimarkdown/distinfo Tue Aug 4 14:26:24 2015 (r393520) @@ -1,8 +1,8 @@ SHA256 (multimarkdown/fletcher-MultiMarkdown-4-4.7_GH0.tar.gz) = 6ee0ac92c5e9eff924e3f9713f145cabd561ce62ef55fb9dacd69fa145d0fbfc SIZE (multimarkdown/fletcher-MultiMarkdown-4-4.7_GH0.tar.gz) = 120573 -SHA256 (multimarkdown/greg-98ecf13.tar.gz) = a3d13c16bdc0fce1f6fc1f8ec4fa9c32956876440c91a25a8183846334ba66c0 -SIZE (multimarkdown/greg-98ecf13.tar.gz) = 34304 -SHA256 (multimarkdown/human-markdown-reference-199dae8.tar.gz) = 6b7c0e1acfa5f3c40ce09dfdb456161e2fc6cd60159e4b06d9dc7f8772a50c59 -SIZE (multimarkdown/human-markdown-reference-199dae8.tar.gz) = 53813 -SHA256 (multimarkdown/MMD-Support-685c95c.tar.gz) = fd6e17f527be51dfa10c5cf9c234b72def462b5a0256e588f77cbe7eca26884d -SIZE (multimarkdown/MMD-Support-685c95c.tar.gz) = 16863 +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 +SHA256 (multimarkdown/fletcher-MMD-Support-685c95c_GH0.tar.gz) = 3544d81579a0a3d8b1649437ef418f5a4862c5cf080309fd817f617a2f958e69 +SIZE (multimarkdown/fletcher-MMD-Support-685c95c_GH0.tar.gz) = 16865
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508041426.t74EQPRE034196>