--- texlive-docs/Makefile	(revision 488766)
+++ texlive-docs/Makefile	(working copy)
@@ -11,8 +11,9 @@ 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeX Live Typesetting System, documentation
 
-USES=		tar:xz
+USES=		python:env shebangfix tar:xz
 USE_TEX=	texmf
+
 NO_BUILD=	yes
 NO_WRKSRC=	yes
 
@@ -36,6 +37,58 @@ 
 
 EXTRACT_AFTER_ARGS=| ${TAR} xf - ${EXCLUDE_FILES:S,^,--exclude ${DISTNAME}/,}
 
+# fix shebang for various perl, bash, python, fontforge scripts
+SHEBANG_FILES=	\
+	share/texmf-dist/doc/generic/pst-mirror/createEPS/scripts/filtre.pl \
+	share/texmf-dist/doc/support/gustprog/porzadki.pl \
+	share/texmf-dist/doc/latex/latex-web-companion/ch7/sgmlspl.pl \
+	share/texmf-dist/doc/latex/ucs/makeunidef.pl \
+	share/texmf-dist/doc/latex/ucs/latexout.pl \
+	share/texmf-dist/doc/latex/ucs/discovermacro.pl \
+	share/texmf-dist/doc/latex/ucs/unsupported/u2ps \
+	share/texmf-dist/doc/fonts/phaistos/getglyphs \
+	share/texmf-dist/doc/fonts/dad/utf8-to-dad.pl \
+	share/texmf-dist/doc/fonts/dad/dad-to-utf8.pl \
+	share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/CheckConformance.pl \
+	share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/mes-list-expand.pl \
+	share/texmf-dist/doc/fonts/gnu-freefont/tools/utility/KerningNumerals.pl \
+	\
+	share/texmf-dist/doc/generic/pst-spirograph/animation/runall.sh \
+	share/texmf-dist/doc/support/latexdiff/contrib/latexdiff-wrap \
+	share/texmf-dist/doc/latex/hepnames/mkmacrotables \
+	share/texmf-dist/doc/latex/isodoc/listkeys \
+	share/texmf-dist/doc/latex/rubik/example-rot1.sh \
+	share/texmf-dist/doc/latex/presentations-en/runAll \
+	share/texmf-dist/doc/latex/seminar/run.sh \
+	share/texmf-dist/doc/latex/ctable/inst \
+	share/texmf-dist/doc/latex/latex-veryshortguide/build \
+	share/texmf-dist/doc/latex/bardiag/example/compile.all \
+	share/texmf-dist/doc/fonts/drm/allfonts.sh \
+	share/texmf-dist/doc/cstex/cspsfonts-gen/mkfc \
+	share/texmf-dist/doc/cstex/cspsfonts-gen/mkf \
+	share/texmf-dist/doc/metapost/featpost/bash/makehtmlindex.sh \
+	share/texmf-dist/doc/metapost/featpost/bash/laproof.sh \
+	share/texmf-dist/doc/metapost/featpost/bash/COMPILE.sh \
+	\
+	share/texmf-dist/doc/latex/ejpecp/mgetmref.py \
+	share/texmf-dist/doc/latex/aramaic-serto/serto.py \
+	share/texmf-dist/doc/latex/thuthesis/zhfonts.py \
+	share/texmf-dist/doc/latex/scanpages/replicate.py \
+	share/texmf-dist/doc/fonts/amiri/tools/build.py \
+	share/texmf-dist/doc/fonts/amiri/tools/runtest.py \
+	share/texmf-dist/doc/fonts/xits/postprocess.py \
+	share/texmf-dist/doc/fonts/xcharter/altone.py \
+	share/texmf-dist/doc/fonts/gnu-freefont/tools/test/ranges/Arabic/unicode_joining.py \
+	share/texmf-dist/doc/fonts/gnu-freefont/tools/test/ranges/Arabic/generate_arabic_shaping.py \
+	share/texmf-dist/doc/fonts/gnu-freefont/tools/test/ranges/Arabic/arabic_test.py \
+	share/texmf-dist/doc/fonts/gnu-freefont/tools/utility/hex_range.py \
+	\
+	share/texmf-dist/doc/fonts/berenisadf/ff-ybd.pe \
+	share/texmf-dist/doc/fonts/gnu-freefont/tools/utility/metafont/bulk_eps_import.py \
+	share/texmf-dist/doc/fonts/gnu-freefont/tools/report/kernclasses.py
+SHEBANG_LANG+=	fontforge
+perl_OLD_CMD+=	/opt/local/bin/perl
+
 do-extract:
 	@${MKDIR} ${WRKDIR}
 
