Date: Fri, 15 Nov 2013 07:23:09 -0600 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Adam Weinberger <adamw@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r331725 - head/textproc/multimarkdown Message-ID: <5286203D.8020707@FreeBSD.org> In-Reply-To: <201310261756.r9QHu7Z9068833@svn.freebsd.org> References: <201310261756.r9QHu7Z9068833@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --MjeKDpXJTBEp78PiEut5J7sLccSXnsIIN Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 10/26/2013 12:56 PM, Adam Weinberger wrote: > Author: adamw > Date: Sat Oct 26 17:56:07 2013 > New Revision: 331725 > URL: http://svnweb.freebsd.org/changeset/ports/331725 >=20 > Log: > Update to 4.3.2. > =20 > The source remains only available through github. It also includes > a couple git submodules, which do not get included in the auto-genera= ted > source tarballs. Some of these submodules do not have tagged releases= =2E > =20 > So, I'm cutting my losses and just checking the source itself out > of github. This is why we have USE_GITHUB. See /usr/ports/CHANGES for how to use it.= git(1) should not be used for any fetching at all. It short circuits the checksum storage and is not a secure method of downloading the source. > =20 > The port can now optionally install all The Other Stuff, and it > prevents the mtools conflict by default. >=20 > Modified: > head/textproc/multimarkdown/Makefile > head/textproc/multimarkdown/pkg-descr > head/textproc/multimarkdown/pkg-plist >=20 > Modified: head/textproc/multimarkdown/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/textproc/multimarkdown/Makefile Sat Oct 26 17:47:25 2013 (r331= 724) > +++ head/textproc/multimarkdown/Makefile Sat Oct 26 17:56:07 2013 (r331= 725) > @@ -2,34 +2,67 @@ > # $FreeBSD$ > =20 > PORTNAME=3D multimarkdown > -PORTVERSION=3D 3.7.1 > -PORTREVISION=3D 2 > -DISTNAME=3D peg-${PORTNAME}-${PORTVERSION} > +PORTVERSION=3D 4.3.2 > CATEGORIES=3D textproc > -MASTER_SITES=3D http://github.com/fletcher/peg-${PORTNAME}/archive/${P= ORTVERSION}.tar.gz?dummy=3D/ > +MASTER_SITES=3D #none > +DISTFILES=3D #none > =20 > MAINTAINER=3D adamw@FreeBSD.org > COMMENT=3D Extended Markdown processor with more features, written in = C > =20 > -CONFLICTS_INSTALL=3D mtools-* > - > LICENSE=3D MIT > =20 > -FETCH_ARGS=3D -Fpr > +EXTRACT_DEPENDS=3D git:${PORTSDIR}/devel/git > + > +WRKSRC=3D ${WRKDIR}/MultiMarkdown-4 > =20 > -USE_GMAKE=3D yes > ALL_TARGET=3D ALL > =20 > +OPTIONS_DEFINE=3D CHEAT_SHEET EXTRAS HELPERS > +CHEAT_SHEET_DESC=3D HTML-based cheat sheat > +EXTRAS_DESC=3D Extra scripts and XSLT support > +HELPERS_DESC=3D Helper scripts (conflicts with emulators/mtools) > + > +OPTIONS_SUB=3D yes > + > +.include <bsd.port.options.mk> > + > +.if ${PORT_OPTIONS:MHELPERS} > +CONFLICTS_INSTALL=3D mtools-* > +.endif > + > +do-extract: > + ${MKDIR} ${WRKDIR} > + cd ${WRKDIR} && git clone https://github.com/fletcher/MultiMarkdown-4= =2Egit > + 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/\?=3D= /\+=3D/; \ > - s/CC=3Dgcc//" \ > - ${WRKSRC}/Makefile > + @${REINPLACE_CMD} -E "s/^(CFLAGS).+=3D/\1 \+=3D/" ${WRKSRC}/Makefile = ${WRKSRC}/greg/Makefile > + @${REINPLACE_CMD} -E "s,^(xslt_path)=3D.*,\1=3D${DATADIR},; s,(xslt_p= ath)/../,\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 ${CH= MOD} ${SHAREMODE} {} \; > =20 > do-install: > ${INSTALL_SCRIPT} ${WRKSRC}/multimarkdown ${STAGEDIR}${PREFIX}/bin > ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${PREFIX}/bin > =20 > @${MKDIR} ${STAGEDIR}${DOCSDIR} > - ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DOCSDIR} > + ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} > =20 > + ${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}/REA= DME-extras.md > + > + @${MKDIR} ${STAGEDIR}${DOCSDIR}/cheat-sheet > + cd ${WRKSRC} && ${FIND} cheat-sheet -not -path '*/.git*' | \ > + ${CPIO} -pdmu --quiet ${STAGEDIR}${DOCSDIR} > .include <bsd.port.mk> >=20 > Modified: head/textproc/multimarkdown/pkg-descr > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/textproc/multimarkdown/pkg-descr Sat Oct 26 17:47:25 2013 (r33= 1724) > +++ head/textproc/multimarkdown/pkg-descr Sat Oct 26 17:56:07 2013 (r33= 1725) > @@ -11,12 +11,6 @@ listed above (Markdown only creates HTML > 'smart' typography for various languages (proper left- and right-sided= > quotes, for example). > =20 > -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. > - > =20 > NOTE: To use the mmd2pdf script, you must install print/latexmk. > =20 >=20 > Modified: head/textproc/multimarkdown/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/textproc/multimarkdown/pkg-plist Sat Oct 26 17:47:25 2013 (r33= 1724) > +++ head/textproc/multimarkdown/pkg-plist Sat Oct 26 17:56:07 2013 (r33= 1725) > @@ -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%% >=20 --=20 Regards, Bryan Drewery --MjeKDpXJTBEp78PiEut5J7sLccSXnsIIN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJShiA+AAoJEDXXcbtuRpfPLvwH/jIZBepSfcyb2bSvXcDr83P0 I6+Zvz3wfSvlRhOO6eF7dBoFmdvv5WdJot6yVmBoE10ffZLtrCTaUO+lOHo1ogCZ 6E3/2d8mVS5WVA3lTBV4EQ5ubbMFN7+042chXGhl8OSu9EZyXDemTmUFVBmusKUq qhZb+dcH1X8Aurhy/zTbAFwSU+5W3RJKk2mYwA9dR1ltSJL5qqlOYfoDuGuTeawi DHESHGBOnAS2zCK4waOmQMcFG74UNHwGyjxHe7JypPEaO+GpU4zuc54HjAO9ZCrX qx5f7ofOgM9EvJHneQLR5VmSNNCXGpPAK64Q2gwgvkQgjeRlWbATqpoZFEdvm00= =uLrf -----END PGP SIGNATURE----- --MjeKDpXJTBEp78PiEut5J7sLccSXnsIIN--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5286203D.8020707>