Index: head/lang/yap/Makefile =================================================================== --- head/lang/yap/Makefile (revision 475662) +++ head/lang/yap/Makefile (revision 475663) @@ -1,47 +1,38 @@ # Created by: Danilo Egea Gondolfo # $FreeBSD$ PORTNAME= yap PORTVERSION= 6.2.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= lang MASTER_SITES= http://www.dcc.fc.up.pt/~vsc/Yap/ MAINTAINER= danilo@FreeBSD.org COMMENT= High-performance Prolog compiler LIB_DEPENDS= libgmp.so:math/gmp PORTSCOUT= limit:^6\.2\. CONFLICTS= yap-6.3.* OPTIONS_DEFINE= DOCS DOCS_USE= TEX=formats:build,dvipsk:build DOCS_BUILD_DEPENDS= ${LOCALBASE}/bin/texi2html:textproc/texi2html \ ${LOCALBASE}/bin/texi2pdf:print/texinfo DOCS_INSTALL_TARGET= install install_docs USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-max-performance \ --disable-myddas USES= gmake localbase readline DOCSDIR= ${PREFIX}/share/doc/Yap DATADIR= ${PREFIX}/share/Yap -.include - -.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 Index: head/lang/yap/files/patch-configure =================================================================== --- head/lang/yap/files/patch-configure (revision 475662) +++ head/lang/yap/files/patch-configure (revision 475663) @@ -1,25 +1,31 @@ https://sourceforge.net/p/yap/yap-6.3/ci/139f64a45900 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 - *3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;; + 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 Index: head/lang/yap-devel/Makefile =================================================================== --- head/lang/yap-devel/Makefile (revision 475662) +++ head/lang/yap-devel/Makefile (revision 475663) @@ -1,67 +1,58 @@ # Created by: Danilo Egea Gondolfo # $FreeBSD$ PORTNAME= yap PORTVERSION= 6.3.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= lang MASTER_SITES= http://www.dcc.fc.up.pt/~vsc/Yap/ PKGNAMESUFFIX= -devel MAINTAINER= danilo@FreeBSD.org COMMENT= High-performance Prolog compiler LICENSE= ART20 LGPL3 LICENSE_COMB= dual BROKEN_armv6= fails to install: tar: Pathname can't be converted from UTF-8 to current locale BROKEN_armv7= fails to install: tar: Pathname can't be converted from UTF-8 to current locale BROKEN_powerpc64= fails to build: YAP Fatal Error: startup.yss in saved state formatting mismatch in saved space exiting.... LIB_DEPENDS= libgmp.so:math/gmp CONFLICTS= yap-6.2.* OPTIONS_DEFINE= DOCS MYDDAS OPTIONS_SUB= yes MYDDAS_DESC= Enable MySQL support DOCS_USE= TEX=formats:build,dvipsk:build DOCS_BUILD_DEPENDS= ${LOCALBASE}/bin/texi2html:textproc/texi2html \ ${LOCALBASE}/bin/texi2pdf:print/texinfo DOCS_INSTALL_TARGET= install install_docs MYDDAS_LIB_DEPENDS= libiodbc.so:databases/libiodbc MYDDAS_CONFIGURE_ENABLE= myddas myddas-top-level LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV= PKGLDFLAGS="${LDFLAGS}" STRIP= #none USES= gmake libarchive readline shebangfix USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-max-performance --disable-clpbn-bp SHEBANG_FILES= packages/http/examples/demo_inetd SHEBANG_LANG= swipl swipl_OLD_CMD= /usr/bin/swipl swipl_CMD= ${LOCALBASE}/bin/swipl # installed by lang/swi-pl DOCSDIR= ${PREFIX}/share/doc/Yap DATADIR= ${PREFIX}/share/Yap -.include - -.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 Index: head/lang/yap-devel/files/patch-configure =================================================================== --- head/lang/yap-devel/files/patch-configure (revision 475662) +++ head/lang/yap-devel/files/patch-configure (revision 475663) @@ -1,13 +1,19 @@ 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 - *3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;; + 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"