--- /usr/local/poudriere/ports/experimental/print/tex-xetex/Makefile	2018-10-23 13:35:03.000000000 +0200
+++ /usr/local/poudriere/ports/experimental/print/tex-xetex/Makefile	2018-11-08 13:29:58.215796000 +0100
@@ -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 \
@@ -24,24 +25,35 @@ 
 		libpoppler.so:graphics/poppler \
 		libTECkit.so:textproc/teckit
 
-USES=		compiler:c++11-lib pkgconfig tar:xz
+USES=		gnome pkgconfig python shebangfix tar:xz
 USE_CXXSTD=	gnu++11
 USE_TEX=	kpathsea web2c texmf formats fmtutil dvipdfmx
 USE_XORG=	pixman
 USE_GNOME=	cairo
+
+PYTHON_NO_DEPENDS=	yes
+
+SHEBANG_FILES_INSTALL=	\
+	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 \
 		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}/,}
 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 +105,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_INSTALL} -type f \
+		-exec ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} {} +
+
 .include <bsd.port.mk>
--- /usr/local/poudriere/ports/experimental/print/tex-xetex/files/patch-configure	2015-07-26 08:57:26.000000000 +0200
+++ /usr/local/poudriere/ports/experimental/print/tex-xetex/files/patch-configure	2018-11-08 13:25:28.891556000 +0100
@@ -1,5 +1,5 @@ 
---- configure.orig	2015-04-12 11:22:39.000000000 +0000
-+++ configure	2015-07-25 21:47:24.532843000 +0000
+--- configure.orig	2015-04-12 11:22:39 UTC
++++ configure
 @@ -1033,6 +1033,8 @@ with_system_poppler
  with_system_xpdf
  with_system_zziplib