From 2139a5afb241b0042d74f595a0c81ea2693fb1ac Mon Sep 17 00:00:00 2001 From: asau Date: Tue, 18 May 2010 09:24:43 +0000 Subject: Update to YAP-6.0.5 Changes in Yap-6.0.5: - Very large programs: indexing very large DBs requires very large intermediate data-structures. malloc is changed to avoid memory fragmentation. - Heap data-structures: there was some confusion about what should be going through save/restore and atom-gc, and what is local to a run. Fixed that by two files describing the two types: global variables and code-space data structures. - SWI emulation cleanup: some builti-ins (like predsort/3, plus/3) are now in YAP proper, the file was cleaned up and made to rely more on Changes in Yap-6.0.4: Overhaul/cleanup of the attributed variable and coroutining code: - attributed variables now don't have a separate stack; instead, they are allocated as global variables. - Prolog code for attributed variables cleaned up: layers now are engine, hprolog/SWI attvars, freeze and SICStus emulation libraries Changes in Yap-6.0.3: 6.0.3 is another bug fix release: - a bug in indexing large integers - a choice-point left over in consulting - fix error handling in comparisons - garbage collection of functor/3 could sometimes break - fixes to chr port - exec_prefix - bad error reporting in some arithmetic conditions - erf function - win32 install fixes - operators need to be exported in module list, some weren't. - tabling stuff Changes in Yap-6.0.2: This is a bug fix release: - fix current_op/3 in WIN32 (P Moura) - fix nb_current/2 (J Santos) and add SWI user:exception/3 (Bernd and Jose), add fix to nb_ in distributed ProbLog. - fix goal_expansion - fix clp(fd) all_distinct/1 and circuit/1 (M Triska) - fix seekable file detection in WIN32 - add yap.pdf and yap.html to win32 bundle (M Ferreira). - check for badly typed calls to load_files and friends. - threads: fix bad locking while spying (P Moura). Changes in Yap-6.0.1: - engine improvements; - many bug fixes; - new implementation of arithmetic; - better ISO compatibility; - improvements in tabling; - SWI-compatibility, YAP now includes support for most of the SWI foreign interface, and many built-ins, ports of SWI packages include jpl, chr, clpfd, clpr, sgml, prolog_xref, swi-minisat interface, and plunit; - yap-6 also includes a really cool new language called ProbLog. Changes in Yap-5.1.4: - FIXED: bad locking in p_signal (obs from Paulo Moura). - FIXED: DESTDIR and chr. - FIXED: make term_variables a builtin. (SWI compatibility). - NEW: X is random(Int) (SWI compatibility). - NEW: seletchk/3. - FIXED: do meta-expansion from undefp. - FIXED: handle correctly flatten([_,[_]],L). - FIXED: bad syntax in config.h (patch from Keri Harris). - NEW: format over atom/1. - FIXED: clean up apply_macros in swi mode. - FIXED: clean up meta-expansion. - FIXED: do meta-expansion from undefined call. - NEW: selectchk/3, nth1/3 and nth1/4. - FIXED: YapOpcodes has wrong formats (obs from Bart Demoen). - FIXED: improve format message (obs from Bart Demoen). - NEW: more versions of maplist (obs from Bart Demoen). - FIXED: use import mechanism for SWI's flatten/2 (obs from Bart Demoen). - FIXED: steps towards typed rbtrees plus some cases where one should not copy the null node (Tom Schrijvers and Bart Demoen). - FIXED: map_tree in trees library (Bart Demoen). - FIXED: bad call to splay_tree (Bart Demoen). - FIXED: bad type for write_x_var in add_info (Bart Demoen). - FIXED: exec/3 should flush streams. - FIXED: load_files/2 compilation_mode to allow :- source and replace compile by compact. - FIXED: list_concat/2 (fix from Bart Demoen). - NEW: dgraph_reachable/3 and friends. --- lang/yap/Makefile | 12 ++-- lang/yap/PLIST | 161 +++++++++++++++++++++++++++++++++++++++++++--- lang/yap/distinfo | 10 ++- lang/yap/patches/patch-ag | 56 ---------------- lang/yap/patches/patch-ai | 15 ----- 5 files changed, 163 insertions(+), 91 deletions(-) delete mode 100644 lang/yap/patches/patch-ag delete mode 100644 lang/yap/patches/patch-ai (limited to 'lang') diff --git a/lang/yap/Makefile b/lang/yap/Makefile index 86168a78377..b34d10f0deb 100644 --- a/lang/yap/Makefile +++ b/lang/yap/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.8 2010/03/24 19:43:26 asau Exp $ +# $NetBSD: Makefile,v 1.9 2010/05/18 09:24:43 asau Exp $ # -DISTNAME= Yap-5.1.3 -PKGREVISION= 1 +DISTNAME= yap-6.0.5 CATEGORIES= lang # MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=yap/} -MASTER_SITES= http://www.dcc.fc.up.pt/~vsc/Yap/current/ +MASTER_SITES= http://www.dcc.fc.up.pt/~vsc/Yap/ \ + http://www.dcc.fc.up.pt/~vsc/Yap/current/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ncc.up.pt/~vsc/Yap/ @@ -13,8 +13,12 @@ COMMENT= ISO-compliant Prolog PKG_DESTDIR_SUPPORT= user-destdir +WRKSRC= $(WRKDIR)/yap-6 + +USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes +USE_TOOLS= gmake # Don't enable system malloc, it dumps core otherwise: #CONFIGURE_ARGS= --enable-use-malloc diff --git a/lang/yap/PLIST b/lang/yap/PLIST index 69144e942e8..16484e2326a 100644 --- a/lang/yap/PLIST +++ b/lang/yap/PLIST @@ -1,37 +1,141 @@ -@comment $NetBSD: PLIST,v 1.4 2010/02/11 20:43:49 asau Exp $ +@comment $NetBSD: PLIST,v 1.5 2010/05/18 09:24:43 asau Exp $ bin/yap +include/Yap/Atoms.h +include/Yap/Regs.h include/Yap/SWI-Prolog.h include/Yap/SWI-Stream.h +include/Yap/Tags_24bits.h +include/Yap/Tags_32LowTag.h +include/Yap/Tags_32Ops.h +include/Yap/Tags_32bits.h +include/Yap/Tags_64bits.h +include/Yap/TermExt.h +include/Yap/Yap.h +include/Yap/YapHeap.h include/Yap/YapInterface.h +include/Yap/Yapproto.h +include/Yap/Yatom.h +include/Yap/absmi.h +include/Yap/alloc.h +include/Yap/amidefs.h +include/Yap/amiops.h +include/Yap/arith2.h +include/Yap/arrays.h +include/Yap/attvar.h include/Yap/c_interface.h +include/Yap/clause.h +include/Yap/clause_list.h +include/Yap/compile.h +include/Yap/config.h +include/Yap/corout.h +include/Yap/cut_c.h +include/Yap/dglobals.h +include/Yap/dhstruct.h +include/Yap/dlmalloc.h +include/Yap/dswiatoms.h +include/Yap/eam.h +include/Yap/eamamasm.h +include/Yap/eval.h +include/Yap/heapgc.h +include/Yap/hglobals.h +include/Yap/hstruct.h +include/Yap/iatoms.h +include/Yap/iglobals.h +include/Yap/ihstruct.h +include/Yap/index.h +include/Yap/iopreds.h +include/Yap/iswiatoms.h +include/Yap/locks_alpha.h +include/Yap/locks_alpha_funcs.h +include/Yap/locks_mips.h +include/Yap/locks_mips_funcs.h +include/Yap/locks_pthread.h +include/Yap/locks_sparc.h +include/Yap/locks_x86.h +include/Yap/myddas.h +include/Yap/myddas_statistics.h +include/Yap/myddas_statistics_structs.h +include/Yap/myddas_structs.h +include/Yap/myddas_wkb.h +include/Yap/myddas_wkb2prolog.h +include/Yap/opt.config.h +include/Yap/opt.macros.h +include/Yap/opt.proto.h +include/Yap/opt.structs.h +include/Yap/or.macros.h +include/Yap/or.sbaamiops.h +include/Yap/or.sbaunify.h +include/Yap/parms.h +include/Yap/ratoms.h +include/Yap/rclause.h +include/Yap/rglobals.h +include/Yap/rheap.h +include/Yap/rhstruct.h +include/Yap/rtree_udi.h +include/Yap/sshift.h +include/Yap/tab.structs.h +include/Yap/tatoms.h +include/Yap/threads.h +include/Yap/tracer.h +include/Yap/trim_trail.h +include/Yap/udi.h include/Yap/yap_structs.h +include/Yap/yapio.h lib/Yap/itries.so lib/Yap/matrix.so +lib/Yap/pl-minisat.so +lib/Yap/plstream.so lib/Yap/random.so -lib/Yap/regcomp.so -lib/Yap/regerror.so -lib/Yap/regexec.so lib/Yap/regexp.so -lib/Yap/regfree.so -lib/Yap/startup +lib/Yap/sgml2pl.so +lib/Yap/startup.yss lib/Yap/sys.so lib/Yap/tries.so lib/Yap/yap_rl.so lib/libYap.a +share/Yap/DTD/HTML4.dcl +share/Yap/DTD/HTML4.dtd +share/Yap/DTD/HTML4.soc +share/Yap/DTD/HTMLlat1.ent +share/Yap/DTD/HTMLspec.ent +share/Yap/DTD/HTMLsym.ent +share/Yap/INDEX.pl share/Yap/aggregate.pl -share/Yap/apply.pl share/Yap/apply.yap share/Yap/apply_macros.yap share/Yap/arg.yap share/Yap/assoc.yap share/Yap/atts.yap +share/Yap/autoloader.yap share/Yap/avl.yap +share/Yap/bhash.yap share/Yap/charsio.yap +share/Yap/chr.pl +share/Yap/chr/README +share/Yap/chr/a_star.pl +share/Yap/chr/binomialheap.pl +share/Yap/chr/builtins.pl +share/Yap/chr/chr_compiler_errors.pl +share/Yap/chr/chr_compiler_options.pl +share/Yap/chr/chr_compiler_utility.pl +share/Yap/chr/chr_debug.pl +share/Yap/chr/chr_hashtable_store.pl +share/Yap/chr/chr_integertable_store.pl +share/Yap/chr/chr_messages.pl +share/Yap/chr/chr_op.pl +share/Yap/chr/chr_runtime.pl +share/Yap/chr/chr_translate.pl +share/Yap/chr/clean_code.pl +share/Yap/chr/find.pl +share/Yap/chr/guard_entailment.pl +share/Yap/chr/listmap.pl +share/Yap/chr/pairlist.pl share/Yap/cleanup.yap share/Yap/clp/clp_events.pl share/Yap/clpbn.yap share/Yap/clpbn/aggregates.yap share/Yap/clpbn/bnt.yap +share/Yap/clpbn/connected.yap share/Yap/clpbn/discrete_utils.yap share/Yap/clpbn/display.yap share/Yap/clpbn/dists.yap @@ -51,9 +155,12 @@ share/Yap/clpbn/graphviz.yap share/Yap/clpbn/hmm.yap share/Yap/clpbn/jt.yap share/Yap/clpbn/learning/bnt_parms.yap +share/Yap/clpbn/learning/em.yap share/Yap/clpbn/learning/learn_utils.yap share/Yap/clpbn/learning/mle.yap share/Yap/clpbn/matrix_cpt_utils.yap +share/Yap/clpbn/pgrammar.yap +share/Yap/clpbn/table.yap share/Yap/clpbn/topsort.yap share/Yap/clpbn/utils.yap share/Yap/clpbn/vel.yap @@ -84,22 +191,34 @@ share/Yap/clpr/ineq_r.pl share/Yap/clpr/itf_r.pl share/Yap/clpr/nf_r.pl share/Yap/clpr/store_r.pl +share/Yap/cnf.pl share/Yap/dbqueues.yap +share/Yap/dbusage.yap share/Yap/debug.pl share/Yap/dgraphs.yap +share/Yap/dialect/commons.yap +share/Yap/dialect/hprolog.yap +share/Yap/dialect/swi.yap +share/Yap/dialect/swi/INDEX.pl +share/Yap/dialect/swi/listing.pl share/Yap/error.pl +share/Yap/expand_macros.yap share/Yap/gensym.yap share/Yap/hacks.yap share/Yap/heaps.yap share/Yap/icon_address.pl +share/Yap/iso_639.pl share/Yap/itries.yap share/Yap/lam_mpi.yap share/Yap/lineutils.yap -share/Yap/listing.yap share/Yap/lists.yap share/Yap/maplist.pl +share/Yap/maplist.yap share/Yap/matlab.yap share/Yap/matrix.yap +share/Yap/minisat.pl +share/Yap/minisat_examples/adder.pl +share/Yap/minisat_examples/pearl_examples.pl share/Yap/nb.yap share/Yap/occurs.yap share/Yap/operators.pl @@ -109,17 +228,22 @@ share/Yap/pairs.pl share/Yap/pillow.pl share/Yap/pl/arith.yap share/Yap/pl/arrays.yap +share/Yap/pl/attributes.yap share/Yap/pl/boot.yap share/Yap/pl/callcount.yap share/Yap/pl/checker.yap share/Yap/pl/chtypes.yap share/Yap/pl/consult.yap +share/Yap/pl/control.yap share/Yap/pl/corout.yap share/Yap/pl/debug.yap share/Yap/pl/depth_bound.yap +share/Yap/pl/dialect.yap share/Yap/pl/directives.yap share/Yap/pl/eam.yap share/Yap/pl/errors.yap +share/Yap/pl/eval.yap +share/Yap/pl/flags.yap share/Yap/pl/grammar.yap share/Yap/pl/ground.yap share/Yap/pl/hacks.yap @@ -139,10 +263,21 @@ share/Yap/pl/statistics.yap share/Yap/pl/strict_iso.yap share/Yap/pl/tabling.yap share/Yap/pl/threads.yap +share/Yap/pl/udi.yap share/Yap/pl/utils.yap share/Yap/pl/yapor.yap share/Yap/pl/yio.yap +share/Yap/plunit.pl share/Yap/prandom.yap +share/Yap/problog.yap +share/Yap/problog/flags.yap +share/Yap/problog/print.yap +share/Yap/problog/tptree.yap +share/Yap/problog_examples/graph.pl +share/Yap/problog_examples/learn_graph.pl +share/Yap/problog_learning.yap +share/Yap/problog_learning/flags_learning.yap +share/Yap/problog_learning/logger.yap share/Yap/prolog_source.pl share/Yap/prolog_xref.pl share/Yap/queues.yap @@ -151,12 +286,14 @@ share/Yap/rbtrees.yap share/Yap/readutil.yap share/Yap/regexp.yap share/Yap/rltree.yap +share/Yap/sgml.pl +share/Yap/sgml_write.pl share/Yap/splay.yap share/Yap/stringutils.yap -share/Yap/swi.yap -share/Yap/swi/apply_macros.pl share/Yap/system.yap share/Yap/terms.yap +share/Yap/test_cover.pl +share/Yap/test_wizard.pl share/Yap/timeout.yap share/Yap/trees.yap share/Yap/tries.yap @@ -166,4 +303,8 @@ share/Yap/varnumbers.yap share/Yap/wdgraphs.yap share/Yap/wgraphs.yap share/Yap/wundgraphs.yap +share/Yap/xsdp_types.pl share/Yap/ypp.yap +share/docs/Yap/Artistic +share/docs/Yap/COPYING +share/docs/Yap/README diff --git a/lang/yap/distinfo b/lang/yap/distinfo index 62868699d7e..7421c5e9517 100644 --- a/lang/yap/distinfo +++ b/lang/yap/distinfo @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.6 2010/02/11 20:43:49 asau Exp $ +$NetBSD: distinfo,v 1.7 2010/05/18 09:24:43 asau Exp $ -SHA1 (Yap-5.1.3.tar.gz) = 76c84b32ad8fbe8324a1db370f8440be11398c34 -RMD160 (Yap-5.1.3.tar.gz) = b2e1153c7a6853a4814a672992d2b8b3834796bc -Size (Yap-5.1.3.tar.gz) = 3266063 bytes +SHA1 (yap-6.0.5.tar.gz) = 1084b1630b48a430d60d6aee8e31914ecc6d5369 +RMD160 (yap-6.0.5.tar.gz) = b35264a7911c73d095426fb3790a104d41d44157 +Size (yap-6.0.5.tar.gz) = 3744819 bytes SHA1 (patch-aa) = dca2acac805aabd8e2815b509ad516294484ad0f SHA1 (patch-ab) = 76e1a2b4a183215c37ede5c8cbec624e901fe427 SHA1 (patch-ac) = c0d382127f9bc3a962d01a0da34c99968f7388ab SHA1 (patch-ad) = e3765c0d6729b4d531cdea59dc8e442055091d10 SHA1 (patch-ae) = cf4a79ccd0c34e42ca3d8a108619a9974288cde6 SHA1 (patch-af) = e49296d42247aec7ead7f65d67a42f93b400ca0f -SHA1 (patch-ag) = a9f2bfc921f5c2aaf2a92e6659c54047e5c13321 SHA1 (patch-ah) = 572e29729d97d5e9942a3d2c22e121d4e756d648 -SHA1 (patch-ai) = a702088735520c36ada438e752b1852d9567e5e2 diff --git a/lang/yap/patches/patch-ag b/lang/yap/patches/patch-ag deleted file mode 100644 index d89c1f4d7c0..00000000000 --- a/lang/yap/patches/patch-ag +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2010/02/11 20:43:49 asau Exp $ - ---- LGPL/chr/Makefile.in.orig 2008-04-03 17:26:38.000000000 +0400 -+++ LGPL/chr/Makefile.in 2009-04-19 05:42:22.000000000 +0400 -@@ -48,42 +48,42 @@ - $(srcdir)/Benchmarks/bool.chr $(srcdir)/Benchmarks/family.chr $(srcdir)/Benchmarks/fibonacci.chr $(srcdir)/Benchmarks/leq.chr $(srcdir)/Benchmarks/listdom.chr \ - $(srcdir)/Benchmarks/chrdif.chr - --all: chr_translate.pl -+all: chr_translate.pl guard_entailment.pl - - chr_translate_bootstrap1.pl: $(srcdir)/chr_translate_bootstrap1.chr - $(PL) -f -l chr_swi_bootstrap.yap \ -- -g "chr_compile_step1('$<','$@'),halt." \ -+ -g "chr_compile_step1('$>','$@'),halt." \ - -z 'halt(1).' - $(PL) -f -l chr_swi_bootstrap.yap \ -- -g "chr_compile_step2('$<','$@'),halt." \ -+ -g "chr_compile_step2('$>','$@'),halt." \ - -z 'halt(1).' - - chr_translate_bootstrap2.pl: $(srcdir)/chr_translate_bootstrap2.chr chr_translate_bootstrap1.pl - $(PL) -f -l chr_swi_bootstrap.yap \ -- -g "chr_compile_step2('$<','$@'),halt." \ -+ -g "chr_compile_step2('$>','$@'),halt." \ - -z 'halt(1).' - $(PL) -f -l chr_swi_bootstrap.yap \ -- -g "chr_compile_step3('$<','$@'),halt." \ -+ -g "chr_compile_step3('$>','$@'),halt." \ - -z 'halt(1).' - - guard_entailment.pl: $(srcdir)/guard_entailment.chr chr_translate_bootstrap2.pl - $(PL) -f -l chr_swi_bootstrap.yap \ -- -g "chr_compile_step3('$<','$@'),halt." \ -+ -g "chr_compile_step3('$>','$@'),halt." \ - -z 'halt(1).' - - chr_translate.pl: $(srcdir)/chr_translate.chr chr_translate_bootstrap2.pl guard_entailment.pl - $(PL) -f -l chr_swi_bootstrap.yap \ -- -g "chr_compile_step3('$<','$@'),halt." \ -+ -g "chr_compile_step3('$>','$@'),halt." \ - -z 'halt(1).' - $(PL) -f -p chr=. -l chr_swi_bootstrap.yap \ - -g "chr_compile_step4('guard_entailment.chr','guard_entailment.pl'),halt." \ - -z 'halt(1).' - $(PL) -f -p chr=. -l chr_swi_bootstrap.yap \ -- -g "chr_compile_step4('$<','$@'),halt." \ -+ -g "chr_compile_step4('$>','$@'),halt." \ - -z 'halt(1).' - - chr.pl: chr_swi.pl -- cp $< $@ -+ cp $> $@ - - install: chr_translate.pl guard_entailment.pl - mkdir -p $(DESTDIR)$(CHRDIR) diff --git a/lang/yap/patches/patch-ai b/lang/yap/patches/patch-ai deleted file mode 100644 index e75e8c5a26f..00000000000 --- a/lang/yap/patches/patch-ai +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2010/02/11 20:43:49 asau Exp $ - -Disable parts to avoid breakage. - ---- Makefile.in.orig 2008-06-04 18:47:18.000000000 +0400 -+++ Makefile.in 2009-12-11 05:30:54.000000000 +0300 -@@ -659,7 +659,7 @@ - @INSTALLCLP@(cd LGPL/clp ; make install) - @INSTALLCLP@(cd GPL/clpqr ; make install) - # (cd CHR ; make install) -- @INSTALLCLP@(cd LGPL/chr ; make install) -+# @INSTALLCLP@(cd LGPL/chr ; make install) - @INSTALLCLP@(cd CLPBN ; make install) - - -- cgit v1.2.3