5 files changed, 35 insertions, 12 deletions

diff --git a/lang/ats/Makefile b/lang/ats/Makefile
index ce2b8c475069..19f98619e8c2 100644
--- a/lang/ats/Makefile
+++ b/lang/ats/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ats
 PORTVERSION=	${ATS_VER}
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}-lang/${PORTNAME}-lang/${ATS_IMPL}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-lang-${ATS_IMPL}-${PORTVERSION}
 
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include \
 		-L${LOCALBASE}/lib
 
-PORTDOCS=	FAQ.txt BOOK TUTORIAL
+PORTDOCS=	FAQ.txt BOOK
 PORTEXAMPLES=	AUP INTRO KernighanRitchie MISC MULTICORE TEST
 
 .include <bsd.port.pre.mk>
diff --git a/lang/ats/bsd.ats.mk b/lang/ats/bsd.ats.mk
index fd14f9439f32..3bbf0e651972 100644
--- a/lang/ats/bsd.ats.mk
+++ b/lang/ats/bsd.ats.mk
@@ -1,5 +1,5 @@
 ATS_IMPL=	anairiats
-ATS_VER=	0.2.5
+ATS_VER=	0.2.6
 
 ATS_LIBDIR_REL=	lib/ats-${ATS_IMPL}-${ATS_VER}
 ATS_LIBDIR=	${LOCALBASE}/${ATS_LIBDIR_REL}
diff --git a/lang/ats/distinfo b/lang/ats/distinfo
index 68914928dbe6..9e462c41a302 100644
--- a/lang/ats/distinfo
+++ b/lang/ats/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ats-lang-anairiats-0.2.5.tar.gz) = ded96413d4b58ed195d2f8ef4cefed807c7b1667a8f9235c9065b3666321aa0b
-SIZE (ats-lang-anairiats-0.2.5.tar.gz) = 2445429
+SHA256 (ats-lang-anairiats-0.2.6.tar.gz) = 403eda8834c76c24992f351c567862281b9f68ad1f1178d5e2252110b74bedf1
+SIZE (ats-lang-anairiats-0.2.6.tar.gz) = 2899016
diff --git a/lang/ats/files/patch-Makefile b/lang/ats/files/patch-Makefile
index b02515fd639b..8aacc58df144 100644
--- a/lang/ats/files/patch-Makefile
+++ b/lang/ats/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2011-10-06 17:27:15.000000000 +0800
-+++ Makefile	2011-10-07 02:01:05.000000000 +0800
+--- Makefile.orig	2011-11-11 09:41:38.000000000 +0800
++++ Makefile	2011-11-15 11:51:22.387400943 +0800
 @@ -92,7 +92,7 @@
  	cd $(abs_top_srcdir)
  	[ -d $(DESTDIR)/$(bindir) ] || $(MKDIR_P) $(DESTDIR)/$(bindir)
@@ -36,9 +36,12 @@
  	@echo "ATS/Anairiats has been built up successfully!"
  	@echo "The value of ATSHOME for this build is \"$(ATSHOME)\"."
  	@echo "The value of ATSHOMERELOC for this build is \"$(ATSHOMERELOC)\"."
-@@ -214,23 +214,23 @@
+@@ -212,25 +212,25 @@
  
- .libfiles_local: .libfiles ; $(CC) -E -P -x c -o $@ $<
+ ATSLIB=$(ATSHOMEQ)/bin/atslib
+ 
+-.libfiles_local: .libfiles ; $(CC) -E -P -x c -o $@ $<
++.libfiles_local: .libfiles ; $(CC) -E -P -x c -o $@ $< ; sed -i '' -e '/linordset_randbst/d' $@
  libfiles: .libfiles_local
 -	$(ATSLIB) $(ATS_PROOFCHECK) -D_XOPEN_SOURCE -O2 --libats
 -	$(ATSLIB) $(ATS_PROOFCHECK) -O2 --libats_lex
diff --git a/lang/ats/pkg-plist b/lang/ats/pkg-plist
index 87547f330daf..5eec3b57df6a 100644
--- a/lang/ats/pkg-plist
+++ b/lang/ats/pkg-plist
@@ -16,7 +16,6 @@ bin/atspack
 %%ATS_LIBDIR%%/ccomp/%%LIBDIR%%/libats_smlbas.a
 %%ATS_LIBDIR%%/ccomp/runtime/GCATS/Makefile
 %%ATS_LIBDIR%%/ccomp/runtime/GCATS/README
-%%ATS_LIBDIR%%/ccomp/runtime/GCATS/X.sats
 %%ATS_LIBDIR%%/ccomp/runtime/GCATS/gc.o
 %%ATS_LIBDIR%%/ccomp/runtime/GCATS/gc_mt.o
 %%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1.cats
