diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 1b9040249bbe..387fcf4be117 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,87 +1,85 @@
 PORTNAME=	a2ps
 PORTVERSION=	4.15.3
 CATEGORIES=	print
 MASTER_SITES=	GNU LOCAL/hrs/a2ps/:i18n
 
-MAINTAINER=	dirk.meyer@dinoex.sub.org
+MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Formats an ASCII file for printing on a postscript printer
 WWW=		https://www.gnu.org/software/a2ps/
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libgc.so:devel/boehm-gc \
 		libpaper.so:print/libpaper
 
 USES=		cpe perl5 gperf pkgconfig localbase gmake
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 INFO=		a2ps ogonkify regex
 I18N_PACKAGE=	i18n-fonts-0.1
-MAKE_JOBS_UNSAFE=yes
 
 CONFIGURE_ARGS=	--with-medium=libpaper --sharedstatedir=${PREFIX}/share \
 	--sysconfdir=${PREFIX}/etc --datadir=${PREFIX}/share \
 	--localstatedir=${PREFIX}/share
 LIBS+=		-L${LOCALBASE}/lib
 
 PAPERSIZE?=
 .if ${PAPERSIZE:tl} == a4
 RUN_DEPENDS+=	${LOCALBASE}/etc/papersize:print/papersize-default-a4
 .endif
 
 OPTIONS_DEFINE=NLS I18N EMACS
-OPTIONS_DEFAULT=NLS
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 EMACS_DESC=Enable Emacs support
 I18N_DESC=Enable I18N support
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 EMACS_USES=		emacs:noflavors
 EMACS_CONFIGURE_ON=	--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
 EMACS_CONFIGURE_OFF=	--without-emacs --without-lispdir
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MEMACS}
 CONFIGURE_ENV+=	EMACS=no
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|^DESTDIR|#DESTDIR|' \
 		`${FIND} ${WRKSRC} -name "Makefile.in"`
 
-.if ${PORT_OPTIONS:MI18N}
+.if ${PORT_OPTIONS:MI18N} || make(makesum) || defined(FETCH_ALL)
 #DISTFILES+=	${I18N_PACKAGE}${EXTRACT_SUFX}:i18n
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${I18N_PACKAGE}${EXTRACT_SUFX}:i18n
 
 pre-configure:
 	cd ${WRKDIR}/${I18N_PACKAGE}/afm && \
 		${ECHO_CMD} *.afm > afms.lst && \
 		${MV} *.afm ${WRKSRC}/afm
 	cd ${WRKDIR}/${I18N_PACKAGE}/fonts && \
 		${MV} *.pfb ${WRKSRC}/fonts
 
 post-configure:
 	@cd ${WRKSRC}/fonts && { ${ECHO_CMD} ''; \
 	${ECHO_CMD} "pfb_fonts =" *.pfb; } >> Makefile && \
 	${REINPLACE_CMD} 's,^\(fonts_DATA = .*\),\1 $$(pfb_fonts),' Makefile
 	@cd ${WRKSRC}/afm && { ${ECHO_CMD} ''; \
 	${ECHO_CMD} "i18n_afms =" `cat ${WRKDIR}/${I18N_PACKAGE}/afm/afms.lst`; } >> Makefile && \
 	${REINPLACE_CMD} 's,^\(all_afms = .*\),\1 $$(i18n_afms),' Makefile
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MEMACS}
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp
 	${LN} -sf ${PREFIX}/share/emacs/site-lisp/a2ps-print.el \
 		  ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/a2ps-print.el
 	${LN} -sf ${PREFIX}/share/emacs/site-lisp/a2ps.el \
 		  ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/a2ps.el
 .endif
 	cd ${WRKSRC}/doc && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${.MAKEFLAGS} ${MAKE_ARGS} ${INSTALL_TARGET}
-	${RM} -f ${STAGEDIR}${PREFIX}/lib/liba2ps.la
+	${RM} ${STAGEDIR}${PREFIX}/lib/liba2ps.la
 
 .include <bsd.port.mk>
diff --git a/print/a2ps/distinfo b/print/a2ps/distinfo
index 3fe0cb3f5439..284a6cd2cfa8 100644
--- a/print/a2ps/distinfo
+++ b/print/a2ps/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1679944910
 SHA256 (a2ps-4.15.3.tar.gz) = d00e81e0eb4dcbf2d4963d89e1df2bb66f71e66d73b4152c43cf9838e6aaf7c7
 SIZE (a2ps-4.15.3.tar.gz) = 3601424
+SHA256 (i18n-fonts-0.1.tar.gz) = 20628df682359044b8e5241c97a3c8da7a098aa260a7d281a87f67486a531786
+SIZE (i18n-fonts-0.1.tar.gz) = 352530