Checking out our own git sources was really poorly received. After

some help from bdrewery, this port now uses github's short-bus-special
package rolling mechanism.

I had to use https because on all my testing, codeload.github.com:80
does not appear to work.

I don't believe that the installed base should be any different from
before, but I am bumping PORTREVISION to be on the safe side.

3 files changed, 44 insertions, 59 deletions

diff --git a/textproc/multimarkdown/Makefile b/textproc/multimarkdown/Makefile
index a17b437d3544..8f8053cb8caa 100644
--- a/textproc/multimarkdown/Makefile
+++ b/textproc/multimarkdown/Makefile
@@ -3,18 +3,27 @@
 
 PORTNAME=	multimarkdown
 PORTVERSION=	4.3.2
+PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	#none
-DISTFILES=		#none
+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
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Extended Markdown processor with more features, written in C
 
 LICENSE=	MIT
 
-GITHUB_CREATOR=	fletcher
-GIT_PROJECT_NAME=	MultiMarkdown-4
-GIT_SUBMODULES=	yes
+MM4_COMMIT=		42a07ab
+SUPPORT_COMMIT=	685c95c
+CHEAT_COMMIT=	c23d807
+GREG_COMMIT=	3f11f56
+
+WRKSRC=	${WRKDIR}/fletcher-MultiMarkdown-4-${MM4_COMMIT}
 
 ALL_TARGET=	${PORTNAME}
 
@@ -23,6 +32,9 @@ 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
+
 OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
@@ -31,15 +43,27 @@ OPTIONS_SUB=	yes
 CONFLICTS_INSTALL=	mtools-*
 .endif
 
+post-extract:
+	@${MV} ${WRKDIR}/nddrylliog-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
+	
 post-patch:
 	@${REINPLACE_CMD} -E "s/^(CFLAGS).+=/\1 \+=/" ${WRKSRC}/Makefile ${WRKSRC}/greg/Makefile
+	@${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/scripts/*
+.if ${PORT_OPTIONS:MEXTRAS}
 	@${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/*
+	@${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 -not -path '*/.git' -exec ${CHMOD} ${SHAREMODE} {} \;
+	@${FIND} ${WRKSRC}/cheat-sheet -type f -exec ${CHMOD} ${SHAREMODE} {} \;
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/multimarkdown ${STAGEDIR}${PREFIX}/bin
@@ -48,16 +72,18 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
+.if ${PORT_OPTIONS:MEXTRAS}
 	${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}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/cheat-sheet
-	cd ${WRKSRC} && ${FIND} cheat-sheet -not -path '*/.git*' | \
-		${CPIO} -pdmu --quiet ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${FIND} cheat-sheet | ${CPIO} -pdmu --quiet ${STAGEDIR}${DOCSDIR}
+.endif
 
-.include "${.CURDIR}/bsd.git-clone.mk"
 .include <bsd.port.mk>
diff --git a/textproc/multimarkdown/bsd.git-clone.mk b/textproc/multimarkdown/bsd.git-clone.mk
deleted file mode 100644
index ed33edae00a4..000000000000
--- a/textproc/multimarkdown/bsd.git-clone.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# Created by: Adam Weinberger <adamw@FreeBSD.org>
-# $FreeBSD$
-
-# if a github project, use:
-#
-#GITHUB_CREATOR=	someuser
-
-# otherwise, use:
-#
-#GIT_URL=	https://example.com/path/to/${GIT_PROJECT_NAME}.git
-
-#GIT_PROJECT_NAME defaults to ${PORTNAME}
-
-# if there are submodules to checkout, define:
-#GIT_SUBMODULES=	yes
-
-
-GIT_PROJECT_NAME?=	${PORTNAME}
-GIT_VERSION?=	${PORTVERSION}
-WRKSRC?=		${WRKDIR}/${GIT_PROJECT_NAME}
-
-.if defined(GITHUB_CREATOR)
-GIT_URL=	https://github.com/${GITHUB_CREATOR}/${GIT_PROJECT_NAME}.git
-.endif
-
-.if !defined(GITHUB_CREATOR) && !defined(GIT_URL)
-.error You must define GITHUB_CREATOR or GIT_URL to use bsd.git-clone.mk
-.endif
-
-FETCH_DEPENDS+=	git:${PORTSDIR}/devel/git
-
-# will not clobber do-{fetch,extract}
-do-fetch: git-fetch
-do-extract: git-extract
-
-git-fetch:
-	@if [ ! -e ${WRKSRC}/.git/index ]; then \
-		${MKDIR} ${WRKDIR}; \
-		cd ${WRKDIR} && git clone ${GIT_URL}; \
-		cd ${WRKSRC} && git checkout ${GIT_VERSION}; \
-		if [ -n "${GIT_SUBMODULES}" ]; then \
-			cd ${WRKSRC} && git submodule init; \
-			cd ${WRKSRC} && git submodule update; \
-		fi \
-	fi
-
-git-extract:
-#normally do-extract starts with an rm -rf ${WRKSRC}
-	@${DO_NADA}
diff --git a/textproc/multimarkdown/distinfo b/textproc/multimarkdown/distinfo
new file mode 100644
index 000000000000..596b6bba3fc9
--- /dev/null
+++ b/textproc/multimarkdown/distinfo
@@ -0,0 +1,8 @@
+SHA256 (multimarkdown/multimarkdown-4.3.2.tar.gz) = b9adf820d5e9bf2cab88928a7ec2ab9c2f8060b89bbe7c4ae75b3c0ae55f6fc3
+SIZE (multimarkdown/multimarkdown-4.3.2.tar.gz) = 85917
+SHA256 (multimarkdown/greg-3f11f56.tar.gz) = eaf3351ca60b533e15fbc175c13dd45802398240f172978b441592017bdabb4f
+SIZE (multimarkdown/greg-3f11f56.tar.gz) = 24133
+SHA256 (multimarkdown/human-markdown-reference-c23d807.tar.gz) = 6ebf2512d6c1e27ce21d205a3285a10d9fa07d883bb4dc549817f510fc928cee
+SIZE (multimarkdown/human-markdown-reference-c23d807.tar.gz) = 53764
+SHA256 (multimarkdown/MMD-Support-685c95c.tar.gz) = fd6e17f527be51dfa10c5cf9c234b72def462b5a0256e588f77cbe7eca26884d
+SIZE (multimarkdown/MMD-Support-685c95c.tar.gz) = 16863