Attachment #195564 for bug #222963

View | Details | Raw Unified | Return to bug 222963 | Differences between
Collapse All | Expand All





PORTNAME=	yap
PORTVERSION=	6.2.2
PORTREVISION=	8
CATEGORIES=	lang
MASTER_SITES=	http://www.dcc.fc.up.pt/~vsc/Yap/


DOCSDIR=	${PREFIX}/share/doc/Yap
DATADIR=	${PREFIX}/share/Yap

post-build-DOCS-off:

.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)
	# prevent the instalation of three docs files
	${REINPLACE_CMD} -e '559,562d' ${WRKSRC}/Makefile
.endif

.include <bsd.port.mk>





--- configure.orig	2011-10-23 22:11:24 UTC
+++ configure
@@ -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

+	  gcc-3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;
        esac
        case "$target_cpu" in
-        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

Return to bug 222963

Lines 3-9 Link Here

(-)Makefile (-11 / +2 lines)
3		3
4	PORTNAME= yap	4	PORTNAME= yap
5	PORTVERSION= 6.2.2	5	PORTVERSION= 6.2.2
6	PORTREVISION= 7	6	PORTREVISION= 8
7	CATEGORIES= lang	7	CATEGORIES= lang
8	MASTER_SITES= http://www.dcc.fc.up.pt/~vsc/Yap/	8	MASTER_SITES= http://www.dcc.fc.up.pt/~vsc/Yap/
9		9
Lines 31-47 Link Here
31	DOCSDIR= ${PREFIX}/share/doc/Yap	31	DOCSDIR= ${PREFIX}/share/doc/Yap
32	DATADIR= ${PREFIX}/share/Yap	32	DATADIR= ${PREFIX}/share/Yap
33		33
34	.include <bsd.port.options.mk>	34	post-build-DOCS-off:
35
36	.if ${ARCH} == i386
37	# H/absmi.h:77:23: error: global register variables are not supported
38	USES+= compiler:gcc-c++11-lib
39	.endif
40
41	post-build:
42	.if empty(PORT_OPTIONS:MDOCS)
43	# prevent the instalation of three docs files	35	# prevent the instalation of three docs files
44	${REINPLACE_CMD} -e '559,562d' ${WRKSRC}/Makefile	36	${REINPLACE_CMD} -e '559,562d' ${WRKSRC}/Makefile
45	.endif
46		37
47	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Lines 3-9 Link Here

(-)files/patch-configure (-6 / +12 lines)
3		3
4	--- configure.orig 2011-10-23 22:11:24 UTC	4	--- configure.orig 2011-10-23 22:11:24 UTC
5	+++ configure	5	+++ configure
6	@@ -4397,7 +4397,7 @@ then	6	@@ -4397,13 +4397,9 @@ then
7	C_PARSER_FLAGS="-O3 -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"	7	C_PARSER_FLAGS="-O3 -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"
8	CFLAGS="-O3 -fomit-frame-pointer -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"	8	CFLAGS="-O3 -fomit-frame-pointer -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"
9	case "`$CC --version < /dev/null`" in	9	case "`$CC --version < /dev/null`" in
Lines 11-25 Link Here
11	+ gcc-3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;	11	+ gcc-3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;
12	esac	12	esac
13	case "$target_cpu" in	13	case "$target_cpu" in
14	i86)	14	- i86)
15	@@ -4434,10 +4434,6 @@ then	15	- CFLAGS="-DBP_FREE $CFLAGS"
		16	- CXXFLAGS="-DBP_FREE $CXXFLAGS"
		17	- ;;
		18	sparc*)
		19	case "$target_os" in
		20	solaris2-9) CFLAGS="-mno-app-regs -DOPTIMISE_ALL_REGS_FOR_SPARC=1 $CFLAGS"
		21	@@ -4433,10 +4429,6 @@ then
		22	i486*)
16	CFLAGS="-march=i486 $CFLAGS"	23	CFLAGS="-march=i486 $CFLAGS"
17	CXXFLAGS="-march=i486 $CXXFLAGS"	24	CXXFLAGS="-march=i486 $CXXFLAGS"
18	;;	25	- ;;
19	- i386*)	26	- i386*)
20	- CFLAGS="-march=i386 $CFLAGS"	27	- CFLAGS="-march=i386 $CFLAGS"
21	- CXXFLAGS="-march=i386 $CXXFLAGS"	28	- CXXFLAGS="-march=i386 $CXXFLAGS"
22	- ;;	29	;;
23	esac	30	esac
24	fi	31	fi
25	fi