1 files changed, 50 insertions, 51 deletions

diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile
index e02fdc5de815..ed70c95aabe4 100644
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@@ -12,7 +12,6 @@ DIST_SUBDIR=	TeX
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeX Live Typesetting System, base binaries
 
-RUN_DEPENDS=	psbook:print/psutils
 LIB_DEPENDS=	libicuio.so:devel/icu \
 		libt1.so:devel/t1lib \
 		libTECkit.so:textproc/teckit \
@@ -25,26 +24,47 @@ LIB_DEPENDS=	libicuio.so:devel/icu \
 		libzzip.so:devel/zziplib \
 		libpoppler.so:graphics/poppler \
 		libpotrace.so:graphics/libpotrace
+RUN_DEPENDS=	psbook:print/psutils
 
-CONFLICTS_INSTALL=	ps2eps texlive-texmf-201[234]*
-
-USE_TEX=	web2c kpathsea ptexenc tlmgr texhash-bootstrap
 USES=		compiler:c++11-lib ghostscript pkgconfig perl5 \
 		python:run shebangfix tar:xz
 USE_CXXSTD=	gnu++11
 USE_PERL5=	run
+USE_TEX=	web2c kpathsea ptexenc tlmgr texhash-bootstrap
+SHEBANG_FILES=	texk/texlive/linked_scripts/accfonts/mkt1font \
+	texk/texlive/linked_scripts/accfonts/vpl2ovp \
+	texk/texlive/linked_scripts/accfonts/vpl2vpl \
+	texk/texlive/linked_scripts/arara/arara.sh \
+	texk/texlive/linked_scripts/bibexport/bibexport.sh \
+	texk/texlive/linked_scripts/convbkmk/convbkmk.rb \
+	texk/texlive/linked_scripts/ctanupload/ctanupload.pl \
+	texk/texlive/linked_scripts/ebong/*.py \
+	texk/texlive/linked_scripts/dtxgen/dtxgen \
+	texk/texlive/linked_scripts/dviasm/*.py \
+	texk/texlive/linked_scripts/exceltex/exceltex \
+	texk/texlive/linked_scripts/findhyph/findhyph \
+	texk/texlive/linked_scripts/fragmaster/fragmaster.pl \
+	texk/texlive/linked_scripts/installfont/installfont-tl \
+	texk/texlive/linked_scripts/kotex-utils/jamo-normalize.pl \
+	texk/texlive/linked_scripts/latexpand/latexpand \
+	texk/texlive/linked_scripts/lilyglyphs/*.py \
+	texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo \
+	texk/texlive/linked_scripts/lua2dox/lua2dox_filter \
+	texk/texlive/linked_scripts/mathspic/mathspic.pl \
+	texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl \
+	texk/texlive/linked_scripts/multibibliography/multibibliography.pl \
+	texk/texlive/linked_scripts/pygmentex/*.py \
+	texk/texlive/linked_scripts/pythontex/*.py \
+	texk/texlive/linked_scripts/rubik/rubikrotation.pl \
+	texk/texlive/linked_scripts/splitindex/splitindex.pl \
+	texk/texlive/linked_scripts/svn-multi/svn-multi.pl \
+	texk/texlive/linked_scripts/texdirflatten/texdirflatten \
+	texk/texlive/linked_scripts/texliveonfly/texliveonfly.py \
+	texk/texlive/linked_scripts/ulqda/ulqda.pl \
+	texk/texlive/linked_scripts/urlbst/urlbst \
+	texk/texlive/linked_scripts/yplan/yplan
+
 # during build phase gnu configure is run a lot
-MAKE_ENV+=	CONFIG_SITE=${CONFIG_SITE}
-EXCLUDE_FILES=	${DISTNAME}/texk/web2c \
-		${DISTNAME}/texk/kpathsea \
-		${DISTNAME}/texk/ptexenc \
-		${DISTNAME}/texk/xdvik \
-		${DISTNAME}/texk/dvipdfm-x \
-		${DISTNAME}/texk/dvipsk \
-		${DISTNAME}/libs \
-		${DISTNAME}/utils/t1utils \
-		${DISTNAME}/utils/xpdfopen
-EXTRACT_AFTER_ARGS=	${EXCLUDE_FILES:S,^,--exclude ,}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --disable-native-texlive-build \
 		--disable-web-progs \
@@ -77,51 +97,30 @@ CONFIGURE_ARGS+=--with-system-$L \
 		--with-$L-include=${LOCALBASE}/include \
 		--with-$L-libdir=${LOCALBASE}/lib
 .endfor
-
-CFLAGS+=	-I${LOCALBASE}/include
-PLIST_SUB=	INSTALL_DATA="${INSTALL_DATA}"
+MAKE_ENV+=	CONFIG_SITE=${CONFIG_SITE}
 INSTALL_TARGET=	install-strip
+CFLAGS+=	-I${LOCALBASE}/include
 
-SHEBANG_FILES=	texk/texlive/linked_scripts/accfonts/mkt1font \
-	texk/texlive/linked_scripts/accfonts/vpl2ovp \
-	texk/texlive/linked_scripts/accfonts/vpl2vpl \
-	texk/texlive/linked_scripts/arara/arara.sh \
-	texk/texlive/linked_scripts/bibexport/bibexport.sh \
-	texk/texlive/linked_scripts/convbkmk/convbkmk.rb \
-	texk/texlive/linked_scripts/ctanupload/ctanupload.pl \
-	texk/texlive/linked_scripts/ebong/*.py \
-	texk/texlive/linked_scripts/dtxgen/dtxgen \
-	texk/texlive/linked_scripts/dviasm/*.py \
-	texk/texlive/linked_scripts/exceltex/exceltex \
-	texk/texlive/linked_scripts/findhyph/findhyph \
-	texk/texlive/linked_scripts/fragmaster/fragmaster.pl \
-	texk/texlive/linked_scripts/installfont/installfont-tl \
-	texk/texlive/linked_scripts/kotex-utils/jamo-normalize.pl \
-	texk/texlive/linked_scripts/latexpand/latexpand \
-	texk/texlive/linked_scripts/lilyglyphs/*.py \
-	texk/texlive/linked_scripts/ltxfileinfo/ltxfileinfo \
-	texk/texlive/linked_scripts/lua2dox/lua2dox_filter \
-	texk/texlive/linked_scripts/mathspic/mathspic.pl \
-	texk/texlive/linked_scripts/mf2pt1/mf2pt1.pl \
-	texk/texlive/linked_scripts/multibibliography/multibibliography.pl \
-	texk/texlive/linked_scripts/pygmentex/*.py \
-	texk/texlive/linked_scripts/pythontex/*.py \
-	texk/texlive/linked_scripts/rubik/rubikrotation.pl \
-	texk/texlive/linked_scripts/splitindex/splitindex.pl \
-	texk/texlive/linked_scripts/svn-multi/svn-multi.pl \
-	texk/texlive/linked_scripts/texdirflatten/texdirflatten \
-	texk/texlive/linked_scripts/texliveonfly/texliveonfly.py \
-	texk/texlive/linked_scripts/ulqda/ulqda.pl \
-	texk/texlive/linked_scripts/urlbst/urlbst \
-	texk/texlive/linked_scripts/yplan/yplan
-
+CONFLICTS_INSTALL=	ps2eps texlive-texmf-201[234]*
+EXTRACT_AFTER_ARGS=	${EXCLUDE_FILES:S,^,--exclude ,}
 INFO=	dvipng tlbuild
+PLIST_SUB=	INSTALL_DATA="${INSTALL_DATA}"
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
 X11_USE=	TEX=xpdfopen:run
 
+EXCLUDE_FILES=	${DISTNAME}/texk/web2c \
+		${DISTNAME}/texk/kpathsea \
+		${DISTNAME}/texk/ptexenc \
+		${DISTNAME}/texk/xdvik \
+		${DISTNAME}/texk/dvipdfm-x \
+		${DISTNAME}/texk/dvipsk \
+		${DISTNAME}/libs \
+		${DISTNAME}/utils/t1utils \
+		${DISTNAME}/utils/xpdfopen
+
 post-patch:
 	cd ${WRKSRC}/texk/texlive && \
 	    ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \