View | Details | Raw Unified | Return to bug 226045 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-17 / +19 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	multimarkdown
4
PORTNAME=	multimarkdown
5
DISTVERSION=	4.7.1
5
DISTVERSION=	6.3.0
6
CATEGORIES=	textproc
6
CATEGORIES=	textproc
7
DIST_SUBDIR=	${PORTNAME}
7
DIST_SUBDIR=	${PORTNAME}
8
8
Lines 9-32 Link Here
9
MAINTAINER=	ports@FreeBSD.org
9
MAINTAINER=	ports@FreeBSD.org
10
COMMENT=	Extended Markdown processor with more features, written in C
10
COMMENT=	Extended Markdown processor with more features, written in C
11
11
12
LICENSE=	MIT GPLv2+
12
LICENSE=	BSD3CLAUSE MIT GPLv2+ ZLIB
13
LICENSE_COMB=	dual
13
LICENSE_COMB=	multi
14
LICENSE_FILE=	${WRKSRC}/LICENSE.txt
14
15
15
USES=		gmake
16
BUILD_DEPENDS=	ninja>0:devel/ninja
17
LIB_DEPENDS=	libcurl.so:ftp/curl
18
19
USES=		cmake
16
USE_GITHUB=	yes
20
USE_GITHUB=	yes
17
GH_ACCOUNT=	fletcher:DEFAULT nddrylliog:greg
21
GH_ACCOUNT=	fletcher
18
GH_PROJECT=	MultiMarkdown-4 greg:greg
22
GH_PROJECT=	MultiMarkdown-6
19
GH_TAGNAME=	98ecf13:greg
20
GH_SUBDIR=	greg:greg
21
ALL_TARGET=	${PORTNAME}
22
23
24
PORTDOCS=	README.md
25
23
OPTIONS_DEFINE=		CHEAT_SHEET EXTRAS HELPERS DOCS
26
OPTIONS_DEFINE=		CHEAT_SHEET EXTRAS HELPERS DOCS
24
CHEAT_SHEET_DESC=	HTML-based cheat sheat
27
CHEAT_SHEET_DESC=	HTML-based cheat sheat
25
EXTRAS_DESC=		Extra scripts and XSLT support
28
EXTRAS_DESC=		Extra scripts and XSLT support
26
HELPERS_DESC=		Helper scripts (conflicts with emulators/mtools)
29
HELPERS_DESC=		Helper scripts (conflicts with emulators/mtools)
27
30
28
CHEAT_SHEET_GH_PROJECT=	human-markdown-reference:cheat
31
CHEAT_SHEET_GH_PROJECT=	MultiMarkdown-6-Syntax-Guide:cheat
29
CHEAT_SHEET_GH_TAGNAME=	199dae8:cheat
32
CHEAT_SHEET_GH_TAGNAME=	3b268b4:cheat
30
CHEAT_SHEET_GH_SUBDIR=	cheat-sheet:cheat
33
CHEAT_SHEET_GH_SUBDIR=	cheat-sheet:cheat
31
EXTRAS_GH_PROJECT=	MMD-Support:support
34
EXTRAS_GH_PROJECT=	MMD-Support:support
32
EXTRAS_GH_TAGNAME=	685c95c:support
35
EXTRAS_GH_TAGNAME=	685c95c:support
Lines 37-45 Link Here
37
OPTIONS_SUB=	yes
40
OPTIONS_SUB=	yes
38
41
39
post-patch:
42
post-patch:
40
	@${REINPLACE_CMD} -E "s/^(CFLAGS).+=/\1 \+=/" ${WRKSRC}/Makefile ${WRKSRC}/greg/Makefile
43
	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/CMakeLists.txt
