Index: head/lang/guile2/Makefile
===================================================================
--- head/lang/guile2/Makefile	(revision 457631)
+++ head/lang/guile2/Makefile	(revision 457632)
@@ -1,61 +1,61 @@
 # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	guile
 PORTVERSION=	2.0.14
 PORTREVISION=	1
 CATEGORIES=	lang scheme
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	GNU Ubiquitous Intelligent Language for Extension
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libltdl.so:devel/libltdl \
 		libunistring.so:devel/libunistring \
 		libffi.so:devel/libffi
 
 CONFLICTS_INSTALL=	guile-[0-9]*
 
 MAKE_JOBS_UNSAFE=	yes
-BROKEN_powerpc64=	does not build: error: expected declaration specifiers or ... before __builtin_choose_expr
-BROKEN_sparc64=		fails to compile: errors in complex.h
 
 USES=		charsetfix gmake libtool makeinfo ncurses pathfix pkgconfig \
 		readline
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
+INFO=		guile r5rs
+
 PLIST_SUB=	GUILE_VER=${PORTVERSION:R}
 
 OPTIONS_DEFINE=	NLS THREADS
 OPTIONS_DEFAULT=THREADS
 OPTIONS_SUB=	yes
+
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
+
 THREADS_CONFIGURE_WITH=	threads
 THREADS_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded
 THREADS_LIB_DEPENDS_OFF=	libgc.so:devel/boehm-gc
 
 REINPLACE_FILES=	libguile/smob.c libguile/filesys.c libguile/gc.c \
 			libguile/mallocs.c libguile/eval.c \
 			libguile/gc-malloc.c libguile/ports.c
-
-INFO=		guile r5rs
 
 post-patch:
 	@cd ${WRKSRC} ; \
 	  ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${REINPLACE_FILES}
 	@${REINPLACE_CMD} -e 's|sys/time.h sys/timeb.h|sys/time.h |g' \
 		${WRKSRC}/configure
 
 post-patch-THREADS-on:
 	@${REINPLACE_CMD} -e 's|bdw-gc|bdw-gc-threaded|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: head/lang/guile2/files/patch-libguile_numbers.c
===================================================================
--- head/lang/guile2/files/patch-libguile_numbers.c	(revision 457631)
+++ head/lang/guile2/files/patch-libguile_numbers.c	(revision 457632)
@@ -1,11 +1,23 @@
---- libguile/numbers.c.orig	2014-03-12 13:24:54 UTC
+--- libguile/numbers.c.orig	2016-12-15 00:03:33 UTC
 +++ libguile/numbers.c
-@@ -183,7 +183,7 @@ static double atanh (double x) { return 
+@@ -45,7 +45,11 @@
+ #  include <config.h>
+ #endif
+ 
++/* With old GCC, do not override _Static_assert: it conflicts with
++   #include <complex.h> below. */
++#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6)
+ #include <verify.h>
++#endif
+ #include <assert.h>
+ 
+ #include <math.h>
+@@ -183,7 +187,7 @@ static double atanh (double x) { return 0.5 * log ((1 
  
  
  #if defined (GUILE_I)
 -#if defined HAVE_COMPLEX_DOUBLE
 +#if defined HAVE_COMPLEX_DOUBLE && (HAVE_CLOG || HAVE_CLOG10 || HAVE_CEXP || HAVE_USABLE_CSQRT) && defined (SCM_COMPLEX_VALUE)
  
  /* For an SCM object Z which is a complex number (ie. satisfies
     SCM_COMPLEXP), return its value as a C level "complex double". */