@@ -45,4 +98,10 @@ 
 	    --strip-components 1 --no-same-permission --no-same-owner \
 	    ${DISTNAME}/texmf-dist/doc
 
+post-install:
+# Fix shebangs for files installed straight from distribution tarball
+	cd ${STAGEDIR}${PREFIX} && \
+		${FIND} ${SHEBANG_FILES} -type f \
+		-exec ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} {} +
+
 .include <bsd.port.mk>
--- tex-xetex/Makefile	(revision 488766)
+++ tex-xetex/Makefile	(working copy)
@@ -15,7 +15,8 @@ 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	TeX System with Unicode and Modern Font Technologies
 
-LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
 		libgraphite2.so:graphics/graphite2 \
 		libicuio.so:devel/icu \
 		libharfbuzz.so:print/harfbuzz \
@@ -23,11 +24,19 @@ 
 		libpng.so:graphics/png \
 		libTECkit.so:textproc/teckit
 
-USES=		compiler:c++11-lib pkgconfig tar:xz
+USES=		compiler:c++11-lib gnome python:env shebangfix pkgconfig tar:xz
 USE_CXXSTD=	gnu++11
 USE_TEX=	kpathsea web2c texmf formats fmtutil dvipdfmx
 USE_XORG=	pixman
 USE_GNOME=	cairo
+
+SHEBANG_FILES=	\
+	share/texmf-dist/doc/xelatex/xepersian/dkun-0.3.py \
+	share/texmf-dist/doc/xelatex/xepersian/dkun-0.4.py \
+	share/texmf-dist/doc/xelatex/xepersian/undk-0.6.py \
+	share/texmf-dist/doc/xelatex/xepersian/unldk-0.2.py \
+	share/texmf-dist/scripts/xetex/perl/xdv2pdf_mergemarks \
+	share/texmf-dist/source/xelatex/arabxetex/makemaps.pl
 TEXHASHDIRS=	${TEXMFDISTDIR} ${TEXMFVARDIR}
 EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
 EXTRACT_FILES=	build-aux \
@@ -34,7 +43,7 @@ 
 		libs/poppler \
 		libs/xpdf \
 		texk/web2c
-EXTRACT_AFTER_ARGS_TEXMF= \
+EXTRACT_AFTER_ARGS_TEXMF=	\
 	| ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/share \
 		--strip-components 1 --no-same-permission --no-same-owner \
 		${EXTRACT_FILES_TEXMF:S,^,${DISTNAME_TEXMF}/,}
@@ -41,7 +50,7 @@ 
 DISTVERSION_TEXLIVE_SOURCE=20150521
 DISTVERSION_TEXLIVE_TEXMF=20150523
 DISTNAME_TEXMF=	texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf
-EXTRACT_FILES_TEXMF= \
+EXTRACT_FILES_TEXMF=	\
 	texmf-dist/doc/xelatex \
 	texmf-dist/doc/xetex \
 	texmf-dist/fonts/misc/xetex \
@@ -93,4 +102,10 @@ 
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${DISTVERSION_TEXLIVE_TEXMF}-texmf${EXTRACT_SUFX} \
 		${EXTRACT_AFTER_ARGS_TEXMF}
 
+post-install:
+# Fix shebangs for files installed straight from distribution tarball
+	cd ${STAGEDIR}${PREFIX} && \
+		${FIND} ${SHEBANG_FILES} -type f \
+		-exec ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} {} +
+
 .include <bsd.port.mk>