@@ -50,6 +49,7 @@ bin/atspack
 %%ATS_LIBDIR%%/libats/CATS/hashtable_chain.cats
 %%ATS_LIBDIR%%/libats/CATS/intinf.cats
 %%ATS_LIBDIR%%/libats/CATS/linbitvec.cats
+%%ATS_LIBDIR%%/libats/CATS/linordset_randbst.cats
 %%ATS_LIBDIR%%/libats/CATS/linqueue_arr.cats
 %%ATS_LIBDIR%%/libats/CATS/linqueue_lst.cats
 %%ATS_LIBDIR%%/libats/CATS/linstack_arr.cats
@@ -57,12 +57,14 @@ bin/atspack
 %%ATS_LIBDIR%%/libats/CATS/regexp.cats
 %%ATS_LIBDIR%%/libats/CATS/slseg.cats
 %%ATS_LIBDIR%%/libats/CATS/vector.cats
+%%ATS_LIBDIR%%/libats/DATS/biarray.dats
 %%ATS_LIBDIR%%/libats/DATS/fmatrix.dats
 %%ATS_LIBDIR%%/libats/DATS/freelst.dats
 %%ATS_LIBDIR%%/libats/DATS/funarray_braun.dats
 %%ATS_LIBDIR%%/libats/DATS/fundeque_fingertree.dats
 %%ATS_LIBDIR%%/libats/DATS/funheap_braun.dats
 %%ATS_LIBDIR%%/libats/DATS/funmap_avltree.dats
+%%ATS_LIBDIR%%/libats/DATS/funmap_rbtree.dats
 %%ATS_LIBDIR%%/libats/DATS/funralist_nested.dats
 %%ATS_LIBDIR%%/libats/DATS/funset_avltree.dats
 %%ATS_LIBDIR%%/libats/DATS/funset_listord.dats
@@ -77,19 +79,24 @@ bin/atspack
 %%ATS_LIBDIR%%/libats/DATS/iterint.dats
 %%ATS_LIBDIR%%/libats/DATS/linbitvec.dats
 %%ATS_LIBDIR%%/libats/DATS/linmap_avltree.dats
+%%ATS_LIBDIR%%/libats/DATS/linmap_rbtree.dats
+%%ATS_LIBDIR%%/libats/DATS/linordset_randbst.dats
 %%ATS_LIBDIR%%/libats/DATS/linqueue_arr.dats
 %%ATS_LIBDIR%%/libats/DATS/linqueue_lst.dats
+%%ATS_LIBDIR%%/libats/DATS/linset_avltree.dats
 %%ATS_LIBDIR%%/libats/DATS/linstack_arr.dats
 %%ATS_LIBDIR%%/libats/DATS/parworkshop.dats
 %%ATS_LIBDIR%%/libats/DATS/rarray.dats
 %%ATS_LIBDIR%%/libats/DATS/regexp.dats
 %%ATS_LIBDIR%%/libats/DATS/vector.dats
+%%ATS_LIBDIR%%/libats/SATS/biarray.sats
 %%ATS_LIBDIR%%/libats/SATS/fmatrix.sats
 %%ATS_LIBDIR%%/libats/SATS/freelst.sats
 %%ATS_LIBDIR%%/libats/SATS/funarray_braun.sats
 %%ATS_LIBDIR%%/libats/SATS/fundeque_fingertree.sats
 %%ATS_LIBDIR%%/libats/SATS/funheap_braun.sats
 %%ATS_LIBDIR%%/libats/SATS/funmap_avltree.sats
+%%ATS_LIBDIR%%/libats/SATS/funmap_rbtree.sats
 %%ATS_LIBDIR%%/libats/SATS/funralist_nested.sats
 %%ATS_LIBDIR%%/libats/SATS/funset_avltree.sats
 %%ATS_LIBDIR%%/libats/SATS/funset_listord.sats
@@ -107,8 +114,11 @@ bin/atspack
 %%ATS_LIBDIR%%/libats/SATS/itreep.sats
 %%ATS_LIBDIR%%/libats/SATS/linbitvec.sats
 %%ATS_LIBDIR%%/libats/SATS/linmap_avltree.sats
+%%ATS_LIBDIR%%/libats/SATS/linmap_rbtree.sats
+%%ATS_LIBDIR%%/libats/SATS/linordset_randbst.sats
 %%ATS_LIBDIR%%/libats/SATS/linqueue_arr.sats
 %%ATS_LIBDIR%%/libats/SATS/linqueue_lst.sats
