Update to 4.3.2.

The source remains only available through github. It also includes
a couple git submodules, which do not get included in the auto-generated
source tarballs. Some of these submodules do not have tagged releases.

So, I'm cutting my losses and just checking the source itself out
of github.

The port can now optionally install all The Other Stuff, and it
prevents the mtools conflict by default.

3 files changed, 110 insertions, 25 deletions

diff --git a/textproc/multimarkdown/Makefile b/textproc/multimarkdown/Makefile
index 9e5bad379324..802fa91062d2 100644
--- a/textproc/multimarkdown/Makefile
+++ b/textproc/multimarkdown/Makefile
@@ -2,34 +2,67 @@
 # $FreeBSD$
 
 PORTNAME=	multimarkdown
-PORTVERSION=	3.7.1
-PORTREVISION=	2
-DISTNAME=	peg-${PORTNAME}-${PORTVERSION}
+PORTVERSION=	4.3.2
 CATEGORIES=	textproc
-MASTER_SITES=	http://github.com/fletcher/peg-${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
+MASTER_SITES=	#none
+DISTFILES=		#none
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Extended Markdown processor with more features, written in C
 
-CONFLICTS_INSTALL=	mtools-*
-
 LICENSE=	MIT
 
-FETCH_ARGS=	-Fpr
+EXTRACT_DEPENDS=	git:${PORTSDIR}/devel/git
+
+WRKSRC=		${WRKDIR}/MultiMarkdown-4
 
-USE_GMAKE=	yes
 ALL_TARGET=	ALL
 
+OPTIONS_DEFINE=	CHEAT_SHEET EXTRAS HELPERS
+CHEAT_SHEET_DESC=	HTML-based cheat sheat
+EXTRAS_DESC=	Extra scripts and XSLT support
+HELPERS_DESC=	Helper scripts (conflicts with emulators/mtools)
+
+OPTIONS_SUB=	yes
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MHELPERS}
+CONFLICTS_INSTALL=	mtools-*
+.endif
+
+do-extract:
+	${MKDIR} ${WRKDIR}
+	cd ${WRKDIR} && git clone https://github.com/fletcher/MultiMarkdown-4.git
+	cd ${WRKSRC} && git checkout ${PORTVERSION}
+	cd ${WRKSRC} && git submodule init
+	cd ${WRKSRC} && git submodule update
+
 post-patch:
