Index: Makefile
===================================================================
--- Makefile	(revision 475360)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	yap
 PORTVERSION=	6.2.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang
 MASTER_SITES=	http://www.dcc.fc.up.pt/~vsc/Yap/
 
@@ -31,17 +31,8 @@
 DOCSDIR=	${PREFIX}/share/doc/Yap
 DATADIR=	${PREFIX}/share/Yap
 
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == i386
-# H/absmi.h:77:23: error: global register variables are not supported
-USES+=		compiler:gcc-c++11-lib
-.endif
-
-post-build:
-.if empty(PORT_OPTIONS:MDOCS)
+post-build-DOCS-off:
 	# prevent the instalation of three docs files
 	${REINPLACE_CMD} -e '559,562d' ${WRKSRC}/Makefile
-.endif
 
 .include <bsd.port.mk>
Index: files/patch-configure
===================================================================
--- files/patch-configure	(revision 475360)
+++ files/patch-configure	(working copy)
@@ -3,7 +3,7 @@
 
 --- configure.orig	2011-10-23 22:11:24 UTC
 +++ configure
-@@ -4397,7 +4397,7 @@ then
+@@ -4397,13 +4397,9 @@ then
         C_PARSER_FLAGS="-O3 -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"
         CFLAGS="-O3 -fomit-frame-pointer -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"
         case "`$CC --version < /dev/null`" in
@@ -11,15 +11,21 @@
 +	  gcc-3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;
         esac
         case "$target_cpu" in
-         i*86*)
-@@ -4434,10 +4434,6 @@ then
+-        i*86*)
+-           CFLAGS="-DBP_FREE $CFLAGS"
+-           CXXFLAGS="-DBP_FREE $CXXFLAGS"
+-        ;;
+         sparc*)
+ 	  case "$target_os" in
+            *solaris2-9*)	             CFLAGS="-mno-app-regs -DOPTIMISE_ALL_REGS_FOR_SPARC=1 $CFLAGS"
+@@ -4433,10 +4429,6 @@ then
+           i486*)
             CFLAGS="-march=i486 $CFLAGS"
             CXXFLAGS="-march=i486 $CXXFLAGS"
-           ;;
+-          ;;
 -          i386*)
 -           CFLAGS="-march=i386 $CFLAGS"
 -           CXXFLAGS="-march=i386 $CXXFLAGS"
--          ;;
+           ;;
           esac
         fi
-    fi