Index: branches/2018Q1/databases/recutils/Makefile
===================================================================
--- branches/2018Q1/databases/recutils/Makefile	(revision 464772)
+++ branches/2018Q1/databases/recutils/Makefile	(revision 464773)
@@ -1,32 +1,36 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	recutils
 PORTVERSION=	1.7
 PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	GNU
 
 MAINTAINER=	zeus@ibs.dn.ua
 COMMENT=	Tools and libraries to access human-editable, plain text databases
 
 LICENSE=	GPLv3
 
 USES=		charsetfix libtool makeinfo
 GNU_CONFIGURE=	yes
+.ifdef QEMU_EMULATING
+# XXX bug 224740: configure hangs
+CONFIGURE_ENV=	gl_cv_func_printf_enomem=no
+.endif
 USE_LDCONFIG=	yes
 
 INFO=		rec-mode recutils
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: branches/2018Q1/misc/gnuls/Makefile
===================================================================
--- branches/2018Q1/misc/gnuls/Makefile	(revision 464772)
+++ branches/2018Q1/misc/gnuls/Makefile	(revision 464773)
@@ -1,46 +1,50 @@
 # Created by: bmc@WillsCreek.COM
 # $FreeBSD$
 
 PORTNAME=	gnuls
 PORTVERSION=	8.22
 PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	GNU/coreutils
 DISTNAME=	coreutils-${PORTVERSION}
 
 MAINTAINER=	bmc@clapper.org
 COMMENT=	GNU colorized 'ls'
 
 OPTIONS_DEFINE=		NLS
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	FORCE_UNSAFE_CONFIGURE=1
+.ifdef QEMU_EMULATING
+# XXX bug 224740: configure hangs
+CONFIGURE_ENV+=	gl_cv_func_printf_enomem=no
+.endif
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
 USES=		gmake perl5 tar:xz
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
 PLIST_FILES=	bin/dir \
 		bin/dircolors \
 		bin/gnuls \
 		bin/vdir \
 		man/man1/dir.1.gz \
 		man/man1/dircolors.1.gz \
 		man/man1/gnuls.1.gz \
 		man/man1/vdir.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dir ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dircolors ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ls ${STAGEDIR}${PREFIX}/bin/gnuls
 	${INSTALL_PROGRAM} ${WRKSRC}/src/vdir ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/dir.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/dircolors.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/ls.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/gnuls.1
 	${INSTALL_MAN} ${WRKSRC}/man/vdir.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
Index: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 464772)
+++ branches/2018Q1	(revision 464773)

Property changes on: branches/2018Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r464772