- Update LaTeX2e to 20150101pl2.

- Add CONFLICTS.
- Fix pkg-plist.

3 files changed, 95 insertions, 7 deletions

diff --git a/print/texlive-texmf/Makefile b/print/texlive-texmf/Makefile
index 54ae47cc24b0..09f1b40e515e 100644
--- a/print/texlive-texmf/Makefile
+++ b/print/texlive-texmf/Makefile
@@ -2,16 +2,21 @@
 
 PORTNAME=	texlive
 PORTVERSION=	20150523
+PORTREVISION=	1
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.tug.org/historic/systems/texlive/2015/
+MASTER_SITES=	ftp://ftp.tug.org/historic/systems/texlive/2015/:texmf \
+		LOCAL/hrs:latex
 PKGNAMESUFFIX=	-texmf
-DISTNAME=	${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
+DISTFILES=	${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}${EXTRACT_SUFX}:texmf \
+		latex-base-20150101.2${EXTRACT_SUFX}:latex
 DIST_SUBDIR=	TeX
+EXTRACT_ONLY=	latex-base-20150101.2${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeX Live Typesetting System, texmf Tree
 
-CONFLICTS_INSTALL=	texlive-base-201[234]*
+CONFLICTS_INSTALL=	texlive-base-201[234]* \
+			texlive-texmf-201[234]*
 
 USES=		tar:xz
 USE_TEX=	base tlmgr:run texhash
@@ -56,6 +61,7 @@ EXCLUDE_FILES=	\*/doc/man \
 	texmf-dist/tex/generic/xetexconfig \
 	texmf-dist/tex/jadetex \
 	texmf-dist/tex/lambda \
+	texmf-dist/tex/latex/base \
 	texmf-dist/tex/latex/latexconfig/dvilualatex.ini \
 	texmf-dist/tex/latex/latexconfig/lualatex-patch-kernel.tex \
 	texmf-dist/tex/latex/latexconfig/lualatex-reset-codes.tex \
@@ -245,15 +251,20 @@ EXCLUDE_FILES=	\*/doc/man \
 	texmf-dist/scripts/vpe/vpe.pl \
 	texmf-dist/scripts/yplan/yplan
 
-EXTRACT_AFTER_ARGS=| ${TAR} xf - ${EXCLUDE_FILES:S,^,--exclude ${DISTNAME}/,}
+EXTRACT_AFTER_ARGS=| ${TAR} xf - ${EXCLUDE_FILES:S,^,--exclude ${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}/,}
 
-do-extract:
-	@${MKDIR} ${WRKDIR}
+post-extract:
+	cd ${WRKDIR}/latex-base-20150101.2 && \
+	    ${SETENV} TEXMF=. ${LOCALBASE}/bin/tex -ini unpack.ins && \
+	    ${RM} README *.log *.aux *.pdf *.dtx *.ins *.txt *.ist *.fdd *.err
 
 do-install:
-	${CAT} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
+	${CAT} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS} -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner
+	${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/tex/latex/base
+	cd ${WRKDIR}/latex-base-20150101.2 && ${PAX} -rw . \
+	    ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/tex/latex/base
 	${REINPLACE_CMD} -i '' 's/\\def\\magyar@sugg@ie@low#1#2#3/\\def\\magyar@sugg@ie@low\\protect #1#2#3/' ${STAGEDIR}${PREFIX}/share/texmf-dist/tex/generic/babel-hungarian/magyar.ldf
 	${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/doc
 	${TOUCH} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/doc/.keep_me
diff --git a/print/texlive-texmf/distinfo b/print/texlive-texmf/distinfo
index 7f1e0f898b93..fcf00af53b14 100644
--- a/print/texlive-texmf/distinfo
+++ b/print/texlive-texmf/distinfo
@@ -1,2 +1,4 @@
 SHA256 (TeX/texlive-20150523-texmf.tar.xz) = 1efb2b55cbf7ef9a5d2093b31110191d3caac8d4668b413ad63e996e1ebb70a8
 SIZE (TeX/texlive-20150523-texmf.tar.xz) = 1892010092
+SHA256 (TeX/latex-base-20150101.2.tar.xz) = f253bb6be5e2ca678f11f0c816d25445259cd48dfda799b65cbd1822f601ad9e
+SIZE (TeX/latex-base-20150101.2.tar.xz) = 10553905
diff --git a/print/texlive-texmf/pkg-plist b/print/texlive-texmf/pkg-plist
index c53a99900ab9..34d56c28a90e 100644
--- a/print/texlive-texmf/pkg-plist
+++ b/print/texlive-texmf/pkg-plist
@@ -85603,3 +85603,78 @@
 %%TEXMFDISTDIR%%/xindy/modules/tex/inputenc/latin2.xdy
 %%TEXMFDISTDIR%%/xindy/modules/tex/inputenc/latin3.xdy
 %%TEXMFDISTDIR%%/xindy/modules/tex/inputenc/utf8.xdy
+@dir %%TEXMFDISTDIR%%/scripts/a2ping
+@dir %%TEXMFDISTDIR%%/scripts/accfonts
+@dir %%TEXMFDISTDIR%%/scripts/authorindex
+@dir %%TEXMFDISTDIR%%/scripts/bibexport
+@dir %%TEXMFDISTDIR%%/scripts/bundledoc
+@dir %%TEXMFDISTDIR%%/scripts/checkcites
+@dir %%TEXMFDISTDIR%%/scripts/cjk-gs-integrate
+@dir %%TEXMFDISTDIR%%/scripts/convbkmk
+@dir %%TEXMFDISTDIR%%/scripts/crossrefware
+@dir %%TEXMFDISTDIR%%/scripts/ctanify
+@dir %%TEXMFDISTDIR%%/scripts/ctanupload
+@dir %%TEXMFDISTDIR%%/scripts/de-macro
+@dir %%TEXMFDISTDIR%%/scripts/dosepsbin
+@dir %%TEXMFDISTDIR%%/scripts/dtxgen
+@dir %%TEXMFDISTDIR%%/scripts/dviasm
+@dir %%TEXMFDISTDIR%%/scripts/ebong
+@dir %%TEXMFDISTDIR%%/scripts/epstopdf
+@dir %%TEXMFDISTDIR%%/scripts/exceltex
+@dir %%TEXMFDISTDIR%%/scripts/fig4latex
+@dir %%TEXMFDISTDIR%%/scripts/findhyph
+@dir %%TEXMFDISTDIR%%/scripts/fontools
+@dir %%TEXMFDISTDIR%%/scripts/fragmaster
+@dir %%TEXMFDISTDIR%%/scripts/getmap
+@dir %%TEXMFDISTDIR%%/scripts/installfont
+@dir %%TEXMFDISTDIR%%/scripts/jfontmaps
+@dir %%TEXMFDISTDIR%%/scripts/kotex-utils
+@dir %%TEXMFDISTDIR%%/scripts/latex-git-log
+@dir %%TEXMFDISTDIR%%/scripts/latex2man
+@dir %%TEXMFDISTDIR%%/scripts/latexdiff
+@dir %%TEXMFDISTDIR%%/scripts/latexfileversion
+@dir %%TEXMFDISTDIR%%/scripts/latexmk
+@dir %%TEXMFDISTDIR%%/scripts/latexpand
+@dir %%TEXMFDISTDIR%%/scripts/listbib
+@dir %%TEXMFDISTDIR%%/scripts/listings-ext
+@dir %%TEXMFDISTDIR%%/scripts/ltxfileinfo
+@dir %%TEXMFDISTDIR%%/scripts/ltximg
+@dir %%TEXMFDISTDIR%%/scripts/m-tx
+@dir %%TEXMFDISTDIR%%/scripts/match_parens
+@dir %%TEXMFDISTDIR%%/scripts/mathspic
+@dir %%TEXMFDISTDIR%%/scripts/mf2pt1
+@dir %%TEXMFDISTDIR%%/scripts/mkgrkindex
+@dir %%TEXMFDISTDIR%%/scripts/mkjobtexmf
+@dir %%TEXMFDISTDIR%%/scripts/mkpic
+@dir %%TEXMFDISTDIR%%/scripts/multibibliography
+@dir %%TEXMFDISTDIR%%/scripts/musixtex
+@dir %%TEXMFDISTDIR%%/scripts/pdfcrop
+@dir %%TEXMFDISTDIR%%/scripts/pdfjam
+@dir %%TEXMFDISTDIR%%/scripts/perltex
+@dir %%TEXMFDISTDIR%%/scripts/pfarrei
+@dir %%TEXMFDISTDIR%%/scripts/pkfix
+@dir %%TEXMFDISTDIR%%/scripts/pkfix-helper
+@dir %%TEXMFDISTDIR%%/scripts/pmx
+@dir %%TEXMFDISTDIR%%/scripts/ps2eps
+@dir %%TEXMFDISTDIR%%/scripts/pst2pdf
+@dir %%TEXMFDISTDIR%%/scripts/ptex2pdf
+@dir %%TEXMFDISTDIR%%/scripts/purifyeps
+@dir %%TEXMFDISTDIR%%/scripts/pygmentex
+@dir %%TEXMFDISTDIR%%/scripts/rubik
+@dir %%TEXMFDISTDIR%%/scripts/simpdftex
+@dir %%TEXMFDISTDIR%%/scripts/sty2dtx
+@dir %%TEXMFDISTDIR%%/scripts/svn-multi
+@dir %%TEXMFDISTDIR%%/scripts/texcount
+@dir %%TEXMFDISTDIR%%/scripts/texdef
+@dir %%TEXMFDISTDIR%%/scripts/texdiff
+@dir %%TEXMFDISTDIR%%/scripts/texdirflatten
+@dir %%TEXMFDISTDIR%%/scripts/texdoctk
+@dir %%TEXMFDISTDIR%%/scripts/texfot
+@dir %%TEXMFDISTDIR%%/scripts/texliveonfly
+@dir %%TEXMFDISTDIR%%/scripts/texloganalyser
+@dir %%TEXMFDISTDIR%%/scripts/thumbpdf
+@dir %%TEXMFDISTDIR%%/scripts/typeoutfileinfo
+@dir %%TEXMFDISTDIR%%/scripts/ulqda
+@dir %%TEXMFDISTDIR%%/scripts/urlbst
+@dir %%TEXMFDISTDIR%%/scripts/vpe
+@dir %%TEXMFDISTDIR%%/scripts/yplan