Index: head/lang/yap/Makefile =================================================================== --- head/lang/yap/Makefile (revision 433824) +++ head/lang/yap/Makefile (revision 433825) @@ -1,40 +1,46 @@ # Created by: Danilo Egea Gondolfo # $FreeBSD$ PORTNAME= yap PORTVERSION= 6.2.2 -PORTREVISION= 2 +PORTREVISION= 3 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 -USES= gmake readline -USE_GCC= any +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) # 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 (nonexistent) +++ head/lang/yap/files/patch-configure (revision 433825) @@ -0,0 +1,25 @@ +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 + 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 + CFLAGS="-march=i486 $CFLAGS" + CXXFLAGS="-march=i486 $CXXFLAGS" + ;; +- i386*) +- CFLAGS="-march=i386 $CFLAGS" +- CXXFLAGS="-march=i386 $CXXFLAGS" +- ;; + esac + fi + fi Property changes on: head/lang/yap/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/yap/files/patch-packages_swi-minisat2_C_SolverTypes.h =================================================================== --- head/lang/yap/files/patch-packages_swi-minisat2_C_SolverTypes.h (nonexistent) +++ head/lang/yap/files/patch-packages_swi-minisat2_C_SolverTypes.h (revision 433825) @@ -0,0 +1,31 @@ +https://sourceforge.net/p/yap/yap-6.3/ci/e938c1774890 +https://sourceforge.net/p/yap/yap-6.3/ci/6d2e2597b183 + +--- packages/swi-minisat2/C/SolverTypes.h.orig 2010-10-18 08:48:21 UTC ++++ packages/swi-minisat2/C/SolverTypes.h +@@ -119,11 +119,7 @@ public: + + // -- use this function instead: + template +- friend Clause* Clause_new(const V& ps, bool learnt = false) { +- assert(sizeof(Lit) == sizeof(uint32_t)); +- assert(sizeof(float) == sizeof(uint32_t)); +- void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size())); +- return new (mem) Clause(ps, learnt); } ++ friend Clause* Clause_new(const V& ps, bool learnt); + + int size () const { return size_etc >> 3; } + void shrink (int i) { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); } +@@ -147,6 +143,12 @@ public: + }; + + ++template ++Clause* Clause_new(const V& ps, bool learnt) { ++ assert(sizeof(Lit) == sizeof(uint32_t)); ++ assert(sizeof(float) == sizeof(uint32_t)); ++ void* mem = malloc(sizeof(Clause) + sizeof(uint32_t)*(ps.size())); ++ return new (mem) Clause(ps, learnt); } + /*_________________________________________________________________________________________________ + | + | subsumes : (other : const Clause&) -> Lit Property changes on: head/lang/yap/files/patch-packages_swi-minisat2_C_SolverTypes.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/yap-devel/Makefile =================================================================== --- head/lang/yap-devel/Makefile (revision 433824) +++ head/lang/yap-devel/Makefile (revision 433825) @@ -1,59 +1,63 @@ # Created by: Danilo Egea Gondolfo # $FreeBSD$ PORTNAME= yap PORTVERSION= 6.3.3 -PORTREVISION= 4 +PORTREVISION= 5 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 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 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-max-performance --disable-clpbn-bp USES= gmake libarchive readline shebangfix 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 -USE_GCC= any 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) # 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 (nonexistent) +++ head/lang/yap-devel/files/patch-configure (revision 433825) @@ -0,0 +1,13 @@ +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 + 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*) Property changes on: head/lang/yap-devel/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/yap-devel/files/patch-packages_swi-minisat2_C_SolverTypes.h =================================================================== --- head/lang/yap-devel/files/patch-packages_swi-minisat2_C_SolverTypes.h (nonexistent) +++ head/lang/yap-devel/files/patch-packages_swi-minisat2_C_SolverTypes.h (revision 433825) @@ -0,0 +1,13 @@ +https://sourceforge.net/p/yap/yap-6.3/ci/6d2e2597b183 + +--- packages/swi-minisat2/C/SolverTypes.h.orig 2012-06-29 21:30:38 UTC ++++ packages/swi-minisat2/C/SolverTypes.h +@@ -119,7 +119,7 @@ public: + + // -- use this function instead: + template +- friend Clause* Clause_new(const V& ps, bool learnt = false); ++ friend Clause* Clause_new(const V& ps, bool learnt); + + int size () const { return size_etc >> 3; } + void shrink (int i) { assert(i <= size()); size_etc = (((size_etc >> 3) - i) << 3) | (size_etc & 7); } Property changes on: head/lang/yap-devel/files/patch-packages_swi-minisat2_C_SolverTypes.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property