Index: devel/gmake/Makefile
===================================================================
--- devel/gmake/Makefile	(revision 461207)
+++ devel/gmake/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmake
 PORTVERSION=	4.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	GNU/make
 DISTNAME=	make-${PORTVERSION}
@@ -20,8 +20,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g \
 		--without-guile
-# fmake does not like PO_DEPENDS_ON_POT being undefined
-MAKE_ARGS=	PO_DEPENDS_ON_POT=
 
 USES=		cpe tar:bzip2
 CPE_VENDOR=	gnu
@@ -29,9 +27,7 @@ CPE_VENDOR=	gnu
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-NLS_USES=	gettext iconv
-NLS_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG} \
-			--with-libintl-prefix=${LOCALBASE}
+NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 
 INFO=		make
Index: devel/gmake/files/patch-glob-glob.c
===================================================================
--- devel/gmake/files/patch-glob-glob.c	(nonexistent)
+++ devel/gmake/files/patch-glob-glob.c	(working copy)
@@ -0,0 +1,10 @@
+--- glob/glob.c.orig	2013-10-20 17:14:38 UTC
++++ glob/glob.c
+@@ -203,7 +203,6 @@ my_realloc (p, n)
+     return (char *) malloc (n);
+   return (char *) realloc (p, n);
+ }
+-# define	realloc	my_realloc
+ # endif /* __SASC */
+ #endif /* __GNU_LIBRARY__ || __DJGPP__ */
+ 

Property changes on: devel/gmake/files/patch-glob-glob.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: devel/gmake/files/patch-posixos.c
===================================================================
--- devel/gmake/files/patch-posixos.c	(nonexistent)
+++ devel/gmake/files/patch-posixos.c	(working copy)
@@ -0,0 +1,33 @@
+--- posixos.c.orig	2016-05-21 20:21:52 UTC
++++ posixos.c
+@@ -77,6 +77,10 @@ jobserver_setup (int slots)
+       if (r != 1)
+         pfatal_with_name (_("init jobserver pipe"));
+     }
++#ifdef HAVE_PSELECT
++  int flags = fcntl(job_fds[0], F_GETFL, 0);
++  fcntl(job_fds[0], F_SETFL, flags | O_NONBLOCK);
++#endif
+ 
+   return 1;
+ }
+@@ -112,6 +116,10 @@ jobserver_parse_auth (const char *auth)
+ 
+       return 0;
+     }
++#ifdef HAVE_PSELECT
++  int flags = fcntl(job_fds[0], F_GETFL, 0);
++  fcntl(job_fds[0], F_SETFL, flags | O_NONBLOCK);
++#endif
+ 
+   return 1;
+ }
+@@ -275,7 +283,7 @@ jobserver_acquire (int timeout)
+ 
+   /* The read FD is ready: read it!  */
+   EINTRLOOP (r, read (job_fds[0], &intake, 1));
+-  if (r < 0)
++  if (r < 0 && errno != EAGAIN)
+     pfatal_with_name (_("read jobs pipe"));
+ 
+   /* What does it mean if read() returns 0?  It shouldn't happen because only

Property changes on: devel/gmake/files/patch-posixos.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property