svn commit: r475663 - in head/lang: yap yap-devel yap-devel/files yap/files

[Danilo Egea Gondolfo]

Author: danilo
Date: Sun Jul 29 16:42:39 2018
New Revision: 475663
URL: https://svnweb.freebsd.org/changeset/ports/475663

Log:
  - Remove gcc dependency on i386
  - Use options helpers to install DOCS
  
  PR:		222963
  Submitted by:	tobik
  Reported by:	jbeich

Modified:
  head/lang/yap-devel/Makefile
  head/lang/yap-devel/files/patch-configure
  head/lang/yap/Makefile
  head/lang/yap/files/patch-configure

Modified: head/lang/yap-devel/Makefile
==============================================================================
--- head/lang/yap-devel/Makefile	Sun Jul 29 15:20:18 2018	(r475662)
+++ head/lang/yap-devel/Makefile	Sun Jul 29 16:42:39 2018	(r475663)
@@ -3,7 +3,7 @@
 
 PORTNAME=	yap
 PORTVERSION=	6.3.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	lang
 MASTER_SITES=	http://www.dcc.fc.up.pt/~vsc/Yap/
 PKGNAMESUFFIX=	-devel
@@ -51,17 +51,8 @@ swipl_CMD=	${LOCALBASE}/bin/swipl # installed by lang/
 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 installation of docs files
 	${REINPLACE_CMD} -e '758,761d' ${WRKSRC}/Makefile
-.endif
 
 .include <bsd.port.mk>

Modified: head/lang/yap-devel/files/patch-configure
==============================================================================
--- head/lang/yap-devel/files/patch-configure	Sun Jul 29 15:20:18 2018	(r475662)
+++ head/lang/yap-devel/files/patch-configure	Sun Jul 29 16:42:39 2018	(r475663)
@@ -2,7 +2,7 @@ https://sourceforge.net/p/yap/yap-6.3/ci/da61f1c31fed
 
 --- configure.orig	2013-01-19 11:48:08 UTC
 +++ configure
-@@ -5169,7 +5169,7 @@ then
+@@ -5169,13 +5169,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
@@ -10,4 +10,10 @@ https://sourceforge.net/p/yap/yap-6.3/ci/da61f1c31fed
 +	  gcc-3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;
         esac
         case "$target_cpu" in
-         i*86*)
+-        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"

Modified: head/lang/yap/Makefile
==============================================================================
--- head/lang/yap/Makefile	Sun Jul 29 15:20:18 2018	(r475662)
+++ head/lang/yap/Makefile	Sun Jul 29 16:42:39 2018	(r475663)
@@ -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 @@ USES=		gmake localbase readline
 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>

Modified: head/lang/yap/files/patch-configure
==============================================================================
--- head/lang/yap/files/patch-configure	Sun Jul 29 15:20:18 2018	(r475662)
+++ head/lang/yap/files/patch-configure	Sun Jul 29 16:42:39 2018	(r475663)
@@ -3,7 +3,7 @@ https://sourceforge.net/p/yap/yap-6.3/ci/da61f1c31fed
 
 --- 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 @@ https://sourceforge.net/p/yap/yap-6.3/ci/da61f1c31fed
 +	  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