Index: branches/2017Q2/games/acm/Makefile
===================================================================
--- branches/2017Q2/games/acm/Makefile	(revision 440711)
+++ branches/2017Q2/games/acm/Makefile	(revision 440712)
@@ -1,39 +1,37 @@
 # Created by: joerg
 # $FreeBSD$
 
 PORTNAME=	acm
 PORTVERSION=	5.0
 PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Aerial combat simulator for X11
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		perl5
 USE_XORG=	x11 xext
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--x-includes=${LOCALBASE}/include \
 		--x-libraries=${LOCALBASE}/lib
 CONFIGURE_ENV=	ac_cv_lib_Xm_XmCreateBulletinBoard=no \
 		ac_cv_lib_gdbm_dbm_fetch=no
 USE_PERL5=	build
 MAKE_ARGS+=	prefix=${STAGEDIR}${PREFIX}/ OBVDIR=${STAGEDIR}${DATADIR}/
 
-BROKEN_aarch64=	Fails to compile: machine/limits.h not found
-
 OPTIONS_DEFINE=	SOUND
 
 SOUND_LIB_DEPENDS=	libaudio.so:audio/nas
 
 .include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MSOUND)
 CONFIGURE_ENV+=	ac_cv_lib_audio_AuCloseServer=no
 .endif
 
 .include <bsd.port.mk>
Index: branches/2017Q2/games/acm/files/patch-dis_lib_xdr_var_array.c
===================================================================
--- branches/2017Q2/games/acm/files/patch-dis_lib_xdr_var_array.c	(revision 440711)
+++ branches/2017Q2/games/acm/files/patch-dis_lib_xdr_var_array.c	(revision 440712)
@@ -1,24 +1,19 @@
---- dis/lib/xdr_var_array.c~	Mon May 11 20:58:55 1998
-+++ dis/lib/xdr_var_array.c	Sun Jul  6 03:21:47 2003
-@@ -75,6 +75,12 @@
+--- dis/lib/xdr_var_array.c.orig	1998-05-12 03:58:55 UTC
++++ dis/lib/xdr_var_array.c
+@@ -75,6 +75,7 @@ static char *rcsid = "$Id: xdr_var_array.c,v 1.2 1998/
  
  #include <stdio.h>
  #include <stdlib.h>
-+#include <sys/param.h>
-+#if __FreeBSD_Version__ >= 500113
-+#  include <sys/limits.h>
-+#else
-+#  include <machine/limits.h>
-+#endif
++#include <limits.h>
  #include <rpc/types.h>
  #include <rpc/xdr.h>
  
-@@ -104,7 +110,7 @@
+@@ -104,7 +105,7 @@ xdr_var_array(register XDR * xdrs, caddr_t * addrp, u_
  	register u_int nodesize;
  
  	c = size;
 -	if ((c > maxsize) && (xdrs->x_op != XDR_FREE)) {
 +	if ((c > maxsize || c > UINT_MAX/elsize) && (xdrs->x_op != XDR_FREE)) {
  		return (FALSE);
  	}
  	nodesize = c * elsize;
Index: branches/2017Q2
===================================================================
--- branches/2017Q2	(revision 440711)
+++ branches/2017Q2	(revision 440712)

Property changes on: branches/2017Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r440711