Date: Thu, 17 Jul 2014 12:04:44 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362137 - head/textproc/multimarkdown Message-ID: <201407171204.s6HC4imn038062@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Thu Jul 17 12:04:43 2014 New Revision: 362137 URL: http://svnweb.freebsd.org/changeset/ports/362137 QAT: https://qat.redports.org/buildarchive/r362137/ Log: General cleanups Modified: head/textproc/multimarkdown/Makefile head/textproc/multimarkdown/pkg-plist Modified: head/textproc/multimarkdown/Makefile ============================================================================== --- head/textproc/multimarkdown/Makefile Thu Jul 17 11:59:02 2014 (r362136) +++ head/textproc/multimarkdown/Makefile Thu Jul 17 12:04:43 2014 (r362137) @@ -5,11 +5,11 @@ PORTNAME= multimarkdown PORTVERSION= 4.5.3 CATEGORIES= textproc MASTER_SITES= https://codeload.github.com/fletcher/MultiMarkdown-4/legacy.tar.gz/${MM4_COMMIT}?dummy=/: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= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:MM4 \ - greg-${GREG_COMMIT}${EXTRACT_SUFX}:greg + 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= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:MM4 \ + greg-${GREG_COMMIT}${EXTRACT_SUFX}:greg DIST_SUBDIR= ${PORTNAME} MAINTAINER= adamw@FreeBSD.org @@ -17,19 +17,19 @@ COMMENT= Extended Markdown processor wit LICENSE= MIT -MM4_COMMIT= b891584 +MM4_COMMIT= b891584 SUPPORT_COMMIT= 685c95c CHEAT_COMMIT= 199dae8 GREG_COMMIT= 3f11f56 -WRKSRC= ${WRKDIR}/fletcher-MultiMarkdown-4-${MM4_COMMIT} +WRKSRC= ${WRKDIR}/fletcher-MultiMarkdown-4-${MM4_COMMIT} ALL_TARGET= ${PORTNAME} -OPTIONS_DEFINE= CHEAT_SHEET EXTRAS HELPERS DOCS +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) +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 @@ -48,7 +48,7 @@ post-extract: .if ${PORT_OPTIONS:MEXTRAS} @${MV} ${WRKDIR}/fletcher-MMD-Support-${SUPPORT_COMMIT}/* ${WRKSRC}/Support .endif - + post-patch: @${REINPLACE_CMD} -E "s/^(CFLAGS).+=/\1 \+=/" ${WRKSRC}/Makefile ${WRKSRC}/greg/Makefile @${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/scripts/* @@ -63,7 +63,7 @@ pre-install: @${FIND} ${WRKSRC}/cheat-sheet -type f -exec ${CHMOD} ${SHAREMODE} {} \; do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/multimarkdown ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/multimarkdown ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -80,7 +80,7 @@ do-install: .if ${PORT_OPTIONS:MCHEAT_SHEET} @${MKDIR} ${STAGEDIR}${DOCSDIR}/cheat-sheet - cd ${WRKSRC} && ${FIND} cheat-sheet | ${CPIO} -pdmu --quiet ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} cheat-sheet ${STAGEDIR}${DOCSDIR}) .endif .include <bsd.port.mk> Modified: head/textproc/multimarkdown/pkg-plist ============================================================================== --- head/textproc/multimarkdown/pkg-plist Thu Jul 17 11:59:02 2014 (r362136) +++ head/textproc/multimarkdown/pkg-plist Thu Jul 17 12:04:43 2014 (r362137) @@ -37,19 +37,19 @@ bin/multimarkdown %%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/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/images/arrow_down.gif -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/images/arrow_right.gif -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/index.html %%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/it/index.html -%%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/markdown-reference.css -%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/mmd.png %%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/ru/index.html %%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/sv/index.html %%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/tr/index.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407171204.s6HC4imn038062>