--- Makefile	(revision 516635)
+++ Makefile	(working copy)
@@ -29,14 +29,16 @@ 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-USES=		charsetfix cpe gmake iconv libtool ncurses perl5 tar:xz
+USES=		charsetfix cpe gettext-runtime gmake iconv libtool \
+		localbase ncurses perl5 tar:xz
 
 CONFIGURE_ARGS=	--with-external-libintl-perl \
 		--with-external-Text-Unidecode \
+		PERL_EXT_CPPFLAGS="${CPPFLAGS}" \
 		--with-external-Unicode-EastAsianWidth
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip install-tex
-MAKE_ARGS=	PERL=${PERL} TEXMF=${LOCALBASE}/${TEXMFDIR}
+MAKE_ARGS=	LTLIBICONV= PERL=${PERL} TEXMF=${PREFIX}/${TEXMFDIR}
 PKGDEINSTALL=	${PKGINSTALL}
 USE_TEX=	yes
 
@@ -50,7 +52,7 @@ 
 CPE_VERSION=	${PORTVERSION:R}
 
 NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=		gettext
+NLS_USES=		gettext-tools
 
 post-patch:
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/texinfo.tex-${TEXINFO_TEX_RELDATE} ${WRKSRC}/doc/texinfo.tex
--- files/patch-tp-Texinfo-XS-parsetexi-api.c	(revision 516635)
+++ files/patch-tp-Texinfo-XS-parsetexi-api.c	(nonexistent)
@@ -1,12 +0,0 @@ 
---- tp/Texinfo/XS/parsetexi/api.c.orig	2019-08-25 17:11:45 UTC
-+++ tp/Texinfo/XS/parsetexi/api.c
-@@ -25,7 +25,9 @@
- 
- #undef context
- 
-+#if defined(HAVE_LIBINTL_H)
- #include <libintl.h>
-+#endif
- 
- #include <stdlib.h>
- #include <stdio.h>
--- files/patch-tp-Texinfo-XS-parsetexi-errors.c	(revision 516635)
+++ files/patch-tp-Texinfo-XS-parsetexi-errors.c	(nonexistent)
@@ -1,12 +0,0 @@ 
---- tp/Texinfo/XS/parsetexi/errors.c.orig	2019-08-25 17:11:45 UTC
-+++ tp/Texinfo/XS/parsetexi/errors.c
-@@ -14,7 +14,9 @@
-    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
- 
- #include <config.h>
-+#if defined(HAVE_LIBINTL_H)
- #include <libintl.h>
-+#endif
- 
- #include <stdlib.h>
- #include <stdarg.h>