-	@${REINPLACE_CMD} -E "/CFLAGS/s/-arch [[:alnum:]]+//; /CFLAGS/s/\?=/\+=/; \
-		s/CC=gcc//" \
-		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -E "s/^(CFLAGS).+=/\1 \+=/" ${WRKSRC}/Makefile ${WRKSRC}/greg/Makefile
+	@${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/* ${WRKSRC}/scripts/*
+
+pre-install:
+	@${FIND} ${WRKSRC} -name '*.bak' -delete
+	@${FIND} ${WRKSRC}/cheat-sheet -type f -not -path '*/.git' -exec ${CHMOD} ${SHAREMODE} {} \;
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/multimarkdown ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${PREFIX}/bin
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+
+	${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
 
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/cheat-sheet
+	cd ${WRKSRC} && ${FIND} cheat-sheet -not -path '*/.git*' | \
+		${CPIO} -pdmu --quiet ${STAGEDIR}${DOCSDIR}
 .include <bsd.port.mk>
diff --git a/textproc/multimarkdown/pkg-descr b/textproc/multimarkdown/pkg-descr
index 6860d1da6898..362c06ea9943 100644
--- a/textproc/multimarkdown/pkg-descr
+++ b/textproc/multimarkdown/pkg-descr
@@ -11,12 +11,6 @@ listed above (Markdown only creates HTML). Additionally, it builds in
 'smart' typography for various languages (proper left- and right-sided
 quotes, for example).
 
-MultiMarkdown was originally a fork of the Markdown Perl code, but as of
-version 3.0 has been rewritten as a fork of peg-markdown by John
-MacFarlane, written in C. It can be compiled for any major operating
-system, and as a native binary runs much faster than the Perl version it
-replaces.
-
 
 NOTE: To use the mmd2pdf script, you must install print/latexmk.
 
diff --git a/textproc/multimarkdown/pkg-plist b/textproc/multimarkdown/pkg-plist
index e3ebb45198b6..23e7de52a39e 100644
--- a/textproc/multimarkdown/pkg-plist
+++ b/textproc/multimarkdown/pkg-plist
@@ -1,9 +1,67 @@
-bin/mmd
-bin/mmd2all
-bin/mmd2odf
-bin/mmd2opml
-bin/mmd2pdf
-bin/mmd2tex
 bin/multimarkdown
-%%PORTDOCS%%%%DOCSDIR%%/README.markdown
+%%HELPERS%%bin/mmd
+%%HELPERS%%bin/mmd2all
+%%HELPERS%%bin/mmd2odf
+%%HELPERS%%bin/mmd2opml
+%%HELPERS%%bin/mmd2pdf
+%%HELPERS%%bin/mmd2tex
+
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%EXTRAS%%%%DOCSDIR%%/README-extras.md
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+
+%%EXTRAS%%bin/mmd-xslt
+%%EXTRAS%%bin/mmd2LaTeX.pl
+%%EXTRAS%%bin/mmd2ODF.pl
+%%EXTRAS%%bin/mmd2OPML.pl
+%%EXTRAS%%bin/mmd2RTF.pl
+%%EXTRAS%%bin/mmd2XHTML.pl
+%%EXTRAS%%bin/mmd2tex-xslt
+%%EXTRAS%%bin/opml2html
+%%EXTRAS%%bin/opml2mmd
+%%EXTRAS%%bin/opml2tex
+%%EXTRAS%%bin/prep_tufte.sh
+%%EXTRAS%%%%DATADIR%%/utilities/mmd_merge.pl
+%%EXTRAS%%%%DATADIR%%/utilities/table_cleanup.pl
+%%EXTRAS%%%%DATADIR%%/XSLT/beamer.xslt
+%%EXTRAS%%%%DATADIR%%/XSLT/clean-text.xslt
+%%EXTRAS%%%%DATADIR%%/XSLT/memoir.xslt
+%%EXTRAS%%%%DATADIR%%/XSLT/opml2mmd.xslt
+%%EXTRAS%%%%DATADIR%%/XSLT/xhtml-toc-h2.xslt
+%%EXTRAS%%%%DATADIR%%/XSLT/xhtml2latex.xslt
+%%EXTRAS%%@dirrmtry %%DATADIR%%/XSLT
+%%EXTRAS%%@dirrmtry %%DATADIR%%/utilities
+%%EXTRAS%%@dirrmtry %%DATADIR%%
+
+%%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/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
+%%CHEAT_SHEET%%@dirrmtry %%DOCSDIR%%/cheat-sheet/tr
+%%CHEAT_SHEET%%@dirrmtry %%DOCSDIR%%/cheat-sheet/sv
+%%CHEAT_SHEET%%@dirrmtry %%DOCSDIR%%/cheat-sheet/ru
+%%CHEAT_SHEET%%@dirrmtry %%DOCSDIR%%/cheat-sheet/javascripts
+%%CHEAT_SHEET%%@dirrmtry %%DOCSDIR%%/cheat-sheet/it
+%%CHEAT_SHEET%%@dirrmtry %%DOCSDIR%%/cheat-sheet/images
+%%CHEAT_SHEET%%@dirrmtry %%DOCSDIR%%/cheat-sheet/fr
+%%CHEAT_SHEET%%@dirrmtry %%DOCSDIR%%/cheat-sheet/es
+%%CHEAT_SHEET%%@dirrmtry %%DOCSDIR%%/cheat-sheet/en
+%%CHEAT_SHEET%%@dirrmtry %%DOCSDIR%%/cheat-sheet/de
+%%CHEAT_SHEET%%@dirrmtry %%DOCSDIR%%/cheat-sheet/ca
+%%CHEAT_SHEET%%@dirrmtry %%DOCSDIR%%/cheat-sheet
+%%CHEAT_SHEET%%@dirrmtry %%DOCSDIR%%