+%%ATS_LIBDIR%%/libats/SATS/linset_avltree.sats
 %%ATS_LIBDIR%%/libats/SATS/linstack_arr.sats
 %%ATS_LIBDIR%%/libats/SATS/optini.sats
 %%ATS_LIBDIR%%/libats/SATS/parworkshop.sats
@@ -234,6 +244,12 @@ bin/atspack
 %%ATS_LIBDIR%%/libc/SATS/utime.sats
 %%ATS_LIBDIR%%/libc/arpa/CATS/inet.cats
 %%ATS_LIBDIR%%/libc/arpa/SATS/inet.sats
+%%ATS_LIBDIR%%/libc/gdbm/CATS/datum.cats
+%%ATS_LIBDIR%%/libc/gdbm/CATS/gdbm.cats
+%%ATS_LIBDIR%%/libc/gdbm/CATS/ndbm.cats
+%%ATS_LIBDIR%%/libc/gdbm/SATS/datum.sats
+%%ATS_LIBDIR%%/libc/gdbm/SATS/gdbm.sats
+%%ATS_LIBDIR%%/libc/gdbm/SATS/ndbm.sats
 %%ATS_LIBDIR%%/libc/netinet/CATS/in.cats
 %%ATS_LIBDIR%%/libc/netinet/SATS/in.sats
 %%ATS_LIBDIR%%/libc/sys/CATS/poll.cats
@@ -293,7 +309,7 @@ bin/atspack
 %%ATS_LIBDIR%%/prelude/DATS/arith.dats
 %%ATS_LIBDIR%%/prelude/DATS/array.dats
 %%ATS_LIBDIR%%/prelude/DATS/array0.dats
-%%ATS_LIBDIR%%/prelude/DATS/array_v.dats
+%%ATS_LIBDIR%%/prelude/DATS/array_prf.dats
 %%ATS_LIBDIR%%/prelude/DATS/basics.dats
 %%ATS_LIBDIR%%/prelude/DATS/bool.dats
 %%ATS_LIBDIR%%/prelude/DATS/filebas.dats
@@ -306,6 +322,7 @@ bin/atspack
 %%ATS_LIBDIR%%/prelude/DATS/list_vt.dats
 %%ATS_LIBDIR%%/prelude/DATS/matrix.dats
 %%ATS_LIBDIR%%/prelude/DATS/matrix0.dats
+%%ATS_LIBDIR%%/prelude/DATS/memalign.dats
 %%ATS_LIBDIR%%/prelude/DATS/option.dats
 %%ATS_LIBDIR%%/prelude/DATS/option0.dats
 %%ATS_LIBDIR%%/prelude/DATS/option_vt.dats
@@ -317,7 +334,6 @@ bin/atspack
 %%ATS_LIBDIR%%/prelude/DATS/string.dats
 %%ATS_LIBDIR%%/prelude/DATS/syndef.dats
 %%ATS_LIBDIR%%/prelude/DATS/unsafe.dats
-%%ATS_LIBDIR%%/prelude/DATS/vsubrw.dats
 %%ATS_LIBDIR%%/prelude/HATS/lmacrodef.hats
 %%ATS_LIBDIR%%/prelude/HATS/number.hats
 %%ATS_LIBDIR%%/prelude/HATS/syndef.hats
@@ -340,6 +356,7 @@ bin/atspack
 %%ATS_LIBDIR%%/prelude/SATS/list_vt.sats
 %%ATS_LIBDIR%%/prelude/SATS/matrix.sats
 %%ATS_LIBDIR%%/prelude/SATS/matrix0.sats
+%%ATS_LIBDIR%%/prelude/SATS/memalign.sats
 %%ATS_LIBDIR%%/prelude/SATS/memory.sats
 %%ATS_LIBDIR%%/prelude/SATS/multiset.sats
 %%ATS_LIBDIR%%/prelude/SATS/number.sats
@@ -387,6 +404,9 @@ bin/atspack
 @dirrm %%ATS_LIBDIR%%/libc/arpa/CATS
 @dirrm %%ATS_LIBDIR%%/libc/arpa/SATS
 @dirrm %%ATS_LIBDIR%%/libc/arpa
+@dirrm %%ATS_LIBDIR%%/libc/gdbm/CATS
+@dirrm %%ATS_LIBDIR%%/libc/gdbm/SATS
+@dirrm %%ATS_LIBDIR%%/libc/gdbm
 @dirrm %%ATS_LIBDIR%%/libc/netinet/CATS
 @dirrm %%ATS_LIBDIR%%/libc/netinet/SATS
 @dirrm %%ATS_LIBDIR%%/libc/netinet