41
	@${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/scripts/*
44
	@${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/scripts/*
42
	@${REINPLACE_CMD} -E 's,(-include) (GLibFacade.h),\1 ${WRKSRC}/\2,' ${WRKSRC}/Makefile
43
45
44
post-patch-EXTRAS-on:
46
post-patch-EXTRAS-on:
45
	@${REINPLACE_CMD} -E "s,^(xslt_path)=.*,\1=${DATADIR},; s,(xslt_path)/../,\1/," \
47
	@${REINPLACE_CMD} -E "s,^(xslt_path)=.*,\1=${DATADIR},; s,(xslt_path)/../,\1/," \
Lines 46-55 Link Here
46
		${WRKSRC}/Support/bin/*
48
		${WRKSRC}/Support/bin/*
47
	@${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/Support/bin/*
49
	@${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/Support/bin/*
48
50
49
do-install:
51
post-patch-CHEAT_SHEET-on:
50
	@${FIND} ${WRKSRC} -name '*.bak' -o -name '*.bat' -delete
52
.for f in .gitignore Makefile scripts source templates
51
	${INSTALL_PROGRAM} ${WRKSRC}/multimarkdown ${STAGEDIR}${PREFIX}/bin
53
	@${RM} -r ${WRKSRC}/cheat-sheet/${f}
52
	${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${PREFIX}/bin
54
.endfor
53
55
54
do-install-DOCS-on:
56
do-install-DOCS-on:
55
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
57
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
(-)distinfo (-7 / +5 lines)
Lines 1-9 Link Here
1
TIMESTAMP = 1518418152
1
TIMESTAMP = 1519036011
2
SHA256 (multimarkdown/fletcher-MultiMarkdown-4-4.7.1_GH0.tar.gz) = 832e5dce6fa1bff4d67e64ac2cc24f0920ae8d91280e53ea879237a1d43f4865
2
SHA256 (multimarkdown/fletcher-MultiMarkdown-6-6.3.0_GH0.tar.gz) = 0c511910cd378a8bdf0c6de34123cbacaec74c18b5a4131093e940589a18946c
3
SIZE (multimarkdown/fletcher-MultiMarkdown-4-4.7.1_GH0.tar.gz) = 120896
3
SIZE (multimarkdown/fletcher-MultiMarkdown-6-6.3.0_GH0.tar.gz) = 2297376
4
SHA256 (multimarkdown/nddrylliog-greg-98ecf13_GH0.tar.gz) = 47fe156a4d6fb2a6009f49c3037c6460e56c4f70f6836fb4fa73749644ed68d9
4
SHA256 (multimarkdown/fletcher-MultiMarkdown-6-Syntax-Guide-3b268b4_GH0.tar.gz) = cc8e5c49d81dc65212b3366719a13fb62ab2b21f54d997ec943a439118158401
5
SIZE (multimarkdown/nddrylliog-greg-98ecf13_GH0.tar.gz) = 34254
5
SIZE (multimarkdown/fletcher-MultiMarkdown-6-Syntax-Guide-3b268b4_GH0.tar.gz) = 48364
6
SHA256 (multimarkdown/fletcher-human-markdown-reference-199dae8_GH0.tar.gz) = afab54673253f5b4d6f1be96bd7ec0383b07328f8ff26512e9edd0724b099783
7
SIZE (multimarkdown/fletcher-human-markdown-reference-199dae8_GH0.tar.gz) = 53809
8
SHA256 (multimarkdown/fletcher-MMD-Support-685c95c_GH0.tar.gz) = 3544d81579a0a3d8b1649437ef418f5a4862c5cf080309fd817f617a2f958e69
6
SHA256 (multimarkdown/fletcher-MMD-Support-685c95c_GH0.tar.gz) = 3544d81579a0a3d8b1649437ef418f5a4862c5cf080309fd817f617a2f958e69
9
SIZE (multimarkdown/fletcher-MMD-Support-685c95c_GH0.tar.gz) = 16865
7
SIZE (multimarkdown/fletcher-MMD-Support-685c95c_GH0.tar.gz) = 16865
(-)files/patch-CMakeLists.txt (+11 lines)
Line 0 Link Here
1
--- CMakeLists.txt.orig	2018-02-19 11:02:50 UTC
2
+++ CMakeLists.txt
3
@@ -437,6 +437,8 @@ if (NOT DEFINED TEST)
4
 	find_package(CURL)
5
 	if (CURL_FOUND)
6
 		add_definitions(-DUSE_CURL)
7
+		include_directories(%%PREFIX%%/include)
8
+		link_directories(%%PREFIX%%/lib)
9
 		message (STATUS "libcurl found")
10
 	else ()
11
 		message (STATUS "libcurl not found")
(-)pkg-plist (-21 / +36 lines)
Lines 2-15 Link Here
2
bin/multimarkdown
2
bin/multimarkdown
3
%%HELPERS%%bin/mmd
3
%%HELPERS%%bin/mmd
4
%%HELPERS%%bin/mmd2all
4
%%HELPERS%%bin/mmd2all
5
%%HELPERS%%bin/mmd2odf
5
%%HELPERS%%bin/mmd2epub
6
%%HELPERS%%bin/mmd2fodt
7
%%HELPERS%%bin/mmd2odt
6
%%HELPERS%%bin/mmd2opml
8
%%HELPERS%%bin/mmd2opml
7
%%HELPERS%%bin/mmd2pdf
9
%%HELPERS%%bin/mmd2pdf
8
%%HELPERS%%bin/mmd2rtf
9
%%HELPERS%%bin/mmd2tex
10
%%HELPERS%%bin/mmd2tex
10
11
share/texmf/tex/latex/mmd6/Portfolio.png
11
%%PORTDOCS%%%%DOCSDIR%%/README.md
12
share/texmf/tex/latex/mmd6/README.md
12
13
share/texmf/tex/latex/mmd6/Vintage.png
14
share/texmf/tex/latex/mmd6/beamerthemekeynote-gradient.sty
15
share/texmf/tex/latex/mmd6/beamerthemekeynote-portfolio.sty
16
share/texmf/tex/latex/mmd6/beamerthemekeynote-vintage.sty
17
share/texmf/tex/latex/mmd6/mmd-envelope.sty
18
share/texmf/tex/latex/mmd6/mmd-letterhead.sty
19
share/texmf/tex/latex/mmd6/mmd6-article-begin.tex
20
share/texmf/tex/latex/mmd6/mmd6-article-footer.tex
21
share/texmf/tex/latex/mmd6/mmd6-article-leader.tex
22
share/texmf/tex/latex/mmd6/mmd6-beamer-begin.tex
23
share/texmf/tex/latex/mmd6/mmd6-beamer-footer.tex
24
share/texmf/tex/latex/mmd6/mmd6-beamer-leader.tex
25
share/texmf/tex/latex/mmd6/mmd6-criticmarkup.tex
26
share/texmf/tex/latex/mmd6/mmd6-default-metadata.tex
27
share/texmf/tex/latex/mmd6/mmd6-letterhead-begin.tex
28
share/texmf/tex/latex/mmd6/mmd6-letterhead-footer.tex
29
share/texmf/tex/latex/mmd6/mmd6-letterhead-leader.tex
30
share/texmf/tex/latex/mmd6/mmd6-memoir-footer.tex
31
share/texmf/tex/latex/mmd6/mmd6-memoir-layout-8.5x11.tex
32
share/texmf/tex/latex/mmd6/mmd6-memoir-packages.tex
33
share/texmf/tex/latex/mmd6/mmd6-memoir-setup.tex
34
share/texmf/tex/latex/mmd6/mmd6-title.tex
35
share/texmf/tex/latex/mmd6/mmd6-tufte-book-begin.tex
36
share/texmf/tex/latex/mmd6/mmd6-tufte-book-footer.tex
37
share/texmf/tex/latex/mmd6/mmd6-tufte-book-leader.tex
38
share/texmf/tex/latex/mmd6/mmd6-tufte-footer.tex
39
share/texmf/tex/latex/mmd6/mmd6-tufte-handout-begin.tex
40
share/texmf/tex/latex/mmd6/mmd6-tufte-handout-footer.tex
41
share/texmf/tex/latex/mmd6/mmd6-tufte-handout-leader.tex
13
%%EXTRAS%%bin/mmd-xslt
42
%%EXTRAS%%bin/mmd-xslt
14
%%EXTRAS%%bin/mmd2LaTeX.pl
43
%%EXTRAS%%bin/mmd2LaTeX.pl
15
%%EXTRAS%%bin/mmd2ODF.pl
44
%%EXTRAS%%bin/mmd2ODF.pl
Lines 30-52 Link Here
30
%%EXTRAS%%%%DATADIR%%/XSLT/xhtml-toc-h2.xslt
59
%%EXTRAS%%%%DATADIR%%/XSLT/xhtml-toc-h2.xslt
31
%%EXTRAS%%%%DATADIR%%/XSLT/xhtml2latex.xslt
60
%%EXTRAS%%%%DATADIR%%/XSLT/xhtml2latex.xslt
32
%%EXTRAS%%%%DOCSDIR%%/README-extras.md
61
%%EXTRAS%%%%DOCSDIR%%/README-extras.md
33
34
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/LICENCE
35
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/MMD-Guide.html
36
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/README.md
62
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/README.md
63
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/css/markdown-reference.css
37
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/index.html
64
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/index.html
38
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/markdown-reference.css
39
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/mmd.png
40
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/images/arrow_down.gif
41
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/images/arrow_right.gif
42
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/javascripts/guide.js
65
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/javascripts/guide.js
43
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/javascripts/jquery-1.4.2.min.js
66
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/javascripts/jquery-1.4.2.min.js
44
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/ca/index.html
67
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/mmd.png
45
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/de/index.html
46
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/en/index.html
47
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/es/index.html
48
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/fr/index.html
49
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/it/index.html
50
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/ru/index.html
51
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/sv/index.html
52
%%CHEAT_SHEET%%%%DOCSDIR%%/cheat-sheet/tr/index.html

Return to bug 226045